Rel 2; add map format fix patch

[packages/bind.git] / bind-pmake.patch

diff --git a/bind-pmake.patch b/bind-pmake.patch
index 38944ea3e00a137899af46bf570eb20aaf7f5cf7..681fa806f9719684d9cbbad7b60d9d562248ead2 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -1,41 +1,23 @@
-Only in bind-9.2.4: bind-pmake.patch
-diff -ur bind-9.2.4-orig/lib/bind/make/rules.in bind-9.2.4/lib/bind/make/rules.in
---- bind-9.2.4-orig/lib/bind/make/rules.in     2004-03-15 05:44:47.000000000 +0100
-+++ bind-9.2.4/lib/bind/make/rules.in  2004-09-24 12:14:10.777828088 +0200
-@@ -49,8 +49,10 @@
- ### Makefile may define:
+diff -ur bind-9.3.0rc3.orig/make/rules.in bind-9.3.0rc3/make/rules.in
+--- bind-9.3.0rc3.orig/make/rules.in   2004-03-15 02:02:44.000000000 +0100
++++ bind-9.3.0rc3/make/rules.in        2004-09-01 10:51:31.568733488 +0200
+@@ -47,7 +47,10 @@ top_builddir =      @BIND9_TOP_BUILDDIR@
+ ###   PREREQS
  ###   TARGETS
  
--all: subdirs ${TARGETS}
-+all: touchfile ${TARGETS}
- 
+-all: ${PREREQS} subdirs ${TARGETS} testdirs
++all: ${PREREQS} touchfile ${TARGETS} testdirs
++
 +touchfile: subdirs
 +      touch touchfile
+ 
  ###
  ### Subdirectories
- ###
-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-09-24 12:09:25.000000000 +0200
-+++ bind-9.2.4/lib/bind/Makefile.in    2004-09-24 12:17:08.951741536 +0200
-@@ -96,11 +96,11 @@
- 
- @BIND9_MAKE_RULES@
- 
--libbind.@SA@: ${OBJS}
-+libbind.@SA@: touchfile
-       ${AR} ${ARFLAGS} $@ ${OBJS}
-       ${RANLIB} $@
- 
--libbind.la: ${OBJS}
-+libbind.la: touchfile
-       ${LIBTOOL_MODE_LINK} \
-       ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libbind.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-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-09-24 12:10:43.000000000 +0200
-+++ bind-9.2.4/lib/dns/Makefile.in     2004-09-24 12:16:30.551579248 +0200
-@@ -99,11 +99,11 @@
-               -DLIBAGE=${LIBAGE} \
+diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.in
+--- bind-9.3.0rc3.orig/lib/dns/Makefile.in     2004-07-20 09:01:57.000000000 +0200
++++ bind-9.3.0rc3/lib/dns/Makefile.in  2004-09-01 10:54:21.089962344 +0200
+@@ -135,11 +135,11 @@ version.@O@: version.c
+               -DMAPAPI=\"${MAPAPI}\" \
                -c ${srcdir}/version.c
  
 -libdns.@SA@: ${OBJS}
@@ -47,54 +29,33 @@ diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in
 +libdns.la: touchfile ${OBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-@@ -129,7 +129,7 @@
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-               ${GSSAPIOBJS} ${LIBS}
- 
--timestamp: libdns.@A@
-+timestamp: include libdns.@A@
-       touch timestamp
- 
- installdirs:
-@@ -177,5 +177,8 @@
-       include/dns/rdatastruct.h code.h
- subdirs: include/dns/enumtype.h include/dns/enumclass.h \
-       include/dns/rdatastruct.h code.h
-+$(OBJS): include/dns/enumtype.h include/dns/enumclass.h \
-+      include/dns/rdatastruct.h code.h
- ${DNSOBJS}: include/dns/enumtype.h include/dns/enumclass.h \
-         include/dns/rdatastruct.h
-+
-diff -ur bind-9.2.4-orig/lib/isc/Makefile.in bind-9.2.4/lib/isc/Makefile.in
---- bind-9.2.4-orig/lib/isc/Makefile.in        2004-07-20 09:00:19.000000000 +0200
-+++ bind-9.2.4/lib/isc/Makefile.in     2004-09-24 12:15:16.713804296 +0200
-@@ -88,11 +88,11 @@
-               -DLIBAGE=${LIBAGE} \
+               -release "${VERSION}" \
+--- bind-9.16.12/lib/isc/Makefile.in~  2021-02-04 12:35:16.000000000 +0100
++++ bind-9.16.12/lib/isc/Makefile.in   2021-02-17 22:03:34.729090432 +0100
+@@ -97,21 +97,21 @@ version.@O@: version.c
+               -DVERSION=\"${VERSION}\" \
                -c ${srcdir}/version.c
  
--libisc.@SA@: ${OBJS}
-+libisc.@SA@: touchfile ${OBJS}
+-libisc.@SA@: ${OBJS} ${SYMTBLOBJS}
++libisc.@SA@: touchfile ${OBJS} ${SYMTBLOBJS}
+       ${AR} ${ARFLAGS} $@ ${OBJS} ${SYMTBLOBJS}
+       ${RANLIB} $@
+ 
+-libisc-nosymtbl.@SA@: ${OBJS}
++libisc-nosymtbl.@SA@: touchfile ${OBJS}
        ${AR} ${ARFLAGS} $@ ${OBJS}
        ${RANLIB} $@
  
--libisc.la: ${OBJS}
-+libisc.la: touchfile ${OBJS}
+-libisc.la: ${OBJS} ${SYMTBLOBJS}
++libisc.la: touchfile ${OBJS} ${SYMTBLOBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-diff -ur bind-9.2.4-orig/make/rules.in bind-9.2.4/make/rules.in
---- bind-9.2.4-orig/make/rules.in      2004-07-20 09:00:21.000000000 +0200
-+++ bind-9.2.4/make/rules.in   2004-09-24 12:14:10.788826416 +0200
-@@ -47,7 +47,10 @@
- ### Makefile may define:
- ###   TARGETS
+               -release "${VERSION}" \
+               ${OBJS} ${SYMTBLOBJS} ${LIBS}
  
--all: subdirs ${TARGETS}
-+all: touchfile ${TARGETS}
-+
-+touchfile: subdirs
-+      touch touchfile
- 
- ###
- ### Subdirectories
+-libisc-nosymtbl.la: ${OBJS}
++libisc-nosymtbl.la: touchfile ${OBJS}
+       ${LIBTOOL_MODE_LINK} \
+               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
+               -release "${VERSION}" \
+