diff options
| author | Tomas Hozza <thozza@redhat.com> | 2015-02-02 12:39:57 +0100 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2015-02-02 12:39:57 +0100 |
| commit | 4e2098e221d7c2af7c72c8d91d311ae0dc2d4b80 (patch) | |
| tree | 899f8ccb7cdaaabd4056c1efeb8f06f814ce3041 /bind-9.9.1-P2-multlib-conflict.patch | |
| parent | 407c2d38c0d8acfa5a098b124e9b36502f1969b3 (diff) | |
| download | bind-4e2098e221d7c2af7c72c8d91d311ae0dc2d4b80.tar.gz bind-4e2098e221d7c2af7c72c8d91d311ae0dc2d4b80.tar.xz bind-4e2098e221d7c2af7c72c8d91d311ae0dc2d4b80.zip | |
update to 9.10.2rc1
- fix nsupdate server auto-detection (#1184151)
- drop merged patch bind99-rh985918.patch
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 | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch index 9a68172..7724749 100644 --- a/bind-9.9.1-P2-multlib-conflict.patch +++ b/bind-9.9.1-P2-multlib-conflict.patch @@ -1,7 +1,8 @@ -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 +diff --git a/config.h.in b/config.h.in +index ff72235..bce1a24 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -513,7 +513,7 @@ int sigwait(const unsigned int *set, int *sig); #undef PREFER_GOSTASN1 /* The size of `void *', as computed by sizeof. */ @@ -10,23 +11,28 @@ diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -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 *, +diff --git a/configure.in b/configure.in +index 10c98c3..d54b036 100644 +--- a/configure.in ++++ b/configure.in +@@ -3048,8 +3048,11 @@ int getnameinfo(const struct sockaddr *, size_t, char *, size_t, char *, size_t, int);], [ return (0);], [AC_MSG_RESULT(size_t for buflen; int for flags) +- AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t) - AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t) + # Changed to solve multilib conflict on Fedora ++ # AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t) + # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t) ++ AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t) + AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t) 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 -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 + AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t) +diff --git a/isc-config.sh.in b/isc-config.sh.in +index 10df275..5215eb0 100644 +--- a/isc-config.sh.in ++++ b/isc-config.sh.in @@ -21,7 +21,18 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set= |