diff --git a/.c-ares.metadata b/.c-ares.metadata new file mode 100644 index 0000000..4b68daf --- /dev/null +++ b/.c-ares.metadata @@ -0,0 +1 @@ +e44e6575d5af99cb3a38461486e1ee8b49810eb5 SOURCES/c-ares-1.10.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Use-RPM-compiler-options.patch b/SOURCES/0001-Use-RPM-compiler-options.patch new file mode 100644 index 0000000..721b713 --- /dev/null +++ b/SOURCES/0001-Use-RPM-compiler-options.patch @@ -0,0 +1,41 @@ +From 7dada62a77e061c752123e672e844386ff3b01ea Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Wed, 10 Apr 2013 12:32:44 -0400 +Subject: [PATCH] Use RPM compiler options + +--- + m4/cares-compilers.m4 | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +diff --git a/m4/cares-compilers.m4 b/m4/cares-compilers.m4 +index 7ee8e0dbe741c1a64149a0d20b826f507b3ec620..d7708230fb5628ae80fbf1052da0d2c78ebbc160 100644 +--- a/m4/cares-compilers.m4 ++++ b/m4/cares-compilers.m4 +@@ -143,19 +143,12 @@ AC_DEFUN([CARES_CHECK_COMPILER_GNU_C], [ + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" +- flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" +- flags_opt_off="-O0" ++ flags_dbg_all="" ++ flags_dbg_yes="" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" ++ flags_opt_off="" + CURL_CHECK_DEF([_WIN32], [], [silent]) + else + AC_MSG_RESULT([no]) +-- +1.8.1.4 diff --git a/SOURCES/LICENSE b/SOURCES/LICENSE new file mode 100644 index 0000000..4c1423a --- /dev/null +++ b/SOURCES/LICENSE @@ -0,0 +1,12 @@ +Copyright (C) 2004 by Daniel Stenberg et al + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of M.I.T. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. M.I.T. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + diff --git a/SOURCES/c-ares-1.10.0-multilib.patch b/SOURCES/c-ares-1.10.0-multilib.patch new file mode 100644 index 0000000..4daa9d2 --- /dev/null +++ b/SOURCES/c-ares-1.10.0-multilib.patch @@ -0,0 +1,30 @@ +diff -up c-ares-1.10.0/ares_build.h.in.multilib c-ares-1.10.0/ares_build.h.in +--- c-ares-1.10.0/ares_build.h.in.multilib 2013-05-13 11:40:22.697814087 +0200 ++++ c-ares-1.10.0/ares_build.h.in 2013-05-13 11:40:26.236813966 +0200 +@@ -96,7 +96,14 @@ + #endif + + /* The size of `long', as computed by sizeof. */ +-#undef CARES_SIZEOF_LONG ++#include ++#if __WORDSIZE == 32 ++#define CARES_SIZEOF_LONG 4 ++#elif __WORDSIZE == 64 ++#define CARES_SIZEOF_LONG 8 ++#else ++#error "Unknown word size" ++#endif + + /* Integral data type used for ares_socklen_t. */ + #undef CARES_TYPEOF_ARES_SOCKLEN_T +diff -up c-ares-1.10.0/configure.ac.multilib c-ares-1.10.0/configure.ac +--- c-ares-1.10.0/configure.ac.multilib 2013-05-13 11:41:00.480812797 +0200 ++++ c-ares-1.10.0/configure.ac 2013-05-13 11:41:17.210812226 +0200 +@@ -457,7 +457,6 @@ AC_CHECK_SIZEOF(size_t) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(short) +-CARES_CONFIGURE_LONG + AC_CHECK_SIZEOF(time_t) + + AC_CHECK_TYPE(long long, diff --git a/SPECS/c-ares.spec b/SPECS/c-ares.spec new file mode 100644 index 0000000..3a7b800 --- /dev/null +++ b/SPECS/c-ares.spec @@ -0,0 +1,212 @@ +Summary: A library that performs asynchronous DNS operations +Name: c-ares +Version: 1.10.0 +Release: 1%{?dist} +License: MIT +Group: System Environment/Libraries +URL: http://c-ares.haxx.se/ +Source0: http://c-ares.haxx.se/download/%{name}-%{version}.tar.gz +# The license can be obtained at http://c-ares.haxx.se/license.html +Source1: LICENSE +Patch0: 0001-Use-RPM-compiler-options.patch +Patch1: c-ares-1.10.0-multilib.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool + +%description +c-ares is a C library that performs DNS requests and name resolves +asynchronously. c-ares is a fork of the library named 'ares', written +by Greg Hudson at MIT. + +%package devel +Summary: Development files for c-ares +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +This package contains the header files and libraries needed to +compile applications or shared objects that use c-ares. + +%prep +%setup -q +%patch0 -p1 -b .optflags +%patch1 -p1 -b .multilib + +cp %{SOURCE1} . +f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f + +%build +autoreconf -if +%configure --enable-shared --disable-static \ + --disable-dependency-tracking +%{__make} %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT/%{_libdir}/libcares.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) +%doc README README.cares CHANGES NEWS LICENSE +%{_libdir}/*.so.* + +%files devel +%defattr(-, root, root, 0755) +%{_includedir}/ares.h +%{_includedir}/ares_build.h +%{_includedir}/ares_dns.h +%{_includedir}/ares_rules.h +%{_includedir}/ares_version.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/libcares.pc +%{_mandir}/man3/ares_* + +%changelog +* Mon May 13 2013 Jakub Hrozek - 1.10.1-1 +- New upstream release 1.10 +- Obsolete upstreamed patches +- Amend the multilib patch, there's no need to patch configure since we + are running autoreconf anyways +- https://raw.github.com/bagder/c-ares/cares-1_10_0/RELEASE-NOTES + +* Thu Apr 11 2013 Jakub Hrozek - 1.9.1-6 +- Apply an upstream patch to override AC_CONFIG_MACRO_DIR only conditionally + +* Thu Apr 11 2013 Jakub Hrozek - 1.9.1-5 +- Apply a patch by Stephen Gallagher to patch autoconf, not configure to + allow optflags to be passed in by build environment +- Run autoreconf before configure +- git rm obsolete patches +- Apply upstream patch to stop overriding AC_CONFIG_MACRO_DIR + +* Wed Feb 13 2013 Fedora Release Engineering - 1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Aug 8 2012 Jakub Hrozek - 1.9.1-3 +- Include URL to the license text + +* Wed Jul 18 2012 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jun 25 2012 Tom Callaway - 1.9.1-1 +- update to 1.9.1 + +* Sat Apr 28 2012 Tom Callaway - 1.8.0-1 +- update to 1.8.0 +- fix multilib patch (thanks to Paul Howarth) + +* Thu Jan 12 2012 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Aug 17 2011 Jakub Hrozek - 1.7.5-1 +- New upstream release 1.7.5 +- Obsoletes patch #2 +- Rebase patch #1 (optflags) to match the 1.7.5 code +- Fixed Source0 URL to point at the upstream tarball + +* Mon Apr 11 2011 Jakub Hrozek - 1.7.4-3 +- Apply upstream patch to fix rhbz#695424 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 10 2010 Tom "spot" Callaway - 1.7.4-1 +- update to 1.7.4 + +* Wed Aug 25 2010 Jakub Hrozek - 1.7.3-3 +- Actually apply the patches + +* Wed Aug 25 2010 Jakub Hrozek - 1.7.3-2 +- apply couple of patches from upstream + +* Tue Jun 15 2010 Jakub Hrozek - 1.7.3-1 +- Upgrade to new upstream release 1.7.3 (obsoletes search/domain patch) +- Fix conflict of -devel packages on multilib architectures (#602880) + +* Thu Jun 3 2010 Jakub Hrozek - 1.7.1-2 +- Use last instance of search/domain, not the first one (#597286) + +* Tue Mar 23 2010 Jakub Hrozek - 1.7.1-1 +- update to 1.7.1 which contains the IPv6 nameserver patch + +* Sun Mar 7 2010 Jakub Hrozek - 1.7.0-3 +- Change IPv6 nameserver patch according to upstream changes + (upstream revisions 1199,1201,1202) + +* Wed Mar 3 2010 Jakub Hrozek - 1.7.0-2 +- Add a patch to allow usage of IPv6 nameservers + +* Tue Dec 1 2009 Tom "spot" Callaway - 1.7.0-1 +- update to 1.7.0 + +* Sat Jul 25 2009 Ville Skyttä - 1.6.0-3 +- Patch to make upstream build system honor our CFLAGS and friends. +- Don't bother building throwaway static libs. +- Disable autotools dependency tracking for cleaner build logs and possible + slight build speedup. +- Convert docs to UTF-8. +- Update URLs. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Tom "spot" Callaway - 1.6.0-1 +- update to 1.6.0 + +* Mon Feb 23 2009 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Sep 12 2008 Tom "spot" Callaway - 1.5.3-1 +- update to 1.5.3 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.5.1-2 +- Autorebuild for GCC 4.3 + +* Tue Feb 19 2008 Tom "spot" Callaway 1.5.1-1 +- update to 1.5.1 + +* Thu Aug 23 2007 Tom "spot" Callaway 1.4.0-2 +- rebuild for ppc32 + +* Wed Jun 27 2007 Tom "spot" Callaway 1.4.0-1 +- bump to 1.4.0 (resolves bugzilla 243591) +- get rid of static library (.a) + +* Wed Jan 17 2007 Tom "spot" Callaway 1.3.2-1 +- bump to 1.3.2 + +* Mon Sep 11 2006 Tom "spot" Callaway 1.3.1-2 +- FC-6 bump + +* Mon Jul 10 2006 Tom "spot" Callaway 1.3.1-1 +- bump to 1.3.1 + +* Tue Feb 28 2006 Tom "spot" Callaway 1.3.0-2 +- bump for FC-5 rebuild + +* Sun Sep 4 2005 Tom "spot" Callaway 1.3.0-1 +- include LICENSE text +- bump to 1.3.0 + +* Tue May 31 2005 Tom "spot" Callaway 1.2.1-4 +- use dist tag to prevent EVR overlap + +* Fri Apr 22 2005 Tom "spot" Callaway 1.2.1-2 +- fix license (MIT, not LGPL) +- get rid of libcares.la + +* Fri Apr 22 2005 Tom "spot" Callaway 1.2.1-1 +- initial package creation +