r6040 - glibc-package/trunk/debian/patches/any
Author: aurel32
Date: 2014-05-04 21:45:37 +0000 (Sun, 04 May 2014)
New Revision: 6040
Modified:
glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff
glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
Log:
Fix patches conflicts
Modified: glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff 2014-05-04 21:39:26 UTC (rev 6039)
+++ glibc-package/trunk/debian/patches/any/cvs-make-4.0.diff 2014-05-04 21:45:37 UTC (rev 6040)
@@ -1,7 +1,7 @@
2013-10-31 Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
[BZ #16037]
- * configure.ac: allow GNU Make 4.0 and greater.
+ * configure.in: allow GNU Make 4.0 and greater.
* configure: Regenerated.
diff --git a/configure b/configure
@@ -16,9 +16,9 @@
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
critic_missing="$critic_missing gcc")
AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
Modified: glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff 2014-05-04 21:39:26 UTC (rev 6039)
+++ glibc-package/trunk/debian/patches/any/cvs-resolv-first-query-failure.diff 2014-05-04 21:45:37 UTC (rev 6040)
@@ -13,9 +13,9 @@
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -382,7 +382,9 @@ __libc_res_nsearch(res_state statp,
+ ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
answer, anslen, answerp,
- answerp2, nanswerp2, resplen2,
- answerp2_malloced);
+ answerp2, nanswerp2, resplen2);
- if (ret > 0 || trailing_dot)
+ if (ret > 0 || trailing_dot
+ /* If the second response is valid then we use that. */
@@ -26,7 +26,7 @@
@@ -422,7 +424,8 @@ __libc_res_nsearch(res_state statp,
answer, anslen, answerp,
answerp2, nanswerp2,
- resplen2, answerp2_malloced);
+ resplen2);
- if (ret > 0)
+ if (ret > 0 || (ret == 0 && answerp2 != NULL
+ && resplen2 > 0))
Reply to: