svn commit: r357201 - in head/security: tripwire tripwire-131 tripwire-131/files tripwire/files tripwire12 tripwire12/files
Cy Schubert
cy at FreeBSD.org
Mon Jun 9 19:58:36 UTC 2014
Author: cy
Date: Mon Jun 9 19:58:33 2014
New Revision: 357201
URL: http://svnweb.freebsd.org/changeset/ports/357201
QAT: https://qat.redports.org/buildarchive/r357201/
Log:
Stagify tripwire, tripwire12, and tripwire-131.
Take maintainership of tripwire12.
Added:
head/security/tripwire-131/files/patch-man-Makefile (contents, props changed)
head/security/tripwire12/files/patch-src-Makefile (contents, props changed)
Deleted:
head/security/tripwire-131/files/patch-ae
Modified:
head/security/tripwire-131/Makefile
head/security/tripwire-131/files/patch-ab
head/security/tripwire-131/files/patch-ad
head/security/tripwire-131/pkg-plist
head/security/tripwire/Makefile
head/security/tripwire/files/patch-Makefile.in
head/security/tripwire/files/patch-install-install.sh
head/security/tripwire/pkg-plist
head/security/tripwire12/Makefile
head/security/tripwire12/files/patch-ab
head/security/tripwire12/pkg-plist
Modified: head/security/tripwire-131/Makefile
==============================================================================
--- head/security/tripwire-131/Makefile Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire-131/Makefile Mon Jun 9 19:58:33 2014 (r357201)
@@ -12,28 +12,34 @@ PKGNAMESUFFIX= -131
MAINTAINER= cy at FreeBSD.org
COMMENT= File system security and verification program
-BROKEN= Does not build
-MAN5= tw.config.5
-MAN8= siggen.8 tripwire.8
NO_CDROM= Cannot be redistributed for more than the cost of duplication
NO_PACKAGE= requires local database to be built
+# XXX should also work on other 32-bit architectures.
+ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS_REASON= Unknown BYTEORDER
WRKSRC= ${WRKDIR}/tw_ASR_1.3.1_src
MAKE_JOBS_UNSAFE= yes
-TWCONFIG?= ${FILESDIR}/tw.conf.freebsd2
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
+TDATADIR= ${STAGEDIR}/var/local/tcheck
+MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \
+ MANPREFIX=${STAGEDIR}${MANPREFIX}
+NO_DB_BUILD= yes
+
+TWCONFIG?= ${FILESDIR}/tw.conf.freebsd2
+
pre-configure:
@ ${CP} ${FILESDIR}/conf-freebsd2.h ${WRKSRC}/configs
@ ${CP} ${TWCONFIG} ${WRKSRC}/configs/tw.conf.freebsd2
post-install:
- @ ${MKDIR} /var/adm/tcheck
- @ ${CP} ${TWCONFIG} /var/adm/tcheck/tw.config
+ @ ${MKDIR} ${TDATADIR}
+ @ ${CP} ${TWCONFIG} ${TDATADIR}/tw.config.dist
.ifndef NO_DB_BUILD
+ # XXX For reference only
@ ${ECHO} Creating tripwire database
+ @ ${CP} -i ${TWCONFIG} ${TDATADIR}/tw.config
@ (cd /var/adm/tcheck; tripwire -initialize)
.endif
Modified: head/security/tripwire-131/files/patch-ab
==============================================================================
--- head/security/tripwire-131/files/patch-ab Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire-131/files/patch-ab Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,29 +1,50 @@
---- Makefile.orig Tue May 4 01:31:00 1999
-+++ Makefile Thu May 11 19:44:50 2000
-@@ -10,11 +10,11 @@
+--- Makefile.orig 1999-05-04 01:31:00.000000000 -0700
++++ Makefile 2014-06-07 22:43:39.000000000 -0700
+@@ -10,11 +10,9 @@
###
# destination directory for final executables
-DESTDIR = /usr/local/bin/tw
-DATADIR = /var/tripwire
-+DESTDIR = /usr/local/bin
-+DATADIR = /var/adm/tcheck
# destination for man pages
-MANDIR = /usr/man # This needs to change to reflect the path
-+MANDIR = /usr/local/man # This needs to change to reflect the path
++MANDIR = $(MANPREFIX)/man # This needs to change to reflect the path
# on your system
# system utilities
-@@ -109,10 +109,8 @@
- $(INSTALL) -d $(DESTDIR)
- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install)
+@@ -33,7 +31,6 @@
+
+ # you can use ANSI C if you like, but K&R is equally fine.
+ #CC = cc # common
+-CC = gcc # also common
+ #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4)
+
+ CFLAGS = -O # common
+@@ -60,8 +57,8 @@
+ #CPP = /lib/cpp # on older systems
+
+ # make sure libraries are not linked dynamically (as a security measure)
+-#LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous
+-LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0
++LDFLAGS= -static # Most systems, Linux / RedHat 5.2 and previous
++#LDFLAGS= -ldl # Solaris 2.x, Redhat 6.0
+ # common
+ #LDFLAGS= -non_shared # OSF/1
+ #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire
+@@ -106,13 +103,9 @@
+ YACC="$(YACC)" LEX="$(LEX)" all)
+
+ install: all
+- $(INSTALL) -d $(DESTDIR)
+- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install)
++ $(INSTALL) -d $(BINDIR)
++ (cd src; make INSTALL=$(INSTALL) BINDIR=$(BINDIR) install)
(cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install)
- (cd configs; $(INSTALL) -m 444 tw.config $(DESTDIR))
- chmod 555 $(DESTDIR)
- $(INSTALL) -m 0755 -d $(DATADIR)
+- $(INSTALL) -m 0755 -d $(DATADIR)
- $(INSTALL) -m 444 tests/tw.db_TEST $(DATADIR)
-+ (cd configs; $(INSTALL) -m 444 tw.config $(DATADIR))
test: all
(cd tests; make HOSTNAME=$(HOSTNAME) DIST=$(DIST) SHELL=$(SHELL) \
Modified: head/security/tripwire-131/files/patch-ad
==============================================================================
--- head/security/tripwire-131/files/patch-ad Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire-131/files/patch-ad Mon Jun 9 19:58:33 2014 (r357201)
@@ -6,8 +6,8 @@
install: tripwire
- $(INSTALL) -m 555 tripwire $(DESTDIR)
- $(INSTALL) -m 555 siggen $(DESTDIR)
-+ $(INSTALL) -f noschg -s -m 555 tripwire $(DESTDIR)
-+ $(INSTALL) -f noschg -s -m 555 siggen $(DESTDIR)
++ $(INSTALL) -f noschg -s -m 555 tripwire $(BINDIR)
++ $(INSTALL) -f noschg -s -m 555 siggen $(BINDIR)
clean:
-rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \
Added: head/security/tripwire-131/files/patch-man-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/tripwire-131/files/patch-man-Makefile Mon Jun 9 19:58:33 2014 (r357201)
@@ -0,0 +1,10 @@
+--- man/Makefile.orig 1999-05-04 01:31:00.000000000 -0700
++++ man/Makefile 2014-06-01 22:12:53.000000000 -0700
+@@ -5,6 +5,7 @@
+ all: install
+
+ install:
++ mkdir -p $(MANDIR)/man5 $(MANDIR)/man8
+ cp siggen.8 $(MANDIR)/man8
+ cp tripwire.8 $(MANDIR)/man8
+ cp tw.config.5 $(MANDIR)/man5
Modified: head/security/tripwire-131/pkg-plist
==============================================================================
--- head/security/tripwire-131/pkg-plist Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire-131/pkg-plist Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,2 +1,8 @@
bin/tripwire
bin/siggen
+man/man5/tw.config.5.gz
+man/man8/siggen.8.gz
+man/man8/tripwire.8.gz
+/var/local/tcheck/tw.config.dist
+ at unexec rmdir "/var/local/tcheck" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/local" >/dev/null 2>&1 || :
Modified: head/security/tripwire/Makefile
==============================================================================
--- head/security/tripwire/Makefile Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire/Makefile Mon Jun 9 19:58:33 2014 (r357201)
@@ -14,14 +14,13 @@ COMMENT= File system security and verifi
LICENSE= GPLv2
NO_LICENSES_INSTALL= yes
-MAN5= twfiles.5 twconfig.5 twpolicy.5
-MAN8= siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
MAKE_JOBS_UNSAFE= yes
-USES= gmake
-USE_BZIP2= yes
+USES= gmake tar:bzip2
GNU_CONFIGURE= yes
-MAKE_ARGS= SYSPRE=${ARCH}-unknown-freebsd
+USE_GCC= any
+MAKE_ARGS= SYSPRE=${ARCH}-unknown-freebsd \
+ DESTDIR=${STAGEDIR}
IS_INTERACTIVE= yes
M4= /usr/bin/m4
@@ -44,7 +43,11 @@ TW_PROMPT_DESC= Interactive install (ig
SW_ONLY_DESC= Install software only, do not post-configure (ignored when PACKAGE_BUILDING)
DB_BUILD_DESC= Build database during post-install (ignored when PACKAGE_BUILDING)
-NO_STAGE= yes
+PACKAGE_BUILDING= yes
+.ifndef PACKAGE_BUILDING
+BROKEN= for testing only
+.endif
+
.include <bsd.port.pre.mk>
# Tripwire config files are stored in TWCFG
@@ -117,12 +120,12 @@ install-config-files:
.endif
@ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh .
.ifdef PACKAGE_BUILDING
- @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
+ @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
.else
.if ${PORT_OPTIONS:MSW_ONLY}
- @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
+ @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
.else
- @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook
+ @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook
.endif
.endif
@@ -161,6 +164,7 @@ make-pkg-install:
@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL}
create-database:
+.ifndef PACKAGE_BUILDING
.if ${PORT_OPTIONS:MDB_BUILD}
.if ${PORT_OPTIONS:MSW_ONLY}
@ ${ECHO} SW_ONLY has been specified, database will not be built.
@@ -175,6 +179,7 @@ create-database:
@ ${ECHO} therefore the authors suggest creating a floppy is not necessary.
.endif
.endif
+.endif
post-install: install-config-files create-database make-pkg-install
Modified: head/security/tripwire/files/patch-Makefile.in
==============================================================================
--- head/security/tripwire/files/patch-Makefile.in Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire/files/patch-Makefile.in Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,6 +1,6 @@
---- Makefile.in.orig Thu Dec 1 19:24:47 2005
-+++ Makefile.in Fri Jan 6 15:06:24 2006
-@@ -536,7 +536,6 @@
+--- Makefile.in.orig 2011-11-21 08:06:56.000000000 -0800
++++ Makefile.in 2014-05-30 22:28:35.966716249 -0700
+@@ -540,7 +540,6 @@
install-data-am:
@$(NORMAL_INSTALL)
@@ -8,3 +8,12 @@
install-exec-am:
+@@ -589,7 +588,7 @@
+
+
+ install-data-hook:
+- prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
++ STGDIR="$$STAGEDIR" prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
+ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
+ ./install/install.sh
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: head/security/tripwire/files/patch-install-install.sh
==============================================================================
--- head/security/tripwire/files/patch-install-install.sh Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire/files/patch-install-install.sh Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,5 +1,5 @@
--- install/install.sh.orig 2011-11-21 08:06:56.000000000 -0800
-+++ install/install.sh 2012-01-26 14:46:55.995316577 -0800
++++ install/install.sh 2014-06-01 20:55:20.632399290 -0700
@@ -174,17 +174,11 @@
# Starting directory.
START_DIR=`pwd`
@@ -45,7 +45,16 @@
if [ -z "$TW_SITE_PASS" ] || [ -z "$TW_LOCAL_PASS" ] ; then
echo "Error: You must specify site and local passphrase" 1>&2
echo "if no prompting is chosen." 1>&2
-@@ -525,7 +521,7 @@
+@@ -514,7 +510,7 @@
+ ##-------------------------------------------------------
+
+ for i in $path2; do
+- eval "d=\$${i}"
++ eval "d=${DESTDIR}/\$${i}"
+ if [ ! -d "$d" ] ; then
+ mkdir -p "$d"
+ if [ ! -d "$d" ] ; then
+@@ -525,12 +521,12 @@
chmod 0750 "$d" > /dev/null
fi
else
@@ -54,6 +63,12 @@
fi
done
+ for i in $path3; do
+- eval "d=\$${i}"
++ eval "d=${DESTDIR}/\$${i}"
+ if [ ! -d "$d" ] ; then
+ mkdir -p "$d"
+ if [ ! -d "$d" ] ; then
@@ -541,7 +537,7 @@
chmod 0755 "$d" > /dev/null
fi
@@ -71,6 +86,25 @@
echo
echo "----------------------------------------------"
echo "Copying files..."
+@@ -568,14 +565,14 @@
+
+ #f1=' ff=$README ; d="" ; dd=$TWDOCS ; rr=0444 '
+ #f2=' ff=$REL_NOTES ; d="" ; dd=$TWDOCS ; rr=0444 '
+-f3=' ff=$TWLICENSEFILE ; d="" ; dd=$TWDOCS ; rr=0444 '
++f3=' ff=$TWLICENSEFILE ; d="" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
+ #f4=' ff=tripwire ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f5=' ff=twadmin ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f6=' ff=twprint ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f7=' ff=siggen ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+-f8=' ff=TRADEMARK ; d="" ; dd=$TWDOCS ; rr=0444 '
+-f9=' ff=policyguide.txt ; d="/policy" ; dd=$TWDOCS ; rr=0444 '
+-f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$TWPOLICY ; rr=0640 '
++f8=' ff=TRADEMARK ; d="" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
++f9=' ff=policyguide.txt ; d="/policy" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
++f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$DESTDIR/$TWPOLICY ; rr=0640 '
+ #f11=' ff=twpolicy.4 ; d="/man/man4" ; dd=$TWMAN/man4 ; rr=0444 '
+ #f12=' ff=twconfig.4 ; d="/man/man4" ; dd=$TWMAN/man4 ; rr=0444 '
+ #f13=' ff=twfiles.5 ; d="/man/man5" ; dd=$TWMAN/man5 ; rr=0444 '
@@ -593,7 +590,7 @@
f=${TAR_DIR}$d/$ff
ff=${dd}/$ff
Modified: head/security/tripwire/pkg-plist
==============================================================================
--- head/security/tripwire/pkg-plist Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire/pkg-plist Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,3 +1,11 @@
+man/man5/twfiles.5.gz
+man/man5/twconfig.5.gz
+man/man5/twpolicy.5.gz
+man/man8/siggen.8.gz
+man/man8/tripwire.8.gz
+man/man8/twadmin.8.gz
+man/man8/twintro.8.gz
+man/man8/twprint.8.gz
sbin/tripwire
sbin/twadmin
sbin/twprint
@@ -6,3 +14,8 @@ share/doc/tripwire/COPYING
share/doc/tripwire/TRADEMARK
share/doc/tripwire/policyguide.txt
@dirrm share/doc/tripwire
+%%ETCDIR%%/twpol-FreeBSD.txt
+ at dirrmtry %%ETCDIR%%
+ at dirrmtry %%TWDB%%/report
+ at dirrmtry %%TWDB%%
+
Modified: head/security/tripwire12/Makefile
==============================================================================
--- head/security/tripwire12/Makefile Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire12/Makefile Mon Jun 9 19:58:33 2014 (r357201)
@@ -8,26 +8,31 @@ CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_NETBSD}
PKGNAMESUFFIX= 12
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= cy at FreeBSD.org
COMMENT= File system security and verification program
-MAN5= tw.config.5
-MAN8= siggen.8 tripwire.8
NO_CDROM= cannot be redistributed for more than the cost of duplication
NO_PACKAGE= requires local database to be built
+ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS_REASON= Unknown BYTEORDER
USES= perl5
USE_PERL5= build
MAKE_JOBS_UNSAFE=yes
+.include <bsd.port.pre.mk>
+
+TDATADIR= ${STAGEDIR}/var/local/tcheck
+MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \
+ MANDIR=${STAGEDIR}${PREFIX}/man \
+ DATADIR=${DATADIR}
+NO_DB_BUILD= yes
+
TWCONFIG?= ${FILESDIR}/tw.conf.freebsd8
-NO_STAGE= yes
post-extract:
@ (cd ${WRKDIR}; tar xpf T1.2.tar)
post-patch:
- @${REINPLACE_CMD} -i '' -e 's|/secureplace/bin|${PREFIX}/bin|' \
- -e 's|/usr/man|${PREFIX}/man|' ${WRKSRC}/Makefile
${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
's|bs_ntohl|ntohl|g;s|bs_htonl|htonl|g'
@@ -36,8 +41,8 @@ pre-configure:
@ ${CP} ${TWCONFIG} ${WRKSRC}/configs/tw.conf.freebsd8
post-install:
- @ ${MKDIR} /var/adm/tcheck
- @ ${CP} ${TWCONFIG} /var/adm/tcheck/tw.config
+ @ ${MKDIR} ${TDATADIR}
+ @ ${CP} ${TWCONFIG} /${TDATADIR}/tw.config.dist
# Creating tripwire database
.ifndef NO_DB_BUILD
@ (cd /var/adm/tcheck; tripwire -initialize)
@@ -59,4 +64,4 @@ post-install:
.endif
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/security/tripwire12/files/patch-ab
==============================================================================
--- head/security/tripwire12/files/patch-ab Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire12/files/patch-ab Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,62 +1,46 @@
-*** Makefile Mon Jul 25 10:59:41 1994
---- Makefile Thu Jan 2 12:04:35 1997
-***************
-*** 34,36 ****
- # you can use ANSI C if you like, but K&R is equally fine.
-! CC = cc # common
- #CC = gcc # also common
---- 34,36 ----
- # you can use ANSI C if you like, but K&R is equally fine.
-! #CC = cc # common
- #CC = gcc # also common
-***************
-*** 38,40 ****
-
-! CFLAGS = -O # common
- #CFLAGS = -g # common
---- 38,40 ----
-
-! #CFLAGS = -O # common
- #CFLAGS = -g # common
-***************
-*** 60,66 ****
- #CPP = /lib/cpp # on older systems
-
- # make sure libraries are not linked dynamically (as a security measure)
-! LDFLAGS= # common
- #LDFLAGS= -non_shared # OSF/1
- #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire
- # on Solaris 2.3)
---- 60,67 ----
- #CPP = /lib/cpp # on older systems
-
- # make sure libraries are not linked dynamically (as a security measure)
-! LDFLAGS= -static
-! #LDFLAGS= # common
- #LDFLAGS= -non_shared # OSF/1
- #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire
- # on Solaris 2.3)
-
-
---- src/Makefile.orig Mon Jul 25 10:40:54 1994
-+++ src/Makefile Sun May 28 15:52:25 2000
-@@ -3,7 +3,7 @@
- # Tripwire build
- #
-
--CFLAGS = -O
-+#CFLAGS = -O
-
- OFILES = config.parse.o main.o list.o ignorevec.o dbase.build.o \
- utils.o preen.o preen.interp.o preen.report.o \
-@@ -103,8 +103,9 @@
- .c.o:
- $(CC) $(CFLAGS) -c $<
-
--install: tripwire
-+install: tripwire siggen
- $(INSTALL) tripwire $(DESTDIR)
-+ $(INSTALL) siggen $(DESTDIR)
+--- Makefile.orig 2014-06-09 12:38:51.784239761 -0700
++++ Makefile 2014-06-09 12:43:05.345562324 -0700
+@@ -12,10 +12,8 @@
+ ###
- clean:
- -rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \
+ # destination directory for final executables
+-DESTDIR = /secureplace/bin
+
+ # destination for man pages
+-MANDIR = /usr/man
+
+ # system utilities
+ LEX = lex
+@@ -32,11 +30,11 @@
+ #SHELL = /bin/bash # For the GNU fanatics
+
+ # you can use ANSI C if you like, but K&R is equally fine.
+-CC = cc # common
++#CC = cc # common
+ #CC = gcc # also common
+ #CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4)
+
+-CFLAGS = -O # common
++#CFLAGS = -O # common
+ #CFLAGS = -g # common
+ #CFLAGS = -g # debugging
+ #CFLAGS = -O -cckr # SGI
+@@ -60,7 +58,8 @@
+ #CPP = /lib/cpp # on older systems
+
+ # make sure libraries are not linked dynamically (as a security measure)
+-LDFLAGS= # common
++LDFLAGS= -static
++#LDFLAGS= # common
+ #LDFLAGS= -non_shared # OSF/1
+ #LDFLAGS= -Bstatic # SunOS 4 (cannot statically link tripwire
+ # on Solaris 2.3)
+@@ -103,7 +102,7 @@
+ YACC="$(YACC)" LEX="$(LEX)" all)
+
+ install: all
+- (cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install)
++ (cd src; make INSTALL=$(INSTALL) DESTDIR=$(BINDIR) install)
+ (cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install)
+
+ test: all
Added: head/security/tripwire12/files/patch-src-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/tripwire12/files/patch-src-Makefile Mon Jun 9 19:58:33 2014 (r357201)
@@ -0,0 +1,23 @@
+--- src/Makefile.orig Mon Jul 25 10:40:54 1994
++++ src/Makefile Sun May 28 15:52:25 2000
+@@ -3,7 +3,7 @@
+ # Tripwire build
+ #
+
+-CFLAGS = -O
++#CFLAGS = -O
+
+ OFILES = config.parse.o main.o list.o ignorevec.o dbase.build.o \
+ utils.o preen.o preen.interp.o preen.report.o \
+@@ -103,8 +103,9 @@
+ .c.o:
+ $(CC) $(CFLAGS) -c $<
+
+-install: tripwire
++install: tripwire siggen
+- $(INSTALL) tripwire $(DESTDIR)
++ $(INSTALL) tripwire $(BINDIR)
++ $(INSTALL) siggen $(BINDIR)
+
+ clean:
+ -rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \
Modified: head/security/tripwire12/pkg-plist
==============================================================================
--- head/security/tripwire12/pkg-plist Mon Jun 9 19:55:48 2014 (r357200)
+++ head/security/tripwire12/pkg-plist Mon Jun 9 19:58:33 2014 (r357201)
@@ -1,2 +1,9 @@
-bin/siggen
bin/tripwire
+bin/siggen
+man/man5/tw.config.5.gz
+man/man8/siggen.8.gz
+man/man8/tripwire.8.gz
+/var/local/tcheck/tw.config.dist
+ at unexec rmdir "/var/local/tcheck" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/local" >/dev/null 2>&1 || :
+
More information about the svn-ports-head
mailing list