NetBSD Problem Report #22633

Received: (qmail 23524 invoked by uid 605); 29 Aug 2003 03:53:00 -0000
Message-Id: <20030829035251.7BCDB83C8@mike.infnis.com>
Date: Thu, 28 Aug 2003 22:52:51 -0500 (CDT)
From: Min Sik Kim <minskim@bawi.org>
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: minskim@bawi.org
To: gnats-bugs@gnats.netbsd.org
Subject: updated package: net/ns
X-Send-Pr-Version: 3.95

>Number:         22633
>Category:       pkg
>Synopsis:       net/ns update (2.26)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 29 03:54:00 +0000 2003
>Closed-Date:    Mon Sep 01 18:24:25 +0000 2003
>Last-Modified:  Mon Sep 01 18:25:00 +0000 2003
>Originator:     Min Sik Kim
>Release:        NetBSD 1.6X
>Organization:
>Environment:
System: NetBSD mike.infnis.com 1.6X NetBSD 1.6X (MIKE) #17: Wed Aug 27 20:49:48 CDT 2003 root@mike.infnis.com:/usr/src/sys/arch/i386/compile/MIKE i386
Architecture: i386
Machine: i386
>Description:
net/ns 2.26 is available.
>How-To-Repeat:
N/A
>Fix:

diff -burN -x CVS -I '\$NetBSD' ../ns-orig/Makefile ./Makefile
--- ../ns-orig/Makefile	2003-07-17 17:51:29.000000000 -0500
+++ ./Makefile	2003-08-28 21:10:44.000000000 -0500
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.7 2003/07/17 22:51:29 grant Exp $

-DISTNAME=	ns-src-2.1b9a
-PKGREVISION=	1
+DISTNAME=	ns-src-2.26
 PKGNAME=	${DISTNAME:S/b/rc/:S/-src//}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
@@ -29,16 +28,8 @@
 # Yes there is object files and executables in the source tarball.
 post-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}			\
-	cd ${WRKSRC} &&					\
-	${FIND} . -name "*.o" -exec ${RM} {} \;
-	${_PKG_SILENT}${_PKG_DEBUG}			\
 	cd ${WRKSRC}/indep-utils &&			\
-	${RM} cmu-scen-gen/setdest/setdest		\
-	   cmu-scen-gen/setdest/calcdest		\
-	   webtrace-conv/dec/dec-tr-stat		\
-	   webtrace-conv/epa/epa-tr-stat		\
-	   webtrace-conv/nlanr/nlanr-tr-stat		\
-	   webtrace-conv/ucb/ucb-tr-stat
+	${RM} cmu-scen-gen/setdest/calcdest

 .include  "../../net/libpcap/buildlink2.mk"
 .include  "../../devel/tcl-tclcl/buildlink2.mk"
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/distinfo ./distinfo
--- ../ns-orig/distinfo	2002-08-27 03:07:07.000000000 -0500
+++ ./distinfo	2003-08-28 21:53:11.000000000 -0500
@@ -1,20 +1,19 @@
 $NetBSD: distinfo,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $

-SHA1 (ns-src-2.1b9a.tar.gz) = c1c5103ca67856800b2c8c3eaf5267d7ec62202e
-Size (ns-src-2.1b9a.tar.gz) = 39952700 bytes
-SHA1 (patch-aa) = 9fb0cccfedf034e0bff4cd3569aec8b58cebeaf5
+SHA1 (ns-src-2.26.tar.gz) = 23da69b5e23356a14e4e1825b7f434731bdc5f68
+Size (ns-src-2.26.tar.gz) = 41592248 bytes
+SHA1 (patch-aa) = 7acec0349ee60265655a633da659a12393b9fbc2
 SHA1 (patch-ab) = 123d9110ac20063ffd32466dfa630bcbb76eff6d
 SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152
 SHA1 (patch-ad) = 43dbf7d17c22c300ab3e9ea7057b1cd8ff805958
 SHA1 (patch-ae) = af6c1937b07d7328d8949f27f0821cec75f2dae7
-SHA1 (patch-af) = 7e4862411dfe54ca38ab3646ce8767d86816c3c3
-SHA1 (patch-ag) = 680c16651358ac3d79dc2cc357a4190323916a63
+SHA1 (patch-af) = 9668b346c700d889f635f9368f5512bbceeebdda
 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
-SHA1 (patch-aj) = e527edb6e684e5dc4d06efa3919f975c62fe62a0
-SHA1 (patch-ak) = 259dd2ceeacf63e17aa02c4c097f7d1871ef286b
-SHA1 (patch-al) = 8e20a8108926e22e9753174f1e94a96df092ce42
-SHA1 (patch-am) = dccc31a0da4984c2cd9fadaea836eb872b3194ac
+SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
+SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
+SHA1 (patch-al) = e51a85e698ad9b107cdb8865ae4007faa6412b29
+SHA1 (patch-am) = d2f30afe70777f03486e606a076df95c52b18939
 SHA1 (patch-an) = 610ab5dd26a4f232af52662a373995378c12c58d
-SHA1 (patch-ao) = ce520023b7652024cb4224410d49b1f639e5f977
+SHA1 (patch-ao) = 2c319518185002b15d9b00d46d8257be9ff47984
 SHA1 (patch-ap) = 78e14fbc682f3fc87f3812773a9e12f17ec549a5
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-aa ./patches/patch-aa
--- ../ns-orig/patches/patch-aa	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-aa	2003-08-28 21:14:22.000000000 -0500
@@ -2,7 +2,7 @@

 --- Makefile.in.orig	Thu Jun  6 22:37:57 2002
 +++ Makefile.in
-@@ -54,7 +54,7 @@ PERL	= @PERL@
+@@ -54,7 +54,7 @@

  CCOPT	= @V_CCOPT@
  STATIC	= @V_STATIC@
@@ -10,4 +10,4 @@
 +LDFLAGS	= @LDFLAGS@
  LDOUT	= -o $(BLANK)

- DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK -DNIXVECTOR @V_DEFINE@ @V_DEFINES@ @DEFS@ -DPGM -DPGM_DEBUG -DNS_DIFFUSION
+ DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DSTL_NAMESPACE=@STL_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-af ./patches/patch-af
--- ../ns-orig/patches/patch-af	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-af	2003-08-28 21:52:27.000000000 -0500
@@ -2,25 +2,25 @@

 --- configure.orig	Sat Apr 13 00:34:24 2002
 +++ configure
-@@ -4082,7 +4082,7 @@ TCLCL_PROG_PLACES="\
+@@ -2939,7 +2939,7 @@
                  /usr/src/local/Tcl \
                  /usr/src/local/Tcl-1.0 \
                  "
 -TCLCL_PROG_PLACES_D="$d"
 +TCLCL_PROG_PLACES_D="$d/bin"

- NS_PACKAGE_tclcl_UNDERWAY=false
- NS_PACKAGE_tclcl_COMPLETE=true
-@@ -5422,7 +5422,7 @@ EOF
+ 
+ 
+@@ -4154,7 +4154,7 @@
  fi
  done

--for ac_header in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h
-+for ac_header in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/if.h net/ethernet.h netinet/if_ether.h sys/socket.h
+-for ac_hdr in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h
++for ac_hdr in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/if.h net/ethernet.h netinet/if_ether.h sys/socket.h
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- echo "$as_me:5428: checking for $ac_header" >&5
-@@ -6509,7 +6509,24 @@ cat >conftest.$ac_ext <<_ACEOF
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4798,7 +4798,24 @@
  #include "confdefs.h"

  #include <stdio.h>
@@ -43,9 +43,9 @@
 +#include <netinet/if_ether.h>
 +#endif

- int
- main ()
-@@ -6563,7 +6580,24 @@ cat >conftest.$ac_ext <<_ACEOF
+ int main() {
+ 
+@@ -4838,7 +4855,24 @@ cat >conftest.$ac_ext <<EOF
  #include "confdefs.h"

  #include <stdio.h>
@@ -68,9 +68,9 @@
 +#include <netinet/if_ether.h>
 +#endif

- int
- main ()
-@@ -6783,6 +6817,9 @@ cat >conftest.$ac_ext <<_ACEOF
+ int main() {
+ 
+@@ -4967,7 +5001,10 @@ cat >conftest.$ac_ext <<_ACEOF
  #include "confdefs.h"

  #include <stdio.h>
@@ -79,15 +79,18 @@
 +#endif
  #include <netinet/tcp.h>

- int
-@@ -6874,9 +6911,7 @@ if test $ac_cv_lib_pcap_main = yes; then
-   V_LIB="$V_LIB -lpcap" pcap=yes
+ int main() {
+ 
+@@ -5111,11 +5148,8 @@ if test $ac_cv_lib_pcap_main = yes; then
+   echo "$ac_t""no" 1>&6
  fi

 -V_INCLUDES="$V_INCLUDES -I/usr/include/pcap"
 -
--echo "$as_me:6879: checking to make nse" >&5
-+echo "$as_me:6914: checking to make nse" >&5
- echo $ECHO_N "checking to make nse... $ECHO_C" >&6
+-
+ echo $ac_n "checking to make nse""... $ac_c" 1>&6
+-echo "configure:5119: checking to make nse" >&5
++echo "configure:5153: checking to make nse" >&5
  if test $tcphdr = yes && test $pcap = yes; then
  		build_nse="nse"
+ 		echo "$ac_t""yes" 1>&6
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-ag ./patches/patch-ag
--- ../ns-orig/patches/patch-ag	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-ag	1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
-
---- dsr/dsragent.cc.orig	Fri Jun 21 21:16:01 2002
-+++ dsr/dsragent.cc
-@@ -310,7 +310,7 @@ public:
- /*===========================================================================
-   DSRAgent methods
- ---------------------------------------------------------------------------*/
--DSRAgent::DSRAgent(): Agent(PT_DSR), request_table(128), route_cache(NULL), \
-+DSRAgent::DSRAgent(): Agent(PT_DSR), request_table(128), route_cache(NULL), 
- send_buf_timer(this), flow_table(), ars_table()
- {
-   int c;
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-aj ./patches/patch-aj
--- ../ns-orig/patches/patch-aj	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-aj	2003-08-28 21:36:33.000000000 -0500
@@ -2,12 +2,11 @@

 --- emulate/iptap.h.orig	Fri Jan 11 22:06:09 2002
 +++ emulate/iptap.h
-@@ -37,6 +37,8 @@
- #define iptap_h
+@@ -38,6 +38,7 @@

  #include "tap.h"
+ 
 +#include <sys/types.h>
-+#include <netinet/in_systm.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-ak ./patches/patch-ak
--- ../ns-orig/patches/patch-ak	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-ak	2003-08-28 21:37:49.000000000 -0500
@@ -2,12 +2,11 @@

 --- emulate/tcptap.h.orig	Fri Jan 11 22:06:09 2002
 +++ emulate/tcptap.h
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,7 @@
  #define tcptap_h

  #include "tap.h"
 +#include <sys/types.h>
-+#include <netinet/in_systm.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-al ./patches/patch-al
--- ../ns-orig/patches/patch-al	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-al	2003-08-28 21:40:15.000000000 -0500
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$netbsd: patch-al,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $

 --- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig	Fri Jan 11 22:06:09 2002
 +++ indep-utils/cmu-scen-gen/setdest/Makefile.in
 @@ -38,7 +38,7 @@ MKDEP	= ../../../conf/mkdep
- 
- DEFINE = -Dstand_alone
+ # when including files from ns, we need to take care STL_NAMESPACE
+ DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@
  CFLAGS = @V_CCOPT@ 
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-am ./patches/patch-am
--- ../ns-orig/patches/patch-am	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-am	2003-08-28 21:41:37.000000000 -0500
@@ -2,10 +2,10 @@

 --- indep-utils/webtrace-conv/dec/Makefile.in.orig	Wed Feb 16 18:08:26 2000
 +++ indep-utils/webtrace-conv/dec/Makefile.in
-@@ -38,7 +38,7 @@ BINDEST = @prefix@/bin
+@@ -39,7 +39,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. @V_INCLUDES@
- CFLAGS = @V_CCOPT@
+ CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
diff -burN -x CVS -I '\$NetBSD' ../ns-orig/patches/patch-ao ./patches/patch-ao
--- ../ns-orig/patches/patch-ao	2002-08-27 03:07:07.000000000 -0500
+++ ./patches/patch-ao	2003-08-28 21:43:31.000000000 -0500
@@ -2,10 +2,10 @@

 --- indep-utils/webtrace-conv/nlanr/Makefile.in.orig	Wed Feb 16 18:08:27 2000
 +++ indep-utils/webtrace-conv/nlanr/Makefile.in
-@@ -35,7 +35,7 @@ BINDEST = @prefix@/bin
+@@ -36,7 +36,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. -I../../.. @V_INCLUDES@
- CFLAGS = @V_CCOPT@
+ CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
>Release-Note:
>Audit-Trail:

From: Stoned Elipot <seb@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:  
Subject: pr/22633 CVS commit: pkgsrc/net/ns
Date: Mon,  1 Sep 2003 18:21:13 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	seb
 Date:		Mon Sep  1 18:21:13 UTC 2003

 Modified Files:
 	pkgsrc/net/ns: Makefile PLIST distinfo
 	pkgsrc/net/ns/patches: patch-aa patch-af patch-aj patch-ak patch-al
 	    patch-am patch-ao
 Removed Files:
 	pkgsrc/net/ns/patches: patch-ag

 Log Message:
 Update to version 2.26.

 Lots of changes and bug fixes since last packaged version,
 see installed $PREFIX/share/doc/html/ns/CHANGES.html.

 Provided in PR pkg/22633 by Min Sik Kim <minskim at bawi dot org>.
 Minor tuning by myself.


 To generate a diff of this commit:
 cvs rdiff -r1.7 -r1.8 pkgsrc/net/ns/Makefile
 cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/ns/PLIST pkgsrc/net/ns/distinfo
 cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/net/ns/patches/patch-aa \
     pkgsrc/net/ns/patches/patch-af pkgsrc/net/ns/patches/patch-aj \
     pkgsrc/net/ns/patches/patch-ak pkgsrc/net/ns/patches/patch-al \
     pkgsrc/net/ns/patches/patch-am pkgsrc/net/ns/patches/patch-ao
 cvs rdiff -r1.1.1.1 -r0 pkgsrc/net/ns/patches/patch-ag

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed 
State-Changed-By: seb 
State-Changed-When: Mon Sep 1 18:23:08 UTC 2003 
State-Changed-Why:  
I have updated the package. 
Thanks for the submission. 
Would you care to provide an update for net/nam ? :) 

From: Stoned Elipot <seb@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:  
Subject: pr/22633 CVS commit: pkgsrc/doc
Date: Mon,  1 Sep 2003 18:23:08 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	seb
 Date:		Mon Sep  1 18:23:07 UTC 2003

 Modified Files:
 	pkgsrc/doc: CHANGES

 Log Message:
 Note update of net/ns to version 2.26. [Lots of changes, see installed
 $PREFIX/share/doc/html/ns/CHANGES.html].
 Provided in PR pkg/22633 by Min Sik Kim <minskim at bawi dot org>.


 To generate a diff of this commit:
 cvs rdiff -r1.3192 -r1.3193 pkgsrc/doc/CHANGES

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.