rediff patches; rel 3

diff --git a/bind-link.patch b/bind-link.patch
index 26cc82403fa478e6274e79185363b86e5cfc67d5..a2cacb0c1e496e730814863cc73f02d6217a3c3a 100644 (file)
--- a/bind-link.patch
+++ b/bind-link.patch
@@ -35,18 +35,18 @@ diff -Nur bind-9.3.2.orig/lib/isccfg/Makefile.in bind-9.3.2.link/lib/isccfg/Make
 +LIBS =                @LIBS@ ../isc/libisc.la ../dns/libdns.la
  
  SUBDIRS =     include
- 
+ TESTDIRS =    @UNITTESTS@
 --- 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
+ 
+ ISCCFGDEPLIBS =       ../../lib/isccfg/libisccfg.@A@
  
 -LIBS =                @LIBS@
 +LIBS =                @LIBS@ ../isccfg/libisccfg.la ../isc/libisc.la ../dns/libdns.la
  
- SUBDIRS =     include
- TARGETS =     timestamp
+ # Alphabetically
+ OBJS =                context.@O@ \
 --- 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_
@@ -57,4 +57,4 @@ diff -Nur bind-9.3.2.orig/lib/isccfg/Makefile.in bind-9.3.2.link/lib/isccfg/Make
 +LIBS =                @LIBS@ ../dns/libdns.la
  
  # Alphabetically
- OBJS =                client.@O@ interfacemgr.@O@ lib.@O@ \
+ OBJS =                client.@O@ hooks.@O@ interfacemgr.@O@ lib.@O@ \

diff --git a/bind-pmake.patch b/bind-pmake.patch
index ec696fcc5fd1ccb40571c4986b8f61163a85ad98..681fa806f9719684d9cbbad7b60d9d562248ead2 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -17,7 +17,7 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
 --- 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
-               -DLIBAGE=${LIBAGE} \
+               -DMAPAPI=\"${MAPAPI}\" \
                -c ${srcdir}/version.c
  
 -libdns.@SA@: ${OBJS}
@@ -29,7 +29,7 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
 +libdns.la: touchfile ${OBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${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

diff --git a/bind.spec b/bind.spec
index 871c3b73100d0b6cfd7d554533d263dda25da200..60fe93e6b52517a1e8561f5947b95dbf41f0e450 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -46,7 +46,7 @@ Summary(uk.UTF-8):    BIND - cервер системи доменних імен (
 Summary(zh_CN.UTF-8):  Internet 域名服务器
 Name:          bind
 Version:       %{ver}%{pverdot}
-Release:       2
+Release:       3
 Epoch:         7
 License:       MPL 2.0
 Group:         Networking/Daemons