diff --git a/bind-9.10-use-of-strlcat.patch b/bind-9.10-use-of-strlcat.patch deleted file mode 100644 index 2a39916..0000000 --- a/bind-9.10-use-of-strlcat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/bin/sdb_tools/zone2ldap.c b/bin/sdb_tools/zone2ldap.c -index d56bc56..99c3314 100644 ---- a/bin/sdb_tools/zone2ldap.c -+++ b/bin/sdb_tools/zone2ldap.c -@@ -817,11 +817,11 @@ build_dn_from_dc_list (char **dc_list, unsigned int ttl, int flag, char *zone) - } - - -- strlcat (dn, tmp, sizeof (dn)); -+ strncat (dn, tmp, sizeof (dn) - strlen (dn)); - } - - sprintf (tmp, "dc=%s", dc_list[0]); -- strlcat (dn, tmp, sizeof (dn)); -+ strncat (dn, tmp, sizeof (dn) - strlen (dn)); - - fflush(NULL); - return dn; diff --git a/bind.spec b/bind.spec index 6c9bcfa..3ecc99a 100644 --- a/bind.spec +++ b/bind.spec @@ -113,9 +113,6 @@ Patch136:bind-9.10-dist-native-pkcs11.patch # Do not use isc-pkcs11. Patch149:bind-9.11-kyua-pkcs11.patch -# [ISC-Bugs #42525] non-portable use of strlcat in contrib/sdb/ldap/zone2ldap.c -# introduced by https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=fc9f0ac5778f78003a7acc957a23711811fec122 -Patch137:bind-9.10-use-of-strlcat.patch Patch140:bind-9.11-rh1410433.patch Patch157:bind-9.11-fips-tests.patch Patch164:bind-9.11-rh1666814.patch @@ -449,7 +446,6 @@ cp -r lib/ns{,-pkcs11} %endif %patch133 -p1 -b .rh640538 -#%patch134 -p1 -b .rh669163 # Sparc and s390 arches need to use -fPIE %ifarch sparcv9 sparc64 s390 s390x @@ -691,7 +687,7 @@ install -m 644 %{SOURCE47} ${RPM_BUILD_ROOT}%{_unitdir} %else # Not packaged without PKCS11 find ${RPM_BUILD_ROOT}%{_includedir}/bind9/pk11 ${RPM_BUILD_ROOT}%{_includedir}/bind9/pkcs11 \ - -name '*.h' \! -name site.h -delete + -name '*.h' \! -name site.h -delete %endif