diff options
author | adrianp <adrianp> | 2006-10-27 10:35:47 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2006-10-27 10:35:47 +0000 |
commit | 13517ef9bfe1e828a45e944029a770e303bd43c0 (patch) | |
tree | bfae9618c2c85e388d17b663a1b45190f9872e29 /security/amap | |
parent | 8918ed6d3eaac547f837ec6a5b5922d48877bf27 (diff) | |
download | pkgsrc-13517ef9bfe1e828a45e944029a770e303bd43c0.tar.gz |
Update to 5.2
Fix builds on -current
Grab MAINTAINER
pkglintification
From CHANGES:
v5.2 September 2005 (THC public release)
! THIS IS A THC TAX ANNIVERSARY SPECIAL RELEASE ! HAVE FUN !
* Included patch from ka0ttic@gentoo.org for cleaner gcc compile
* Added SSL_Pending() to prevent rare locking on SSL ports,
thanks to michel(at)arboi.fr.eu.org for reporting
* Added lots of fingerprints, most from Johnny Cyberpunk / THC - THANKS!
v5.1 June 2005 (THC public release)
* Big appdefs.resp update. Thanks to all contributors!
* Finally and forever fixed the --prefix= issue
* Fixed the web update function for bad inet_pton implementations
* Added support for nmap files with IPv6 addresses
* You can scan/check port 0 now (wish from nbach<at>deloitte.dk)
* Less error prone "make install"
Diffstat (limited to 'security/amap')
-rw-r--r-- | security/amap/Makefile | 27 | ||||
-rw-r--r-- | security/amap/distinfo | 12 | ||||
-rw-r--r-- | security/amap/patches/patch-aa | 25 | ||||
-rw-r--r-- | security/amap/patches/patch-ab | 19 |
4 files changed, 44 insertions, 39 deletions
diff --git a/security/amap/Makefile b/security/amap/Makefile index 5589f867b1b..e3058902f00 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2006/07/18 22:12:30 adrianp Exp $ +# $NetBSD: Makefile,v 1.11 2006/10/27 10:35:47 adrianp Exp $ # -DISTNAME= amap-5.0 -PKGREVISION= 1 +DISTNAME= amap-5.2 CATEGORIES= net security MASTER_SITES= http://thc.segfault.net/releases/ \ http://www.thc.org/releases/ -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://thc.org.segfault.net/thc-amap/ COMMENT= Applications and Services scanner @@ -17,7 +16,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} EGDIR= ${PREFIX}/share/examples/amap PKG_SYSCONFSUBDIR?= amap -LICENSE+= amap-license +LICENSE= amap-license CONF_FILES= ${EGDIR}/appdefs.resp ${PKG_SYSCONFDIR}/appdefs.resp CONF_FILES+= ${EGDIR}/appdefs.rpc ${PKG_SYSCONFDIR}/appdefs.rpc @@ -26,23 +25,25 @@ CONF_FILES+= ${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig SUBST_CLASSES+= conf SUBST_FILES.conf= configure SUBST_STAGE.conf= pre-configure -SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' \ - -e 's|@MANDIR@|${PREFIX}/man|g' \ - -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' \ - -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \ - -e "s|@UNAME@|${UNAME}|g" +SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' +SUBST_SED.conf+= -e 's|@MANDIR@|${PREFIX}/man|g' +SUBST_SED.conf+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' +SUBST_SED.conf+= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' +SUBST_SED.conf+= -e "s|@UNAME@|${UNAME}|g" +SUBST_SED.conf+= -e "s|@GREP@|${GREP}|g" +SUBST_SED.conf+= -e "s|@SED@|${SED}|g" SUBST_MESSAGE.conf= Fixing configure script. -INSTALLATION_DIRS= bni man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 post-extract: - @${CHMOD} 0700 ${WRKSRC} + ${CHMOD} 0700 ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin ${LN} -s ${PREFIX}/bin/amap ${PREFIX}/bin/amap6 ${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/amap.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/amap.1 ${PKGMANDIR}/man1 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/appdefs.trig ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/appdefs.resp ${EGDIR} diff --git a/security/amap/distinfo b/security/amap/distinfo index c2bb7106acb..737090eb504 100644 --- a/security/amap/distinfo +++ b/security/amap/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2005/12/11 19:21:36 joerg Exp $ +$NetBSD: distinfo,v 1.3 2006/10/27 10:35:47 adrianp Exp $ -SHA1 (amap-5.0.tar.gz) = 156b8919427040f143649bf54bbf88a220be451c -RMD160 (amap-5.0.tar.gz) = fe80513c59d6f0f19dbb0cf778d97edc3dcf9d71 -Size (amap-5.0.tar.gz) = 261784 bytes -SHA1 (patch-aa) = f0ac804f53307fd496b437c15fb1e9c902e2b6d5 -SHA1 (patch-ab) = 1f6c4e78db3db3838f1d0614fb6964b90261df6f +SHA1 (amap-5.2.tar.gz) = 0474391a4c78040a7504bcce3b45bd926a682c41 +RMD160 (amap-5.2.tar.gz) = 4ea604ecb086f8e3cac84b45caac93b4a04eba26 +Size (amap-5.2.tar.gz) = 262875 bytes +SHA1 (patch-aa) = de977332fa86c19def26e684f8c5e2c5ff032da7 +SHA1 (patch-ab) = 6ad1627821f42d80557b0b2ed600a192ccbffc28 SHA1 (patch-ac) = e331995893a865228383f5631f096e001bf64274 SHA1 (patch-ad) = 907c0d5e06b04d9ccbed8dde172ad8dc9183970d diff --git a/security/amap/patches/patch-aa b/security/amap/patches/patch-aa index 5fb5a5c6a0a..674ac8e6f2c 100644 --- a/security/amap/patches/patch-aa +++ b/security/amap/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2006/10/27 10:35:47 adrianp Exp $ ---- configure.orig 2005-02-16 15:53:57.000000000 +0000 +--- configure.orig 2005-06-03 14:34:19.000000000 +0100 +++ configure @@ -13,10 +13,6 @@ if [ "$1" = "--help" ]; then exit 0 @@ -13,13 +13,20 @@ $NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ echo echo echo "Starting amap auto configuration ..." -@@ -35,7 +31,8 @@ echo +@@ -29,13 +25,14 @@ NSL_PATH="" + SOCKET_PATH="" + MANDIR="" + LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null` +-PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//i'` ++PREFIX=`echo "$1"|@GREP@ prefix=|@SED@ 's/.*prefix=//'` + echo + echo "Checking for openssl ..." for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \ /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \ -/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib . +/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib \ -+@SSLBASE@/lib. ++@SSLBASE@/lib . do if [ "X" = "X$SSL_PATH" ]; then if [ -f "$i/libssl.so" -o -f "$i/libssl.dylib" ]; then @@ -36,8 +43,8 @@ $NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ SSL_IPATH="" fi --SYS=`uname` -+SYS=`@UNAME@` +-SYS=`uname -s` ++SYS=`@UNAME@ -s` if [ "$SYS" = "SunOS" ]; then echo "Checking for Solaris libraries ..." for i in /lib /usr/lib /usr/local/lib $LIBDIRS @@ -46,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ fi -for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do -+for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man @MANDIR@; do ++for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man @MANDIR@ ; do if [ -d $i ]; then MANDIR=$i fi @@ -54,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ fi if [ -n "$PREFIX" ]; then -- XDEFINES="$XDEFINES -DAMAP_PREFIX=$PREFIX" +- XDEFINES="$XDEFINES -DAMAP_PREFIX='\"$PREFIX\"'" + XDEFINES="$XDEFINES -DAMAP_PREFIX=\"\\\"$PREFIX/\\\"\"" else - PREFIX="/usr/local" @@ -67,7 +74,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $ echo "Writing Makefile.in ..." echo "XDEFINES=$XDEFINES" >> Makefile.in -echo "XLIBS=$XLIBS" >> Makefile.in -+echo "XLIBS=$XLIBS @COMPILER_RPATH_FLAG@@PREFIX@/lib -L@PREFIX@/lib" >> Makefile.in >> Makefile.in ++echo "XLIBS=$XLIBS @COMPILER_RPATH_FLAG@@PREFIX@/lib -L@PREFIX@/lib" >> Makefile.in echo "XLIBPATHS=$XLIBPATHS" >> Makefile.in echo "XIPATHS=$XIPATHS" >> Makefile.in echo "MANDIR=$MANDIR/man1/" >> Makefile.in diff --git a/security/amap/patches/patch-ab b/security/amap/patches/patch-ab index 17bcbac5db2..abba77067b8 100644 --- a/security/amap/patches/patch-ab +++ b/security/amap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2005/12/11 19:21:36 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2006/10/27 10:35:47 adrianp Exp $ ---- Makefile.am.orig 2005-02-18 18:01:26.000000000 +0000 +--- Makefile.am.orig 2005-09-22 16:39:18.000000000 +0100 +++ Makefile.am -@@ -1,16 +1,14 @@ +@@ -1,13 +1,14 @@ -CC=gcc -LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/ -OPT=-O2 @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/11 19:21:36 joerg Exp $ +#CC=gcc +LIB=-lpcre +SHAREDIR=${PREFIX}/share/amap -+OPT=${CFLAGS} -DSHAREDIR="\"$(SHAREDIR)/\"" ++OPT=${CFLAGS} -DSHAREDIR="\"$(SHAREDIR)/\"" +#OPT_DEBUG=-ggdb -Wall -lefence BINDIR=/bin DATADIR=/etc @@ -18,15 +18,12 @@ $NetBSD: patch-ab,v 1.2 2005/12/11 19:21:36 joerg Exp $ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc MANPAGE=amap.1 -all: pcre strip -- --pcre: -- cd pcre-3.9 && make +all: strip - amap-lib.o: amap-lib.c - $(CC) $(OPT) -c -o amap-lib.o amap-lib.c $(XIPATHS) $(XDEFINES) -@@ -43,5 +41,4 @@ install: all - -cp -f $(MANPAGE) $(PREFIX)$(MANDIR) + pcre: + cd pcre-3.9 && make +@@ -45,5 +46,4 @@ install: all + -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6 clean: - cd pcre-3.9 && make clean |