[rpms/bind] rawhide: Make binaries contain minor version

[rpms/bind] rawhide: Make binaries contain minor version

[@ 2026-07-01 9:47 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/bind
Branch : rawhide
Commit : 7911863b8994d2b5fc3f45a43c88660215d4813b
Author : Petr Menšík <pemensik@redhat.com>
Date   : 2026-06-24T15:25:53+02:00
Stats  : +128/-59 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/bind/c/7911863b8994d2b5fc3f45a43c88660215d4813b?branch=rawhide

Log:
Make binaries contain minor version

---
diff --git a/0001-Use-variable-PROGRAM_SUFFIX-in-install-target.patch b/0001-Use-variable-PROGRAM_SUFFIX-in-install-target.patch
new file mode 100644
index 0000000..a6e700a
--- /dev/null
+++ b/0001-Use-variable-PROGRAM_SUFFIX-in-install-target.patch
@@ -0,0 +1,61 @@
+From 31bd3a0996a85c0fced0c6ace3da1241b30dc397 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Thu, 30 Apr 2026 17:28:40 +0200
+Subject: [PATCH] Use variable PROGRAM_SUFFIX in install target
+
+--program-suffix is handled by configure itself. But some makefile rules
+need to know it by a special value. Provide that to make multiple
+versions installable together on a single system.
+---
+ Makefile.top            | 1 +
+ bin/check/Makefile.am   | 6 +++---
+ bin/confgen/Makefile.am | 6 +++---
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index e186d15..91c076b 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -14,6 +14,7 @@ AM_CPPFLAGS =					\
+ AM_LDFLAGS =					\
+ 	$(STD_LDFLAGS)
+ LDADD =
++PROGRAM_SUFFIX =
+ 
+ if HOST_MACOS
+ AM_LDFLAGS +=					\
+diff --git a/bin/check/Makefile.am b/bin/check/Makefile.am
+index 8f63c35..36f232c 100644
+--- a/bin/check/Makefile.am
++++ b/bin/check/Makefile.am
+@@ -27,8 +27,8 @@ LDADD +=			\
+ bin_PROGRAMS = named-checkconf named-checkzone
+ 
+ install-exec-hook:
+-	ln -f $(DESTDIR)$(bindir)/named-checkzone \
+-	      $(DESTDIR)$(bindir)/named-compilezone
++	ln -f $(DESTDIR)$(bindir)/named-checkzone$(PROGRAM_SUFFIX) \
++	      $(DESTDIR)$(bindir)/named-compilezone$(PROGRAM_SUFFIX)
+ 
+ uninstall-hook:
+-	-rm -f $(DESTDIR)$(bindir)/named-compilezone
++	-rm -f $(DESTDIR)$(bindir)/named-compilezone$(PROGRAM_SUFFIX)
+diff --git a/bin/confgen/Makefile.am b/bin/confgen/Makefile.am
+index c1dca43..fe86dd7 100644
+--- a/bin/confgen/Makefile.am
++++ b/bin/confgen/Makefile.am
+@@ -23,8 +23,8 @@ libconfgen_la_SOURCES =		\
+ sbin_PROGRAMS = tsig-keygen rndc-confgen
+ 
+ install-exec-hook:
+-	ln -f $(DESTDIR)$(sbindir)/tsig-keygen \
+-	      $(DESTDIR)$(sbindir)/ddns-confgen
++	ln -f $(DESTDIR)$(sbindir)/tsig-keygen$(PROGRAM_SUFFIX) \
++	      $(DESTDIR)$(sbindir)/ddns-confgen$(PROGRAM_SUFFIX)
+ 
+ uninstall-hook:
+-	-rm -f $(DESTDIR)$(sbindir)/ddns-confgen
++	-rm -f $(DESTDIR)$(sbindir)/ddns-confgen$(PROGRAM_SUFFIX)
+-- 
+2.54.0
+

diff --git a/bind.spec b/bind.spec
index 6856c08..2b6eb76 100644
--- a/bind.spec
+++ b/bind.spec
@@ -154,6 +154,8 @@ Patch32: bind-9.18-partial-additional-records.patch
 Patch33: bind-9.18-dig-idn-input-always.patch
 # downstream only too
 Patch34: bind-9.18-dig-idn-input-always-test.patch
+# downstream only, https://redhat.atlassian.net/browse/IDM-6189
+Patch35: 0001-Use-variable-PROGRAM_SUFFIX-in-install-target.patch
 
 %{?systemd_ordering}
 # https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers
@@ -351,6 +353,9 @@ in HTML and PDF format.
 # customize include directory
 %global bind_include %{_includedir}/bind%{mver}
 
+# use this suffix for binaries
+%global program_suffix -%{mver}
+
 
 %prep
 %if 0%{?fedora}
@@ -419,6 +424,7 @@ export LIBDIR_SUFFIX
   --includedir=%{bind_include} \
   --with-tuning=large \
   --with-libidn2 \
+  --program-suffix=%{program_suffix} \
 %if %{with GEOIP2}
   --with-maxminddb \
 %endif
@@ -444,7 +450,7 @@ export LIBDIR_SUFFIX
 %endif
   --enable-fixed-rrset \
   --enable-full-report \
-  CPPFLAGS="$CPPFLAGS" \
+  CPPFLAGS="$CPPFLAGS" PROGRAM_SUFFIX="%{program_suffix}" \
 ;
 %if %{with DNSTAP}
   pushd lib
@@ -461,7 +467,7 @@ fmtutil-user --listcfg || :
 fmtutil-user --missing || :
 %endif
 
-%make_build
+%make_build PROGRAM_SUFFIX="%{program_suffix}"
 
 %if %{with DOC}
   make doc
@@ -576,7 +582,7 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf
 #end chroot
 
 pushd build
-%make_install
+%make_install PROGRAM_SUFFIX="%{program_suffix}"
 popd
 
 # Remove unwanted files
@@ -592,11 +598,10 @@ install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_sysusersdir}
 install -m 644 %{SOURCE50} ${RPM_BUILD_ROOT}%{_sysusersdir}/named.conf
 
-mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}
-install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-chroot.sh
-install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/generate-rndc-key.sh
-
-install -m 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-softhsm.sh
+mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
+install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-chroot.sh
+install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/generate-rndc-key.sh
+install -m 755 %{SOURCE48} ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/setup-named-softhsm.sh
 
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
@@ -619,17 +624,20 @@ popd
 
 # 9.16.4 installs even manual pages for tools not generated
 %if %{without DNSTAP}
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/dnstap-read.1* || true
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/dnstap-read%{program_suffix}.1* || true
 %endif
 %if %{without LMDB}
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/named-nzd2nzf.8* || true
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/named-nzd2nzf%{program_suffix}.8* || true
 %endif
 
 pushd ${RPM_BUILD_ROOT}%{_mandir}/man8
-ln -s ddns-confgen.8.gz tsig-keygen.8.gz
+ln -s ddns-confgen%{program_suffix}.8.gz tsig-keygen%{program_suffix}.8.gz
 popd
 pushd ${RPM_BUILD_ROOT}%{_mandir}/man1
-ln -s named-checkzone.1.gz named-compilezone.1.gz
+ln -s named-checkzone%{program_suffix}.1.gz named-compilezone%{program_suffix}.1.gz
+popd
+pushd ${RPM_BUILD_ROOT}%{_mandir}/man5
+  mv named.conf%{program_suffix}.5.gz named.conf.5.gz
 popd
 
 %if %{with DOC}
@@ -657,7 +665,7 @@ cp -p build/doc/arm/_build/latex/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
 touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/named.log
 
 # configuration files:
-install -m 640 %{SOURCE16} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.conf
+install -m 640 %{SOURCE16} ${RPM_BUILD_ROOT}%{_sysconfdir}/named%{program_suffix}.conf
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.{key,conf}
 install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}%{_sysconfdir}/named.root.key
 install -m 644 %{SOURCE36} ${RPM_BUILD_ROOT}%{_sysconfdir}/trusted-key.key
@@ -696,7 +704,7 @@ done
 :;
 
 mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
-install -p -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf
+install -p -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}.conf
 install -p -m 644 %{SOURCE51} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-chroot.conf
 
 %post
@@ -791,30 +799,30 @@ fi;
 %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key
 %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.ca
 %config(noreplace) %{_sysconfdir}/logrotate.d/named
-%{_tmpfilesdir}/named.conf
+%{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/named.service
 %{_unitdir}/named-setup-rndc.service
-%{_sysusersdir}/named.conf
-%{_bindir}/named-journalprint
-%{_bindir}/named-checkconf
-%{_bindir}/named-rrchecker
-%{_bindir}/mdig
-%{_sbindir}/named
+%{_sysusersdir}/%{name}.conf
+%{_bindir}/named-journalprint%{program_suffix}
+%{_bindir}/named-checkconf%{program_suffix}
+%{_bindir}/named-rrchecker%{program_suffix}
+%{_bindir}/mdig%{program_suffix}
+%{_sbindir}/named%{program_suffix}
 %{_sbindir}/rndc*
 %if "%{_sbindir}" != "%{_bindir}"
-%{_sbindir}/named-checkconf
+%{_sbindir}/named-checkconf%{program_suffix}
 %endif
 %{_libexecdir}/generate-rndc-key.sh
 %{_libexecdir}/setup-named-softhsm.sh
-%{_mandir}/man1/mdig.1*
-%{_mandir}/man1/named-rrchecker.1*
+%{_mandir}/man1/mdig%{program_suffix}.1*
+%{_mandir}/man1/named-rrchecker%{program_suffix}.1*
 %{_mandir}/man5/named.conf.5*
-%{_mandir}/man5/rndc.conf.5*
-%{_mandir}/man8/rndc.8*
-%{_mandir}/man8/named.8*
-%{_mandir}/man1/named-checkconf.1*
-%{_mandir}/man8/rndc-confgen.8*
-%{_mandir}/man1/named-journalprint.1*
+%{_mandir}/man5/rndc.conf%{program_suffix}.5*
+%{_mandir}/man8/rndc%{program_suffix}.8*
+%{_mandir}/man8/named%{program_suffix}.8*
+%{_mandir}/man1/named-checkconf%{program_suffix}.1*
+%{_mandir}/man8/rndc-confgen%{program_suffix}.8*
+%{_mandir}/man1/named-journalprint%{program_suffix}.1*
 %{_mandir}/man8/filter-*.8.gz
 %doc README.md named.conf.default
 %doc sample/
@@ -822,7 +830,7 @@ fi;
 # Hide configuration
 %defattr(0640,root,named,0750)
 %dir %{_sysconfdir}/named
-%config(noreplace) %verify(not link) %{_sysconfdir}/named.conf
+%config(noreplace) %verify(not link) %{_sysconfdir}/named%{program_suffix}.conf
 %config(noreplace) %verify(not link) %{_sysconfdir}/named.rfc1912.zones
 %defattr(0660,root,named,01770)
 %dir %{_localstatedir}/named
@@ -858,40 +866,40 @@ fi;
 %license COPYRIGHT
 
 %files utils
-%{_bindir}/dig
-%{_bindir}/delv
-%{_bindir}/host
-%{_bindir}/nslookup
-%{_bindir}/nsupdate
-%{_bindir}/arpaname
-%{_sbindir}/ddns-confgen
-%{_sbindir}/tsig-keygen
-%{_bindir}/nsec3hash
-%{_bindir}/named-checkzone
-%{_bindir}/named-compilezone
+%{_bindir}/dig%{program_suffix}
+%{_bindir}/delv%{program_suffix}
+%{_bindir}/host%{program_suffix}
+%{_bindir}/nslookup%{program_suffix}
+%{_bindir}/nsupdate%{program_suffix}
+%{_bindir}/arpaname%{program_suffix}
+%{_sbindir}/ddns-confgen%{program_suffix}
+%{_sbindir}/tsig-keygen%{program_suffix}
+%{_bindir}/nsec3hash%{program_suffix}
+%{_bindir}/named-checkzone%{program_suffix}
+%{_bindir}/named-compilezone%{program_suffix}
 %if "%{_sbindir}" != "%{_bindir}"
-%{_sbindir}/named-checkzone
-%{_sbindir}/named-compilezone
+%{_sbindir}/named-checkzone%{program_suffix}
+%{_sbindir}/named-compilezone%{program_suffix}
 %endif
 %if %{with DNSTAP}
-%{_bindir}/dnstap-read
-%{_mandir}/man1/dnstap-read.1*
+%{_bindir}/dnstap-read%{program_suffix}
+%{_mandir}/man1/dnstap-read%{program_suffix}.1*
 %endif
 %if %{with LMDB}
-%{_bindir}/named-nzd2nzf
-%{_mandir}/man1/named-nzd2nzf.1*
+%{_bindir}/named-nzd2nzf%{program_suffix}
+%{_mandir}/man1/named-nzd2nzf%{program_suffix}.1*
 %endif
-%{_mandir}/man1/host.1*
-%{_mandir}/man1/nsupdate.1*
-%{_mandir}/man1/dig.1*
-%{_mandir}/man1/delv.1*
-%{_mandir}/man1/nslookup.1*
-%{_mandir}/man1/arpaname.1*
-%{_mandir}/man8/ddns-confgen.8*
-%{_mandir}/man8/tsig-keygen.8*
-%{_mandir}/man1/nsec3hash.1*
-%{_mandir}/man1/named-checkzone.1*
-%{_mandir}/man1/named-compilezone.1*
+%{_mandir}/man1/host%{program_suffix}.1*
+%{_mandir}/man1/nsupdate%{program_suffix}.1*
+%{_mandir}/man1/dig%{program_suffix}.1*
+%{_mandir}/man1/delv%{program_suffix}.1*
+%{_mandir}/man1/nslookup%{program_suffix}.1*
+%{_mandir}/man1/arpaname%{program_suffix}.1*
+%{_mandir}/man8/ddns-confgen%{program_suffix}.8*
+%{_mandir}/man8/tsig-keygen%{program_suffix}.8*
+%{_mandir}/man1/nsec3hash%{program_suffix}.1*
+%{_mandir}/man1/named-checkzone%{program_suffix}.1*
+%{_mandir}/man1/named-compilezone%{program_suffix}.1*
 %{_sysconfdir}/trusted-key.key
 
 %files dnssec-utils