Hello community, here is the log from the commit of package rkhunter for openSUSE:Factory checked in at 2015-05-11 19:39:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rkhunter (Old) and /work/SRC/openSUSE:Factory/.rkhunter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rkhunter" Changes: -------- --- /work/SRC/openSUSE:Factory/rkhunter/rkhunter.changes 2015-04-10 10:20:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rkhunter.new/rkhunter.changes 2015-05-11 19:49:33.000000000 +0200 @@ -1,0 +2,13 @@ +Sun May 10 08:08:40 UTC 2015 - [email protected] + +- Default config file changed so APPEND_LOG was no longer activated. + Add to /etc/rkhunter.d/00-opensuse.conf + +------------------------------------------------------------------- +Sun May 10 06:58:54 UTC 2015 - [email protected] + +- Fix spec obliterating PKGMGR_NO_VRFY. This fixes bnc#926624 +- Create /etc/rkhunter.d and put config added by rpm in a file in it. +- Fix hideous way of spec adding config variables to a file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rkhunter.spec ++++++ --- /var/tmp/diff_new_pack.OxFhFv/_old 2015-05-11 19:49:34.000000000 +0200 +++ /var/tmp/diff_new_pack.OxFhFv/_new 2015-05-11 19:49:34.000000000 +0200 @@ -82,12 +82,12 @@ %{__install} -Dm750 %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.daily/suse.de-%{name} # adapt the default config for using in openSUSE sed "s|^PREFIX*|PREFIX="%{_prefix}"|g; \ - s|^#SCRIPTDIR.*|SCRIPTDIR=%{_prefix}/lib/%{name}/scripts|g; \ - s|^#TMPDIR.*|TMPDIR=%{_var}/lib/rkhunter/tmp|g; \ - s|^#DBDIR.*|DBDIR=%{_var}/lib/rkhunter/db|g; \ + s|^#SCRIPTDIR=.*|SCRIPTDIR=%{_prefix}/lib/%{name}/scripts|g; \ + s|^#TMPDIR=.*|TMPDIR=%{_var}/lib/rkhunter/tmp|g; \ + s|^#DBDIR=.*|DBDIR=%{_var}/lib/rkhunter/db|g; \ s|^APPEND_LOG=0|APPEND_LOG=1|g; \ s|ALLOW_SSH_ROOT_USER=no|ALLOW_SSH_ROOT_USER=yes|g; \ - s|^#PKGMGR.*|PKGMGR=RPM|g; \ + s|^#PKGMGR=.*|PKGMGR=RPM|g; \ s|^#OS_VERSION_FILE="/etc/release"|OS_VERSION_FILE="/etc/SuSE-release"|g; \ s|^#ALLOWHIDDENDIR=%{_sysconfdir}/.java.*|ALLOWHIDDENDIR=%{_sysconfdir}/.java|g; \ s|^#ALLOWHIDDENDIR=/dev/.udev.*|ALLOWHIDDENDIR=/dev/.udev|g; \ @@ -95,28 +95,48 @@ s|^#ALLOWDEVFILE=/dev/shm/pulse-shm-.*|ALLOWDEVFILE=/dev/shm/sysconfig/new-stamp-\*|g" \ %{buildroot}%{_sysconfdir}/%{name}.conf > %{buildroot}%{_sysconfdir}/%{name}.conf.new mv %{buildroot}%{_sysconfdir}/%{name}.conf.new %{buildroot}%{_sysconfdir}/%{name}.conf -for i in ifup-lo if-lo network config-lo new-stamp-2; do - echo "ALLOWDEVFILE=/dev/shm/sysconfig/$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - # fix for bnc#826276 - echo "ALLOWDEVFILE=/dev/.sysconfig/network/$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf -done -for i in $(seq 0 9); do - echo "ALLOWDEVFILE=/dev/shm/sysconfig/ifup-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - echo "ALLOWDEVFILE=/dev/shm/sysconfig/if-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - echo "ALLOWDEVFILE=/dev/shm/sysconfig/config-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - # fix for bnc#826276 - echo "ALLOWDEVFILE=/dev/.sysconfig/network/ifup-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - echo "ALLOWDEVFILE=/dev/.sysconfig/network/if-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - echo "ALLOWDEVFILE=/dev/.sysconfig/network/config-eth$i" >> %{buildroot}%{_sysconfdir}/%{name}.conf - echo "ALLOWDEVFILE=/dev/.sysconfig/network/started" >> %{buildroot}%{_sysconfdir}/%{name}.conf -done -echo "ALLOWDEVFILE=/dev/shm/pulse-shm-*" >> %{buildroot}%{_sysconfdir}/%{name}.conf -echo "ALLOWHIDDENFILE=/dev/.blkid.tab" >> %{buildroot}%{_sysconfdir}/%{name}.conf -echo "ALLOWHIDDENFILE=/dev/.blkid.tab.old" >> %{buildroot}%{_sysconfdir}/%{name}.conf -echo "ALLOWHIDDENFILE=/etc/.updated" >> %{buildroot}%{_sysconfdir}/%{name}.conf +# Create a new config file for settings that don't have to be in main config. +mkdir %{buildroot}%{_sysconfdir}/%{name}.d +chmod 700 %{buildroot}%{_sysconfdir}/%{name}.d +cat >> %{buildroot}%{_sysconfdir}/%{name}.d/00-opensuse.conf <<EOF +# /etc/rkhunter.d/00-opensuse.conf +# +# Additional configuration for openSUSE. +# + +# Get ourselves checked. +USER_FILEPROP_FILES_DIRS=/etc/rkhunter.d/00-opensuse.conf + +APPEND_LOG=1 + +ALLOWDEVFILE=/dev/shm/sysconfig/config-lo +ALLOWDEVFILE=/dev/shm/sysconfig/if-lo +ALLOWDEVFILE=/dev/shm/sysconfig/ifup-lo +ALLOWDEVFILE=/dev/shm/sysconfig/network +ALLOWDEVFILE=/dev/shm/sysconfig/new-stamp-2 +ALLOWDEVFILE=/dev/shm/sysconfig/ifup-eth[0-9] +ALLOWDEVFILE=/dev/shm/sysconfig/if-eth[0-9] +ALLOWDEVFILE=/dev/shm/sysconfig/config-eth[0-9] + +# fix for bnc#826276 +ALLOWDEVFILE=/dev/.sysconfig/network/config-lo +ALLOWDEVFILE=/dev/.sysconfig/network/if-lo +ALLOWDEVFILE=/dev/.sysconfig/network/ifup-lo +ALLOWDEVFILE=/dev/.sysconfig/network/network +ALLOWDEVFILE=/dev/.sysconfig/network/new-stamp-2 +ALLOWDEVFILE=/dev/.sysconfig/network/ifup-eth[0-9] +ALLOWDEVFILE=/dev/.sysconfig/network/if-eth[0-9] +ALLOWDEVFILE=/dev/.sysconfig/network/config-eth[0-9] +ALLOWDEVFILE=/dev/.sysconfig/network/started + +ALLOWDEVFILE=/dev/shm/pulse-shm-* +ALLOWHIDDENFILE=/dev/.blkid.tab +ALLOWHIDDENFILE=/dev/.blkid.tab.old +ALLOWHIDDENFILE=/etc/.updated # fix for bnc#826276 -echo "ALLOWHIDDENDIR=/dev/.sysconfig" >> %{buildroot}%{_sysconfdir}/%{name}.conf +ALLOWHIDDENDIR=/dev/.sysconfig +EOF # install ghost file mkdir -p %{buildroot}%{_localstatedir}/log @@ -130,12 +150,6 @@ %files %defattr(644,root,root,755) %doc %{_mandir}/man8/%{name}.8* -%doc %{_docdir}/%{name}-%{version}/ACKNOWLEDGMENTS -%doc %{_docdir}/%{name}-%{version}/CHANGELOG -%doc %{_docdir}/%{name}-%{version}/FAQ -%doc %{_docdir}/%{name}-%{version}/LICENSE -%doc %{_docdir}/%{name}-%{version}/README -%doc %{_docdir}/%{name}-%{version}/README.SUSE %doc %{_docdir}/%{name}-%{version} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/scripts @@ -146,6 +160,8 @@ %dir %{_var}/lib/%{name}/tmp %defattr(640,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}.conf +%dir %{_sysconfdir}/%{name}.d +%config(noreplace) %{_sysconfdir}/%{name}.d/00-opensuse.conf %verify(not md5 size mtime) %{_var}/lib/%{name}/db/*.dat %{_var}/lib/%{name}/db/i18n/* %{_var}/lib/%{name}/db/signatures/*
