Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at 2013-09-23 09:33:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipsec-tools (Old) and /work/SRC/openSUSE:Factory/.ipsec-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipsec-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/ipsec-tools/ipsec-tools.changes 2013-01-31 14:50:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ipsec-tools.new/ipsec-tools.changes 2013-09-23 09:33:35.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 19 02:34:45 UTC 2013 - [email protected] + +- remove unused racoon.init from the package, it was + already removed from the spec file in the previous change. + +------------------------------------------------------------------- +Thu Sep 19 02:25:39 UTC 2013 - [email protected] + +- Add systemd support, systemctl enable racoon.service + also enables helper optional service racoon-setkey +- /etc/sysconfig/racoon was never created, fix that. + +------------------------------------------------------------------- Old: ---- racoon.init New: ---- racoon-setkey.service racoon.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.WqOJaj/_old 2013-09-23 09:33:36.000000000 +0200 +++ /var/tmp/diff_new_pack.WqOJaj/_new 2013-09-23 09:33:36.000000000 +0200 @@ -24,16 +24,17 @@ Release: 0 Url: http://ipsec-tools.sourceforge.net/ Source: http://prdownloads.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2 -Source1: racoon.init Source2: sysconfig.racoon Source3: setkey.conf.sample Source4: racoon.pam +Source5: racoon.service +Source6: racoon-setkey.service + Patch0: racoon.conf_macros.patch Patch1: racoon.psk.patch Patch2: ipsec-tools-0.7.3-linkerflag.patch Patch3: ipsec-tools-0.7.2-nodevel.patch Patch4: ipsec-tools-linux-3.7-compat.diff -Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq BuildRequires: bison @@ -46,12 +47,14 @@ BuildRequires: pam BuildRequires: pam-devel BuildRequires: readline-devel +BuildRequires: pkgconfig(systemd) + %if 0%{?suse_version} >= 1100 BuildRequires: fdupes BuildRequires: libselinux-devel %endif Provides: racoon - +%{?systemd_requires} %description This is the IPsec-Tools package. This package is needed to really make use of the IPsec functionality in the version 2.5 and 2.6 Linux @@ -82,8 +85,8 @@ --disable-shared \ --libexecdir=%{_libdir} \ --sysconfdir=/etc/racoon \ - --sharedstatedir=/var/run \ - --localstatedir=/var/run \ + --sharedstatedir=/run \ + --localstatedir=/run \ --with-kernel-headers="/usr/src/linux/include" \ --enable-dpd \ --enable-hybrid \ @@ -106,9 +109,6 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m 0755 $RPM_SOURCE_DIR/racoon.init $RPM_BUILD_ROOT/etc/init.d/racoon -ln -sf /etc/init.d/racoon $RPM_BUILD_ROOT/usr/sbin/rcracoon mkdir -p $RPM_BUILD_ROOT/etc/pam.d install -m 0644 %{S:4} $RPM_BUILD_ROOT/etc/pam.d/racoon %{__install} -d $RPM_BUILD_ROOT/etc/racoon/cert @@ -131,29 +131,36 @@ %fdupes -s $RPM_BUILD_ROOT/ %endif +install -d %{buildroot}%{_tmpfilesdir} +echo 'd /run/racoon 0700 root root -' > %{buildroot}%{_tmpfilesdir}/racoon.conf +install -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/racoon.service +install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/racoon-setkey.service + +%pre +%service_add_pre racoon.service racoon-setkey.service + %post -%{fillup_and_insserv racoon} +%{fillup_only -n racoon} + +%service_add_post racoon.service racoon-setkey.service %preun -%stop_on_removal racoon +%service_del_preun racoon.service racoon-setkey.service %postun -%{insserv_cleanup} - -%clean -%{__rm} -rf $RPM_BUILD_ROOT +%service_del_postun racoon.service racoon-setkey.service %files %defattr(-,root,root) +%{_unitdir}/*.service +%{_tmpfilesdir}/racoon.conf %doc /usr/share/doc/packages/%{name}/ %config(noreplace) /etc/racoon/psk.txt %config(noreplace) /etc/racoon/racoon.conf %config(noreplace) /etc/racoon/setkey.conf -%config /etc/init.d/racoon %config /etc/pam.d/racoon %dir /etc/racoon %dir /etc/racoon/cert -/usr/sbin/rcracoon /usr/sbin/racoon /usr/sbin/racoonctl /usr/sbin/setkey ++++++ racoon-setkey.service ++++++ [Unit] Description=Racoon IPSEC policies After=network.target ConditionPathExists=/etc/racoon/setkey.conf PartOf=racoon.service [Service] Type=oneshot EnvironmentFile=-/etc/sysconfig/racoon ExecStart=/usr/sbin/setkey $SETKEY_OPTIONS -f /etc/racoon/setkey.conf ExecStop=/usr/sbin/setkey $SETKEY_FLUSH_OPTIONS [Install] WantedBy=multi-user.target ++++++ racoon.service ++++++ [Unit] Description=Racoon IKEv1 key management daemon for IPSEC After=network.target racoon-setkey.service ConditionPathExists=/etc/racoon/racoon.conf [Service] EnvironmentFile=-/etc/sysconfig/racoon ExecStart=/usr/sbin/racoon -F $RACOON_OPTIONS -f /etc/racoon/racoon.conf ExecReload=/bin/kill -HUP $MAINPID [Install] Also=racoon-setkey.service WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
