Hello community, here is the log from the commit of package libcares2 for openSUSE:Factory checked in at 2013-05-07 07:24:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcares2 (Old) and /work/SRC/openSUSE:Factory/.libcares2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcares2" Changes: -------- --- /work/SRC/openSUSE:Factory/libcares2/libcares2.changes 2012-02-08 15:35:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2013-05-07 07:24:03.000000000 +0200 @@ -1,0 +2,24 @@ +Fri May 3 07:12:14 UTC 2013 - mvysko...@suse.com + +- Use the genuine upstream tarball +- Verify tarball using gpg-offline + +------------------------------------------------------------------- +Thu May 2 13:24:49 UTC 2013 - jeng...@inai.de + +- Get rid of outdated autotools construct to fix build with + new automake-1.13 + +------------------------------------------------------------------- +Sun Jan 6 21:14:16 UTC 2013 - p.drou...@gmail.com + +- Update to 1.9.1 version: + * include the ares_parse_soa_reply.* files in the tarball +- Removed patches (fixed and merged on upstream release) + * 0001-ares_destroy.c-fix-segfault-in-ares_destroy_options.patch + * 0002-ares_getnameinfo-fix-random-results-with-c-ares-1.7..patch + * 0003-ares_init.c-fix-segfault-triggered-in-ares_init_opti.patch +- Updated and versionned patchs for upstream release: + * 0001-add-symbol-versioning-support.patch + * cares-ocloexec.patch +------------------------------------------------------------------- Old: ---- 0001-add-symbol-versioning-support.patch 0001-ares_destroy.c-fix-segfault-in-ares_destroy_options.patch 0002-ares_getnameinfo-fix-random-results-with-c-ares-1.7..patch 0003-ares_init.c-fix-segfault-triggered-in-ares_init_opti.patch c-ares-1.7.5.tar.bz2 cares-ocloexec.patch New: ---- 0001-cares-1.9.1-add-symbol-versioning-support.patch c-ares-1.9.1.tar.gz c-ares-1.9.1.tar.gz.asc cares-1.9.1-ocloexec.patch cares-autotools.diff libcares2.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcares2.spec ++++++ --- /var/tmp/diff_new_pack.MRJXsT/_old 2013-05-07 07:24:05.000000000 +0200 +++ /var/tmp/diff_new_pack.MRJXsT/_new 2013-05-07 07:24:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcares2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,29 @@ # -Url: http://daniel.haxx.se/projects/c-ares %define pkg_name c-ares Name: libcares2 -Version: 1.7.5 -Release: 1 -License: MIT +Version: 1.9.1 +Release: 0 Summary: Library for asynchronous name resolves +License: MIT Group: Development/Libraries/C and C++ -Source: http://daniel.haxx.se/projects/c-ares/%{pkg_name}-%{version}.tar.bz2 -Source2: baselibs.conf -BuildRequires: pkg-config +Url: http://c-ares.haxx.se/ + +Source0: http://c-ares.haxx.se/download/%{pkg_name}-%{version}.tar.gz +Source1: http://c-ares.haxx.se/download/%{pkg_name}-%{version}.tar.gz.asc +Source3: libcares2.keyring +Source4: baselibs.conf +Patch4: cares-1.9.1-ocloexec.patch +Patch5: 0001-cares-1.9.1-add-symbol-versioning-support.patch +Patch6: cares-autotools.diff BuildRequires: libtool +BuildRequires: pkg-config +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch1: 0001-ares_destroy.c-fix-segfault-in-ares_destroy_options.patch -Patch2: 0002-ares_getnameinfo-fix-random-results-with-c-ares-1.7..patch -Patch3: 0003-ares_init.c-fix-segfault-triggered-in-ares_init_opti.patch -Patch4: cares-ocloexec.patch -Patch5: 0001-add-symbol-versioning-support.patch %description c-ares is a C library that performs DNS requests and name resolves @@ -53,12 +57,14 @@ by Greg Hudson at MIT. %prep +%if 0%{?suse_version} >= 1230 +%gpg_verify %{SOURCE1} +%endif + %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch -P 6 -p1 %build autoreconf -fiv ++++++ 0001-cares-1.9.1-add-symbol-versioning-support.patch ++++++ >From f2f268450d2aff0c7bcbb848b8a1c7b1e1d38291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodrig...@opensuse.org> Date: Fri, 3 Feb 2012 16:01:16 -0300 Subject: [PATCH] add symbol versioning support --- Makefile.am | 11 ++++--- c-ares.map | 72 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +---- m4/ld-version-script.m4 | 53 ++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 12 deletions(-) create mode 100644 c-ares.map create mode 100644 m4/ld-version-script.m4 --- c-ares-1.7.5.orig/Makefile.am +++ c-ares-1.7.5/Makefile.am @@ -93,12 +93,13 @@ # set age to 0. (c:r:a=0) # -if NO_UNDEFINED -# The -no-undefined flag is crucial for this to build fine on some platforms -UNDEF = -no-undefined -endif +libcares_la_LDFLAGS = -no-undefined $(UNDEF) $(VER) -libcares_la_LDFLAGS = $(UNDEF) $(VER) +if HAVE_LD_VERSION_SCRIPT +libcares_la_LDFLAGS += -Wl,--version-script=$(srcdir)/c-ares.map +else +libcares_la_LDFLAGS += -export-symbols-regex '^ares_.*' +endif # Add -Werror if defined CFLAGS += @CARES_CFLAG_EXTRAS@ --- /dev/null +++ c-ares-1.7.5/c-ares.map @@ -0,0 +1,72 @@ +CARES_1.2.0 { +global: + ares_cancel; + ares_destroy; + ares_expand_name; + ares_expand_string; + ares_fds; + ares_free_data; + ares_free_hostent; + ares_free_string; + ares_get_servers; + ares_gethostbyaddr; + ares_gethostbyname; + ares_init; + ares_init_options; + ares_mkquery; + ares_parse_a_reply; + ares_parse_ptr_reply; + ares_process; + ares_query; + ares_search; + ares_send; + ares_set_local_dev; + ares_set_local_ip4; + ares_set_local_ip6; + ares_set_servers; + ares_set_servers_csv; + ares_strerror; + ares_timeout; + ares_version; +local: *; +}; + +CARES_1.3.1 { +global: + ares_parse_aaaa_reply; + ares_getnameinfo; + ares_getsock; +} CARES_1.2.0; + +CARES_1.4.0 { +global: + ares_save_options; + ares_destroy_options; + ares_parse_ns_reply; + ares_process_fd; +} CARES_1.3.1; + +CARES_1.6.0 { +global: + ares_dup; + ares_gethostbyname_file; +} CARES_1.4.0; + +CARES_1.7.0 { +global: + ares_set_socket_callback; + ares_parse_txt_reply; + ares_parse_srv_reply; + ares_library_init; + ares_library_cleanup; +} CARES_1.6.0; + +CARES_1.7.1 { +global: + ares_reinit; +} CARES_1.7.0; + +CARES_1.7.2 { +global: + ares_parse_mx_reply; +} CARES_1.7.1; --- c-ares-1.7.5.orig/configure.ac +++ c-ares-1.7.5/configure.ac @@ -98,9 +98,6 @@ ;; esac -dnl support building of Windows DLLs -AC_LIBTOOL_WIN32_DLL - dnl force libtool to build static libraries with PIC on AMD64-Linux & FreeBSD AC_MSG_CHECKING([if arch-OS host is AMD64-Linux/FreeBSD (to build static libraries with PIC)]) case $host in @@ -125,7 +122,8 @@ esac dnl libtool setup -AC_PROG_LIBTOOL +LT_INIT([win32-dll pic-only disable-static]) +gl_LD_VERSION_SCRIPT AC_MSG_CHECKING([if we need CARES_BUILDING_LIBRARY]) use_cppflag_cares_building_library="no" @@ -179,9 +177,6 @@ CARES_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE CARES_CHECK_COMPILER_SYMBOL_HIDING -CARES_CHECK_NO_UNDEFINED -AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes) - CARES_CHECK_CURLDEBUG AM_CONDITIONAL(CURLDEBUG, test x$want_curldebug = xyes) --- /dev/null +++ c-ares-1.7.5/m4/ld-version-script.m4 @@ -0,0 +1,53 @@ +# ld-version-script.m4 serial 3 +dnl Copyright (C) 2008-2012 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Simon Josefsson + +# FIXME: The test below returns a false positive for mingw +# cross-compiles, 'local:' statements does not reduce number of +# exported symbols in a DLL. Use --disable-ld-version-script to work +# around the problem. + +# gl_LD_VERSION_SCRIPT +# -------------------- +# Check if LD supports linker scripts, and define automake conditional +# HAVE_LD_VERSION_SCRIPT if so. +AC_DEFUN([gl_LD_VERSION_SCRIPT], +[ + AC_ARG_ENABLE([ld-version-script], + AS_HELP_STRING([--enable-ld-version-script], + [enable linker version script (default is enabled when possible)]), + [have_ld_version_script=$enableval], []) + if test -z "$have_ld_version_script"; then + AC_MSG_CHECKING([if LD -Wl,--version-script works]) + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" + cat > conftest.map <<EOF +foo +EOF + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [accepts_syntax_errors=yes], [accepts_syntax_errors=no]) + if test "$accepts_syntax_errors" = no; then + cat > conftest.map <<EOF +VERS_1 { + global: sym; +}; + +VERS_2 { + global: sym; +} VERS_1; +EOF + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [have_ld_version_script=yes], [have_ld_version_script=no]) + else + have_ld_version_script=no + fi + rm -f conftest.map + LDFLAGS="$save_LDFLAGS" + AC_MSG_RESULT($have_ld_version_script) + fi + AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") +]) ++++++ cares-1.9.1-ocloexec.patch ++++++ diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c index 4b4c8a7..6896a91 100644 --- a/ares_gethostbyaddr.c +++ b/ares_gethostbyaddr.c @@ -222,7 +222,7 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host) return ARES_ENOTFOUND; #endif - fp = fopen(PATH_HOSTS, "r"); + fp = fopen(PATH_HOSTS, "re"); if (!fp) { error = ERRNO; diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c index 4869402..bfc54b6 100644 --- a/ares_gethostbyname.c +++ b/ares_gethostbyname.c @@ -380,7 +380,7 @@ static int file_lookup(const char *name, int family, struct hostent **host) return ARES_ENOTFOUND; #endif - fp = fopen(PATH_HOSTS, "r"); + fp = fopen(PATH_HOSTS, "re"); if (!fp) { error = ERRNO; diff --git a/ares_init.c b/ares_init.c index 0c1d545..b9b9508 100644 --- a/ares_init.c +++ b/ares_init.c @@ -1173,7 +1173,7 @@ if (ARES_CONFIG_CHECK(channel)) return ARES_SUCCESS; - fp = fopen(PATH_RESOLV_CONF, "r"); + fp = fopen(PATH_RESOLV_CONF, "re"); if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS) { @@ -1215,7 +1215,7 @@ if ((status == ARES_EOF) && (!channel->lookups)) { /* Many systems (Solaris, Linux, BSD's) use nsswitch.conf */ - fp = fopen("/etc/nsswitch.conf", "r"); + fp = fopen("/etc/nsswitch.conf", "re"); if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS) @@ -1245,7 +1245,7 @@ if ((status == ARES_EOF) && (!channel->lookups)) { /* Linux / GNU libc 2.x and possibly others have host.conf */ - fp = fopen("/etc/host.conf", "r"); + fp = fopen("/etc/host.conf", "re"); if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS) @@ -1275,7 +1275,7 @@ if ((status == ARES_EOF) && (!channel->lookups)) { /* Tru64 uses /etc/svc.conf */ - fp = fopen("/etc/svc.conf", "r"); + fp = fopen("/etc/svc.conf", "re"); if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) == ARES_SUCCESS) @@ -1908,7 +1908,7 @@ } #else /* !WIN32 */ #ifdef RANDOM_FILE - FILE *f = fopen(RANDOM_FILE, "rb"); + FILE *f = fopen(RANDOM_FILE, "rbe"); if(f) { counter = aresx_uztosi(fread(key, 1, key_data_len, f)); fclose(f); diff --git a/ares_process.c b/ares_process.c index 5de1ae6..1b85640 100644 --- a/ares_process.c +++ b/ares_process.c @@ -877,7 +877,7 @@ setsocknonblock(s, TRUE); -#if defined(FD_CLOEXEC) && !defined(MSDOS) +#if !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC) && !defined(MSDOS) /* Configure the socket fd as close-on-exec. */ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) return -1; @@ -964,7 +964,7 @@ } /* Acquire a socket. */ - s = socket(server->addr.family, SOCK_STREAM, 0); + s = socket(server->addr.family, SOCK_STREAM | SOCK_CLOEXEC, 0); if (s == ARES_SOCKET_BAD) return -1; @@ -1056,7 +1056,7 @@ } /* Acquire a socket. */ - s = socket(server->addr.family, SOCK_DGRAM, 0); + s = socket(server->addr.family, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (s == ARES_SOCKET_BAD) return -1; diff --git a/ares_search.c b/ares_search.c index 1877c19..387a16f 100644 --- a/ares_search.c +++ b/ares_search.c @@ -256,7 +256,7 @@ static int single_domain(ares_channel channel, const char *name, char **s) hostaliases = getenv("HOSTALIASES"); if (hostaliases) { - fp = fopen(hostaliases, "r"); + fp = fopen(hostaliases, "re"); if (fp) { while ((status = ares__read_line(fp, &line, &linesize)) ++++++ cares-autotools.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2013-05-02 15:15:23.388234597 +0200 build: do away with old autotools constructs --- Makefile.am | 9 +++------ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) Index: c-ares-1.9.1/Makefile.am =================================================================== --- c-ares-1.9.1.orig/Makefile.am +++ c-ares-1.9.1/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = foreign nostdinc ACLOCAL_AMFLAGS = -I m4 @@ -22,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4 # $(top_srcdir) is for c-ares's ares_setup.h and other "c-ares-private" files if CURLDEBUG -INCLUDES = -I$(top_builddir)/../include/curl \ +AM_CPPFLAGS = -I$(top_builddir)/../include/curl \ -I$(top_builddir)/../include \ -I$(top_srcdir)/../include \ -I$(top_builddir)/../lib \ @@ -30,7 +29,7 @@ INCLUDES = -I$(top_builddir)/../include/ -I$(top_builddir) \ -I$(top_srcdir) else -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) endif @@ -108,9 +107,7 @@ CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES # For Windows build targets, when building or using static c-ares if USE_CPPFLAG_CARES_STATICLIB -AM_CPPFLAGS = -DCARES_STATICLIB -else -AM_CPPFLAGS = +AM_CPPFLAGS += -DCARES_STATICLIB endif if DOING_CARES_SYMBOL_HIDING Index: c-ares-1.9.1/configure.ac =================================================================== --- c-ares-1.9.1.orig/configure.ac +++ c-ares-1.9.1/configure.ac @@ -8,8 +8,8 @@ XC_OVR_ZZ50 CARES_OVERRIDE_AUTOCONF AC_CONFIG_SRCDIR([ares_ipv6.h]) -AM_CONFIG_HEADER([ares_config.h ares_build.h]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADERS([ares_config.h ares_build.h]) +m4_ifdef([AC_CONFIG_MACRO_DIRS], [AC_CONFIG_MACRO_DIRS([m4])], [AC_CONFIG_MACRO_DIR([m4])]) AM_MAINTAINER_MODE CARES_CHECK_OPTION_DEBUG @@ -68,7 +68,7 @@ if test -f ${srcdir}/ares_build.h; then rm -f ${srcdir}/ares_build.h fi -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign nostdinc]) dnl dnl Detect the canonical host and target build environment ++++++ libcares2.keyring ++++++ pub 1024D/279D5C91 2003-04-28 uid Daniel Stenberg (Haxx) <dan...@haxx.se> sub 1024g/B70B3510 2003-04-28 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD6tnnoRBACRPnFBVoapBrTpPrCNZ2rq3DcmW6n/soQJW47+zP+vcrcxQ1WJ QiWSzLGO+QOIUZSYfnliR22r8HkFX9EUSW3IAcRMJMsaO3wMJ0a+78a9QqWLp6RV 0arcQkuuCvG79h+yJ6NnoAXe1geRt8vNGsaWtsS91CtYlTSs6JVtaRLnYwCg/Ly1 EFgvNZ6SJRc/8I5rRv0lrz8D/0goih2kZ5z4SI+r2hgABNcN7g565YwGKaQDbIch soh3OBzgETWc3wuAZqmCzQXPXMpMx+ziqX6XDzDKNiGL1CdrBJQd0II8UutWVDje f9UxLfo02YQ8diGYeq0u9k1RezC13w4TVUmQfg0Uqn4xM6DNzO1O6yCK8rlNwsvL gHNJA/9m1pfzjpvdxtmJNKRU3C4cRCjXhxNdM7laSEj0/wOGaR2QWWEge51orWwo SLQUIe4BDPvtRStQHC+tI7qr7d12rMMEBXviJC5EkGBOzlgWr9virjM/u/pkGMc2 m5r3pVuWH/JSsHsV952y2kWP64uP4zdLXOpVzX/xs0sYJ9nOPLQnRGFuaWVsIFN0 ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iFkEExECABkFAj6tnnoECwcD AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAn1gK6Q0qUTHwYJBAhIDmrRi0 ebfDAJ4qDSHd6UU2MEkkFCgGfYgEBXKbb7kBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb XNg9Z31QzIz65qS9XdNsFNAdKxnY4b72nhc0oaS9/7Dcdf2Q+1mDa2p72DWk+9iz 7knmBL++csBP2z9eMe5h8oV53prqNOHDHyL3WLOa25ga9381gZnzWoQME74iSBBM wDw8vbLEgIZ34JaQ7Oe+9N3+6n8AAwcD/Av+Ms+3gCc5pLp4nx36qqi36fodaG9+ dwIcMbr9bivEtjmDHeuPsD6X1J9+Y/ikUBIDpMPv33lJxLoubOtpLhEuN2XN/ojT rueVPDKA1f+GyfHnyfpf/78IgX1hGVqu/3RBWKPpXFwSZA4q8vFR+FaPC5WbU68t FLJpYuC9ZO/LiEYEGBECAAYFAj6tnn0ACgkQeOEcayedXJGtPQCgxrbd59afemZ9 OIadZD8kUGC29dUAoJ94aGUkWCwoEiPyEZRGXv9XRlfx =yTQx -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
