dynagen is a configuration generator for the dynamips cisco emulator. this updates adds dynamic reconfiguration support from confDynagen (see http://7200emu.hacki.at/viewtopic.php?t=828), improves error reporting, and fixes bugs.
Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/dynagen/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 18 Jan 2008 09:12:12 -0000 1.1.1.1 +++ Makefile 22 Nov 2008 12:12:35 -0000 @@ -2,10 +2,10 @@ COMMENT= front-end for dynamips cisco emulator -DISTNAME= dynagen-0.10.1 +DISTNAME= dynagen-0.11.0 CATEGORIES= emulators -HOMEPAGE= http://dyna-gen.sourceforge.net/ +HOMEPAGE= http://dynagen.org/ MAINTAINER= Stuart Henderson <[EMAIL PROTECTED]> @@ -27,10 +27,10 @@ PKG_ARCH= * post-extract: @find ${WRKSRC} -type f -exec perl -pi -e 's:\x0d::' {} \; +pre-configure: + @${SUBST_CMD} ${WRKSRC}/dynagen + do-install: - @perl -pi -e 's:%%PREFIX%%:${TRUEPREFIX}:;' -e \ - 's:%%SYSCONFDIR%%:${SYSCONFDIR}:;' -e \ - 's:/usr/bin/env python:${MODPY_BIN}:' ${WRKSRC}/dynagen ${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${DESTDIR}${MODPY_SITEPKG}/dynagen ${INSTALL_SCRIPT} ${WRKSRC}/*.py* ${DESTDIR}${MODPY_SITEPKG}/dynagen Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/dynagen/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 18 Jan 2008 09:12:12 -0000 1.1.1.1 +++ distinfo 22 Nov 2008 12:12:35 -0000 @@ -1,5 +1,5 @@ -MD5 (dynagen-0.10.1.tar.gz) = TKJuS0uL7mGnf5LqzoQE0A== -RMD160 (dynagen-0.10.1.tar.gz) = JNomIWjGrQvjS9xG85bLbh5Gb2M= -SHA1 (dynagen-0.10.1.tar.gz) = bZY+1WxSwngE5VWl9HrTgH5n9lQ= -SHA256 (dynagen-0.10.1.tar.gz) = wfl7UptXAgmArF4W2fi4iyDfEoQhTDiR7Rxq9cVdhqY= -SIZE (dynagen-0.10.1.tar.gz) = 614999 +MD5 (dynagen-0.11.0.tar.gz) = P4izRJsXCW3KhNAH8LkbPw== +RMD160 (dynagen-0.11.0.tar.gz) = xohhyrmVmigzh3fdieu5xQZMRFk= +SHA1 (dynagen-0.11.0.tar.gz) = PjxuM7x4EwHHq+JFMqBrynLTKK8= +SHA256 (dynagen-0.11.0.tar.gz) = U1I/4T4VHAR2WWMVqnJNUMZSOrcrtk0P/I0+qK1Olig= +SIZE (dynagen-0.11.0.tar.gz) = 1418846 Index: patches/patch-dynagen =================================================================== RCS file: /cvs/ports/emulators/dynagen/patches/patch-dynagen,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-dynagen --- patches/patch-dynagen 18 Jan 2008 09:12:12 -0000 1.1.1.1 +++ patches/patch-dynagen 22 Nov 2008 12:12:35 -0000 @@ -1,21 +1,27 @@ $OpenBSD: patch-dynagen,v 1.1.1.1 2008/01/18 09:12:12 sthen Exp $ ---- dynagen.orig Tue Jan 15 21:42:17 2008 -+++ dynagen Tue Jan 15 21:47:05 2008 -@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos - """ +--- dynagen.orig Sat Nov 22 11:56:57 2008 ++++ dynagen Sat Nov 22 11:59:25 2008 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!${MODPY_BIN} + # -*- coding: utf-8 -*- - import sys, os, re, traceback + """ +@@ -25,8 +25,8 @@ import sys + import os + import re + import traceback -from console import Console -from dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_A1, PA_FE_TX, PA_4T, PA_8T, \ +from dynagen.console import Console +from dynagen.dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_A1, PA_FE_TX, PA_4T, PA_8T, \ - PA_4E, PA_8E, PA_POS_OC3, Router, C7200, C3600, Leopard_2FE, NM_1FE_TX, NM_1E, NM_4E, \ - NM_16ESW, NM_4T, DynamipsError, DynamipsWarning, Bridge, FRSW, ATMSW, ETHSW, \ - NIO_udp, NIO_linux_eth, NIO_gen_eth, NIO_tap, NIO_unix, NIO_vde, nosend, setdebug, \ -@@ -29,15 +29,15 @@ from dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_ - CISCO2600_MB_1E, CISCO2600_MB_2E, CISCO2600_MB_1FE, CISCO2600_MB_2FE, PA_2FE_TX, \ - PA_GE, PA_C7200_IO_2FE, PA_C7200_IO_GE_E, C1700, CISCO1710_MB_1FE_1E, C1700_MB_1ETH, \ - DEVICETUPLE, DynamipsVerError, DynamipsErrorHandled, WICS, NM_CIDS, NM_NAM + PA_4E, PA_8E, PA_POS_OC3, Router, C7200, C3600, Leopard_2FE, NM_1FE_TX, NM_1E, NM_4E, \ + NM_16ESW, NM_4T, DynamipsError, DynamipsWarning, Bridge, FRSW, ATMSW, ETHSW, ATMBR, \ + NIO_udp, NIO_linux_eth, NIO_gen_eth, NIO_tap, NIO_unix, NIO_vde, NIO_null, nosend, setdebug, \ +@@ -35,15 +35,15 @@ from dynamips_lib import Dynamips, PA_C7200_IO_FE, PA_ + PA_GE, PA_C7200_IO_2FE, PA_C7200_IO_GE_E, C1700, CISCO1710_MB_1FE_1E, C1700_MB_1ETH, \ + DEVICETUPLE, DynamipsVerError, DynamipsErrorHandled, NM_CIDS, NM_NAM, get_reverse_udp_nio + from pemu_lib import Pemu, FW, nosend_pemu -from validate import Validator -from configobj import ConfigObj, flatten_errors +from dynagen.validate import Validator @@ -23,12 +29,12 @@ $OpenBSD: patch-dynagen,v 1.1.1.1 2008/0 from optparse import OptionParser # Constants - VERSION = '0.10.1.090807' --CONFIGSPECPATH = [ "/usr/share/dynagen", "/usr/local/share" ] -+CONFIGSPECPATH = [ "%%PREFIX%%/share/dynagen" ] + VERSION = '0.11.0' +-CONFIGSPECPATH = ['/usr/share/dynagen', '/usr/local/share'] ++CONFIGSPECPATH = ['${LOCALBASE}/share/dynagen'] CONFIGSPEC = 'configspec' --INIPATH = [ "/etc", "/usr/local/etc" ] -+INIPATH = [ "%%SYSCONFDIR%%" ] +-INIPATH = ['/etc', '/usr/local/etc'] ++INIPATH = ['${SYSCONFDIR}'] INIFILE = 'dynagen.ini' - MODELTUPLE = (C1700, C2600, C2691, C3725, C3745, C3600, C7200) # A tuple of known model objects - ADAPTER_TRANSFORM = { + MODELTUPLE = ( # A tuple of known model objects + C1700, Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/dynagen/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 18 Jan 2008 09:12:12 -0000 1.1.1.1 +++ pkg/PLIST 22 Nov 2008 12:12:35 -0000 @@ -2,17 +2,24 @@ bin/dynagen lib/python${MODPY_VERSION}/site-packages/dynagen/ lib/python${MODPY_VERSION}/site-packages/dynagen/__init__.py +lib/python${MODPY_VERSION}/site-packages/dynagen/confConsole.py lib/python${MODPY_VERSION}/site-packages/dynagen/configobj.py lib/python${MODPY_VERSION}/site-packages/dynagen/console.py lib/python${MODPY_VERSION}/site-packages/dynagen/dynamips_lib.py +lib/python${MODPY_VERSION}/site-packages/dynagen/pemu_lib.py +lib/python${MODPY_VERSION}/site-packages/dynagen/pemubin.py +lib/python${MODPY_VERSION}/site-packages/dynagen/pemuwrapper.py lib/python${MODPY_VERSION}/site-packages/dynagen/validate.py share/doc/dynagen/ share/doc/dynagen/tutorial.htm share/doc/dynagen/tutorial_files/ share/doc/dynagen/tutorial_files/image001.jpg share/doc/dynagen/tutorial_files/image002.gif +share/doc/dynagen/tutorial_files/image002.jpg share/doc/dynagen/tutorial_files/image003.gif +share/doc/dynagen/tutorial_files/image003.jpg share/doc/dynagen/tutorial_files/image004.gif +share/doc/dynagen/tutorial_files/image004.jpg share/doc/dynagen/tutorial_files/image005.jpg share/doc/dynagen/tutorial_files/image006.jpg share/doc/dynagen/tutorial_files/image007.jpg @@ -20,9 +27,13 @@ share/doc/dynagen/tutorial_files/image00 share/doc/dynagen/tutorial_files/image009.jpg share/doc/dynagen/tutorial_files/image010.jpg share/doc/dynagen/tutorial_files/image011.gif +share/doc/dynagen/tutorial_files/image011.jpg share/doc/dynagen/tutorial_files/image012.gif +share/doc/dynagen/tutorial_files/image012.jpg share/doc/dynagen/tutorial_files/image013.gif +share/doc/dynagen/tutorial_files/image013.jpg share/doc/dynagen/tutorial_files/image014.gif +share/doc/dynagen/tutorial_files/image014.jpg share/doc/dynagen/tutorial_files/image015.gif share/doc/dynagen/tutorial_files/image016.gif share/doc/dynagen/tutorial_files/image017.gif @@ -44,6 +55,8 @@ share/examples/dynagen/frame_relay/ share/examples/dynagen/frame_relay/frame_relay1.net share/examples/dynagen/multiserver/ share/examples/dynagen/multiserver/multiserver.net +share/examples/dynagen/pix/ +share/examples/dynagen/pix/pixtest.net share/examples/dynagen/simple1/ share/examples/dynagen/simple1/simple1.net share/examples/dynagen/simple2/
