[29963] trunk/dports/security/tripwire
source_changes at macosforge.org
source_changes at macosforge.org
Tue Oct 16 17:43:57 PDT 2007
Revision: 29963
http://trac.macosforge.org/projects/macports/changeset/29963
Author: markd at macports.org
Date: 2007-10-16 17:43:57 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Closes #12894. Update to 2.4.1.2.
Modified Paths:
--------------
trunk/dports/security/tripwire/Portfile
trunk/dports/security/tripwire/files/patch-Makefile.am
trunk/dports/security/tripwire/files/patch-install.cfg
trunk/dports/security/tripwire/files/patch-install.sh
Added Paths:
-----------
trunk/dports/security/tripwire/files/patch-aclocal.m4
trunk/dports/security/tripwire/files/patch-configure
trunk/dports/security/tripwire/files/patch-configure.in
trunk/dports/security/tripwire/files/patch-platform.h
Modified: trunk/dports/security/tripwire/Portfile
===================================================================
--- trunk/dports/security/tripwire/Portfile 2007-10-17 00:33:09 UTC (rev 29962)
+++ trunk/dports/security/tripwire/Portfile 2007-10-17 00:43:57 UTC (rev 29963)
@@ -2,7 +2,7 @@
PortSystem 1.0
name tripwire
-version 2.3.1-2
+version 2.4.1.2
categories security
platforms darwin
maintainers nomaintainer at macports.org
@@ -15,29 +15,32 @@
intrusion detection tool, but can be used for many \
other purposes such as integrity assurance, change \
management, policy compliance and more.
-homepage http://www.${name}.org/
-master_sites sourceforge:${name}:source \
- http://www.frenchfries.net/paul/${name}/
-distfiles ${distname}.tar.gz:source
-checksums ${distname}.tar.gz md5 6a15fe110565cef9ed33c1c7e070355e \
- tw-20030919.patch.gz md5 27fe54c81a7c447f9fe1b688615c6260
+homepage http://sourceforge.net/projects/tripwire/
+use_bzip2 yes
+master_sites sourceforge:${name}
+distname ${distname}-src
+distfiles ${distname}.tar.bz2
+checksums ${distname}.tar.bz2 md5 8a1147c278b528ed593023912c4b649a
-depends_lib lib:libcrypto.0.9:openssl
+depends_lib port:openssl
+depends_build port:automake
-variant anacron {
- depends_run bin:anacron:anacron
-}
+#variant anacron {
+# depends_run bin:anacron:anacron
+#}
-patchfiles tw-20030919.patch.gz \
- patch-Makefile.am \
- patch-install.cfg \
- patch-install.sh \
- patch-twpol.txt
-patch.dir ${workpath}
+patchfiles patch-Makefile.am \
+ patch-platform.h \
+ patch-aclocal.m4 \
+ patch-configure.in \
+ patch-configure \
+ patch-install.cfg \
+ patch-install.sh
+
post-patch { file attributes ${worksrcpath}/configure -permissions +x }
-configure.args --sysconfdir="${prefix}/etc/${name}" \
- --mandir="${prefix}/share/man"
+configure.args --sysconfdir="${prefix}/etc/${name}" \
+ --mandir="${prefix}/share/man"
post-destroot {
# Installation locations
Modified: trunk/dports/security/tripwire/files/patch-Makefile.am
===================================================================
--- trunk/dports/security/tripwire/files/patch-Makefile.am 2007-10-17 00:33:09 UTC (rev 29962)
+++ trunk/dports/security/tripwire/files/patch-Makefile.am 2007-10-17 00:43:57 UTC (rev 29963)
@@ -1,5 +1,5 @@
---- tripwire-2.3.1-2.orig/Makefile.am Tue Apr 27 17:09:17 2004
-+++ tripwire-2.3.1-2/Makefile.am Tue Apr 27 17:38:39 2004
+--- Makefile.am Tue Apr 27 17:09:17 2004
++++ Makefile.am Tue Apr 27 17:38:39 2004
@@ -4,4 +4,4 @@
install-data-hook:
prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
Added: trunk/dports/security/tripwire/files/patch-aclocal.m4
===================================================================
--- trunk/dports/security/tripwire/files/patch-aclocal.m4 (rev 0)
+++ trunk/dports/security/tripwire/files/patch-aclocal.m4 2007-10-17 00:43:57 UTC (rev 29963)
@@ -0,0 +1,39 @@
+--- aclocal.m4.original Sun Sep 2 10:52:05 2007
++++ aclocal.m4 Sun Sep 2 10:52:33 2007
+@@ -33,14 +33,14 @@
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.10"])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.8.5])])
++ [AM_AUTOMAKE_VERSION([1.10])])
+
+ # AM_AUX_DIR_EXPAND
+
+@@ -469,11 +469,15 @@
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ # test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++# is not polluted with repeated "-I."
++AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++# test to see if srcdir already configured
++if test -f $srcdir/config.status; then
++AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
+ fi
+-
+ # test whether we have cygpath
+ if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
Added: trunk/dports/security/tripwire/files/patch-configure
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure (rev 0)
+++ trunk/dports/security/tripwire/files/patch-configure 2007-10-17 00:43:57 UTC (rev 29963)
@@ -0,0 +1,84 @@
+--- configure.orig Mon Sep 24 19:21:28 2007
++++ configure Mon Sep 24 20:52:05 2007
+@@ -605,6 +605,7 @@
+ PACKAGE_VERSION
+ PACKAGE_STRING
+ PACKAGE_BUGREPORT
++am__isrc
+ exec_prefix
+ prefix
+ program_transform_name
+@@ -663,6 +664,7 @@
+ STRIP
+ INSTALL_STRIP_PROGRAM
+ mkdir_p
++MKDIR_P
+ AWK
+ SET_MAKE
+ am__leading_dot
+@@ -1901,7 +1903,7 @@
+ test "$program_prefix$program_suffix$program_transform_name" = \
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+-am__api_version="1.8"
++am__api_version="1.10"
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -2043,6 +2045,9 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
++# added to avoid compile error, true value needs to be set to something
++am__isrc=""
++
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -2061,6 +2066,7 @@
+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+ # expensive solution, as it forces Make to start a sub-shell.)
+ mkdir_p='mkdir -p -- .'
++ MKDIR_P='mkdir -p -- .'
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+@@ -2073,11 +2079,18 @@
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
++ MKDIR_P='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
++ MKDIR_P='$(install_sh) -d'
+ fi
+ fi
+
++# catch if MKDIR_P is empty and set to equal mkdir_p
++ if test -z "$MKDIR_P"; then
++ MKDIR_P=$mkdir_p
++ fi
++
+ for ac_prog in gawk mawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -11287,6 +11300,7 @@
+ STRIP!$STRIP$ac_delim
+ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+ mkdir_p!$mkdir_p$ac_delim
++MKDIR_P!$MKDIR_P$ac_delim
+ AWK!$AWK$ac_delim
+ SET_MAKE!$SET_MAKE$ac_delim
+ am__leading_dot!$am__leading_dot$ac_delim
+@@ -11319,9 +11333,10 @@
+ path_to_sendmail!$path_to_sendmail$ac_delim
+ CPP!$CPP$ac_delim
+ GREP!$GREP$ac_delim
++am__isrc!$am__isrc$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 99; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Added: trunk/dports/security/tripwire/files/patch-configure.in
===================================================================
--- trunk/dports/security/tripwire/files/patch-configure.in (rev 0)
+++ trunk/dports/security/tripwire/files/patch-configure.in 2007-10-17 00:43:57 UTC (rev 29963)
@@ -0,0 +1,18 @@
+--- configure.in.orig Tue Sep 18 22:18:53 2007
++++ configure.in Fri Sep 21 19:36:56 2007
+@@ -38,6 +38,7 @@
+ dnl ###################
+ dnl Checks for programs
+ dnl ###################
++AC_PROG_MKDIR_P
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_RANLIB
+@@ -406,6 +407,7 @@
+ dnl Export the variables we use
+ dnl #####################################
+ AC_SUBST(CORE_CRYPT_O)
++AC_SUBST([am__isrc], [' -I$(srcdir)'])
+
+ AC_CONFIG_FILES([
+ Makefile
Modified: trunk/dports/security/tripwire/files/patch-install.cfg
===================================================================
--- trunk/dports/security/tripwire/files/patch-install.cfg 2007-10-17 00:33:09 UTC (rev 29962)
+++ trunk/dports/security/tripwire/files/patch-install.cfg 2007-10-17 00:43:57 UTC (rev 29963)
@@ -1,5 +1,5 @@
---- tripwire-2.3.1-2/install/install.cfg.orig Mon Apr 26 11:25:04 2004
-+++ tripwire-2.3.1-2/install/install.cfg Mon Apr 26 12:05:35 2004
+--- install/install.cfg.original Sun Sep 2 06:59:26 2007
++++ install/install.cfg Sun Sep 2 07:00:25 2007
@@ -30,13 +30,13 @@
TWPOLICY="${sysconfdir}"
Modified: trunk/dports/security/tripwire/files/patch-install.sh
===================================================================
--- trunk/dports/security/tripwire/files/patch-install.sh 2007-10-17 00:33:09 UTC (rev 29962)
+++ trunk/dports/security/tripwire/files/patch-install.sh 2007-10-17 00:43:57 UTC (rev 29963)
@@ -1,5 +1,5 @@
---- tripwire-2.3.1-2.orig/install/install.sh Tue Apr 27 17:09:17 2004
-+++ tripwire-2.3.1-2/install/install.sh Wed Apr 28 12:04:20 2004
+--- install/install.sh Sat Sep 1 19:54:34 2007
++++ install/install.sh Sun Sep 2 07:10:58 2007
@@ -19,10 +19,6 @@
PATH='.:/bin:/usr/bin'
@@ -11,44 +11,47 @@
##-------------------------------------------------------
## The usage message.
-@@ -268,8 +264,8 @@
+@@ -262,9 +258,8 @@
##-------------------------------------------------------
paths="TWBIN TWMAN TWPOLICY TWREPORT TWDB TWSITEKEYDIR TWLOCALKEYDIR"
-path2="TWBIN TWPOLICY TWREPORT TWDB TWSITEKEYDIR TWLOCALKEYDIR"
-path3="TWMAN TWDOCS"
+-
+path2="TWPOLICY TWDB TWREPORT TWSITEKEYDIR TWLOCALKEYDIR"
+path3="TWBIN TWMAN TWDOCS"
-
##=======================================================
## User License Agreement
-@@ -285,6 +281,10 @@
+ ##=======================================================
+@@ -279,6 +274,12 @@
##-------------------------------------------------------
if [ "$PROMPT" = "true" ] ; then
++
+ if [ ! -t 0 ] ; then
-+ echo "Say 'sh install.sh', not 'sh < install.sh'"
-+ exit 1
++ echo "Say 'sh install.sh', not 'sh < install.sh'"
++ exit 1
+ fi
++
echo
- echo "LICENSE AGREEMENT for Tripwire(R) 2.3 Open Source"
+ echo "LICENSE AGREEMENT for Tripwire(R) 2.4 Open Source"
echo
-@@ -479,6 +479,14 @@
+@@ -474,6 +475,14 @@
eval "echo \"\$${i}\""
fi
done
+if [ -n "$DESTDIR" ]; then
-+ echo
-+ echo "Using destination root directory:"
-+ echo " $DESTDIR"
-+ echo
++ echo
++ echo "Using destination root directory:"
++ echo " $DESTDIR"
++ echo
+else
-+ DESTDIR=""
++ DESTDIR=""
+fi
##-------------------------------------------------------
## Display value of clobber.
-@@ -519,7 +527,7 @@
+@@ -514,7 +523,7 @@
##-------------------------------------------------------
for i in $path2; do
@@ -57,7 +60,7 @@
if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
-@@ -535,7 +543,7 @@
+@@ -530,7 +539,7 @@
done
for i in $path3; do
@@ -66,7 +69,7 @@
if [ ! -d "$d" ] ; then
mkdir -p "$d"
if [ ! -d "$d" ] ; then
-@@ -598,11 +606,11 @@
+@@ -591,11 +600,11 @@
for i in $loosefiles; do
eval "eval \"\$$i\""
f=${TAR_DIR}$d/$ff
@@ -80,15 +83,16 @@
if [ $? -eq 0 ]; then
echo "$ff: copied"
chmod "$rr" "$ff" > /dev/null
-@@ -636,6 +644,7 @@
+@@ -628,7 +637,7 @@
+ ## If user has to enter a passphrase, give some
## advice about what is appropriate.
##-------------------------------------------------------
-
+-
+if [ -z "$DESTDIR" ]; then
if [ -z "$TW_SITE_PASS" ] || [ -z "$TW_LOCAL_PASS" ]; then
cat << END_OF_TEXT
-@@ -683,7 +692,7 @@
+@@ -676,7 +685,7 @@
if [ $? -ne 0 ] ; then
echo "Error: site key generation failed"
exit 1
@@ -97,7 +101,7 @@
fi
fi
-@@ -711,9 +720,10 @@
+@@ -704,9 +713,10 @@
if [ $? -ne 0 ] ; then
echo "Error: local key generation failed"
exit 1
@@ -109,7 +113,7 @@
##=======================================================
## Generate tripwire configuration file.
-@@ -723,7 +733,7 @@
+@@ -716,7 +726,7 @@
echo "----------------------------------------------"
echo "Generating Tripwire configuration file..."
@@ -118,7 +122,7 @@
ROOT =$TWBIN
POLFILE =$POLICY_FILE
DBFILE =$TWDB/\$(HOSTNAME).twd
-@@ -741,27 +751,28 @@
+@@ -734,27 +744,27 @@
END_OF_TEXT
if [ "$TWMAILMETHOD" = "SMTP" ] ; then
@@ -147,12 +151,12 @@
##=======================================================
## Create signed tripwire configuration file.
##=======================================================
-
+-
+if [ -z "$DESTDIR" ]; then
echo
echo "----------------------------------------------"
echo "Creating signed configuration file..."
-@@ -803,7 +814,7 @@
+@@ -796,7 +806,7 @@
fi
# Set the rights properly
@@ -161,7 +165,7 @@
##-------------------------------------------------------
## We keep the cleartext version around.
-@@ -817,6 +828,7 @@
+@@ -810,6 +820,7 @@
that you delete this file manually after you have examined it.
END_OF_TEXT
@@ -169,7 +173,7 @@
##=======================================================
## Modify default policy file with file locations
-@@ -827,6 +839,7 @@
+@@ -820,6 +831,7 @@
echo "Customizing default policy file..."
sed '/@@section GLOBAL/,/@@section FS/ {
@@ -177,7 +181,7 @@
s?^\(TWROOT=\).*$?TWDOCS='\""$TWDOCS"\"';?
s?^\(TWBIN=\).*$?\1'\""$TWBIN"\"';?
s?^\(TWPOL=\).*$?\1'\""$TWPOLICY"\"';?
-@@ -835,22 +848,23 @@
+@@ -828,22 +840,22 @@
s?^\(TWLKEY=\).*$?\1'\""$TWLOCALKEYDIR"\"';?
s?^\(TWREPORT=\).*$?\1'\""$TWREPORT"\"';?
s?^\(HOSTNAME=\).*$?\1'"$HOST_NAME"';?
@@ -204,12 +208,12 @@
##=======================================================
## Create signed tripwire policy file.
##=======================================================
-
+-
+if [ -z "$DESTDIR" ]; then
echo
echo "----------------------------------------------"
echo "Creating signed policy file..."
-@@ -909,6 +923,7 @@
+@@ -902,6 +914,7 @@
a new signed copy of the Tripwire policy.
END_OF_TEXT
Added: trunk/dports/security/tripwire/files/patch-platform.h
===================================================================
--- trunk/dports/security/tripwire/files/patch-platform.h (rev 0)
+++ trunk/dports/security/tripwire/files/patch-platform.h 2007-10-17 00:43:57 UTC (rev 29963)
@@ -0,0 +1,11 @@
+--- src/core/platform.h.original Mon Sep 3 09:50:34 2007
++++ src/core/platform.h Mon Sep 3 09:51:33 2007
+@@ -34,7 +34,7 @@
+ //
+
+ #ifdef HAVE_CONFIG_H
+-# include <config.h>
++# include "config.h"
+ #endif
+
+ #ifndef __PLATFORM_H
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071016/a80c8657/attachment-0001.html
More information about the macports-changes
mailing list