upgrade to 1.7.5

PR:		45197
Submitted by:	maintainer

5 files changed, 32 insertions, 22 deletions

diff --git a/net/ipsorc/Makefile b/net/ipsorc/Makefile
index 580baf9f3731..c532a40d88b7 100644
--- a/net/ipsorc/Makefile
+++ b/net/ipsorc/Makefile
@@ -5,16 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=       ipsorc
-PORTVERSION=    1.6
-CATEGORIES=     net security
-MASTER_SITES=   http://www.legions.org/~phric/
-MASTER_SITE_SUBDIR=     ${PORTNAME}
+PORTNAME=	ipsorc
+PORTVERSION=	1.7.5
+CATEGORIES=	net security
+MASTER_SITES=	http://www.informony.com/ipsorc/
+#MASTER_SITE_SUBDIR=     ${PORTNAME}
 
-MAINTAINER=     Nicolas.Jombart@hsc-labs.com
+MAINTAINER=	Nicolas.Jombart@hsc-labs.com
 
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
+USE_BZIP2=	yes
 
 post-patch:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old
@@ -28,7 +29,7 @@ do-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in README
+.for i in README HOWTO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net/ipsorc/distinfo b/net/ipsorc/distinfo
index 9f879edadecd..9127cebbc763 100644
--- a/net/ipsorc/distinfo
+++ b/net/ipsorc/distinfo
@@ -1 +1 @@
-MD5 (ipsorc-1.6.tar.gz) = 9a5470ee8a9e1e2b3e01ad0b5f7cd07b
+MD5 (ipsorc-1.7.5.tar.bz2) = 2178f7e286cb3d0f5ec2794fd819e379
diff --git a/net/ipsorc/files/patch-aa b/net/ipsorc/files/patch-aa
index 7108ddcc64b1..91d19cce8fcf 100644
--- a/net/ipsorc/files/patch-aa
+++ b/net/ipsorc/files/patch-aa
@@ -1,31 +1,28 @@
---- Makefile.orig	Fri Mar 29 16:12:20 2002
-+++ Makefile	Mon Apr  1 12:15:29 2002
+--- Makefile.orig	Sun Nov 10 19:38:17 2002
++++ Makefile	Sun Nov 10 21:08:50 2002
 @@ -1,6 +1,5 @@
-  ## Makefile for IPMagic ##
+  ## Makefile for IP Sorcery ##
  
 -CC = cc
  SPELL = magic
  SRC =  ipmagic.c spellbook.c cauldron.c spells.c tcp.c icmp.c udp.c
- CON = sorcery.c spells.c ipsorcery.c icmp.c
-@@ -9,16 +8,18 @@
- default:
- 	@echo "Usage: make[gtk|con] then make [gtk-install|con-install]"
+ CON = sorcery.c spells.c route.c ip.c tcp.c udp.c ipsorcery.c icmp.c 
+@@ -12,15 +11,15 @@
+ all:    con gtk
  
-+all:   con gtk
-+
  con:
--	$(CC) -g -O2 -Wall -ansi -D_CON_ $(CON) -o ipmagic
-+	$(CC) $(CFLAGS) -Wall -ansi -D_CON_ $(CON) -o ipmagic
+-	$(CC) -g -O2 -Wall -ansi -D_VERSION_=\"1.7.5\" -D_CON_ $(CON) -o ipmagic
++	$(CC) $(CFLAGS) -Wall -ansi -D_VERSION_=\"1.7.5\" -D_CON_ $(CON) -o ipmagic
  	
  
  gtk:
 -	$(CC) -g -O2 -Wall -ansi -D_GTK_ $(SRC) -o $(SPELL) `gtk-config --cflags --libs`
-+	$(CC) $(CFLAGS) -Wall -ansi -D_GTK_ $(SRC) -o $(SPELL) `/usr/X11R6/bin/gtk12-config --cflags --libs`
++	$(CC) $(CFLAGS) -Wall -ansi -D_GTK_ $(SRC) -o $(SPELL) `$(GTK_CONFIG) --cflags --libs`
  
  
  solaris:     
--	$(CC) -g -O2 -Wall -ansi -D_CON_ $(CON) -o $(SPELL)  -lsocket -lnsl
-+	$(CC) $(CFLAGS) -Wall -ansi -D_CON_ $(CON) -o $(SPELL)  -lsocket -lnsl
+-	$(CC) -g -O2 -Wall -ansi  -D_CON_  $(CON) -o $(SPELL)  -lsocket -lnsl
++	$(CC) $(CFLAGS) -Wall -ansi  -D_CON_  $(CON) -o $(SPELL)  -lsocket -lnsl
  
  
  install: con-install
diff --git a/net/ipsorc/files/patch-sorcery.c b/net/ipsorc/files/patch-sorcery.c
new file mode 100644
index 000000000000..74eed0338ca4
--- /dev/null
+++ b/net/ipsorc/files/patch-sorcery.c
@@ -0,0 +1,11 @@
+--- sorcery.c.orig	Sun Nov 10 21:13:36 2002
++++ sorcery.c	Sun Nov 10 21:14:18 2002
+@@ -152,7 +152,7 @@
+  if(exi.READ_IT) {
+  
+   /* open second socket for snooping them packets */
+-  if((snoop = socket(PF_PACKET, SOCK_PACKET, ETH_P_ALL)) == -1)
++  if((snoop = socket(PF_INET, SOCK_RAW, 0)) == -1)
+   {
+     perror("snoop socket");
+     exit(snoop);
diff --git a/net/ipsorc/pkg-plist b/net/ipsorc/pkg-plist
index f6b174c826fa..52b200771b4d 100644
--- a/net/ipsorc/pkg-plist
+++ b/net/ipsorc/pkg-plist
@@ -1,4 +1,5 @@
 bin/ipmagic
 bin/magic
 %%PORTDOCS%%share/doc/ipsorc/README
+%%PORTDOCS%%share/doc/ipsorc/HOWTO
 %%PORTDOCS%%@dirrm share/doc/ipsorc