Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dhcp for openSUSE:Factory checked in
at 2021-08-16 10:08:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcp (Old)
and /work/SRC/openSUSE:Factory/.dhcp.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp"
Mon Aug 16 10:08:58 2021 rev:126 rq:911811 version:4.4.2.P1
Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2021-05-31
11:43:41.954306793 +0200
+++ /work/SRC/openSUSE:Factory/.dhcp.new.1899/dhcp.changes 2021-08-16
10:13:51.862935005 +0200
@@ -1,0 +2,8 @@
+Thu Aug 5 11:33:54 UTC 2021 - Reinhard Max <m...@suse.com>
+
+- bsc#1186249: Remove remaining references to /etc/init.d from
+ dhclient-script and if-up.d.dhcpd-restart-hook .
+- Use , instead of - or / as a separator in sed when dealing with
+ path names.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp.spec ++++++
--- /var/tmp/diff_new_pack.YqXaWr/_old 2021-08-16 10:13:52.678933963 +0200
+++ /var/tmp/diff_new_pack.YqXaWr/_new 2021-08-16 10:13:52.682933958 +0200
@@ -312,7 +312,7 @@
install -d -m0755 %{buildroot}%{_libexecdir}/dhcp
install -m0755 $RPM_SOURCE_DIR/dhcpd.script \
%{buildroot}%{_libexecdir}/dhcp/dhcpd
-sed -e 's/@LIBDIR@/%{_lib}/g' -i %{buildroot}%{_libexecdir}/dhcp/dhcpd
+sed -e 's,@LIBDIR@,%{_lib},g' -i %{buildroot}%{_libexecdir}/dhcp/dhcpd
install -m0755 $RPM_SOURCE_DIR/dhcrelay.script \
%{buildroot}%{_libexecdir}/dhcp/dhcrelay
# service units
@@ -325,7 +325,7 @@
%{buildroot}%{_unitdir}/dhcrelay.service
install -m0644 $RPM_SOURCE_DIR/dhcrelay6.service \
%{buildroot}%{_unitdir}/dhcrelay6.service
-sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{buildroot}%{_unitdir}/d*
+sed -e 's,@LIBEXECDIR@,%{_libexecdir},g' -i %{buildroot}%{_unitdir}/d*
# rcservice links
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd6
@@ -365,6 +365,8 @@
install -d -m0755 %{buildroot}%{_sysconfdir}/sysconfig/network/scripts
install -m0755 $RPM_SOURCE_DIR/if-up.d.dhcpd-restart-hook \
%{buildroot}%{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook
+sed 's,@LIBEXECDIR@,%{_libexecdir},g' -i \
+
%{buildroot}%{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook
ln -sf ../scripts/dhcpd-restart-hook \
%{buildroot}%{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook
# slp support
++++++ dhclient-script ++++++
--- /var/tmp/diff_new_pack.YqXaWr/_old 2021-08-16 10:13:52.806933799 +0200
+++ /var/tmp/diff_new_pack.YqXaWr/_new 2021-08-16 10:13:52.810933794 +0200
@@ -340,8 +340,6 @@
# reload syslog so it knows the new hostname
if test -x /usr/bin/systemctl ; then
/usr/bin/systemctl reload syslog.service
- else
- /etc/init.d/syslog reload
fi
fi
fi
++++++ if-up.d.dhcpd-restart-hook ++++++
--- /var/tmp/diff_new_pack.YqXaWr/_old 2021-08-16 10:13:53.010933538 +0200
+++ /var/tmp/diff_new_pack.YqXaWr/_new 2021-08-16 10:13:53.010933538 +0200
@@ -102,7 +102,7 @@
fi
if test "$restart_needed" = yes ; then
- /etc/init.d/dhcpd try-restart
+ @LIBEXECDIR@/dhcp/dhcpd -4 try-restart
fi
}
dhcpv6_server_restart()
@@ -140,7 +140,7 @@
fi
if test "$restart_needed" = yes ; then
- /etc/init.d/dhcpd6 try-restart
+ @LIBEXECDIR@/dhcp/dhcpd -6 try-restart
fi
}
