diff options
| author | mnag <mnag@FreeBSD.org> | 2006-04-29 08:49:20 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2006-04-29 08:49:20 +0800 |
| commit | b67f158ff268e8cc739d729f346a46bcf474887b (patch) | |
| tree | da28e4b2d94f70ffdc1311f101e1569f8ad84677 /security | |
| parent | f8eb190248ebd46ee71c3ddc82a955b70d02c406 (diff) | |
| download | freebsd-ports-gnome-b67f158ff268e8cc739d729f346a46bcf474887b.tar.gz freebsd-ports-gnome-b67f158ff268e8cc739d729f346a46bcf474887b.tar.zst freebsd-ports-gnome-b67f158ff268e8cc739d729f346a46bcf474887b.zip | |
- Preserv .conf file.
- Bump PORTREVISION
PR: 95553
Reported by: Torfinn Ingolfsen <torfinn.ingolfsen___broadpark.no>
Approved by: maintainer timeout (19 days)
Diffstat (limited to 'security')
| -rw-r--r-- | security/rkhunter/Makefile | 3 | ||||
| -rw-r--r-- | security/rkhunter/files/patch-installer.sh | 18 | ||||
| -rw-r--r-- | security/rkhunter/pkg-plist | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile index 8e8cb0de8f7f..0b3a55261c0e 100644 --- a/security/rkhunter/Makefile +++ b/security/rkhunter/Makefile @@ -7,6 +7,7 @@ PORTNAME= rkhunter PORTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://downloads.rootkit.nl/ @@ -35,7 +36,7 @@ do-install: cd ${WRKSRC} && ./installer.sh --installdir ${PREFIX} ${INSTALL_MAN} ${WRKSRC}/files/development/rkhunter.8 ${MAN8PREFIX}/man/man8 .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/files/|} ${DOCSDIR} .endif diff --git a/security/rkhunter/files/patch-installer.sh b/security/rkhunter/files/patch-installer.sh index a3ca88786967..8fb478bb6f86 100644 --- a/security/rkhunter/files/patch-installer.sh +++ b/security/rkhunter/files/patch-installer.sh @@ -1,6 +1,6 @@ ---- installer.sh.orig Sat Mar 19 22:04:43 2005 -+++ installer.sh Wed May 18 17:42:29 2005 -@@ -119,15 +119,12 @@ +--- installer.sh.orig Mon Apr 25 13:24:56 2005 ++++ installer.sh Fri Apr 28 21:44:41 2006 +@@ -119,15 +119,13 @@ overwrite:programs_good.dat:/db/programs_good.dat:Database%%Program%%versions overwrite:defaulthashes.dat:/db/defaulthashes.dat:Database%%Default%%file%%hashes overwrite:md5blacklist.dat:/db/md5blacklist.dat:Database%%MD5%%blacklisted%%files @@ -14,11 +14,12 @@ -nooverwrite:rkhunter.conf:/usr/local/etc/rkhunter.conf:RK%%Hunter%%configuration%%file -overwrite:rkhunter:/usr/local/bin/rkhunter:RK%%Hunter%%binary +nooverwrite:rkhunter.conf:${INSTALLDIR}/etc/rkhunter.conf:RK%%Hunter%%configuration%%file ++overwrite:rkhunter.conf:${INSTALLDIR}/etc/rkhunter.conf.sample:RK%%Hunter%%sample%%configuration%%file +overwrite:rkhunter:${INSTALLDIR}/bin/rkhunter:RK%%Hunter%%binary " # Create directories (only if they do not exist) -@@ -136,9 +133,7 @@ +@@ -136,9 +134,7 @@ ${INSTALLDIR}/etc ${INSTALLDIR}/bin ${INSTALLDIR}/lib/rkhunter/db @@ -28,7 +29,7 @@ /usr/local/etc /usr/local/bin " -@@ -397,9 +392,6 @@ +@@ -397,9 +393,6 @@ ################################################################################# @@ -38,11 +39,14 @@ echo "${INSTALLER_NAME} ${INSTALLER_VERSION} (${INSTALLER_COPYRIGHT})" echo $ECHOOPT "---------------" echo "Starting installation/update" -@@ -532,11 +524,11 @@ +@@ -534,11 +527,14 @@ done # Installation dir to configuration file -INSTALLDIRCHECK=`cat /usr/local/etc/rkhunter.conf | grep "INSTALLDIR="` ++echo "" >> ${INSTALLDIR}/etc/rkhunter.conf.sample ++echo "INSTALLDIR=${INSTALLDIR}" >> ${INSTALLDIR}/etc/rkhunter.conf.sample ++ +INSTALLDIRCHECK=`cat ${INSTALLDIR}/etc/rkhunter.conf | grep "INSTALLDIR="` if [ "${INSTALLDIRCHECK}" = "" ] then @@ -53,7 +57,7 @@ echo "Configuration updated with installation path (${INSTALLDIR})" else echo "Configuration already updated." -@@ -546,7 +538,7 @@ +@@ -548,7 +544,7 @@ then echo "" echo $E "$t17" diff --git a/security/rkhunter/pkg-plist b/security/rkhunter/pkg-plist index 8d7dc6f4319c..ee338b225d74 100644 --- a/security/rkhunter/pkg-plist +++ b/security/rkhunter/pkg-plist @@ -1,5 +1,6 @@ bin/rkhunter -etc/rkhunter.conf +@unexec if cmp -s %D/etc/rkhunter.conf %D/etc/rkhunter.conf.sample; then rm -f %D/etc/rkhunter.conf; fi +etc/rkhunter.conf.sample lib/rkhunter/db/backdoorports.dat lib/rkhunter/db/defaulthashes.dat lib/rkhunter/db/md5blacklist.dat |