- up to 9.16.12; fixes CVE-2020-8625; new way of soname versioning

diff --git a/bind-pmake.patch b/bind-pmake.patch
index 189c009faf53027d4d8fab3159365c4bfd6e87f9..ec696fcc5fd1ccb40571c4986b8f61163a85ad98 100644 (file)
--- a/bind-pmake.patch
+++ b/bind-pmake.patch
@@ -30,10 +30,10 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
---- bind-9.7.0/lib/isc/Makefile.in~    2009-12-18 05:09:55.000000000 +0100
-+++ bind-9.7.0/lib/isc/Makefile.in     2010-02-17 08:04:13.849211197 +0100
-@@ -94,21 +94,21 @@
-               -DLIBAGE=${LIBAGE} \
+--- 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} ${SYMTBLOBJS}
@@ -50,11 +50,12 @@ diff -ur bind-9.3.0rc3.orig/lib/dns/Makefile.in bind-9.3.0rc3/lib/dns/Makefile.i
 +libisc.la: touchfile ${OBJS} ${SYMTBLOBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+               -release "${VERSION}" \
                ${OBJS} ${SYMTBLOBJS} ${LIBS}
  
 -libisc-nosymtbl.la: ${OBJS}
 +libisc-nosymtbl.la: touchfile ${OBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
-               -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+               -release "${VERSION}" \
+

diff --git a/bind.spec b/bind.spec
index 5dd8ce8b3599d918f400048182fc7fb690a03ba2..bbafb956dfdb2b3875e5fa85e9700a8bc7be380c 100644 (file)
--- a/bind.spec
+++ b/bind.spec
@@ -26,7 +26,7 @@
 %bcond_without epoll           # disable epoll support
 %endif
 
-%define                ver     9.16.11
+%define                ver     9.16.12
 %if 0
 %define                pverdot .P0
 %define                pverdir -P0
@@ -51,7 +51,7 @@ Epoch:                7
 License:       MPL 2.0
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/bind9/%{ver}%{pverdir}/%{name}-%{ver}%{pverdir}.tar.xz
-# Source0-md5: 58cbc23121e43ec934d644c4f412ceea
+# Source0-md5: 61c545db393628152e5b2c957e8bf712
 Source1:       named.init
 Source2:       named.sysconfig
 Source3:       named.logrotate
@@ -63,7 +63,7 @@ Source5:      dnszone-schema.txt
 Source6:       %{name}-hip.tar.gz
 # Source6-md5: 62a8a67f51ff8db9fe815205416a1f62
 Source7:       https://www.internic.net/domain/named.root
-# Source7-md5: d83d7308d4bdadc3d82ec9d73ef8df36
+# Source7-md5: 9681e4e9cb586670a51bf49ed4bf403a
 Source8:       %{name}-127.0.0.zone
 Source9:       %{name}-localhost.zone
 Source10:      %{name}-named.conf
@@ -494,9 +494,6 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema
 
 %{?with_hip:install -p bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}}
 
-# let rpm generate deps (workaround -m644 used for libs installation)
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*.*
-
 # we don't want Makefiles in documentation...
 rm -rf _doc
 cp -a doc _doc
@@ -642,20 +639,13 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libbind9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libbind9.so.1600
-%attr(755,root,root) %{_libdir}/libdns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdns.so.1611
-%attr(755,root,root) %{_libdir}/libirs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libirs.so.1601
-%attr(755,root,root) %{_libdir}/libisc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisc.so.1609
-%attr(755,root,root) %{_libdir}/libisccc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccc.so.1600
-%attr(755,root,root) %{_libdir}/libisccfg.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libisccfg.so.1603
-%attr(755,root,root) %{_libdir}/libns.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libns.so.1607
+%attr(755,root,root) %ghost %{_libdir}/libbind9-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libdns-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libirs-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libisc-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libisccc-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libisccfg-%{version}.so
+%attr(755,root,root) %ghost %{_libdir}/libns-%{version}.so
 
 %files devel
 %defattr(644,root,root,755)