Attachment 33662 Details for Bug 55011 – amap-4.0.diff

[patch] amap-4.0.diff

amap-4.0.diff (text/plain), 5.32 KB, created by yonatan on 2003-07-29 13:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yonatan

Created: 2003-07-29 13:00:26 UTC

Size: 5.32 KB

patch

obsolete

>diff -urN amap.orig/Makefile amap/Makefile
>--- amap.orig/Makefile	Mon Jun 30 02:10:17 2003
>+++ amap/Makefile	Tue Jul 29 14:20:24 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	amap
>-PORTVERSION=	2.7
>+PORTVERSION=	4.0
> CATEGORIES=	security
> MASTER_SITES=	http://www.thc.org/releases/
> 
>@@ -19,7 +19,7 @@
> MAN1=		amap.1
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/amap.c
>+	${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/amap.h
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin/
>@@ -31,7 +31,7 @@
> 	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1/
> .	if !defined(NOPORTDOCS)
> 		${MKDIR} ${DOCSDIR}
>-.		for i in README BUGS TODO CHANGES LICENSE
>+.		for i in README TODO CHANGES LICENSE IGNORE VOTE
> 			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
> .		endfor
> .	endif
>diff -urN amap.orig/distinfo amap/distinfo
>--- amap.orig/distinfo	Sun Jun 29 20:09:45 2003
>+++ amap/distinfo	Tue Jul 29 13:53:26 2003
>@@ -1 +1 @@
>-MD5 (amap-2.7.tar.gz) = 742448f85d6abf0897a7d0a703b66328
>+MD5 (amap-4.0.tar.gz) = c92a0f159c1ccd34f63e932b81a5b660
>diff -urN amap.orig/files/patch-Makefile.am amap/files/patch-Makefile.am
>--- amap.orig/files/patch-Makefile.am	Sun Jun 29 20:40:47 2003
>+++ amap/files/patch-Makefile.am	Tue Jul 29 13:59:44 2003
>@@ -1,15 +1,13 @@
>---- Makefile.am.orig	Tue Jun 10 17:02:49 2003
>-+++ Makefile.am	Tue Jun 10 17:03:35 2003
>-@@ -1,9 +1,9 @@
>+--- Makefile.am.orig	Mon Jul 14 17:38:18 2003
>++++ Makefile.am	Tue Jul 29 13:58:40 2003
>+@@ -1,8 +1,8 @@
>  CC=gcc
>+ LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
> -OPT=-O2
> +OPT=${CFLAGS}
>- OPT_DEBUG=-ggdb -Wall
>+ OPT_DEBUG=-ggdb -Wall -lefence
> -DIR=/usr/local/bin
> +DIR=${PREFIX}/bin
>  SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
>--MANDIR=/usr/local/man/man1
>-+MANDIR=${MANPREFIX}/man/man1
>  MANPAGE=amap.1
>- all:	strip
>- 
>+ all:	pcre strip
>diff -urN amap.orig/files/patch-amap-inc.h amap/files/patch-amap-inc.h
>--- amap.orig/files/patch-amap-inc.h	Sun Jun 29 20:32:33 2003
>+++ amap/files/patch-amap-inc.h	Tue Jul 29 14:27:38 2003
>@@ -1,14 +1,10 @@
>---- amap-inc.h.orig	Sun Jun 29 20:31:38 2003
>-+++ amap-inc.h	Sun Jun 29 20:31:50 2003
>-@@ -12,10 +12,9 @@
>+--- amap-inc.h.orig	Tue Jul 29 14:26:51 2003
>++++ amap-inc.h	Tue Jul 29 14:27:05 2003
>+@@ -13,7 +13,6 @@
>  #include <sys/stat.h>
>  #include <sys/types.h>
>  #include <sys/socket.h>
> -#include <arpa/inet.h>
>--#include <netdb.h>
>+ #include <netdb.h>
>  #include <netinet/in.h>
>  #include <arpa/inet.h>
>-+#include <netdb.h>
>- #include <fcntl.h>
>- #include <time.h>
>- #include <errno.h>
>diff -urN amap.orig/files/patch-amap.h amap/files/patch-amap.h
>--- amap.orig/files/patch-amap.h	Sun Jun 29 20:28:13 2003
>+++ amap/files/patch-amap.h	Tue Jul 29 14:06:54 2003
>@@ -1,12 +1,11 @@
>---- amap.h.orig	Tue Jun 10 17:05:40 2003
>-+++ amap.h	Tue Jun 10 17:06:25 2003
>-@@ -57,7 +57,8 @@
>- //-----------------------------------------
>+--- amap.h.orig	Tue Jul 22 13:54:37 2003
>++++ amap.h	Tue Jul 29 14:06:27 2003
>+@@ -24,7 +24,7 @@
>+ #define AMAP_EMAIL     "amap-dev@thc.org"
>+ #define AMAP_RESOURCE  "www.thc.org"
>  
>- // where are my appdefs files? all entries must end with a slash!
>--char *searchpath[14] = { "./", "/etc/", "/usr/etc/", "/usr/local/etc/",
>-+char *searchpath[15] = { "./", "PREFIX/share/amap/", "/etc/", "/usr/etc/",
>-+  "/usr/local/etc/",
>-   "/opt/etc/", "/usr/local/amap/", "/opt/amap/",
>-   "/usr/local/lib/", "/usr/local/lib/amap/",
>-   "/usr/lib/amap/", "/usr/local/bin/",
>+-#define AMAP_APPDEF_PATH	"/usr/local/bin"
>++#define AMAP_APPDEF_PATH	"PREFIX/bin"
>+ #define AMAP_BUFSIZE		1024	// standard buffer size
>+ #define AMAP_BUFSIZE_BIG	16348   // big standard buffer size
>+ #define AMAP_REGEX_OPTIONS	( PCRE_MULTILINE | PCRE_CASELESS )
>diff -urN amap.orig/files/patch-amapcrap.c amap/files/patch-amapcrap.c
>--- amap.orig/files/patch-amapcrap.c	Sun Jun 29 20:26:32 2003
>+++ amap/files/patch-amapcrap.c	Thu Jan  1 00:00:00 1970
>@@ -1,13 +0,0 @@
>---- amapcrap.c.orig	Sun Jun 29 20:26:03 2003
>-+++ amapcrap.c	Sun Jun 29 20:26:13 2003
>-@@ -15,9 +15,9 @@
>- #include <stdio.h>
>- #include <string.h>
>- #include <netdb.h>
>--#include <netinet/in.h>
>- #include <sys/types.h>
>- #include <sys/socket.h>
>-+#include <netinet/in.h>
>- #include <sys/stat.h>
>- #include <sys/time.h>
>- #include <sys/resource.h>
>diff -urN amap.orig/files/patch-configure amap/files/patch-configure
>--- amap.orig/files/patch-configure	Thu Jan  1 00:00:00 1970
>+++ amap/files/patch-configure	Tue Jul 29 14:16:39 2003
>@@ -0,0 +1,11 @@
>+--- configure.orig	Tue Jul 29 14:10:16 2003
>++++ configure	Tue Jul 29 14:15:56 2003
>+@@ -135,7 +135,7 @@
>+     XLIBS="$XLIBS -lresolv"
>+ fi
>+ 
>+-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
>++for i in ${MANPPREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
>+   if [ -d $i ]; then
>+     MANDIR=$i
>+   fi
>diff -urN amap.orig/pkg-plist amap/pkg-plist
>--- amap.orig/pkg-plist	Mon Jun 30 02:10:17 2003
>+++ amap/pkg-plist	Tue Jul 29 14:33:34 2003
>@@ -4,10 +4,11 @@
> share/amap/appdefs.resp
> share/amap/appdefs.rpc
> share/amap/appdefs.trig
>-%%PORTDOCS%%share/doc/amap/README
>-%%PORTDOCS%%share/doc/amap/BUGS
>-%%PORTDOCS%%share/doc/amap/TODO
>-%%PORTDOCS%%share/doc/amap/CHANGES
>-%%PORTDOCS%%share/doc/amap/LICENSE
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/IGNORE
>+%%PORTDOCS%%%%DOCSDIR%%/VOTE
>+%%PORTDOCS%%%%DOCSDIR%%/TODO
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%@dirrm share/doc/amap
> @dirrm share/amap

Actions: View | Diff

Attachments on bug 55011: 33662