diff options
| author | Tomas Hozza <thozza@redhat.com> | 2014-10-02 14:14:01 +0200 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2014-10-03 11:21:38 +0200 |
| commit | b746061914a9103cf5a7f7f947ee12f19a580d3d (patch) | |
| tree | 51886e4b8483f134246d64c3c2a701d3f49cf952 /bind-9.9.1-P2-multlib-conflict.patch | |
| parent | c095b972f64e7caab50243b70a226c20c02b6cb8 (diff) | |
| download | bind-b746061914a9103cf5a7f7f947ee12f19a580d3d.tar.gz bind-b746061914a9103cf5a7f7f947ee12f19a580d3d.tar.xz bind-b746061914a9103cf5a7f7f947ee12f19a580d3d.zip | |
Update to 9.9.6
- drop merged patches and rebase some of existing patches
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 | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch index 03d5f5c..ead0040 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.9.3rc2/config.h.in.multlib-conflict bind-9.9.3rc2/config.h.in ---- bind-9.9.3rc2/config.h.in.multlib-conflict 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/config.h.in 2013-05-13 12:10:22.514870894 +0200 -@@ -416,7 +416,7 @@ int sigwait(const unsigned int *set, int +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 /* The size of `void *', as computed by sizeof. */ @@ -10,24 +11,26 @@ diff -up bind-9.9.3rc2/config.h.in.multlib-conflict bind-9.9.3rc2/config.h.in /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -diff -up bind-9.9.3rc2/configure.in.multlib-conflict bind-9.9.3rc2/configure.in ---- bind-9.9.3rc2/configure.in.multlib-conflict 2013-05-13 12:10:22.481870901 +0200 -+++ bind-9.9.3rc2/configure.in 2013-05-13 12:10:22.515870894 +0200 -@@ -2251,7 +2251,9 @@ int getnameinfo(const struct sockaddr *, - size_t, char *, size_t, int);], +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 *, + size_t, char *, size_t, int);], [ return (0);], [AC_MSG_RESULT(size_t for buflen; int for flags) - AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t) -+ # Changed to solve multilib conflict on Fedora -+ #AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t) ++ # Changed to solve multilib conflict on Fedora ++ # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_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.9.3rc2/isc-config.sh.in.multlib-conflict bind-9.9.3rc2/isc-config.sh.in ---- bind-9.9.3rc2/isc-config.sh.in.multlib-conflict 2013-04-30 08:38:46.000000000 +0200 -+++ bind-9.9.3rc2/isc-config.sh.in 2013-05-13 12:26:40.258698745 +0200 -@@ -21,7 +21,18 @@ prefix=@prefix@ +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@ exec_prefix=@exec_prefix@ exec_prefix_set= includedir=@includedir@ @@ -44,10 +47,11 @@ diff -up bind-9.9.3rc2/isc-config.sh.in.multlib-conflict bind-9.9.3rc2/isc-confi + sec_libdir=/usr/lib64 + ;; +esac ++ usage() { -@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then +@@ -133,6 +145,16 @@ if test x"$echo_libs" = x"true"; then if test x"${exec_prefix_set}" = x"true"; then includes="-L${exec_prefix}/lib" else |