[gentoo-commits] gentoo-x86 commit in net-analyzer/nsat/files: nsat-1.5-lvalue-gcc4.patch nsat-1.5-configure.patch nsat-1.5-strip.patch nsat-1.5-amd64-compat.patch nsat-1.5-misc.patch

[Jeroen Roovers (jer)]

jer         14/07/05 17:19:54

  Modified:             nsat-1.5-lvalue-gcc4.patch nsat-1.5-configure.patch
                        nsat-1.5-strip.patch nsat-1.5-amd64-compat.patch
  Added:                nsat-1.5-misc.patch
  Log:
  Use dev-libs/libmix instead of bundled libmix++. Fix parallel make issues. Combine sed scripts into patch. Clean up patches.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch?r1=1.1&r2=1.2

Index: nsat-1.5-lvalue-gcc4.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-lvalue-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsat-1.5-lvalue-gcc4.patch	19 Apr 2006 00:31:08 -0000	1.1
+++ nsat-1.5-lvalue-gcc4.patch	5 Jul 2014 17:19:54 -0000	1.2
@@ -1,6 +1,5 @@
-diff -Naur nsat.old/src/smb/ADMsmb.c nsat/src/smb/ADMsmb.c
---- nsat.old/src/smb/ADMsmb.c	2006-03-31 01:51:26.000000000 -0500
-+++ nsat/src/smb/ADMsmb.c	2006-03-31 01:52:27.000000000 -0500
+--- a/src/smb/ADMsmb.c
++++ b/src/smb/ADMsmb.c
 @@ -123,7 +123,7 @@
      {
        usleep (100000);



1.3                  net-analyzer/nsat/files/nsat-1.5-configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-configure.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-configure.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-configure.patch?r1=1.2&r2=1.3

Index: nsat-1.5-configure.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsat-1.5-configure.patch	15 Jan 2009 07:04:29 -0000	1.2
+++ nsat-1.5-configure.patch	5 Jul 2014 17:19:54 -0000	1.3
@@ -1,5 +1,5 @@
---- nsat/configure.in.orig	2003-01-05 22:47:13.000000000 +0100
-+++ nsat/configure.in	2009-01-15 07:56:35.000000000 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -15,7 +15,6 @@
  else
      AC_MSG_RESULT(crappy :P)



1.2                  net-analyzer/nsat/files/nsat-1.5-strip.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-strip.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-strip.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-strip.patch?r1=1.1&r2=1.2

Index: nsat-1.5-strip.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-strip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsat-1.5-strip.patch	15 Jan 2009 07:04:29 -0000	1.1
+++ nsat-1.5-strip.patch	5 Jul 2014 17:19:54 -0000	1.2
@@ -1,5 +1,5 @@
---- nsat/src/Makefile.in.orig	2002-04-26 08:45:38.000000000 +0200
-+++ nsat/src/Makefile.in	2009-01-15 07:44:11.000000000 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -37,7 +37,6 @@
  
  ../nsat:



1.2                  net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch?r1=1.1&r2=1.2

Index: nsat-1.5-amd64-compat.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-amd64-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsat-1.5-amd64-compat.patch	25 Sep 2012 18:30:48 -0000	1.1
+++ nsat-1.5-amd64-compat.patch	5 Jul 2014 17:19:54 -0000	1.2
@@ -1,5 +1,5 @@
---- nsat/src/mod/xp_icmp_echo.c.orig	2002-02-07 20:14:20.000000000 +0300
-+++ nsat/src/mod/xp_icmp_echo.c	2011-11-07 00:57:48.885372644 +0400
+--- a/src/mod/xp_icmp_echo.c
++++ b/src/mod/xp_icmp_echo.c
 @@ -90,7 +90,7 @@
     fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);
  #endif
@@ -9,8 +9,8 @@
  
     if (recv_pack == NULL || (unsigned)res < sizeof(ip) + 8) {
  #ifdef EBUG
---- nsat/src/mod/xp_icmp_infr.c.orig	2002-02-07 20:14:20.000000000 +0300
-+++ nsat/src/mod/xp_icmp_infr.c	2011-11-07 01:09:43.192287799 +0400
+--- a/src/mod/xp_icmp_infr.c
++++ b/src/mod/xp_icmp_infr.c
 @@ -83,7 +83,7 @@
     fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);
  #endif
@@ -20,8 +20,8 @@
  
     if (recv_pack == NULL || (unsigned)res < sizeof(ip) + 8) {
  #ifdef EBUG
---- nsat/src/mod/xp_udp_probe.c.orig	2011-11-07 01:05:26.000000000 +0400
-+++ nsat/src/mod/xp_udp_probe.c	2011-11-07 01:05:48.403407231 +0400
+--- a/src/mod/xp_udp_probe.c
++++ b/src/mod/xp_udp_probe.c
 @@ -92,7 +92,7 @@
  #ifdef EBUG
     fprintf(stderr,"[%d bytes] sent, waiting for reponse.\n", res);



1.1                  net-analyzer/nsat/files/nsat-1.5-misc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-misc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/files/nsat-1.5-misc.patch?rev=1.1&content-type=text/plain

Index: nsat-1.5-misc.patch
===================================================================
* link against dev-libs/libmix
* parallel $(MAKE)
* usr/local/ -> usr/
* LDFLAGS
* verbose CC

--- a/Makefile.in
+++ b/Makefile.in
@@ -7,14 +7,14 @@
 #    #  ####  #    #   #
 
 # Change me if you want...
-INSTALL_PATH=/usr/local/bin
-MAN_PATH=/usr/local/man
+INSTALL_PATH=/usr/bin
+MAN_PATH=/usr/man
 
 # If you change this, change src/lang.h as well
-DATA_PATH=/usr/local/share/nsat
+DATA_PATH=/usr/share/nsat
 
 all:
-	@cd src;make all
+	@cd src; $(MAKE) all
 	@echo ""
 	@echo " Compiling is done!"
 	@echo " You can now 'make install' to put the files in place."
@@ -58,5 +58,5 @@
 doc/nsat.8:
 	@echo "Hmm, can't find manpage -- skipping :/"
 
-nsat:
-	@make all
+nsat: src
+	$(MAKE) all
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,22 +21,22 @@
   
 MIXOBJ = libmix++/net/net.o libmix++/misc/misc.o libmix++/misc/exclude.o
 
-all:	../smb-ns $(OBJ) modobj mixobj ../nsat
+all:	../smb-ns $(OBJ) modobj ../nsat
 
 ../smb-ns:
-	@cd smb ; make smb
+	@cd smb ; $(MAKE) smb
 
-mixobj:	libmix++/Makefile
-	@cd libmix++ ; make
+#mixobj:	libmix++/Makefile
+#	@cd libmix++ ; $(MAKE)
 
-libmix++/Makefile:
-	@cd .. ; ./configure
+#libmix++/Makefile:
+#	@cd .. ; ./configure
 
 modobj:
-	@cd mod ; make modobj
+	@cd mod ; $(MAKE) modobj
 
-../nsat:
-	${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+../nsat: modobj
+	${GPP} ${CFLAGS} ${LDFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
 
 pidalloc.o:
 	${GPP} ${CFLAGS} -c pidalloc.cpp
@@ -63,11 +63,11 @@
 	${GPP} ${CFLAGS} -c Logging.cpp
 
 clean:
-	cd mod && make clean
+	cd mod && $(MAKE) clean
 	rm -f core *.o ../*.log *.log *~ ../nsat ../.nsrc ../.nspid
 
 distclean: clean
-	@cd mod ; make clean
-	@cd smb ; make clean
-	@cd libmix++ ; make clean
+	@cd mod ; $(MAKE) clean
+	@cd smb ; $(MAKE) clean
+	@cd libmix++ ; $(MAKE) clean
 	rm -f mod/Makefile Makefile
--- a/src/smb/Makefile.in
+++ b/src/smb/Makefile.in
@@ -11,7 +11,6 @@
 LIBDIR = $(BASEDIR)/lib
 VARDIR = $(BASEDIR)/var
 INSTALLPERMS = 0755
-FLAGS1 = -O3
 LIBS1 = 
 SHELL = /bin/sh
 srcdir = ./
@@ -53,10 +52,10 @@
 .SUFFIXES: .c .o .h
 
 .c.o: $(INCLUDES)
-	@$(CC) $(CFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -c $(srcdir)$*.c -o $(srcdir)$*.o
 
 smb: msg $(CLIENT_OBJ) $(ARCFOUR_OBJ)
-	@$(CC) $(CFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(BINARY) $(CLIENT_OBJ) $(ARCFOUR_OBJ) $(LIBS)
 	@echo done
 
 msg: