From owner-svn-ports-head@FreeBSD.ORG Tue Aug 12 18:31:27 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 204765DE for ; Tue, 12 Aug 2014 18:31:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 006833DC3 for ; Tue, 12 Aug 2014 18:31:27 +0000 (UTC) Received: from cs (uid 1263) (envelope-from cs@FreeBSD.org) id 67be by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 12 Aug 2014 18:31:26 +0000 From: Carlo Strub Date: Tue, 12 Aug 2014 18:31:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364732 - in head/security/rkhunter: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53ea5d7e.67be.471ef88b@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2014 18:31:27 -0000 Author: cs Date: Tue Aug 12 18:31:26 2014 New Revision: 364732 URL: http://svnweb.freebsd.org/changeset/ports/364732 QAT: https://qat.redports.org/buildarchive/r364732/ Log: - unbreak - added some FreeBSD defaults regarding SSH - made port more PREFIX aware - changed maintainer PR: 191842 Submitted by: Gerard J. Cerchio and Lukasz Wasikowski (maintainer) Modified: head/security/rkhunter/Makefile head/security/rkhunter/files/patch-files__rkhunter.conf Modified: head/security/rkhunter/Makefile ============================================================================== --- head/security/rkhunter/Makefile Tue Aug 12 18:28:02 2014 (r364731) +++ head/security/rkhunter/Makefile Tue Aug 12 18:31:26 2014 (r364732) @@ -3,10 +3,11 @@ PORTNAME= rkhunter PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= lukasz@wasikowski.net COMMENT= Rootkit detection tool LICENSE= GPLv2 @@ -27,8 +28,10 @@ LSOF_RUN_DEPENDS= lsof:${PORTSDIR}/sysut NMAP_RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap post-patch: - @${REINPLACE_CMD} -e 's|{SHAREDIR}/man/man8|{PREFIX}/man/man8|g' \ + @${REINPLACE_CMD} -i '' -e 's|{SHAREDIR}/man/man8|{PREFIX}/man/man8|g' \ ${WRKSRC}/installer.sh + @${REINPLACE_CMD} -i '' -e 's|RKHPREFIX|${PREFIX}|g' \ + ${WRKSRC}/files/${PORTNAME}.conf do-install: cd ${WRKSRC} && ./installer.sh --layout custom ${STAGEDIR}${PREFIX} --install @@ -40,7 +43,7 @@ do-install: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/files/|} ${STAGEDIR}${DOCSDIR} post-install: - ${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' \ + @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf ${INSTALL_DATA} ${WRKSRC}/files/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${INSTALL_DATA} -m 640 ${WRKSRC}/files/programs_bad.dat ${STAGEDIR}${PREFIX}/var/lib/${PORTNAME}/db/programs_bad.dat.sample Modified: head/security/rkhunter/files/patch-files__rkhunter.conf ============================================================================== --- head/security/rkhunter/files/patch-files__rkhunter.conf Tue Aug 12 18:28:02 2014 (r364731) +++ head/security/rkhunter/files/patch-files__rkhunter.conf Tue Aug 12 18:31:26 2014 (r364732) @@ -1,17 +1,60 @@ ---- files/rkhunter.conf.orig 2014-06-06 09:59:35.000000000 -0400 -+++ files/rkhunter.conf 2014-06-06 10:01:32.000000000 -0400 -@@ -575,6 +575,10 @@ +--- files/rkhunter.conf.orig 2014-01-25 22:29:51.000000000 +0100 ++++ files/rkhunter.conf 2014-08-11 23:18:14.887973000 +0200 +@@ -154,7 +154,7 @@ + # subsequently commented out or removed, then the program will assume a + # default directory beneath the installation directory. + # +-#TMPDIR=/var/lib/rkhunter/tmp ++TMPDIR=RKHPREFIX/var/lib/rkhunter/tmp + + # + # This option specifies the database directory to use. +@@ -163,7 +163,7 @@ + # subsequently commented out or removed, then the program will assume a + # default directory beneath the installation directory. + # +-#DBDIR=/var/lib/rkhunter/db ++DBDIR=RKHPREFIX/var/lib/rkhunter/db + + # + # This option specifies the script directory to use. +@@ -171,7 +171,7 @@ + # The installer program will set the default directory. If this default is + # subsequently commented out or removed, then the program will not run. + # +-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts ++SCRIPTDIR=RKHPREFIX/lib/rkhunter/scripts + + # + # This option can be used to modify the command directory list used by rkhunter +@@ -303,7 +303,7 @@ + # + # The default value is 'no'. + # +-#ALLOW_SSH_ROOT_USER=no ++ALLOW_SSH_ROOT_USER=unset + + # + # Set this option to '1' to allow the use of the SSH-1 protocol, but note +@@ -317,7 +317,7 @@ + # + # The default value is '0'. + # +-#ALLOW_SSH_PROT_V1=0 ++ALLOW_SSH_PROT_V1=2 + + # + # This setting tells rkhunter the directory containing the SSH configuration +@@ -575,6 +575,8 @@ # The default value is the null string. # #SCRIPTWHITELIST=/usr/bin/groups +SCRIPTWHITELIST=/usr/bin/whatis +SCRIPTWHITELIST=/usr/sbin/adduser -+SCRIPTWHITELIST=/usr/local/bin/GET -+SCRIPTWHITELIST=/usr/local/sbin/pkgdb # # Allow the specified file to have the immutable attribute set. -@@ -584,6 +588,10 @@ +@@ -584,6 +586,10 @@ # The default value is the null string. # #IMMUTWHITELIST=/sbin/ifdown @@ -22,7 +65,7 @@ # # If this option is set to '1', then the immutable-bit test is reversed. That -@@ -787,6 +795,7 @@ +@@ -787,6 +793,7 @@ # The default value is the null string. # #UID0_ACCOUNTS=toor rooty @@ -30,3 +73,10 @@ # # This option allows the specified accounts to have no password. NIS/YP entries +@@ -1222,3 +1229,6 @@ + # + #EMPTY_LOGFILES="" + #MISSING_LOGFILES="" ++ ++INSTALLDIR=RKHPREFIX ++USER_FILEPROP_FILES_DIRS=RKHPREFIX/etc/rkhunter.conf