freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update 2.4.3.2 --> 2.4.3.6

Browse Source
This commit is contained in:
Cy Schubert
2017-11-18 06:58:42 +00:00
parent 33a0dcac55
commit 9282b88194
6 changed files with 81 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/tripwire/Makefile
+2 -1
View File
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tripwire
PORTVERSION= 2.4.3.2
PORTVERSION= 2.4.3.6
CATEGORIES= security
MAINTAINER= cy@FreeBSD.org
@@ -180,5 +180,6 @@ create-database:
.endif
post-install: install-config-files create-database make-pkg-install
${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
.include <bsd.port.post.mk>
security/tripwire/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1486025650
SHA256 (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 25588c585f1af60958b3dce5bfc28e52c3237b2690dd5f4120e9c2f42d98fd2b
SIZE (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 967679
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
security/tripwire/files/patch-Makefile.in
+5 -5
View File
@@ -1,5 +1,5 @@
--- Makefile.in.orig 2017-01-31 21:35:07.000000000 -0800
+++ Makefile.in 2017-02-02 00:55:45.246665000 -0800
--- Makefile.in.orig 2017-10-01 19:49:45.000000000 -0700
+++ Makefile.in 2017-11-17 13:10:21.882484000 -0800
@@ -727,7 +727,6 @@
install-data-am:
@@ -8,12 +8,12 @@
install-dvi: install-dvi-recursive
install-dvi-am:
@@ -797,7 +796,7 @@
@@ -799,7 +798,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)" \
./installer/install.sh
$(top_srcdir)/installer/install.sh
security/tripwire/files/patch-installer-install.sh
+63 -29
View File
@@ -1,8 +1,8 @@
--- installer/install.sh.orig 2011-11-21 08:06:56.000000000 -0800
+++ installer/install.sh 2014-06-21 10:37:36.784492831 -0700
--- installer/install.sh.orig 2017-10-01 19:49:45.000000000 -0700
+++ installer/install.sh 2017-11-17 22:14:46.819124000 -0800
@@ -19,10 +19,6 @@
PATH='.:/bin:/usr/bin'
PATH=".:/bin:/usr/bin:/usr/local/bin:$PATH"
export PATH || (echo 'You must use sh to run this script'; kill $$)
-if [ ! -t 0 ] ; then
- echo "Say 'sh install.sh', not 'sh < install.sh'"
@@ -11,7 +11,7 @@
##-------------------------------------------------------
## The usage message.
@@ -174,17 +170,11 @@
@@ -136,17 +132,11 @@
# Starting directory.
START_DIR=`pwd`
@@ -31,7 +31,7 @@
# Guess where the toplevel for the distribution is.
# A bad guess is the current directory
@@ -200,6 +190,7 @@
@@ -162,6 +152,7 @@
## Parse the command line.
##-------------------------------------------------------
@@ -39,7 +39,7 @@
while [ "x$1" != "x" ] ; do
case "$1" in
-n) PROMPT="false"; xCLOBBER="true" ;;
@@ -232,6 +223,7 @@
@@ -201,6 +192,7 @@
esac
shift
done
@@ -47,7 +47,7 @@
##-------------------------------------------------------
## Print the sign-on banner here before the first
@@ -333,7 +325,7 @@
@@ -301,7 +293,7 @@
## passphrases must be specified on the command line.
##-------------------------------------------------------
@@ -56,7 +56,7 @@
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
@@ -514,7 +506,7 @@
@@ -488,7 +480,7 @@
##-------------------------------------------------------
for i in $path2; do
@@ -65,7 +65,7 @@
if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
@@ -525,12 +517,12 @@
@@ -499,12 +491,12 @@
chmod 0750 "$d" > /dev/null
fi
else
@@ -80,7 +80,7 @@
if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
@@ -541,7 +533,7 @@
@@ -515,7 +507,7 @@
chmod 0755 "$d" > /dev/null
fi
else
@@ -89,7 +89,7 @@
fi
done
@@ -550,6 +542,7 @@
@@ -524,6 +516,7 @@
## Copy all files to the location specified.
##=======================================================
@@ -97,26 +97,60 @@
echo
echo "----------------------------------------------"
echo "Copying files..."
@@ -568,14 +561,14 @@
@@ -540,27 +533,31 @@
## Make sure README_LOC and fil1 stay in sync.
##-------------------------------------------------------
#f1=' ff=$README ; d="" ; dd=$TWDOCS ; rr=0444 '
#f2=' ff=$REL_NOTES ; d="" ; dd=$TWDOCS ; rr=0444 '
-#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 '
-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 +586,7 @@
-#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 '
-#f14=' ff=siggen.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
-#f15=' ff=tripwire.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
-#f16=' ff=twadmin.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
-#f17=' ff=twintro.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
-#f18=' ff=twprint.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 '
-f19=' ff=COMMERCIAL ; d="" ; dd=$TWDOCS ; rr=0444 '
-f20=' ff=ReadMe-2.4.3 ; d="" ; dd=$TWDOCS ; rr=0444 '
-f21=' ff=ChangeLog ; d="" ; dd=$TWDOCS ; rr=0444 '
+XTWDOCS=$DESTDIR/$TWDOCS
+XTWBIN=$DESTDIR/$TWBIN
+XTWPOLICY=$DESTDIR/$TWPOLICY
+XTWMAN=$DESTDIR/$TWMAN
+#f1=' ff=$README ; d="" ; dd=$XTWDOCS ; rr=0444 '
+#f2=' ff=$REL_NOTES ; d="" ; dd=$XTWDOCS ; rr=0444 '
+f3=' ff=$XTWLICENSEFILE ; d="" ; dd=$TWDOCS ; rr=0444 '
+f4=' ff=tripwire ; d="/bin" ; dd=$XTWBIN ; rr=0550 '
+f5=' ff=twadmin ; d="/bin" ; dd=$XTWBIN ; rr=0550 '
+f6=' ff=twprint ; d="/bin" ; dd=$XTWBIN ; rr=0550 '
+f7=' ff=siggen ; d="/bin" ; dd=$XTWBIN ; rr=0550 '
+f8=' ff=TRADEMARK ; d="" ; dd=$XTWDOCS ; rr=0444 '
+f9=' ff=policyguide.txt ; d="/policy" ; dd=$XTWDOCS ; rr=0444 '
+f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$XTWPOLICY ; rr=0640 '
+#f11=' ff=twpolicy.4 ; d="/man/man4" ; dd=$XTWMAN/man4 ; rr=0444 '
+#f12=' ff=twconfig.4 ; d="/man/man4" ; dd=$XTWMAN/man4 ; rr=0444 '
+#f13=' ff=twfiles.5 ; d="/man/man5" ; dd=$XTWMAN/man5 ; rr=0444 '
+#f14=' ff=siggen.8 ; d="/man/man8" ; dd=$XTWMAN/man8 ; rr=0444 '
+#f15=' ff=tripwire.8 ; d="/man/man8" ; dd=$XTWMAN/man8 ; rr=0444 '
+#f16=' ff=twadmin.8 ; d="/man/man8" ; dd=$XTWMAN/man8 ; rr=0444 '
+#f17=' ff=twintro.8 ; d="/man/man8" ; dd=$XTWMAN/man8 ; rr=0444 '
+#f18=' ff=twprint.8 ; d="/man/man8" ; dd=$XTWMAN/man8 ; rr=0444 '
+f19=' ff=COMMERCIAL ; d="" ; dd=$XTWDOCS ; rr=0444 '
+f20=' ff=ReadMe-2.4.3 ; d="" ; dd=$XTWDOCS ; rr=0444 '
+f21=' ff=ChangeLog ; d="" ; dd=$XTWDOCS ; rr=0444 '
# Binaries and manpages are already installed by the install target
loosefiles="f3 f4 f5 f6 f7 f8 f9 f10 f19 f20 f21"
@@ -570,7 +567,7 @@
f=${TAR_DIR}$d/$ff
ff=${dd}/$ff
if [ -s $ff ] && [ "$CLOBBER" = "false" ] ; then
@@ -125,7 +159,7 @@
else
cp "$f" "$dd"
if [ $? -eq 0 ]; then
@@ -604,6 +597,12 @@
@@ -581,6 +578,12 @@
fi
fi
done
@@ -136,5 +170,5 @@
+*) ;;
+esac
##=======================================================
## Files are now present on user's system.
if [ -n "$INSTALL_STRIP_FLAG" ] ; then
echo "INSTALL_STRIP_FLAG is set, stripping binaries"
security/tripwire/files/patch-man__man5__Makefile.in
+5 -7
View File
@@ -1,12 +1,10 @@
--- man/man5/Makefile.in.orig 2016-04-23 19:12:41.000000000 -0700
+++ man/man5/Makefile.in 2016-04-29 23:17:14.071690000 -0700
@@ -159,8 +159,8 @@
target_os = @target_os@
target_vendor = @target_vendor@
--- man/man5/Makefile.in.orig 2017-10-01 19:49:45.000000000 -0700
+++ man/man5/Makefile.in 2017-11-17 22:29:30.161039000 -0800
@@ -269,7 +269,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies
-man_MANS = twfiles.5
-dist_man_MANS = twfiles.5
+man_MANS = twfiles.5 twconfig.5 twpolicy.5
+dist_man_MANS = twfiles.5 twconfig.5 twpolicy.5
all: all-am
security/tripwire/pkg-plist
+3 -1
View File
@@ -9,9 +9,11 @@ man/man8/twprint.8.gz
sbin/tripwire
sbin/twadmin
sbin/twprint
sbin/twtest
sbin/siggen
share/doc/tripwire/COMMERCIAL
share/doc/tripwire/COPYING
share/doc/tripwire/ChangeLog
share/doc/tripwire/ReadMe-2.4.3
share/doc/tripwire/TRADEMARK
share/doc/tripwire/policyguide.txt
%%ETCDIR%%/twpol-FreeBSD.txt