Index: head/security/tripwire/Makefile =================================================================== --- head/security/tripwire/Makefile (revision 466153) +++ head/security/tripwire/Makefile (revision 466154) @@ -1,185 +1,185 @@ # Created by: Cy Schubert # $FreeBSD$ PORTNAME= tripwire -PORTVERSION= 2.4.3.6 +PORTVERSION= 2.4.3.7 CATEGORIES= security MAINTAINER= cy@FreeBSD.org COMMENT= File system security and verification program LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= Tripwire GH_PROJECT= tripwire-open-source NO_LICENSES_INSTALL= yes MAKE_JOBS_UNSAFE= yes USES= gmake ssl GNU_CONFIGURE= yes MAKE_ARGS= SYSPRE=${ARCH}-unknown-freebsd \ DESTDIR=${STAGEDIR} M4= /usr/bin/m4 # Tripwire database files are stored in TWDB. TWDB?= /var/db/tripwire # If TW_CLOBBER is set to true, the install script clobbers # previously installed config files. # # If TW_PROMPT is set to true, the install script is interactive. OPTIONS_SINGLE= TWCFG OPTIONS_SINGLE_TWCFG= TWCFG_ETC TWCFG_TWDB OPTIONS_DEFINE= TW_CLOBBER TW_PROMPT SW_ONLY DB_BUILD OPTIONS_DEFAULT= TWCFG_ETC TW_PROMPT DB_BUILD TWCFG_ETC_DESC= Put config files in ${ETCDIR} TWCFG_TWDB_DESC= Put config files in ${TWDB}/etc TW_CLOBBER_DESC= Clobber existing database files at install TW_PROMPT_DESC= Interactive install (ignored when PACKAGE_BUILDING) 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) PACKAGE_BUILDING= yes .ifndef PACKAGE_BUILDING BROKEN= for testing only .endif .include # Tripwire config files are stored in TWCFG .if ${PORT_OPTIONS:MTWCFG_ETC} TWCFG?= ${ETCDIR} .endif .if ${PORT_OPTIONS:MTWCFG_TWDB} TWCFG?= ${TWDB}/etc .endif .if ${PORT_OPTIONS:MTW_CLOBBER} TW_CLOBBER= true .else TW_CLOBBER= false .endif .if ${PORT_OPTIONS:MTW_PROMPT} TW_PROMPT= true .else TW_PROMPT= false # TW_SITE_PASS?= FreeBSD .ifndef TW_SITE_PASS BROKEN= No site passphrase specified or turn PROMPT on .endif # TW_LOCAL_PASS?= FreeBSD .ifndef TW_LOCAL_PASS BROKEN= No local passphrase specified or turn PROMPT on .endif .endif # Tripwire policy files are stored in TWPOLICY. TWPOLICY?= ${TWCFG} # The Tripwire site key files are stored in TWSITEKEYDIR. TWSITEKEYDIR?= ${TWPOLICY} # The Tripwire local key files are stored in TWLOCALKEYDIR. TWLOCALKEYDIR?= ${TWPOLICY} # Tripwire report files are stored in TWREPORT. TWREPORT?= ${TWDB}/report # This sets the default text editor for Tripwire. TWEDITOR?= /usr/bin/vi # This sets the location of the twpol.txt file that is to be installed TWPOL_TXT?= ${FILESDIR}/twpol.m4 CONFIGURE_ARGS= --prefix=${PREFIX} --program-transform-name='' --sysconfdir=${TWCFG} PLIST_SUB+= TWCFG=${TWCFG} TWDB=${TWDB} PKGPOSTINSTALL= ${WRKDIR}/pkg-postinstall PKGPOSTDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-deinstall SUB_LIST= TWCFG=${TWCFG} 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 "${TWCFG}"%# define CONFIG_FILE_ROOT "${TWCFG}"%' ${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 install-config-files: @ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/installer/install.cfg @ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/installer/install.cfg @ ${ECHO_CMD} TWLOCALKEYDIR=${TWLOCALKEYDIR} >> ${WRKSRC}/installer/install.cfg @ ${ECHO_CMD} TWDB=${TWDB} >> ${WRKSRC}/installer/install.cfg @ ${ECHO_CMD} TWREPORT=${TWREPORT} >> ${WRKSRC}/installer/install.cfg @ ${ECHO_CMD} TWEDITOR=${TWEDITOR} >> ${WRKSRC}/installer/install.cfg .ifdef TW_SITE_PASS @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/installer/install.cfg .endif .ifdef TW_LOCAL_PASS @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/installer/install.cfg .endif @ cd ${WRKSRC} && ${LN} -sf installer/install.cfg installer/install.sh . .ifdef PACKAGE_BUILDING @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else .if ${PORT_OPTIONS:MSW_ONLY} @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook .else @ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${MAKE_CMD} install-data-hook .endif .endif make-pkg-install: @ ${ECHO_CMD} '#!/bin/sh -' > ${PKGPOSTINSTALL} @ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} "# Generated by make-${PKGPOSTINSTALL} on `date`" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'case $$2 in' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'POST-INSTALL) ;;' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} '*) exit 0;;' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} 'esac' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} PREFIX="${PREFIX}" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} prefix=${PREFIX} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} sysconfdir=${TWCFG} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} path_to_vi="/usr/bin/vi" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} path_to_sendmail="/usr/sbin/sendmail" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} BASE_DIR=${PREFIX}/ >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} BIN_DIR=${PREFIX}/sbin >> ${PKGPOSTINSTALL} .ifdef TW_SITE_PASS @ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${PKGPOSTINSTALL} .endif .ifdef TW_LOCAL_PASS @ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGPOSTINSTALL} .endif @ ${CAT} ${WRKSRC}/installer/install.cfg >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} ${CAT} "> /tmp/$$$$.tmp <<'EOF'" >> ${PKGPOSTINSTALL} @ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} EOF >> ${PKGPOSTINSTALL} @ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/installer/install.sh >> ${PKGPOSTINSTALL} 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. .else @ ${MKDIR} ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \ ${TWDB} ${TWREPORT} @ ${ECHO} Creating tripwire database @ cd ${TWCFG} && ${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 the authors suggest creating a floppy is not necessary. .endif .endif .endif post-install: install-config-files create-database make-pkg-install ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} .include Index: head/security/tripwire/distinfo =================================================================== --- head/security/tripwire/distinfo (revision 466153) +++ head/security/tripwire/distinfo (revision 466154) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510952538 -SHA256 (Tripwire-tripwire-open-source-2.4.3.6_GH0.tar.gz) = f55fe6805f2c159bd67fa3761ba52df95b2a7d0bdd06196847564bac00dd5606 -SIZE (Tripwire-tripwire-open-source-2.4.3.6_GH0.tar.gz) = 1001145 +TIMESTAMP = 1522588176 +SHA256 (Tripwire-tripwire-open-source-2.4.3.7_GH0.tar.gz) = 18d40b85f04b8822717d9a3e987887600840a3753f0e9a9f6ab77692d5658450 +SIZE (Tripwire-tripwire-open-source-2.4.3.7_GH0.tar.gz) = 1002257 Index: head/security/tripwire/files/patch-src-core-archive.cpp =================================================================== --- head/security/tripwire/files/patch-src-core-archive.cpp (revision 466153) +++ head/security/tripwire/files/patch-src-core-archive.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/core/archive.cpp.orig 2016-04-23 19:12:41.000000000 -0700 -+++ src/core/archive.cpp 2016-04-29 23:21:27.059769000 -0700 -@@ -919,8 +919,8 @@ - }//try - catch (eFile& fileError) { - TSTRING errStr = TSS_GetString( cCore, core::STR_BAD_TEMPDIRECTORY ); -- eArchiveOpen e(strTempFile, errStr); -- throw e; -+ eArchiveOpen e2(strTempFile, errStr); -+ throw e2; - } - - /////////////////////////////////////////////////////////////////////////////// Property changes on: head/security/tripwire/files/patch-src-core-archive.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/tripwire/files/patch-Makefile.in =================================================================== --- head/security/tripwire/files/patch-Makefile.in (revision 466153) +++ head/security/tripwire/files/patch-Makefile.in (revision 466154) @@ -1,19 +1,19 @@ ---- Makefile.in.orig 2017-10-01 19:49:45.000000000 -0700 -+++ Makefile.in 2017-11-17 13:10:21.882484000 -0800 +--- Makefile.in.orig 2018-03-30 23:05:50.000000000 -0700 ++++ Makefile.in 2018-04-01 06:12:25.219417000 -0700 @@ -727,7 +727,6 @@ install-data-am: @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive install-dvi-am: -@@ -799,7 +798,7 @@ +@@ -798,7 +797,7 @@ - install-data-hook: - export INSTALL_STRIP_FLAG -- prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ -+ STGDIR="$$STAGEDIR" prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ - path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - $(top_srcdir)/installer/install.sh + install-data-hook: +- INSTALL_STRIP_FLAG="$(INSTALL_STRIP_FLAG)" \ ++ STGDIR="$$STAGEDIR" INSTALL_STRIP_FLAG="$(INSTALL_STRIP_FLAG)" \ + prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ + path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ + $(top_srcdir)/installer/install.sh Index: head/security/tripwire/files/patch-man__man4__twconfig.4 =================================================================== --- head/security/tripwire/files/patch-man__man4__twconfig.4 (revision 466153) +++ head/security/tripwire/files/patch-man__man4__twconfig.4 (revision 466154) @@ -1,44 +1,44 @@ ---- man/man4/twconfig.4.orig 2016-04-23 19:12:41.000000000 -0700 -+++ man/man4/twconfig.4 2016-04-30 00:02:20.117209000 -0700 +--- man/man4/twconfig.4.orig 2018-03-30 23:05:50.000000000 -0700 ++++ man/man4/twconfig.4 2018-04-01 06:21:21.327692000 -0700 @@ -35,7 +35,7 @@ .. .nh .ad l --.TH TWCONFIG 4 "1 July 2000" -+.TH TWCONFIG 5 "1 July 2000" +-.TH TWCONFIG 4 "04 Jan 2018" "Open Source Tripwire 2.4" ++.TH TWCONFIG 5 "04 Jan 2018" "Open Source Tripwire 2.4" .SH NAME twconfig \- \fITripwire\fP configuration file reference .SH DESCRIPTION @@ -48,7 +48,7 @@ signed with the site key, and the site passphrase is required to edit the file. .PP -During installation, a signed \fITripwire\fP configuration file \fItw.cfg\fP will be created in the \fI/etc/tripwire\fP directory, and a plain text copy of this configuration file \fItwcfg.txt\fP will be created in the same directory. +During installation, a signed \fITripwire\fP configuration file \fItw.cfg\fP will be created in the \fI/usr/local/etc/tripwire\fP directory, and a plain text copy of this configuration file \fItwcfg.txt\fP will be created in the same directory. .PP The configuration file is modified using the .B twadmin\ \(hy\(hycreate\(hycfgfile @@ -102,11 +102,11 @@ .if n .nr Ti \n(.i .Nf .if n .in 0 -POLFILE Default = /etc/tripwire/tw.pol +POLFILE Default = /usr/local/etc/tripwire/tw.pol DBFILE Default = /var/lib/tripwire/$(HOSTNAME).twd REPORTFILE Default = /var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr -SITEKEYFILE Default = /etc/tripwire/site.key -LOCALKEYFILE Default = /etc/tripwire/$(HOSTNAME)-local.key +SITEKEYFILE Default = /usr/local/etc/tripwire/site.key +LOCALKEYFILE Default = /usr/local/etc/tripwire/$(HOSTNAME)-local.key .Fi .if n .in +\n(Tiu .SS Other Variables -@@ -298,7 +298,7 @@ +@@ -318,7 +318,7 @@ .BR twadmin (8), .BR twprint (8), .BR siggen (8), -.BR twpolicy (4), +.BR twpolicy (5), .BR twfiles (5), .BR sendmail (1), .BR vi (1), Index: head/security/tripwire/files/patch-man__man4__twpolicy.4 =================================================================== --- head/security/tripwire/files/patch-man__man4__twpolicy.4 (revision 466153) +++ head/security/tripwire/files/patch-man__man4__twpolicy.4 (revision 466154) @@ -1,27 +1,27 @@ ---- man/man4/twpolicy.4.orig 2016-04-23 19:12:41.000000000 -0700 -+++ man/man4/twpolicy.4 2016-04-30 00:04:18.371172000 -0700 +--- man/man4/twpolicy.4.orig 2018-03-30 23:05:50.000000000 -0700 ++++ man/man4/twpolicy.4 2018-04-01 06:23:06.577543000 -0700 @@ -36,7 +36,7 @@ .\" .nh .ad l --.TH TWPOLICY 4 "1 July 2000" -+.TH TWPOLICY 5 "1 July 2000" +-.TH TWPOLICY 4 "04 Jan 2018" "Open Source Tripwire 2.4" ++.TH TWPOLICY 5 "04 Jan 2018" "Open Source Tripwire 2.4" .SH NAME twpolicy \- \fITripwire\fP policy file reference .SH DESCRIPTION @@ -51,7 +51,7 @@ \fITripwire\fP checks the integrity of any system. .PP During installation, an encoded and signed policy file (\fItw.pol\fP) -will be created in the \fI/etc/tripwire\fP directory, +will be created in the \fI/usr/local/etc/tripwire\fP directory, and a plain text copy of this policy file (\fItwpol.txt\fP) will be generated in the same directory. An additional text file (\fIpolicyguide.txt\fP) illustrates all of the features of the policy @@ -544,5 +544,5 @@ .BR twadmin (8), .BR twprint (8), .BR siggen (8), -.BR twconfig (4), +.BR twconfig (5), .BR twfiles (5)