Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at 2017-12-23 12:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcp (Old) and /work/SRC/openSUSE:Factory/.dhcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp" Sat Dec 23 12:16:32 2017 rev:105 rq:557307 version:4.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2017-07-08 12:27:39.511503390 +0200 +++ /work/SRC/openSUSE:Factory/.dhcp.new/dhcp.changes 2017-12-23 12:16:38.135923448 +0100 @@ -1,0 +2,26 @@ +Wed Dec 13 15:52:25 UTC 2017 - [email protected] + +- Drop old sysvinit support from the spec file. All the supported + openSUSE distributions are systemd based so there isn't much point + in keeping sysvinit support and files around. + +------------------------------------------------------------------- +Thu Nov 23 13:49:18 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Fri Jul 14 09:48:25 UTC 2017 - [email protected] + +- Replace net-tools Requires in dhcp-client with hostname on + suse_version >= 1330 (CODE15): net-tools does no longer provide + any tool referenced by dhclient-script, but we require hostname + (which is also a dependency to net-tools, thus hiding the issue). + +------------------------------------------------------------------- +Thu Jul 13 12:27:59 UTC 2017 - [email protected] + +- use .gz year instead of current one to make build reproducible + +------------------------------------------------------------------- Old: ---- rc.dhcpd rc.dhcpd6 rc.dhcrelay rc.dhcrelay6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.SLj7IG/_old 2017-12-23 12:16:40.043830420 +0100 +++ /var/tmp/diff_new_pack.SLj7IG/_new 2017-12-23 12:16:40.043830420 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define isc_version 4.3.5 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc @@ -26,11 +31,6 @@ %define with_ldapcasa 0%{?sles_version} >= 10 || (%suse_version >= 1110 && %suse_version < 1140) # doc package is new on 11.3 %define with_doc_package %suse_version >= 1130 -%if 0%{?suse_version} >= 1310 -%bcond_without systemd -%else -%bcond_with systemd -%endif Name: dhcp %if %{with_ldap} @@ -53,17 +53,10 @@ # Source10: dhcpd.script Source11: dhcrelay.script -%if %{with systemd} Source12: dhcpd.service Source13: dhcpd6.service Source14: dhcrelay.service Source15: dhcrelay6.service -%else -Source12: rc.dhcpd -Source13: rc.dhcpd6 -Source14: rc.dhcrelay -Source15: rc.dhcrelay6 -%endif Source17: sysconfig.dhcpd Source18: sysconfig.dhcrelay Source19: if-up.d.dhcpd-restart-hook @@ -130,9 +123,6 @@ Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -%if !%{with systemd} -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd %package client @@ -141,18 +131,19 @@ Requires: /usr/bin/host Requires: /usr/bin/touch Requires: dhcp = %{version} +%if 0%{?suse_version} >= 1330 +Requires: hostname +%else +Requires: net-tools +%endif Requires: iproute2 Requires: iputils -Requires: net-tools %package relay Summary: ISC DHCP Relay Agent Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -%if !%{with systemd} -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp %package devel @@ -270,6 +261,9 @@ for i in /usr/share/automake-*/config.{sub,guess} ; do install -v -m755 $i $bind_dir/ done +# use the year from source gzip header instead of current one to make reproducible rpms +year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < bind.tar.gz) +sed -i "s/stdout, copyright, year/stdout, copyright, \"-$year\"/" $bind_dir/lib/dns/gen.c popd ## @@ -336,12 +330,6 @@ ./server/dhcpd -4 -t -cf $RPM_SOURCE_DIR/dhcpd.conf ./server/dhcpd -6 -t -cf $RPM_SOURCE_DIR/dhcpd6.conf # check syntax in our scripts -%if !%{with systemd} -bash -n $RPM_SOURCE_DIR/rc.dhcpd -bash -n $RPM_SOURCE_DIR/rc.dhcpd6 -bash -n $RPM_SOURCE_DIR/rc.dhcrelay -bash -n $RPM_SOURCE_DIR/rc.dhcrelay6 -%endif bash -n $RPM_SOURCE_DIR/dhcpd.script bash -n $RPM_SOURCE_DIR/dhcrelay.script bash -n $RPM_SOURCE_DIR/dhclient-script @@ -359,7 +347,7 @@ install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema %endif install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run -install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates +install -d -m0755 $RPM_BUILD_ROOT%{_fillupdir} # chroot jail install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev @@ -385,7 +373,6 @@ sed -e 's/@LIBDIR@/%{_lib}/g' -i $RPM_BUILD_ROOT/usr/lib/dhcp/dhcpd install -m0755 $RPM_SOURCE_DIR/dhcrelay.script \ $RPM_BUILD_ROOT/usr/lib/dhcp/dhcrelay -%if %{with systemd} # service units install -d -m0755 $RPM_BUILD_ROOT%{_unitdir} install -m0644 $RPM_SOURCE_DIR/dhcpd.service \ @@ -401,23 +388,6 @@ ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6 ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6 -%else -# service scripts -install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d -install -m0755 $RPM_SOURCE_DIR/rc.dhcpd \ - $RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcpd -install -m0755 $RPM_SOURCE_DIR/rc.dhcpd6 \ - $RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcpd6 -install -m0755 $RPM_SOURCE_DIR/rc.dhcrelay \ - $RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcrelay -install -m0755 $RPM_SOURCE_DIR/rc.dhcrelay6 \ - $RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcrelay6 -# rcservice links -ln -sf %{_sysconfdir}/init.d/dhcpd $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd -ln -sf %{_sysconfdir}/init.d/dhcpd6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6 -ln -sf %{_sysconfdir}/init.d/dhcrelay $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay -ln -sf %{_sysconfdir}/init.d/dhcrelay6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6 -%endif %if %suse_version > 1310 # rcservice actions legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions @@ -442,11 +412,11 @@ %endif # sysconfig files install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ # another config files and scripts %if %{with_ldap} install -m0644 contrib/ldap/dhcp.schema \ @@ -498,21 +468,14 @@ %pre server /usr/sbin/useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d /var/lib/dhcp dhcpd 2> /dev/null ||: -%if %{with systemd} %service_add_pre dhcpd.service %service_add_pre dhcpd6.service -%endif %post server -%if %{with systemd} %{fillup_only -n dhcpd dhcpd} %{fillup_only -ans syslog dhcpd} %service_add_post dhcpd.service %service_add_post dhcpd6.service -%else -%{fillup_and_insserv -n dhcpd dhcpd dhcpd6} -%{fillup_only -ans syslog dhcpd} -%endif # FIXME: update? if [ ${FIRST_ARG:-0} -gt 1 ]; then if grep -q '^DHCPD_RUN_AS=.*nobody' etc/sysconfig/dhcpd; then @@ -530,37 +493,16 @@ fi %preun server -%if %{with systemd} %service_del_preun dhcpd.service %service_del_preun dhcpd6.service -%else -if test -x /etc/init.d/dhcpd ; then - %stop_on_removal dhcpd -fi -if test -x /etc/init.d/dhcpd6 ; then - %stop_on_removal dhcpd6 -fi -%endif %postun server -%if %{with systemd} %service_del_postun dhcpd.service %service_del_postun dhcpd6.service -%else -if test -x /etc/init.d/dhcpd ; then - %restart_on_update dhcpd -fi -if test -x /etc/init.d/dhcpd6 ; then - %restart_on_update dhcpd6 -fi -%insserv_cleanup -%endif %pre relay -%if %{with systemd} %service_add_pre dhcrelay.service %service_add_pre dhcrelay6.service -%endif %post relay # @@ -569,40 +511,17 @@ %{rename_sysconfig_variable -f etc/sysconfig/dhcrelay DHCRELAY6_UPPER_INTERFACES_ARGS DHCRELAY6_UPPER_INTERFACES} # -%if %{with systemd} %{fillup_only -n dhcrelay dhcrelay} %service_add_post dhcrelay.service %service_add_post dhcrelay6.service -%else -%{fillup_and_insserv -n dhcrelay dhcrelay dhcrelay6} -%endif %preun relay -%if %{with systemd} %service_del_preun dhcrelay.service %service_del_preun dhcrelay6.service -%else -if test -x /etc/init.d/dhcrelay ; then - %stop_on_removal dhcrelay -fi -if test -x /etc/init.d/dhcrelay6 ; then - %stop_on_removal dhcrelay6 -fi -%endif %postun relay -%if %{with systemd} %service_del_postun dhcrelay.service %service_del_postun dhcrelay6.service -%else -if test -x /etc/init.d/dhcrelay ; then - %restart_on_update dhcrelay -fi -if test -x /etc/init.d/dhcrelay6 ; then - %restart_on_update dhcrelay6 -fi -%insserv_cleanup -%endif %post client test -e %{_localstatedir}/lib/dhcp/dhclient.leases || \ @@ -628,7 +547,6 @@ %{_sbindir}/dhcpd6 %{_sbindir}/rcdhcpd %{_sbindir}/rcdhcpd6 -%if %{with systemd} %{_unitdir}/dhcpd.service %{_unitdir}/dhcpd6.service %if %suse_version > 1310 @@ -637,10 +555,6 @@ %dir /usr/lib/initscripts/legacy-actions/dhcpd6 /usr/lib/initscripts/legacy-actions/dhcpd6/* %endif -%else -%config %{_sysconfdir}/init.d/dhcpd -%config %{_sysconfdir}/init.d/dhcpd6 -%endif %config(noreplace) %{_sysconfdir}/dhcpd.conf %config(noreplace) %{_sysconfdir}/dhcpd6.conf %attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd.d/ @@ -675,8 +589,8 @@ %{omc_svcdir}/dhcpd6.xml %{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook %{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd -%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd +%{_fillupdir}/sysconfig.dhcpd +%{_fillupdir}/sysconfig.syslog-dhcpd %if %{with_doc_package} %files doc @@ -708,15 +622,10 @@ %{_sbindir}/rcdhcrelay6 %dir /usr/lib/dhcp /usr/lib/dhcp/dhcrelay -%if %{with systemd} %{_unitdir}/dhcrelay.service %{_unitdir}/dhcrelay6.service -%else -%config %{_sysconfdir}/init.d/dhcrelay -%config %{_sysconfdir}/init.d/dhcrelay6 -%endif %doc %{_mandir}/man8/dhcrelay.8.gz -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcrelay +%{_fillupdir}/sysconfig.dhcrelay %files devel %defattr(-,root,root)
