Date: Wed, 25 Jan 2012 13:13:42 -0500 (EST) From: Michael Scheidell <scheidell@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/164487: [UPDATE] security/tripwire to 2.4.2.2. pet portlint Message-ID: <20120125181342.3E7ED1D3E5@scanner.secnap.net> Resent-Message-ID: <201201251820.q0PIK2fE053285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164487
>Category: ports
>Synopsis: [UPDATE] security/tripwire to 2.4.2.2. pet portlint
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 25 18:20:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Michael Scheidell
>Release: FreeBSD 7.4-RELEASE-p3 i386
>Organization:
SECNAP Network Security Corp
>Environment:
7.4 amd64, 7.3 amd64
>Description:
- Update to 2.4.2.2
- Fix(ing) portlint issues
- Fix master site
- Clarified 'NO_PACKAGE' description
- added @exec mkdir -p (critical dirs) in case you make a package
note: you can't make a package. I can, and maybe you can if you (edit things you should not). I have made a package from
this, but it won't build in non-interactive mode, and license might restrict binary distribution anyway.
Changes some PLIST and SUB vars to ETCDIR / DOCSDIR vars.
>How-To-Repeat:
na
>Fix:
this patch
--- tripwire.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/tripwire/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile 22 Aug 2009 00:35:07 -0000 1.39
+++ Makefile 25 Jan 2012 18:04:38 -0000
@@ -6,9 +6,9 @@
#
PORTNAME= tripwire
-PORTVERSION= 2.4.1.2
+PORTVERSION= 2.4.2.2
CATEGORIES= security
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= cy@FreeBSD.org
@@ -17,19 +17,17 @@
LATEST_LINK= ${PORTNAME}
MAN5= twfiles.5 twconfig.5 twpolicy.5
MAN8= siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
-NO_PACKAGE= "requires local database to be built"
+NO_PACKAGE= requires manual acceptance of license agreement and site and local passphrase
+IS_INTERACTIVE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKE_ARGS= SYSPRE=${ARCH}-unknown-freebsd
-IS_INTERACTIVE= yes
M4= /usr/bin/m4
-# Tripwire config files are stored in TWCFG
-TWCFG?= /usr/local/etc/tripwire
# Tripwire policy files are stored in TWPOLICY.
-TWPOLICY?= ${TWCFG}
+TWPOLICY?= ${ETCDIR}
# The Tripwire site key files are stored in TWSITEKEYDIR.
TWSITEKEYDIR?= ${TWPOLICY}
# The Tripwire local key files are stored in TWLOCALKEYDIR.
@@ -46,14 +44,14 @@
TRIPWIRE_CLOBBER?= NO
# If TRIPWIRE_CLOBBER is set to YES, the install script clobbers
# previously installed config files.
-CONFIGURE_ARGS= --prefix=${PREFIX} --program-transform-name='' --sysconfdir=${TWCFG}
+CONFIGURE_ARGS= --prefix=${PREFIX} --program-transform-name='' --sysconfdir=${ETCDIR}
-PLIST_SUB+= TWCFG=${TWCFG} TWDB=${TWDB}
+PLIST_SUB+= TWDB=${TWDB}
pre-configure:
@ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} > ${WRKSRC}/policy/twpol-FreeBSD.txt
@ ${MV} ${WRKSRC}/src/core/stdcore.h ${WRKSRC}/src/core/stdcore.h.orig
- @ ${SED} 's%^# define CONFIG_FILE_ROOT "/usr/local/etc/tripwire"%# define CONFIG_FILE_ROOT "${TWCFG}"%' ${WRKSRC}/src/core/stdcore.h.orig > ${WRKSRC}/src/core/stdcore.h
+ @ ${SED} 's%^# define CONFIG_FILE_ROOT "/usr/local/etc/tripwire"%# define CONFIG_FILE_ROOT "${ETCDIR}"%' ${WRKSRC}/src/core/stdcore.h.orig > ${WRKSRC}/src/core/stdcore.h
@ ${MV} ${WRKSRC}/man/man4/twconfig.4 ${WRKSRC}/man/man5/twconfig.5
@ ${MV} ${WRKSRC}/man/man4/twpolicy.4 ${WRKSRC}/man/man5/twpolicy.5
@ ${LN} -s ${WRKSRC}/contrib ${WRKSRC}/install
@@ -75,16 +73,13 @@
create-database:
.ifndef NO_DB_BUILD
- @ ${MKDIR} -p ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \
+ @ ${MKDIR} ${ETCDIR} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \
${TWDB} ${TWREPORT}
@ ${ECHO} Creating tripwire database
- @ cd ${TWCFG} && ${PREFIX}/sbin/tripwire --init
+ @ cd ${ETCDIR} && ${PREFIX}/sbin/tripwire --init
@ ${ECHO_CMD}
@ ${ECHO} The tripwire database, configuration file and
- @ ${ECHO} policy file are signed using the local and site keys,
- @ ${ECHO} therefore according to the support staff at
- @ ${ECHO} tripwiresecurity.com, creating a floppy is not necessary.
-
+ @ ${ECHO} policy file are signed using the local and site keys
.endif
post-install: install-config-files create-database
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/tripwire/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 3 Jul 2011 14:03:47 -0000 1.7
+++ distinfo 25 Jan 2012 18:04:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (tripwire-2.4.1.2-src.tar.bz2) = 55462b13a81aa65b83a76cd43d8617a60eb669d2b3d9999d0377a0e68e692907
-SIZE (tripwire-2.4.1.2-src.tar.bz2) = 711311
+SHA256 (tripwire-2.4.2.2-src.tar.bz2) = e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad
+SIZE (tripwire-2.4.2.2-src.tar.bz2) = 716616
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/tripwire/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 16 Feb 2006 15:17:30 -0000 1.6
+++ pkg-plist 25 Jan 2012 18:04:38 -0000
@@ -2,8 +2,10 @@
sbin/twadmin
sbin/twprint
sbin/siggen
-share/doc/tripwire/COPYING
-share/doc/tripwire/TRADEMARK
-share/doc/tripwire/policyguide.txt
-@dirrm share/doc/tripwire
-@unexec echo If permanently deleting this package, %%TWCFG%% and %%TWDB%% must be removed manually
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/TRADEMARK
+%%DOCSDIR%%/policyguide.txt
+@dirrm %%DOCSDIR%%
+@exec mkdir -p %%TWDB%% %D/%%ETCDIR%%
+@unexec rmdir %%ETCDIR%% %%TWDB%% 2>/dev/null || true
+@unexec if [ -d %D/%%ETCDIR%% ] || [ -d %%TWDB%% ] ; then echo If permanently deleting this package, %D/%%ETCDIR%% and %%TWDB%% must be removed manually; fi
--- tripwire.patch ends here ---
______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r).
For Information please see http://www.spammertrap.com/
______________________________________________________________________
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120125181342.3E7ED1D3E5>