head 1.7; access; symbols pkgsrc-2015Q3:1.6.0.14 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.12 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.10 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.8 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.6 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.4 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.2 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.5.0.8 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.6 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.4 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.2 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.18 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.16 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.14 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.12 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.10 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.8 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.6 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.4 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.2 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.2.0.18 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.16 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.14 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.12 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.10 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.8 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.6 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.4 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.2 pkgsrc-2008Q1:1.1.1.1.0.2 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2015.12.12.20.20.04; author markd; state dead; branches; next 1.6; commitid 3K8vIPvtVMC2hHMy; 1.6 date 2014.02.24.12.30.59; author wiedi; state Exp; branches; next 1.5; commitid lzyRTflwN3yUPlqx; 1.5 date 2013.02.27.19.33.11; author markd; state Exp; branches; next 1.4; 1.4 date 2012.05.23.05.13.22; author dholland; state Exp; branches; next 1.3; 1.3 date 2010.02.05.20.10.42; author markd; state Exp; branches; next 1.2; 1.2 date 2008.06.03.13.53.49; author kefren; state Exp; branches; next 1.1; 1.1 date 2008.02.14.11.00.13; author kefren; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.02.14.11.00.13; author kefren; state Exp; branches; next ; desc @@ 1.7 log @Update dynamips to 0.2.15 10-Jul-2013 to 31-Jul-2013 (renamed to dynamips) ------------------------------------------------ Fixed issue 11 - nvram:private-config is destroyed when we write nvram:startup-config Fixed issue 13 - C3745 has an emulated NVRAM that is not continuous, so we can generate an invalid checksum when the config is written Fixed issue 14 - a file descriptor is leaked every time the config is extracted/read +-------------------. | Release: v0.2.9 | +-------------------' 05-Aug-2013 to 07-Sep-2013 -------------------------- Implemented enhancement 15 - extend hypervisor commands push_config, extract_config, and set_config Implemented enhancement 16 - reimplement nvram_export Fixed issue 17 - Dynamips hangs on startup if no (or unknown) parameters are given v0.2.8 and 0.2.9 +--------------------. | Release: v0.2.10 | +--------------------' 16-Sep-2013 to 10-Feb-2014 -------------------------- Fixed issue 20 - segmentation fault when accessing a device that failed to memory map it's file Implemented enhancement 21 - Renaming devices Closed issue 22 - Hypervisor documentation is out of date Implemented enhancement 36 - hypervisor command to clean the files of a vm Fixed issue 27 - Rename issues. +--------------------. | Release: v0.2.11 | +--------------------' 10-Feb-2014 to 27-Mar-2014 -------------------------- Fixed issue 29 - packet loss with multicast traffic Closed issue 31 - create hypervisor command to find a pattern in the router memory +--------------------. | Release: v0.2.12 | +--------------------' 04-Apr-2014 to 05-Jul-2014 -------------------------- Final fix for issue 9 - Reproducable crash Fixed issue 38 - Unknown file system detected Fixed issue 41 - "Frame is Too Long" error in Wireshark Merge pull request 45 from candlerb/candlerb/txperformance +--------------------. | Release: v0.2.13 | +--------------------' 10-Jul-2014 to 01-Sep-2014 -------------------------- Fixed issue 49 - IOS crashes after router restart Fixed issue 50 - vm send_con_msg Fixed issue 55 - 'unstable' installs 'stable' version on Mac OS X +--------------------+ | Release: v0.2.14 | +--------------------+ 06-Dec-2014 ----------- +--------------------+ | Release: v0.2.15 | +--------------------+ 01-06-2015 ---------- Fixed issue 60 - build on Mac OS X Fixed packet capture on Mac OS X (echoed packets) @ text @$NetBSD: patch-aa,v 1.6 2014/02/24 12:30:59 wiedi Exp $ --- Makefile.orig 2007-10-14 08:43:07.000000000 +0000 +++ Makefile @@@@ -3,7 +3,19 @@@@ # Replace x86 by amd64 for a build on x86_64. # Use "nojit" for architectures that are not x86 or x86_64. -DYNAMIPS_ARCH?=x86 +ifeq ($(shell uname -m), i386) + DYNAMIPS_ARCH?=x86 +else +ifeq ($(shell uname -m), i686) + DYNAMIPS_ARCH?=x86 +else +ifeq ($(shell uname -m), amd64) + DYNAMIPS_ARCH?=amd64 +else + DYNAMIPS_ARCH?=nojit +endif +endif +endif # Change this to 0 if your system doesn't support RFC 2553 extensions HAS_RFC2553?=1 @@@@ -54,11 +66,21 @@@@ ifeq ($(shell uname), FreeBSD) $(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64 LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS) else +ifeq ($(shell uname -s), NetBSD) + PTHREAD_LIBS?=-pthread + CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib +else +ifeq ($(shell uname -s), DragonFly) + PTHREAD_LIBS?=-pthread + CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib +else ifeq ($(shell uname), Linux) PTHREAD_LIBS?=-lpthread # PCAP_LIB=-lpcap CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS) - LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS) + LIBS=-L${LOCALBASE}/lib -L. -ldl -lelf $(PTHREAD_LIBS) ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib DESTDIR=/usr else ifeq ($(shell uname -s), Darwin) @@@@ -66,11 +88,11 @@@@ ifeq ($(shell uname -s), Darwin) LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread else ifeq ($(shell uname -s), SunOS) - CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \ - -I /opt/csw/include -DSUNOS - LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread -L/opt/csw/lib \ - -lsocket -lnsl -lresolv - PCAP_LIB=/opt/csw/lib/libpcap.a + PTHREAD_LIBS?=-pthread + CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} \ + -DINADDR_NONE=0xFFFFFFFF -DSUNOS + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} \ + ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lsocket -lnsl -lresolv else ifeq ($(shell uname -o), Cygwin) CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \ @@@@ -79,7 +101,9 @@@@ ifeq ($(shell uname -o), Cygwin) PCAP_LIB=-lpacket -lwpcap else CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 - LIBS=-L. -ldl /usr/lib/libelf.a -lpthread + LIBS=-L. -ldl -lelf -lpthread +endif +endif endif endif endif @ 1.6 log @Adjust Makefile for SunOS in similar style as used for NetBSD and Drangonfly @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2013/02/27 19:33:11 markd Exp $ @ 1.5 log @Fix linking on Linux. While here use ${COMPILER_RPATH_FLAG} on NetBSD and DragonFly. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2012/05/23 05:13:22 dholland Exp $ d49 17 @ 1.4 log @Don't hardwire /usr/lib/libelf.a, even for Linux. Should fix Linux build. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $ d33 1 a33 1 + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib d38 1 a38 1 + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib d45 1 a45 1 + LIBS=-L/usr/lib -L. -ldl -lelf $(PTHREAD_LIBS) @ 1.3 log @Update dynamips to 0.2.8-RC2 (from 2007) 0.2.8-RC2 * mainly a bug fix release 0.2.8-RC1 * hypervisor control protocol has been modified * Support of the Cisco 1700 platforms, with WIC-1T, WIC-2T and WIC-1ENET cards * Support of WIC-1T and WIC-2T for the 2600, 2691, 3725 and 3745. * Support of NM-NAM and NM-CIDS interfaces. * Plugin system * Bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2008/06/03 13:53:49 kefren Exp $ d26 1 a26 1 @@@@ -54,6 +66,16 @@@@ ifeq ($(shell uname), FreeBSD) d43 14 a56 1 @@@@ -85,6 +107,8 @@@@ endif a59 5 +endif +endif PROG=dynamips$(BIN_EXT) PACKAGE=$(PROG)-$(VERSION) @ 1.2 log @Fix pkg/38836: emulators/dynamips doesn't compile in DragonFly. Patch submitted by hasso@@estpak.ee @ text @d1 4 a4 3 $NetBSD$ --- Makefile.orig 2007-05-26 12:52:33 +0300 +++ Makefile 2008-06-02 18:40:41 +0300 d26 3 a28 14 @@@@ -40,8 +52,8 @@@@ CFLAGS+=-g -Wall -O3 -fomit-frame-pointe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -DHAS_RFC2553=$(HAS_RFC2553) -PCAP_LIB=/usr/local/lib/libpcap.a -#PCAP_LIB=-lpcap +#PCAP_LIB=/usr/local/lib/libpcap.a +PCAP_LIB=-lpcap ifeq ($(shell uname), FreeBSD) PTHREAD_LIBS?=-pthread @@@@ -49,6 +61,16 @@@@ ifeq ($(shell uname), FreeBSD) -D_FILE_OFFSET_BITS=64 LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) d31 3 a33 3 + PTHREAD_LIBS?=-pthread + CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib d36 3 a38 3 + PTHREAD_LIBS?=-pthread + CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} + LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib d43 1 a43 1 @@@@ -80,6 +102,8 @@@@ endif @ 1.1 log @Initial revision @ text @d2 2 a3 3 --- Makefile.orig 2007-05-26 11:52:33.000000000 +0200 +++ Makefile 2007-07-16 19:07:57.000000000 +0200 d25 1 a25 1 @@@@ -40,8 +52,8 @@@@ d36 1 a36 1 @@@@ -49,6 +61,11 @@@@ d45 5 d53 1 a53 1 @@@@ -80,6 +97,7 @@@@ d58 1 @ 1.1.1.1 log @Import dynamips, a Cisco 3600 and Cisco 7200 emulator @ text @@