X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bind-link.patch;h=28c822fc96fd5780d7401ba0dba4fb739337600b;hb=9feb0b0;hp=78f5239881a3b648ba33c06a6001764f0eeaf540;hpb=acdb7d00e156bcc489904e3a100144a9d1556c73;p=packages%2Fbind.git

diff --git a/bind-link.patch b/bind-link.patch
index 78f5239..28c822f 100644
--- a/bind-link.patch
+++ b/bind-link.patch
@@ -1,49 +1,21 @@
-diff -ur bind-9.2.4-orig/configure.in bind-9.2.4/configure.in
---- bind-9.2.4-orig/configure.in	2004-09-24 12:08:40.000000000 +0200
-+++ bind-9.2.4/configure.in	2004-09-24 12:09:25.417209496 +0200
-@@ -899,8 +899,8 @@
- 	mips-sgi-irix*)
+diff -Nur bind-9.3.2.orig/configure.in bind-9.3.2.link/configure.in
+--- bind-9.3.2.orig/configure.in	2006-08-05 01:45:48.000000000 +0200
++++ bind-9.3.2.link/configure.in	2006-08-05 01:45:55.000000000 +0200
+@@ -1171,8 +1171,8 @@
+ 	*-linux*)
  		;;
  	*)
 -		AC_CHECK_LIB(socket, socket)
--		AC_CHECK_LIB(nsl, inet_ntoa)
+-		AC_CHECK_LIB(nsl, inet_addr)
 +		AC_SEARCH_LIBS(socket, socket)
 +		AC_SEARCH_LIBS(inet_ntoa, nsl)
  		;;
  esac
  
-diff -ur bind-9.2.4-orig/lib/bind/configure.in bind-9.2.4/lib/bind/configure.in
---- bind-9.2.4-orig/lib/bind/configure.in	2004-09-24 12:08:40.000000000 +0200
-+++ bind-9.2.4/lib/bind/configure.in	2004-09-24 12:09:25.429207672 +0200
-@@ -664,9 +664,9 @@
- 	mips-sgi-irix*)
- 		;;
- 	*)
--		AC_CHECK_LIB(d4r, gethostbyname_r)
--		AC_CHECK_LIB(socket, socket)
--		AC_CHECK_LIB(nsl, inet_ntoa)
-+		AC_SEARCH_LIBS(gethostbyname_r, d4r)
-+		AC_SEARCH_LIBS(socket, socket)
-+		AC_SEARCH_LIBS(inet_ntoa, nsl)
- 		;;
- esac
- 
-diff -ur bind-9.2.4-orig/lib/bind/Makefile.in bind-9.2.4/lib/bind/Makefile.in
---- bind-9.2.4-orig/lib/bind/Makefile.in	2004-07-20 09:00:18.000000000 +0200
-+++ bind-9.2.4/lib/bind/Makefile.in	2004-09-24 12:09:25.415209800 +0200
-@@ -19,6 +19,8 @@
- VPATH =         @srcdir@
- top_srcdir =    @top_srcdir@
- 
-+LIBS = @LIBS@
-+
- @LIBBIND_API@
- 
- LIBS =		@LIBS@
-diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in
---- bind-9.2.4-orig/lib/dns/Makefile.in	2004-07-20 09:00:19.000000000 +0200
-+++ bind-9.2.4/lib/dns/Makefile.in	2004-09-24 12:10:43.106398944 +0200
-@@ -38,7 +38,7 @@
+diff -Nur bind-9.3.2.orig/lib/dns/Makefile.in bind-9.3.2.link/lib/dns/Makefile.in
+--- bind-9.3.2.orig/lib/dns/Makefile.in	2004-12-09 05:07:15.000000000 +0100
++++ bind-9.3.2.link/lib/dns/Makefile.in	2006-08-05 01:45:55.000000000 +0200
+@@ -39,7 +39,7 @@
  
  ISCDEPLIBS =	../../lib/isc/libisc.@A@
  
@@ -52,18 +24,9 @@ diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in
  
  # Alphabetically
  
-@@ -169,7 +169,7 @@
- 	./gen -s ${srcdir} > code.h
- 
- gen: gen.c
--	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c
- 
- rbtdb64.@O@: rbtdb.c
- 
-diff -ur bind-9.2.4-orig/lib/isccc/Makefile.in bind-9.2.4/lib/isccc/Makefile.in
---- bind-9.2.4-orig/lib/isccc/Makefile.in	2004-07-20 09:00:20.000000000 +0200
-+++ bind-9.2.4/lib/isccc/Makefile.in	2004-09-24 12:09:25.422208736 +0200
+diff -Nur bind-9.3.2.orig/lib/isccc/Makefile.in bind-9.3.2.link/lib/isccc/Makefile.in
+--- bind-9.3.2.orig/lib/isccc/Makefile.in	2004-07-20 09:01:58.000000000 +0200
++++ bind-9.3.2.link/lib/isccc/Makefile.in	2006-08-05 01:45:55.000000000 +0200
 @@ -36,7 +36,7 @@
  ISCDEPLIBS =	../../lib/isc/libisc.@A@
  ISCCCDEPLIBS =	libisccc.@A@
@@ -73,9 +36,9 @@ diff -ur bind-9.2.4-orig/lib/isccc/Makefile.in bind-9.2.4/lib/isccc/Makefile.in
  
  SUBDIRS =	include
  
-diff -ur bind-9.2.4-orig/lib/isccfg/Makefile.in bind-9.2.4/lib/isccfg/Makefile.in
---- bind-9.2.4-orig/lib/isccfg/Makefile.in	2004-07-20 09:00:20.000000000 +0200
-+++ bind-9.2.4/lib/isccfg/Makefile.in	2004-09-24 12:09:25.424208432 +0200
+diff -Nur bind-9.3.2.orig/lib/isccfg/Makefile.in bind-9.3.2.link/lib/isccfg/Makefile.in
+--- bind-9.3.2.orig/lib/isccfg/Makefile.in	2004-07-20 09:01:58.000000000 +0200
++++ bind-9.3.2.link/lib/isccfg/Makefile.in	2006-08-05 01:45:55.000000000 +0200
 @@ -38,7 +38,7 @@
  ISCDEPLIBS =	../../lib/isc/libisc.@A@
  ISCCFGDEPLIBS =	libisccfg.@A@
@@ -85,16 +48,25 @@ diff -ur bind-9.2.4-orig/lib/isccfg/Makefile.in bind-9.2.4/lib/isccfg/Makefile.i
  
  SUBDIRS =	include
  
-diff -ur bind-9.2.4-orig/lib/lwres/Makefile.in bind-9.2.4/lib/lwres/Makefile.in
---- bind-9.2.4-orig/lib/lwres/Makefile.in	2004-08-28 08:15:27.000000000 +0200
-+++ bind-9.2.4/lib/lwres/Makefile.in	2004-09-24 12:09:25.426208128 +0200
-@@ -44,7 +44,8 @@
- 		lwres_gabn.c lwres_gnba.c lwres_grbn.c lwres_noop.c \
- 		lwinetaton.c lwinetpton.c lwinetntop.c print.c
+--- bind-9.10.0/lib/irs/Makefile.in~	2014-04-28 21:18:53.000000000 +0200
++++ bind-9.10.0/lib/irs/Makefile.in	2014-05-01 10:13:55.831613124 +0200
+@@ -42,7 +42,7 @@
+ 		gai_strerror.c getaddrinfo.c getnameinfo.c \
+ 		resconf.c
  
 -LIBS =		@LIBS@
-+# -lpthread not needed here
-+LIBS =
++LIBS =		@LIBS@ ../isccfg/libisccfg.la ../isc/libisc.la ../dns/libdns.la
  
- SUBDIRS =	include man unix
+ SUBDIRS =	include
  TARGETS =	timestamp
+--- bind-9.12.0/lib/ns/Makefile.in~	2018-01-17 07:56:09.000000000 +0100
++++ bind-9.12.0/lib/ns/Makefile.in	2018-01-24 08:29:54.886677552 +0100
+@@ -37,7 +37,7 @@ DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_
+ 
+ DNSDEPLIBS =	../../lib/dns/libdns.@A@
+ 
+-LIBS =		@LIBS@
++LIBS =		@LIBS@ ../dns/libdns.la
+ 
+ # Alphabetically
+ OBJS =		client.@O@ interfacemgr.@O@ lib.@O@ \