diff options
| author | Tomas Hozza <thozza@redhat.com> | 2015-01-14 12:38:32 +0100 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2015-01-14 12:47:51 +0100 |
| commit | 4fa9972d29e90c85178948213dacd5027fb66500 (patch) | |
| tree | cf818ce29928698279b97090dffdf3044b5b2c96 /bind-9.9.1-P2-multlib-conflict.patch | |
| parent | e001c1a0663326dffac1ee7d65598550e4b2f70a (diff) | |
| download | bind-4fa9972d29e90c85178948213dacd5027fb66500.tar.gz bind-4fa9972d29e90c85178948213dacd5027fb66500.tar.xz bind-4fa9972d29e90c85178948213dacd5027fb66500.zip | |
Update to 9.10.1-P1 stable
Signed-off-by: Tomas Hozza <thozza@redhat.com>
Diffstat (limited to 'bind-9.9.1-P2-multlib-conflict.patch')
| -rw-r--r-- | bind-9.9.1-P2-multlib-conflict.patch | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch index ead0040..9a68172 100644 --- a/bind-9.9.1-P2-multlib-conflict.patch +++ b/bind-9.9.1-P2-multlib-conflict.patch @@ -1,9 +1,8 @@ -diff --git a/config.h.in b/config.h.in -index 71048b6..7382171 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -440,7 +440,7 @@ int sigwait(const unsigned int *set, int *sig); - #undef PORT_NONBLOCK +diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in +--- bind-9.10.1b1/config.h.in.multlib-conflict 2014-08-04 12:42:19.750274089 +0200 ++++ bind-9.10.1b1/config.h.in 2014-08-04 12:43:19.334332434 +0200 +@@ -495,7 +495,7 @@ int sigwait(const unsigned int *set, int + #undef PREFER_GOSTASN1 /* The size of `void *', as computed by sizeof. */ -#undef SIZEOF_VOID_P @@ -11,11 +10,10 @@ index 71048b6..7382171 100644 /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -diff --git a/configure.in b/configure.in -index 1a34bb6..1c29465 100644 ---- a/configure.in -+++ b/configure.in -@@ -2370,7 +2370,9 @@ int getnameinfo(const struct sockaddr *, socklen_t, char *, +diff -up bind-9.10.1b1/configure.in.multlib-conflict bind-9.10.1b1/configure.in +--- bind-9.10.1b1/configure.in.multlib-conflict 2014-08-04 12:42:19.751274090 +0200 ++++ bind-9.10.1b1/configure.in 2014-08-04 12:47:50.157648387 +0200 +@@ -2952,7 +2952,9 @@ int getnameinfo(const struct sockaddr *, size_t, char *, size_t, int);], [ return (0);], [AC_MSG_RESULT(size_t for buflen; int for flags) @@ -26,11 +24,10 @@ index 1a34bb6..1c29465 100644 AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)], [AC_MSG_RESULT(not match any subspecies; assume standard definition) AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t) -diff --git a/isc-config.sh.in b/isc-config.sh.in -index 10df275..9b30482 100644 ---- a/isc-config.sh.in -+++ b/isc-config.sh.in -@@ -21,7 +21,19 @@ prefix=@prefix@ +diff -up bind-9.10.1b1/isc-config.sh.in.multlib-conflict bind-9.10.1b1/isc-config.sh.in +--- bind-9.10.1b1/isc-config.sh.in.multlib-conflict 2014-06-23 06:47:35.000000000 +0200 ++++ bind-9.10.1b1/isc-config.sh.in 2014-08-04 12:42:19.752274091 +0200 +@@ -21,7 +21,18 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set= includedir=@includedir@ @@ -47,11 +44,10 @@ index 10df275..9b30482 100644 + sec_libdir=/usr/lib64 + ;; +esac -+ usage() { -@@ -133,6 +145,16 @@ if test x"$echo_libs" = x"true"; then +@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then if test x"${exec_prefix_set}" = x"true"; then includes="-L${exec_prefix}/lib" else |