From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 14 10:00:07 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 278E416A417 for ; Fri, 14 Sep 2007 10:00:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0113813C4A3 for ; Fri, 14 Sep 2007 10:00:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l8EA06eP074936 for ; Fri, 14 Sep 2007 10:00:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l8EA06Hq074935; Fri, 14 Sep 2007 10:00:06 GMT (envelope-from gnats) Resent-Date: Fri, 14 Sep 2007 10:00:06 GMT Resent-Message-Id: <200709141000.l8EA06Hq074935@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pavel I Volkov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA34816A50F for ; Fri, 14 Sep 2007 09:53:26 +0000 (UTC) (envelope-from pol@opk.ru) Received: from fire.iib.ru (fire.iib.ru [195.151.95.16]) by mx1.freebsd.org (Postfix) with ESMTP id AA76213C481 for ; Fri, 14 Sep 2007 09:53:25 +0000 (UTC) (envelope-from pol@opk.ru) Received: from saturn.iib.ru (saturn.iib.ru [192.168.49.101]) by fire.iib.ru (8.9/8.9) with ESMTP id l8E9XGGn072131 for ; Fri, 14 Sep 2007 13:33:16 +0400 (MSD) (envelope-from pol@opk.ru) Received: from 192.168.0.100 by 192.168.0.101 with smtp-gw id normxLairt; Fri, 14 Sep 2007 09:36:35 GMT Received: from pol.iib.ru (pol.iib.ru [192.168.0.45]) by mars.iib.ru (8.13.3/8.13.3) with ESMTP id l8E9XAqk047442 for ; Fri, 14 Sep 2007 13:33:11 +0400 (MSD) (envelope-from pol@opk.ru) Received: from pol.iib.ru (localhost [127.0.0.1]) by pol.iib.ru (8.14.1/8.14.1) with ESMTP id l8E9XAYh061923 for ; Fri, 14 Sep 2007 13:33:10 +0400 (MSD) (envelope-from pol@pol.iib.ru) Received: (from pol@localhost) by pol.iib.ru (8.14.1/8.14.1/Submit) id l8E9S5WI061139; Fri, 14 Sep 2007 13:28:05 +0400 (MSD) (envelope-from pol) Message-Id: <200709140928.l8E9S5WI061139@pol.iib.ru> Date: Fri, 14 Sep 2007 13:28:05 +0400 (MSD) From: Pavel I Volkov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/116344: [MAINTAINER] emulators/dynamips-devel: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2007 10:00:07 -0000 >Number: 116344 >Category: ports >Synopsis: [MAINTAINER] emulators/dynamips-devel: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 14 10:00:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Pavel I Volkov >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD pol.iib.ru 6.2-STABLE FreeBSD 6.2-STABLE #4: Fri May 25 12:42:35 MSD 2007 >Description: [DESCRIBE CHANGES] Removed file(s): - files/patch-README.hypervisor - files/patch-hypervisor.c - files/patch-hypervisor.h - files/patch-net.c - files/patch-net.h - files/patch-utils.c - files/patch-utils.h Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- dynamips-devel-0.2.8.r1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/Makefile /usr/ports/emulators/dynamips-devel/Makefile --- /usr/ports/emulators/dynamips-devel.orig/Makefile Sat Jun 2 05:12:30 2007 +++ /usr/ports/emulators/dynamips-devel/Makefile Fri Sep 14 13:09:28 2007 @@ -6,7 +6,7 @@ # PORTNAME= dynamips -DISTVERSION= 0.2.7-RC3 +DISTVERSION= 0.2.8-RC1 CATEGORIES= emulators MASTER_SITES= http://www.ipflow.utc.fr/dynamips/ PKGNAMESUFFIX= -devel @@ -15,6 +15,8 @@ COMMENT= Cisco 3600/7200 Simulator LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf + +CONFLICTS= dynamips-[0-9]* USE_GMAKE= yes USE_GCC= 3.2+ diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/distinfo /usr/ports/emulators/dynamips-devel/distinfo --- /usr/ports/emulators/dynamips-devel.orig/distinfo Sat Jun 2 05:12:30 2007 +++ /usr/ports/emulators/dynamips-devel/distinfo Mon Sep 10 10:54:50 2007 @@ -1,3 +1,3 @@ -MD5 (dynamips-0.2.7-RC3.tar.gz) = 9d1d5ab929fda30ea3b4b8d9284edc70 -SHA256 (dynamips-0.2.7-RC3.tar.gz) = cd1d23fa0122bcec70a4028ce60ae100fbe3d7a599f1bbb1f30f34faa35546c1 -SIZE (dynamips-0.2.7-RC3.tar.gz) = 522645 +MD5 (dynamips-0.2.8-RC1.tar.gz) = 39d08f2d20cdd78ef05c50ae86c4b522 +SHA256 (dynamips-0.2.8-RC1.tar.gz) = 266cd3fe12f643f8c6aaf59ec8b99b20d6fb53ed8032c1984477065ca97ee994 +SIZE (dynamips-0.2.8-RC1.tar.gz) = 569599 diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-Makefile /usr/ports/emulators/dynamips-devel/files/patch-Makefile --- /usr/ports/emulators/dynamips-devel.orig/files/patch-Makefile Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-Makefile Thu Sep 13 19:55:51 2007 @@ -1,34 +1,10 @@ ---- Makefile.orig Thu Feb 8 15:23:36 2007 -+++ Makefile Thu Feb 8 15:34:39 2007 -@@ -12,6 +12,9 @@ - # (WinPcap is used for Cygwin) - HAS_PCAP?=1 - -+# Change this to 1 if your system has posix_memalign -+HAS_POSIX_MEMALIGN?=0 -+ - # Current dynamips release - VERSION_TRAIN=0.2.6 - VERSION_SUB=-RC5 -@@ -34,16 +37,17 @@ - -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ - -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -- -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) - --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 -- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \ -+ LOCALBASE?=/usr/local -+ CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) \ - -D_FILE_OFFSET_BITS=64 -- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS) +--- Makefile.orig Thu Sep 13 19:55:14 2007 ++++ Makefile Thu Sep 13 19:55:30 2007 +@@ -52,7 +52,7 @@ + LOCALBASE?=/usr/local + CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf \ + $(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64 +- LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS) + LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS) else ifeq ($(shell uname), Linux) diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-README /usr/ports/emulators/dynamips-devel/files/patch-README --- /usr/ports/emulators/dynamips-devel.orig/files/patch-README Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-README Thu Sep 13 19:48:11 2007 @@ -1,6 +1,6 @@ ---- README.orig Fri Apr 6 20:53:59 2007 -+++ README Fri Apr 6 20:57:02 2007 -@@ -50,7 +50,7 @@ +--- README.orig Wed Sep 12 14:35:13 2007 ++++ README Thu Sep 13 19:47:58 2007 +@@ -52,11 +52,12 @@ -R : Load an alternate ROM (default: embedded) -k : Set the clock divisor (default: 4) @@ -8,4 +8,9 @@ + -T [ip_address:] : Console is on TCP -U : Console in on serial interface (default is on the terminal) + + -A : AUX is on TCP ++ (AUX binding IP == Console binding IP) + -B : AUX is on serial interface + (default is no AUX port) diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-README.hypervisor /usr/ports/emulators/dynamips-devel/files/patch-README.hypervisor --- /usr/ports/emulators/dynamips-devel.orig/files/patch-README.hypervisor Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-README.hypervisor Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- README.hypervisor.orig Wed Mar 21 10:00:28 2007 -+++ README.hypervisor Wed Mar 21 10:01:22 2007 -@@ -8,7 +8,7 @@ - Running dynamips in hypervisor mode - =================================== - --dynamips -H -+dynamips -H [ip_address:] - - Managing the hypervisor - ======================= diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-dev_vtty.c /usr/ports/emulators/dynamips-devel/files/patch-dev_vtty.c --- /usr/ports/emulators/dynamips-devel.orig/files/patch-dev_vtty.c Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-dev_vtty.c Fri Sep 14 10:25:10 2007 @@ -1,5 +1,5 @@ ---- dev_vtty.c.orig Fri Apr 6 16:44:07 2007 -+++ dev_vtty.c Fri Apr 6 19:43:37 2007 +--- dev_vtty.c.orig Fri Sep 7 12:03:11 2007 ++++ dev_vtty.c Fri Sep 14 10:24:02 2007 @@ -24,6 +24,8 @@ #include #include @@ -13,21 +13,18 @@ #include "dev_c2600.h" #include "dev_vtty.h" -+extern char hypervisor_ip_address[]; ++extern char *hypervisor_ip_address; + /* VTTY list */ static pthread_mutex_t vtty_list_mutex = PTHREAD_MUTEX_INITIALIZER; static vtty_t *vtty_list = NULL; -@@ -132,7 +136,11 @@ +@@ -132,7 +136,8 @@ memset(&serv,0,sizeof(serv)); serv.sin_family = AF_INET; - serv.sin_addr.s_addr = htonl(INADDR_ANY); -+ if (strlen(hypervisor_ip_address) != 0 && -+ inet_addr(hypervisor_ip_address) != INADDR_NONE) -+ serv.sin_addr.s_addr = inet_addr(hypervisor_ip_address); -+ else -+ serv.sin_addr.s_addr = htonl(INADDR_ANY); ++ if (hypervisor_ip_address && strlen(hypervisor_ip_address)) ++ serv.sin_addr.s_addr = inet_addr(hypervisor_ip_address); serv.sin_port = htons(vtty->tcp_port); if (bind(vtty->accept_fd,(struct sockaddr *)&serv,sizeof(serv)) < 0) { diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-dynamips.1 /usr/ports/emulators/dynamips-devel/files/patch-dynamips.1 --- /usr/ports/emulators/dynamips-devel.orig/files/patch-dynamips.1 Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-dynamips.1 Thu Sep 13 19:46:14 2007 @@ -1,11 +1,11 @@ ---- dynamips.1.orig Wed Feb 14 20:37:58 2007 -+++ dynamips.1 Fri Apr 6 20:59:41 2007 +--- dynamips.1.orig Thu Sep 13 18:45:02 2007 ++++ dynamips.1 Thu Sep 13 19:45:49 2007 @@ -44,7 +44,7 @@ .SH OPTIONS A summary of options is included below. .TP -.B -H -+.B -H [ip_address:] ++.B -H [:] Enable hypervisor mode. .br The hypervisor mode of dynamips allows you to run simultaneously @@ -14,7 +14,15 @@ .TP -.B -T -+.B -T [ip_address:] ++.B -T [:] Console is on TCP .TP .B -U +@@ -141,6 +141,7 @@ + .TP + .B -A + AUX is on TCP ++AUX binding IP == Console binding IP + .TP + .B -B + AUX is on serial interface (default is no AUX port) diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-dynamips.c /usr/ports/emulators/dynamips-devel/files/patch-dynamips.c --- /usr/ports/emulators/dynamips-devel.orig/files/patch-dynamips.c Thu May 3 11:09:41 2007 +++ /usr/ports/emulators/dynamips-devel/files/patch-dynamips.c Fri Sep 14 10:21:14 2007 @@ -1,87 +1,56 @@ ---- dynamips.c.orig Wed Feb 14 20:37:58 2007 -+++ dynamips.c Fri Apr 6 21:11:38 2007 -@@ -61,6 +61,7 @@ - /* Hypervisor */ - int hypervisor_mode = 0; - int hypervisor_tcp_port = 0; -+char hypervisor_ip_address[263]="\000"; /* 256(MAXHOSTNAMELEN)+1(:)+5(port)+NULL */ - - /* Log file */ - char *log_file_name = NULL; -@@ -227,7 +228,7 @@ - printf("Usage: %s [options] \n\n",argv[0]); - - printf("Available options:\n" -- " -H : Run in hypervisor mode\n\n" -+ " -H [ip_address:] : Run in hypervisor mode\n\n" - " -P : Platform to emulate (7200, 3600, " - "2691, 3725 or 3745) " - "(default: 7200)\n\n" -@@ -254,7 +255,7 @@ +--- dynamips.c.orig Fri Sep 7 12:03:11 2007 ++++ dynamips.c Fri Sep 14 10:18:10 2007 +@@ -193,7 +193,7 @@ " -R : Load an alternate ROM (default: embedded)\n" " -k : Set the clock divisor (default: %d)\n" "\n" - " -T : Console is on TCP \n" -+ " -T [ip_address:] : Console is on TCP \n" ++ " -T [:] : Console is on TCP \n" " -U : Console in on serial interface \n" " (default is on the terminal)\n" "\n" -@@ -780,6 +781,7 @@ +@@ -374,6 +374,8 @@ int instance_id; - int res,option; + int option; char *str; + char *index; ++ size_t len; /* Get the instance ID */ instance_id = 0; -@@ -944,7 +946,15 @@ +@@ -541,7 +543,25 @@ /* TCP server for Console Port */ case 'T': vm->vtty_con_type = VTTY_TYPE_TCP; - vm->vtty_con_tcp_port = atoi(optarg); -+ strncpy(hypervisor_ip_address,optarg,sizeof(hypervisor_ip_address)); -+ index=strrchr(hypervisor_ip_address,':'); -+ if (index != NULL) { -+ *index++='\000'; -+ vm->vtty_con_tcp_port = atoi(index); -+ } else { -+ vm->vtty_con_tcp_port = atoi(hypervisor_ip_address); -+ hypervisor_ip_address[0]='\000'; -+ } ++ ++ index = strrchr(optarg,':'); ++ ++ if (!index) { ++ vm->vtty_con_tcp_port = atoi(optarg); ++ } else { ++ len = index - optarg; ++ hypervisor_ip_address = malloc(len + 1); ++ ++ if (!hypervisor_ip_address) { ++ fprintf(stderr,"Unable to set console IP address!\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ memcpy(hypervisor_ip_address,optarg,len); ++ hypervisor_ip_address[len] = '\0'; ++ ++ vm->vtty_con_tcp_port = atoi(++index); ++ } break; /* Serial interface for Console port */ -@@ -1061,6 +1071,7 @@ - static int run_hypervisor(int argc,char *argv[]) - { - char *options_list = "H:l:hN:"; -+ char *index; - int i,option; +@@ -687,6 +707,8 @@ - for(i=1;i - #include - #include -+#include -+#include - - /* True/False definitions */ - #ifndef FALSE -@@ -35,6 +37,8 @@ - #elif defined(__i386) || defined(__i386__) || defined(i386) - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN - #elif defined(__x86_64__) -+#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN -+#elif defined(__ia64__) - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN - #endif - --- dynamips-devel-0.2.8.r1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: