commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2017-06-28 10:35:08
Comparing /work/SRC/openSUSE:Factory/libcares2 (Old)
and /work/SRC/openSUSE:Factory/.libcares2.new (New)
Package is "libcares2"
Wed Jun 28 10:35:08 2017 rev:41 rq:505210 version:1.13.0
Changes:
--- /work/SRC/openSUSE:Factory/libcares2/libcares2.changes 2016-11-03
12:58:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2017-06-28
10:35:11.956605009 +0200
@@ -1,0 +2,10 @@
+Tue Jun 20 19:35:16 UTC 2017 - tchva...@suse.com
+
+- Version update to 1.13.0:
+ * Fixes bsc#1044946 CVE-2017-1000381
+ * Bunch of bugfixes
+- Drop cares-1.9.1-ocloexec.patch as it broke again and it is
+ not really worth all the fwdporting
+- Drop check phase there is only return 0
+
+---
Old:
c-ares-1.12.0.tar.gz
c-ares-1.12.0.tar.gz.asc
cares-1.9.1-ocloexec.patch
New:
c-ares-1.13.0.tar.gz
c-ares-1.13.0.tar.gz.asc
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.CgpKTo/_old 2017-06-28 10:35:12.788487319 +0200
+++ /var/tmp/diff_new_pack.CgpKTo/_new 2017-06-28 10:35:12.792486754 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcares2
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define pkg_name c-ares
Name: libcares2
-Version:1.12.0
+Version:1.13.0
Release:0
Summary:Library for asynchronous name resolves
License:MIT
@@ -28,14 +28,12 @@
Source1:
http://c-ares.haxx.se/download/%{pkg_name}-%{version}.tar.gz.asc
Source3:libcares2.keyring
Source4:baselibs.conf
-Patch0: cares-1.9.1-ocloexec.patch
-Patch1: 0001-Use-RPM-compiler-options.patch
+Patch0: 0001-Use-RPM-compiler-options.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
c-ares is a C library that performs DNS requests and name resolves
@@ -56,7 +54,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1
-%patch1 -p1
# Remove bogus cflags checking
sed -i -e '/XC_CHECK_BUILD_FLAGS/d' configure.ac
@@ -77,9 +74,6 @@
make %{?_smp_mflags} DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -delete -print
-%check
-make %{?_smp_mflags} check
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
++ c-ares-1.12.0.tar.gz -> c-ares-1.13.0.tar.gz ++
51109 lines of diff (skipped)
commit libcares2 for openSUSE:Factory
Hello community, here is the log from the commit of package libcares2 for openSUSE:Factory checked in at 2016-11-03 12:58:22 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 2016-06-13 21:51:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2016-11-03 12:58:23.0 +0100 @@ -1,0 +2,8 @@ +Mon Oct 31 12:05:59 UTC 2016 - tchva...@suse.com + +- Version update to 1.12.0: + * Fixes bsc#1007728 CVE-2016-5180 + * api: add ARES_OPT_NOROTATE optmask value + * Collection of bugfixes + +--- Old: c-ares-1.11.0.tar.gz c-ares-1.11.0.tar.gz.asc New: c-ares-1.12.0.tar.gz c-ares-1.12.0.tar.gz.asc Other differences: -- ++ libcares2.spec ++ --- /var/tmp/diff_new_pack.P7rGZD/_old 2016-11-03 12:58:24.0 +0100 +++ /var/tmp/diff_new_pack.P7rGZD/_new 2016-11-03 12:58:24.0 +0100 @@ -18,7 +18,7 @@ %define pkg_name c-ares Name: libcares2 -Version:1.11.0 +Version:1.12.0 Release:0 Summary:Library for asynchronous name resolves License:MIT @@ -65,6 +65,7 @@ %build autoreconf -fiv %configure \ + --disable-silent-rules \ --enable-symbol-hiding \ --enable-nonblocking \ --enable-shared \ ++ c-ares-1.11.0.tar.gz -> c-ares-1.12.0.tar.gz ++ 8898 lines of diff (skipped) ++ libcares2.keyring ++ --- /var/tmp/diff_new_pack.P7rGZD/_old 2016-11-03 12:58:24.0 +0100 +++ /var/tmp/diff_new_pack.P7rGZD/_new 2016-11-03 12:58:24.0 +0100 @@ -1,28 +1,34 @@ -pub 1024D/279D5C91 2003-04-28 -uid Daniel Stenberg (Haxx) -sub 1024g/B70B3510 2003-04-28 +pub rsa2048 2016-04-07 [SC] + 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 +uid [ unknown] Daniel Stenberg +sub rsa2048 2016-04-07 [E] -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 +mQENBFcGiPEBCAC7sCnaZqWxfXNgBC7P28BSDUs9w4y/PEFsOv9bpgbgZagX1Fnh +G0eV71nm0p8v9T8Bft1eXaBd977Dq9pgk5qKO0xZo8fC8prFqB5db7fMUvPZCuJT +Tb6lGMz4OdfT6aHqUvJ+LFF1mKn8Eqt1Q4snHGSL1PI3/+435qDRQsU15GdYrj1w +aNJKk79aes9oguaI2/OTQqzIcOFK5tJjlSOD1ryOIH1e8vD+5MMpGvsRxv3sQHeT +ZkfZbkzSLFg/LKpoiQkyql1+BLNhBYq8oaE/jlvQrTEkbAyKpMScdyHwmkWWKjyZ +tXTrAtlComnki4yC2lAV9MXINHHvNJBcIXvVABEBAAG0IERhbmllbCBTdGVuYmVy +ZyA8ZGFuaWVsQGhheHguc2U+iQE3BBMBCgAhBQJXBojxAhsDBQsJCAcDBRUKCQgL +BRYCAwEAAh4BAheAAAoJEFzJCP23HhLCOKkH/1CyoKiN2PCgTlWoYQspv/AAmsj+ +cFwZobI167KowA+o3zxQqxg0MV3ds8G+iig9OIuYurlQL5Jr3CbDltaiXdWtVteR +h/VKp61EwyXq77vjJbx81hvOuaXWWLSlU0KB3w7Hj6aD/mt16DpOcY9Aw90mKyva +fRTqMF7TcT7J5HeGn2NL45dPkAhiMDEgEnw9yBTxK/x6UoQGPgiOWxSSN7Foj3mh +UOflp8W0rnkLbJ4icpym6WuLKRMKAefDvk8GVlAWuXAb9gloL1P6u3uNHllq/IOD +R2bZUBI0QNKhvt0iSj7WKsc/kaqscl+AE9jd/6kXd6vhTNFWdzeco/2mGla5AQ0E +VwaI8QEIAOxQAEvF3idxcn80tbUhJg1J98fAS7Hx3WhlFG74uAikZQl1KZrprBu7 +0RWTb7Nm1tvZeXW65IlY7kk42bhfYDs1JrIPWOWKvVwKWDxoEbYgW/yvy1TOuXH2 +76zbxLl5OEE8sQuOfXZsFSX2IPF9hsgNGaNzor8Ke7Y5BuCQLcGZWW5dLFbbKRKj +XG8CaWmsJVoIc2nyXCAss2q9oCJ13X/5z+Ei392rwi1d3NxAYkSiDQan+fkWkCvZ +H+dHmFjQ1ANDKielxcW1VfilK1hu9ziBBDf8TCEud/q0woIAH7rvIft4i3Cqjymo +nByE4/OjfH8j4EteQ8qoknMCjjwNVqkAEQEAAYkBHwQYAQoACQUCVwaI8QIbDAAK +CRBcyQj9tx4SwupjB/9TV4anbZK58bN7QJ5qGnU3GNjlvWFZXMw1u1xVc7abDJyq +mFeJcJ4qLUkvBA0OsvlVnMWmeCmzsXhlQVM4Bv6IWyr7JBWgkK5q2CWVB59V7v7z +nf5kWnMGFhDF
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2016-06-13 21:51:29
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 2014-11-24
11:11:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2016-06-13
21:51:30.0 +0200
@@ -1,0 +2,13 @@
+Thu Jun 9 20:41:26 UTC 2016 - astie...@suse.com
+
+- update to 1.11.0:
+ * Allow multiple -s options to the ahost command
+ * api: Expose the ares_library_initialized() function
+ * api: Add ares_set_sortlist(3) entrypoint
+ * api: Add entrypoints to allow use of per-server ports
+ * api: introduce `ares_parse_txt_reply_ext`
+ * api: Add ares_set_socket_configure_callback()
+ * Add -t u option to ahost
+ * collection of bug fixes
+
+---
Old:
c-ares-1.10.0.tar.gz
c-ares-1.10.0.tar.gz.asc
New:
c-ares-1.11.0.tar.gz
c-ares-1.11.0.tar.gz.asc
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.jqLxhM/_old 2016-06-13 21:51:31.0 +0200
+++ /var/tmp/diff_new_pack.jqLxhM/_new 2016-06-13 21:51:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcares2
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define pkg_name c-ares
Name: libcares2
-Version:1.10.0
+Version:1.11.0
Release:0
Summary:Library for asynchronous name resolves
License:MIT
@@ -32,8 +32,9 @@
Patch1: 0001-Use-RPM-compiler-options.patch
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: gcc-c++
BuildRequires: libtool
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -72,11 +73,13 @@
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -delete -print
-%post -p /sbin/ldconfig
+%check
+make %{?_smp_mflags} check
+%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
++ c-ares-1.10.0.tar.gz -> c-ares-1.11.0.tar.gz ++
65919 lines of diff (skipped)
++ cares-1.9.1-ocloexec.patch ++
--- /var/tmp/diff_new_pack.jqLxhM/_old 2016-06-13 21:51:32.0 +0200
+++ /var/tmp/diff_new_pack.jqLxhM/_new 2016-06-13 21:51:32.0 +0200
@@ -1,8 +1,8 @@
-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)
+Index: c-ares-1.11.0/ares_gethostbyaddr.c
+===
+--- c-ares-1.11.0.orig/ares_gethostbyaddr.c
c-ares-1.11.0/ares_gethostbyaddr.c
+@@ -215,7 +215,7 @@ static int file_lookup(struct ares_addr
return ARES_ENOTFOUND;
#endif
@@ -11,11 +11,11 @@
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)
+Index: c-ares-1.11.0/ares_gethostbyname.c
+===
+--- c-ares-1.11.0.orig/ares_gethostbyname.c
c-ares-1.11.0/ares_gethostbyname.c
+@@ -376,7 +376,7 @@ static int file_lookup(const char *name,
return ARES_ENOTFOUND;
#endif
@@ -24,20 +24,20 @@
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;
+Index: c-ares-1.11.0/ares_init.c
+===
+--- c-ares-1.11.0.orig/ares_init.c
c-ares-1.11.0/ares_init.c
+@@ -1262,7 +1262,7 @@ static int init_by_resolv_conf(ares_chan
+ /* Only update search domains if they're not already specified */
+ update_domains = (channel->ndomains == -1);
-fp = fopen(PATH_RESOLV_CONF, "r");
+fp = fopen(PATH_RESOLV_CONF, "re");
if (fp) {
while ((status = ares__read_line(fp, &line, &linesize)
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2014-11-24 11:11:05
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 2014-05-17
06:43:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2014-11-24
11:11:12.0 +0100
@@ -1,0 +2,8 @@
+Fri Nov 14 09:18:41 UTC 2014 - dims...@opensuse.org
+
+- No longer perform gpg validation; osc source_validator does it
+ implicit:
+ + Drop gpg-offline BuildRequires.
+ + No longer execute gpg_verify.
+
+---
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.ZBvTv9/_old 2014-11-24 11:11:13.0 +0100
+++ /var/tmp/diff_new_pack.ZBvTv9/_new 2014-11-24 11:11:13.0 +0100
@@ -32,7 +32,6 @@
Patch1: 0001-Use-RPM-compiler-options.patch
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: gpg-offline
BuildRequires: libtool
BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -54,9 +53,6 @@
by Greg Hudson at MIT.
%prep
-%if 0%{?suse_version} >= 1230
-%gpg_verify %{SOURCE1}
-%endif
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1
%patch1 -p1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2014-05-17 06:43:09
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 2013-05-07
07:24:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2014-05-17
06:43:20.0 +0200
@@ -1,0 +2,14 @@
+Thu May 15 12:07:42 UTC 2014 - tchva...@suse.com
+
+- Version bump to 1.10.0:
+ * Various small updates all around
+ * Cleanup of automake to build with latest tools
+ * For more see CHANGES
+- Remove upstreamed patches:
+ * cares-autotools.diff
+- Remove patch that needs quite work and was never acceted upstream:
+ * 0001-cares-1.9.1-add-symbol-versioning-support.patch
+- Added patches:
+ * 0001-Use-RPM-compiler-options.patch
+
+---
Old:
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-autotools.diff
New:
0001-Use-RPM-compiler-options.patch
c-ares-1.10.0.tar.gz
c-ares-1.10.0.tar.gz.asc
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.xQeaDY/_old 2014-05-17 06:43:21.0 +0200
+++ /var/tmp/diff_new_pack.xQeaDY/_new 2014-05-17 06:43:21.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcares2
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,27 +17,24 @@
%define pkg_name c-ares
-
Name: libcares2
-Version:1.9.1
+Version:1.10.0
Release:0
Summary:Library for asynchronous name resolves
License:MIT
Group: Development/Libraries/C and C++
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
+Patch0: cares-1.9.1-ocloexec.patch
+Patch1: 0001-Use-RPM-compiler-options.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gpg-offline
BuildRequires: libtool
BuildRequires: pkg-config
-%if 0%{?suse_version} >= 1230
-BuildRequires: gpg-offline
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -60,21 +57,27 @@
%if 0%{?suse_version} >= 1230
%gpg_verify %{SOURCE1}
%endif
-
%setup -q -n %{pkg_name}-%{version}
-%patch4 -p1
-%patch5 -p1
-%patch -P 6 -p1
+%patch0 -p1
+%patch1 -p1
+
+# Remove bogus cflags checking
+sed -i -e '/XC_CHECK_BUILD_FLAGS/d' configure.ac
+sed -i -e '/XC_CHECK_USER_FLAGS/d' m4/xc-cc-check.m4
%build
autoreconf -fiv
-%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
-sed -i -e 's@-g0@-g@g' Makefile
+%configure \
+ --enable-symbol-hiding \
+ --enable-nonblocking \
+ --enable-shared \
+ --disable-static \
+ --with-pic
make %{?_smp_mflags}
%install
-make install DESTDIR=%{buildroot}
-rm -f %{buildroot}%{_libdir}/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
%post -p /sbin/ldconfig
++ 0001-Use-RPM-compiler-options.patch ++
>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_db
commit libcares2 for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2013-05-07
07:24:03.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.MRJXsT/_new 2013-05-07 07:24:05.0 +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?=
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 +---
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2012-02-08 15:35:36
Comparing /work/SRC/openSUSE:Factory/libcares2 (Old)
and /work/SRC/openSUSE:Factory/.libcares2.new (New)
Package is "libcares2", Maintainer is "rha...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libcares2/libcares2.changes 2011-11-16
17:19:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2012-02-08
15:35:37.0 +0100
@@ -1,0 +2,12 @@
+Fri Feb 3 20:27:55 UTC 2012 - crrodrig...@opensuse.org
+
+- Fix license
+- provide symbol versioning support
+- fix -debuginfo packages
+
+---
+Tue Nov 15 09:16:32 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+
+---
New:
0001-add-symbol-versioning-support.patch
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.XPdjp7/_old 2012-02-08 15:35:38.0 +0100
+++ /var/tmp/diff_new_pack.XPdjp7/_new 2012-02-08 15:35:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libcares2
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -22,17 +22,19 @@
Name: libcares2
Version:1.7.5
Release:1
-License:MIT License (or similar)
+License:MIT
Summary:Library for asynchronous name resolves
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
+BuildRequires: libtool
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
@@ -40,7 +42,6 @@
by Greg Hudson at MIT.
%package -n libcares-devel
-License:MIT License (or similar)
Summary:Library for asynchronous name resolves
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -57,17 +58,14 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
+autoreconf -fiv
%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
+sed -i -e 's@-g0@-g@g' Makefile
make %{?_smp_mflags}
-#there is no test suite atm
-#check
-#export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256))
-#{__make} %{?jobs:-j%jobs} check
-#unset MALLOC_CHECK_ MALLOC_PERTURB_
-
%install
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libdir}/*.la
@@ -76,9 +74,6 @@
%postun -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
%{_libdir}/libcares.so.2*
++ 0001-add-symbol-versioning-support.patch ++
>From f2f268450d2aff0c7bcbb848b8a1c7b1e1d38291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?=
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 @@ VER=-version-info 2:0:0
# 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
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at 2011-11-16 17:18:37
Comparing /work/SRC/openSUSE:Factory/libcares2 (Old)
and /work/SRC/openSUSE:Factory/.libcares2.new (New)
Package is "libcares2", Maintainer is "rha...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libcares2/libcares2.changes 2011-10-18
14:29:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.libcares2.new/libcares2.changes 2011-11-16
17:19:11.0 +0100
@@ -1,0 +2,5 @@
+Mon Nov 14 23:42:39 UTC 2011 - crrodrig...@opensuse.org
+
+- Open all fds with O_CLOEXEC.
+
+---
New:
cares-ocloexec.patch
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.J8Yg57/_old 2011-11-16 17:19:13.0 +0100
+++ /var/tmp/diff_new_pack.J8Yg57/_new 2011-11-16 17:19:13.0 +0100
@@ -32,6 +32,7 @@
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
%description
c-ares is a C library that performs DNS requests and name resolves
@@ -55,6 +56,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
++ cares-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
@@ -978,7 +978,7 @@ DhcpNameServer
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)
{
@@ -1020,7 +1020,7 @@ DhcpNameServer
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)
{
@@ -1048,7 +1048,7 @@ DhcpNameServer
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)
{
@@ -1076,7 +1076,7 @@ DhcpNameServer
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)
{
@@ -1705,7 +1705,7 @@ static void randomize_key(unsigned char* key,int
key_data_len)
}
#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 @@ static int configure_socket(ares_socket_t s, int family,
ares_channel channel)
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 @@ static int open_tcp_socket(ares_channel channel, struct
server_state *server)
}
/* Acquire a socket. */
- s = socket(server->addr.family, SOCK_STREAM, 0);
+ s = socket(server->addr.family, SOCK_STREAM | SOCK_CLOEXEC,
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at Tue Oct 18 14:19:38 CEST 2011.
--- openSUSE:Factory/libcares2/libcares2.changes2011-09-23
02:07:54.0 +0200
+++ /mounts/work_src_done/STABLE/libcares2/libcares2.changes2011-10-17
05:32:47.0 +0200
@@ -1,0 +2,9 @@
+Mon Oct 17 03:29:31 UTC 2011 - crrodrig...@opensuse.org
+
+- Cherry-pick 3 patches from HEAD
+ * ares_destroy.c: fix segfault in ares_destroy_options()
+ * ares_getnameinfo: fix random results, memory corruption
+ * ares_init.c: fix segfault triggered in ares_init_options()
+upon previous failure of init_by_defaults()
+
+---
calling whatdependson for head-i586
New:
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
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.z9v89M/_old 2011-10-18 14:19:35.0 +0200
+++ /var/tmp/diff_new_pack.z9v89M/_new 2011-10-18 14:19:35.0 +0200
@@ -29,6 +29,9 @@
Source2:baselibs.conf
BuildRequires: pkg-config
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
%description
c-ares is a C library that performs DNS requests and name resolves
@@ -49,6 +52,9 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
++ 0001-ares_destroy.c-fix-segfault-in-ares_destroy_options.patch ++
>From 5662ee94d2c55b0438679939c294870ec965cfda Mon Sep 17 00:00:00 2001
From: Yang Tse
Date: Sun, 21 Aug 2011 16:41:43 +0200
Subject: [PATCH 1/3] ares_destroy.c: fix segfault in ares_destroy_options()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Cristian Rodríguez
---
ares_destroy.c |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ares_destroy.c b/ares_destroy.c
index 5e274da..a3f6ea2 100644
--- a/ares_destroy.c
+++ b/ares_destroy.c
@@ -1,6 +1,6 @@
/* Copyright 1998 by the Massachusetts Institute of Technology.
- * Copyright (C) 2004-2010 by Daniel Stenberg
+ * Copyright (C) 2004-2011 by Daniel Stenberg
*
* Permission to use, copy, modify, and distribute this
* software and its documentation for any purpose and without
@@ -29,10 +29,12 @@ void ares_destroy_options(struct ares_options *options)
free(options->servers);
for (i = 0; i < options->ndomains; i++)
free(options->domains[i]);
- free(options->domains);
+ if(options->domains)
+free(options->domains);
if(options->sortlist)
free(options->sortlist);
- free(options->lookups);
+ if(options->lookups)
+free(options->lookups);
}
void ares_destroy(ares_channel channel)
--
1.7.4.1
++ 0002-ares_getnameinfo-fix-random-results-with-c-ares-1.7..patch ++
>From a529199abfceae2f6a813616ced29b23d911d91e Mon Sep 17 00:00:00 2001
From: Denis Bilenko
Date: Wed, 24 Aug 2011 18:37:11 +0200
Subject: [PATCH 2/3] ares_getnameinfo: fix random results with c-ares 1.7.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In ares_getnameinfo memcpy did not copy enough bytes, causing
it to return arbitrary memory contents as a result.
Signed-off-by: Cristian Rodríguez
---
ares_getnameinfo.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c
index 82e261d..cdcd516 100644
--- a/ares_getnameinfo.c
+++ b/ares_getnameinfo.c
@@ -188,7 +188,7 @@ void ares_getnameinfo(ares_channel channel, const struct
sockaddr *sa,
if (sa->sa_family == AF_INET)
{
niquery->family = AF_INET;
-memcpy(&niquery->addr.addr4, addr, sizeof(struct in_addr));
+memcpy(&niquery->addr.addr4, addr, sizeof(niquery->addr.addr4));
ares_gethostbyaddr(channel, &addr->sin_addr,
sizeof(struct in_addr), AF_INET,
nameinfo_callback, niquery);
@@ -196,7 +196,7 @@ void ares_getnameinfo(ares_channel channel, const struct
sockaddr *sa,
else
{
niquery->family = AF_INET6;
-memcpy(&niquery->addr.addr6, addr6, sizeof(struct ares_in6_addr));
+memcpy(&niquery->addr.addr6, addr6, sizeof(niquery->addr.addr6));
ares_gethostbyaddr(channel, &addr6->sin6_addr,
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at Thu Aug 18 09:26:14 CEST 2011.
--- libcares2/libcares2.changes 2011-03-19 22:19:45.0 +0100
+++ /mounts/work_src_done/STABLE/libcares2/libcares2.changes2011-08-17
23:19:56.0 +0200
@@ -1,0 +2,9 @@
+Wed Aug 17 21:17:44 UTC 2011 - crrodrig...@opensuse.org
+
+- Update to version 1.7.4
+* Drop obsolete patch
+* detection of semicolon comments in resolv.conf
+* fixed ares_parse_*_reply memory leaks
+* only fall back to AF_INET searches when looking for AF_UNSPEC addresses
+
+---
calling whatdependson for head-i586
Old:
0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch
c-ares-1.7.4.tar.bz2
New:
c-ares-1.7.5.tar.bz2
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.Tl6bdt/_old 2011-08-18 09:25:27.0 +0200
+++ /var/tmp/diff_new_pack.Tl6bdt/_new 2011-08-18 09:25:27.0 +0200
@@ -15,22 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Url:http://daniel.haxx.se/projects/c-ares
%define pkg_name c-ares
Name: libcares2
-Version:1.7.4
-Release:7
+Version:1.7.5
+Release:1
License:MIT License (or similar)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: Development/Libraries/C and C++
Summary:Library for asynchronous name resolves
+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
-Patch: 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
c-ares is a C library that performs DNS requests and name resolves
@@ -39,9 +37,10 @@
%package -n libcares-devel
License:MIT License (or similar)
-Group: Development/Libraries/C and C++
Summary:Library for asynchronous name resolves
-Requires: %{name} = %{version} glibc-devel
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+Requires: glibc-devel
%description -n libcares-devel
c-ares is a C library that performs DNS requests and name resolves
@@ -50,11 +49,11 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-%patch -p1
%build
%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
+
#there is no test suite atm
#check
#export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256))
@@ -62,15 +61,15 @@
#unset MALLOC_CHECK_ MALLOC_PERTURB_
%install
-%{__make} install DESTDIR=%{buildroot}
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
++ c-ares-1.7.4.tar.bz2 -> c-ares-1.7.5.tar.bz2 ++
6 lines of diff (skipped)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libcares2 for openSUSE:Factory
Hello community,
here is the log from the commit of package libcares2 for openSUSE:Factory
checked in at Mon Mar 21 09:48:27 CET 2011.
--- libcares2/libcares2.changes 2010-12-13 17:22:36.0 +0100
+++ /mounts/work_src_done/STABLE/libcares2/libcares2.changes2011-03-19
22:19:45.0 +0100
@@ -1,0 +2,6 @@
+Sat Mar 19 21:16:09 UTC 2011 - crrodrig...@opensuse.org
+
+- fix NULL ptr dereference
+
+
+---
calling whatdependson for head-i586
New:
0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch
Other differences:
--
++ libcares2.spec ++
--- /var/tmp/diff_new_pack.xBAUFn/_old 2011-03-21 09:39:28.0 +0100
+++ /var/tmp/diff_new_pack.xBAUFn/_new 2011-03-21 09:39:28.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libcares2 (Version 1.7.4)
+# spec file for package libcares2
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -22,7 +22,7 @@
Name: libcares2
Version:1.7.4
-Release:1
+Release:7
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/C and C++
@@ -30,6 +30,7 @@
Source:
http://daniel.haxx.se/projects/c-ares/%{pkg_name}-%{version}.tar.bz2
Source2:baselibs.conf
BuildRequires: pkg-config
+Patch: 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch
%description
c-ares is a C library that performs DNS requests and name resolves
@@ -49,6 +50,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch -p1
%build
%configure --enable-symbol-hiding --enable-nonblocking --enable-shared
--disable-static --with-pic
++ 0022-advance_tcp_send_queue-avoid-NULL-ptr-dereference.patch ++
>From 366cd6d54dfdf0d487f60333c45e9c7da9327050 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg
Date: Mon, 27 Dec 2010 13:10:48 +0100
Subject: [PATCH 22/34] advance_tcp_send_queue: avoid NULL ptr dereference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If given a too large 'num_bytes' value, it would cause a NULL ptr
dereference. Instead the code will now break out of the loop at the end
of the list.
Signed-off-by: Cristian Rodríguez
---
ares_process.c | 43 +--
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/ares_process.c b/ares_process.c
index 7d04eff..ca4c8ee 100644
--- a/ares_process.c
+++ b/ares_process.c
@@ -300,29 +300,28 @@ static void advance_tcp_send_queue(ares_channel channel,
int whichserver,
{
struct send_request *sendreq;
struct server_state *server = &channel->servers[whichserver];
- while (num_bytes > 0)
-{
- sendreq = server->qhead;
- if ((size_t)num_bytes >= sendreq->len)
- {
- num_bytes -= sendreq->len;
- server->qhead = sendreq->next;
- if (server->qhead == NULL)
- {
- SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
- server->qtail = NULL;
- }
- if (sendreq->data_storage != NULL)
- free(sendreq->data_storage);
- free(sendreq);
- }
- else
- {
- sendreq->data += num_bytes;
- sendreq->len -= num_bytes;
- num_bytes = 0;
- }
+ while (num_bytes > 0) {
+sendreq = server->qhead;
+if ((size_t)num_bytes >= sendreq->len) {
+ num_bytes -= sendreq->len;
+ server->qhead = sendreq->next;
+ if (sendreq->data_storage)
+free(sendreq->data_storage);
+ free(sendreq);
+ if (server->qhead == NULL) {
+SOCK_STATE_CALLBACK(channel, server->tcp_socket, 1, 0);
+server->qtail = NULL;
+
+/* qhead is NULL so we cannot continue this loop */
+break;
+ }
+}
+else {
+ sendreq->data += num_bytes;
+ sendreq->len -= num_bytes;
+ num_bytes = 0;
}
+ }
}
/* If any TCP socket selects true for reading, read some data,
--
1.7.4.1
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
