Hello community, here is the log from the commit of package oidentd for openSUSE:Factory checked in at 2015-02-16 21:14:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-12-08 11:54:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oidentd.new/oidentd.changes 2015-02-16 21:14:57.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jul 18 14:16:55 UTC 2014 - [email protected] + +- Use systemd instead of sysvinit for openSUSE >= 12.1 +- Do not copy the INSTALL file in package documentation; user doesn't + install from sources +- Get rid of depreciated stuff + +------------------------------------------------------------------- New: ---- oidentd.service oidentd.socket ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oidentd.spec ++++++ --- /var/tmp/diff_new_pack.VXq5JX/_old 2015-02-16 21:14:58.000000000 +0100 +++ /var/tmp/diff_new_pack.VXq5JX/_new 2015-02-16 21:14:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package oidentd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%if 0%{?suse_version} > 1230 +%bcond_without systemd +%else +%bcond_with systemd +%endif + Name: oidentd Version: 2.0.8 Release: 0 @@ -22,12 +28,19 @@ Group: Productivity/Networking/System Url: http://dev.ojnk.net/ Summary: Configurable IDENT Server That Supports NAT/IP Masquerading -Source: http://prdownloads.sourceforge.net/ojnk/oidentd-%{version}.tar.bz2 +Source: http://prdownloads.sourceforge.net/ojnk/%{name}-%{version}.tar.bz2 Source1: sysconfig.oidentd Source2: rc.oidentd +Source3: oidentd.service +Source4: oidentd.socket BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake +%if %{with systemd} +%{?systemd_requires} +BuildRequires: systemd-rpm-macros +%else PreReq: %insserv_prereq %fillup_prereq +%endif +BuildRequires: automake %description Oidentd is an ident (rfc1413 compliant) daemon that runs on Linux, @@ -42,48 +55,71 @@ %setup %build -%{?suse_update_config:%{suse_update_config -f}} autoreconf --install --force -export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --sysconfdir=%{_sysconfdir} -%{__make} all +%configure +make all %install -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} -%{__make} DESTDIR=${RPM_BUILD_ROOT} install -mkdir -p \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d \ - ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates -touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/oidentd.conf -touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/oidentd_masq.conf -install -p -m 0755 ${RPM_SOURCE_DIR}/rc.oidentd ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/oidentd -ln -fs %{_sysconfdir}/init.d/oidentd ${RPM_BUILD_ROOT}/%{_sbindir}/rcoidentd -cp -p ${RPM_SOURCE_DIR}/sysconfig.oidentd ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates - -%clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}/%{_sysconfdir} \ +%if %{with systemd} + %{buildroot}%{_unitdir} +%else + %{buildroot}%{_sysconfdir}/init.d \ + %{buildroot}%{_var}/adm/fillup-templates +%endif +touch %{buildroot}/%{_sysconfdir}/oidentd.conf +touch %{buildroot}/%{_sysconfdir}/oidentd_masq.conf +%if %{with systemd} +install -p -m 0755 %{SOURCE1} %{buildroot}/%{_unitdir}/[email protected] +install -p -m 0755 %{SOURCE2} %{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 +%endif %post +%if %{with systemd} +%service_add_post [email protected] oidentd.socket +%else %{fillup_and_insserv} +%endif + +%preun +%if %{with systemd} +%service_del_preun [email protected] oidentd.socket +%endif %postun +%if %{with systemd} +%service_del_postun [email protected] 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.socket +%else %config %{_sysconfdir}/init.d/oidentd +%{_var}/adm/fillup-templates/sysconfig.oidentd +%endif %{_sbindir}/oidentd %{_sbindir}/rcoidentd %{_mandir}/man5/oidentd.conf.5.gz %{_mandir}/man5/oidentd_masq.conf.5.gz %{_mandir}/man8/oidentd.8.gz -%{_var}/adm/fillup-templates/sysconfig.oidentd -%doc AUTHORS COPYING* ChangeLog* INSTALL NEWS README TODO +%doc AUTHORS COPYING* ChangeLog* NEWS README TODO %changelog ++++++ oidentd.service ++++++ [Unit] Description=Ident (RFC 1413) per-connection server [Service] ExecStart=/usr/bin/oidentd -I -u nobody -g nobody ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardError=syslog ++++++ oidentd.socket ++++++ [Unit] Description=Ident (RFC 1413) socket [Socket] ListenStream=113 Accept=yes [Install] WantedBy=sockets.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
