Hello community,

here is the log from the commit of package oidentd for openSUSE:Factory checked 
in at 2016-01-21 23:42:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oidentd (Old)
 and      /work/SRC/openSUSE:Factory/.oidentd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "oidentd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/oidentd/oidentd.changes  2015-11-10 
10:04:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.oidentd.new/oidentd.changes     2016-01-22 
01:07:21.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Jan  9 14:47:57 UTC 2016 - [email protected]
+
+- Rename [email protected] to oidentd.service and hardcode variables; 
+  (boo#953608)
+- Add back support for sysconfig in the service file 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ oidentd.spec ++++++
--- /var/tmp/diff_new_pack.04skW8/_old  2016-01-22 01:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.04skW8/_new  2016-01-22 01:07:22.000000000 +0100
@@ -64,59 +64,61 @@
 %install
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/%{_sysconfdir}  \
+         %{buildroot}%{_var}/adm/fillup-templates \
 %if %{with systemd}
          %{buildroot}%{_unitdir}
 %else
-         %{buildroot}%{_sysconfdir}/init.d \
-         %{buildroot}%{_var}/adm/fillup-templates
+         %{buildroot}%{_sysconfdir}/init.d
 %endif
 touch %{buildroot}/%{_sysconfdir}/oidentd.conf
 touch %{buildroot}/%{_sysconfdir}/oidentd_masq.conf
+cp -p %{S:1} %{buildroot}%{_var}/adm/fillup-templates
 %if %{with systemd}
-install -p -m 0644 %{SOURCE3} %{buildroot}/%{_unitdir}/[email protected]
+install -p -m 0644 %{SOURCE3} %{buildroot}/%{_unitdir}/oidentd.service
 install -p -m 0644 %{SOURCE4} %{buildroot}/%{_unitdir}/oidentd.socket
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
 %else
 install -p -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/oidentd
 ln -fs %{_sysconfdir}/init.d/oidentd %{buildroot}%{_sbindir}/rcoidentd
-cp -p %{S:1} %{buildroot}%{_var}/adm/fillup-templates
 %endif
 
-%pre
 %if %{with systemd}
-%service_add_pre [email protected] oidentd.socket
+%pre
+%service_add_pre oidentd.service oidentd.socket
 %endif
 
 %post
 %if %{with systemd}
-%service_add_post [email protected] oidentd.socket
+%service_add_post oidentd.service oidentd.socket
+%{fillup_only}
 %else
 %{fillup_and_insserv}
 %endif
 
-%preun
 %if %{with systemd}
-%service_del_preun [email protected] oidentd.socket
+%preun
+%service_del_preun oidentd.service oidentd.socket
 %endif
 
 %postun
 %if %{with systemd}
-%service_del_postun [email protected] oidentd.socket
+%service_del_postun oidentd.service oidentd.socket
 %else
 %{restart_on_update}
 %{insserv_cleanup}
 %endif
+
 %files
 %defattr(-,root,root)
 %config(noreplace) %ghost %{_sysconfdir}/oidentd.conf
 %config(noreplace) %ghost %{_sysconfdir}/oidentd_masq.conf
 %if %{with systemd}
-%{_unitdir}/[email protected]
+%{_unitdir}/oidentd.service
 %{_unitdir}/oidentd.socket
 %else
 %config %{_sysconfdir}/init.d/oidentd
-%{_var}/adm/fillup-templates/sysconfig.oidentd
 %endif
+%{_var}/adm/fillup-templates/sysconfig.oidentd
 %{_sbindir}/oidentd
 %{_sbindir}/rcoidentd
 %{_mandir}/man5/oidentd.conf.5.gz

++++++ oidentd.service ++++++
--- /var/tmp/diff_new_pack.04skW8/_old  2016-01-22 01:07:22.000000000 +0100
+++ /var/tmp/diff_new_pack.04skW8/_new  2016-01-22 01:07:22.000000000 +0100
@@ -1,8 +1,11 @@
 [Unit]
-Description=Ident (RFC 1413) per-connection server
+Description=RFC 1413 identification server
+Documentation=man:oidentd(8) man:oidentd.conf(5) man:oidentd_masq.conf(5)
 
 [Service]
-ExecStart=/usr/bin/oidentd -I -u nobody -g nobody
-ExecReload=/bin/kill -HUP $MAINPID
+Type=simple
+PrivateDevices=true
+EnvironmentFile=/etc/sysconfig/oidentd
+ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody --foreground --nosyslog 
$OIDENTD_OPTIONS
 StandardInput=socket
 StandardError=syslog


Reply via email to