Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at 2015-06-10 09:16:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-05-10 10:46:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ipsec-tools.new/ipsec-tools.changes 2015-06-10 09:16:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 4 12:52:01 UTC 2015 - tchva...@suse.com + +- Cleanup most of the rpmlint warnings to have it in better shape + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.3tnFO4/_old 2015-06-10 09:16:28.000000000 +0200 +++ /var/tmp/diff_new_pack.3tnFO4/_new 2015-06-10 09:16:28.000000000 +0200 @@ -17,11 +17,11 @@ Name: ipsec-tools +Version: 0.8.2 +Release: 0 Summary: IPsec Utilities License: BSD-3-Clause Group: Productivity/Networking/Security -Version: 0.8.2 -Release: 0 Url: http://ipsec-tools.sourceforge.net/ Source: http://prdownloads.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2 Source2: sysconfig.racoon @@ -29,7 +29,6 @@ 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 @@ -37,11 +36,11 @@ Patch4: ipsec-tools-0.8.0-certasn1txtbroken.patch Patch5: racoon-fips-rsa.patch Patch6: racoon-no-md5.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq %fillup_prereq BuildRequires: bison +BuildRequires: fdupes BuildRequires: flex BuildRequires: krb5-devel +BuildRequires: libselinux-devel BuildRequires: libtool BuildRequires: linux-glibc-devel BuildRequires: openldap2-devel @@ -50,23 +49,18 @@ BuildRequires: pam-devel BuildRequires: readline-devel BuildRequires: pkgconfig(systemd) - -BuildRequires: fdupes -BuildRequires: libselinux-devel +Requires(post): %fillup_prereq Provides: racoon +BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?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 kernels. This package builds: - -- libipsec, a PFKeyV2 library - -- setkey, a program to directly manipulate policies and SAs - -- racoon, an IKEv1 keying daemon - + - libipsec, a PFKeyV2 library + - setkey, a program to directly manipulate policies and SAs + - racoon, an IKEv1 keying daemon These sources can be found at the IPsec-Tools home page at: http://ipsec-tools.sourceforge.net/ @@ -83,14 +77,13 @@ sed -i 's|-Werror||g' configure %build -export PATH=$PATH:/usr/lib/mit/bin %configure \ --disable-shared \ --libexecdir=%{_libdir} \ - --sysconfdir=/etc/racoon \ + --sysconfdir=%{_sysconfdir}/racoon \ --sharedstatedir=/run \ --localstatedir=/run \ - -with-kernel-headers="/usr/include" \ + --with-kernel-headers="%{_prefix}/include" \ --enable-dpd \ --enable-hybrid \ --enable-frag \ @@ -101,44 +94,46 @@ --with-libpam \ --enable-security-context=yes \ --with-libldap -make +make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -make install DESTDIR=$RPM_BUILD_ROOT -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 +make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p %{buildroot}%{_sysconfdir}/pam.d +install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/racoon +install -d %{buildroot}%{_sysconfdir}/racoon/cert # unify the permissions of psk.txt - fdupes is sensitive on permissions now (bnc#784670) chmod 0600 src/racoon/samples/psk.txt -install -m 0600 src/racoon/samples/psk.txt $RPM_BUILD_ROOT/etc/racoon/ -install -m 0644 src/racoon/samples/racoon.conf $RPM_BUILD_ROOT/etc/racoon/ -cp -v $RPM_SOURCE_DIR/setkey.conf.sample $RPM_BUILD_ROOT/etc/racoon/setkey.conf -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 $RPM_SOURCE_DIR/sysconfig.racoon $RPM_BUILD_ROOT/var/adm/fillup-templates/ +install -m 0600 src/racoon/samples/psk.txt %{buildroot}%{_sysconfdir}/racoon/ +install -m 0644 src/racoon/samples/racoon.conf %{buildroot}%{_sysconfdir}/racoon/ +cp -v $RPM_SOURCE_DIR/setkey.conf.sample %{buildroot}%{_sysconfdir}/racoon/setkey.conf +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -m 644 $RPM_SOURCE_DIR/sysconfig.racoon %{buildroot}%{_localstatedir}/adm/fillup-templates/ # manage doc -mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/{setkey,racoon} -cp -rv src/racoon/samples $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/racoon -cp -v src/setkey/sample* $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/examples/setkey +mkdir -p %{buildroot}%{_docdir}/%{name}/examples/{setkey,racoon} +cp -rv src/racoon/samples %{buildroot}%{_docdir}/%{name}/examples/racoon +cp -v src/setkey/sample* %{buildroot}%{_docdir}/%{name}/examples/setkey for i in ChangeLog NEWS README; do - install -D -m 0644 $i $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}/ + install -D -m 0644 $i %{buildroot}%{_docdir}/%{name}/ done -#some rpmlint stuff -%fdupes -s $RPM_BUILD_ROOT/ - +# systemd magic 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 +install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/racoon.service +install -D -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/racoon-setkey.service +ln -s service %{buildroot}%{_sbindir}/rcracoon +ln -s service %{buildroot}%{_sbindir}/rcracoon-setkey + +%fdupes -s %{buildroot} %pre %service_add_pre racoon.service racoon-setkey.service %post %{fillup_only -n racoon} - +%tmpfiles_create %{_tmpfilesdir}/racoon.conf %service_add_post racoon.service racoon-setkey.service %preun @@ -150,19 +145,22 @@ %files %defattr(-,root,root) %{_unitdir}/*.service +%{_sbindir}/rcracoon +%{_sbindir}/rcracoon-setkey %{_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/pam.d/racoon -%dir /etc/racoon -%dir /etc/racoon/cert -/usr/sbin/racoon -/usr/sbin/racoonctl -/usr/sbin/setkey -/usr/sbin/plainrsa-gen -/var/adm/fillup-templates/sysconfig.racoon +%doc %{_docdir}/%{name}/ +%config(noreplace) %{_sysconfdir}/racoon/psk.txt +%config(noreplace) %{_sysconfdir}/racoon/racoon.conf +%config(noreplace) %{_sysconfdir}/racoon/setkey.conf +%config %{_sysconfdir}/pam.d/racoon +%dir %{_sysconfdir}/racoon +%dir %{_sysconfdir}/racoon/cert +%{_sbindir}/racoon +%{_sbindir}/racoonctl +%{_sbindir}/setkey +%{_sbindir}/plainrsa-gen +%{_localstatedir}/adm/fillup-templates/sysconfig.racoon %{_mandir}/man*/* +%ghost /run/racoon %changelog
