commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2020-01-06 15:21:26
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new.6675 (New)
Package is "dynamips"
Mon Jan 6 15:21:26 2020 rev:24 rq:760996 version:0.2.21
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2018-02-20
17:55:16.426035588 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new.6675/dynamips.changes
2020-01-06 15:21:29.216459106 +0100
@@ -1,0 +2,13 @@
+Wed Dec 25 10:32:09 UTC 2019 - Martin Hauke
+
+- Update to version 0.2.21
+ * Fix SEGV during snprintf and localtime_r.
+- Update to version 0.2.20
+ * New fix for segmentation fault when using localtime()
+- Update to version 0.2.19
+ * Fix segmentation fault when using localtime() (64-bit only).
+- Update to version 0.2.18
+ * Allow to reuse socket in udp_connect.
+ * Fix segfault when exporting startup-config.
+
+---
Old:
dynamips-0.2.17.tar.gz
New:
dynamips-0.2.21.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.oimh9o/_old 2020-01-06 15:21:29.984459504 +0100
+++ /var/tmp/diff_new_pack.oimh9o/_new 2020-01-06 15:21:29.988459505 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: dynamips
-Version:0.2.17
+Version:0.2.21
Release:0
Summary:Cisco router Emulator
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Emulators/Other
-Url:https://www.gns3.net
+URL:https://www.gns3.net
Source:
https://github.com/GNS3/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: define-s390x-arch.patch
BuildRequires: cmake
@@ -62,9 +62,9 @@
%files
%{_bindir}/%{name}
%{_bindir}/nvram_export
-%{_mandir}/man1/%{name}.1%{ext_man}
-%{_mandir}/man1/nvram_export.1%{ext_man}
-%{_mandir}/man7/hypervisor_mode.7%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
+%{_mandir}/man1/nvram_export.1%{?ext_man}
+%{_mandir}/man7/hypervisor_mode.7%{?ext_man}
%{_datadir}/doc/%{name}
%changelog
++ dynamips-0.2.17.tar.gz -> dynamips-0.2.21.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.17/.circleci/config.yml
new/dynamips-0.2.21/.circleci/config.yml
--- old/dynamips-0.2.17/.circleci/config.yml1970-01-01 01:00:00.0
+0100
+++ new/dynamips-0.2.21/.circleci/config.yml2019-07-12 11:41:16.0
+0200
@@ -0,0 +1,57 @@
+# iOS CircleCI 2.0 configuration file
+version: 2
+jobs:
+ build:
+macos:
+ xcode: "9.4.0"
+
+steps:
+ - checkout
+
+ - run:
+ name: Set timezone and check current datetime
+ command: |
+sudo systemsetup -settimezone Europe/Warsaw
+echo "Today is $(date +"%Y-%m-%d %T")"
+
+ - run:
+ name: Install libelf
+ command: |
+brew install libelf
+
+ - run:
+ name: Install cmake
+ command: |
+brew install cmake
+
+ - run:
+ name: Build dynamips
+ command: |
+mkdir build
+cd build
+cmake ..
+make
+cd ..
+
+ - run:
+ name: Gather artifacts
+ command: |
+mkdir artifacts
+mv build/unstable/dynamips artifacts/dynamips-unstable-osx
+
+ - store_artifacts:
+ path: artifacts
+ destination: artifacts
+
+ - run:
+ name: Upload nightly builds to SF
+ command: |
+if [ -n "${RUN_NIGHTLY_BUILD}" ]; then
+ ssh-keyscan -H frs.sourceforge.net >> ~/.ssh/known_hosts
+ echo "mkdir \"/home/frs/project/gns-3/Nightly Builds/$(date
+"%Y-%m-%d")/\"" | sftp gns3bu...@frs.sourceforge.net
+ echo -ne "
+cd \"/home/frs/project/gns-3/Nightly Builds/$(date
+"%Y-%m-%d")/\"
+put \"artifacts/dynamips-unstable-osx\"
+ " | sftp gns3bu...@frs.sourceforge.net
+fi
+
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2018-02-20 17:55:06
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is "dynamips"
Tue Feb 20 17:55:06 2018 rev:23 rq:578018 version:0.2.17
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2017-03-03
17:44:27.341802376 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2018-02-20
17:55:16.426035588 +0100
@@ -1,0 +2,9 @@
+Sun Feb 18 08:54:40 UTC 2018 - avin...@opensuse.org
+
+- new upstream version 0.2.17
+ * Set nonblocking I/O for UDP sockets
+ * NM-16ESW: process packets even if MAC address table is full
+- remove dos2unix, no longer needed
+- use cmake macros to build
+
+---
Old:
dynamips-0.2.16.tar.gz
New:
dynamips-0.2.17.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.pcc5il/_old 2018-02-20 17:55:17.901982444 +0100
+++ /var/tmp/diff_new_pack.pcc5il/_new 2018-02-20 17:55:17.905982300 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,23 @@
Name: dynamips
-Version:0.2.16
+Version:0.2.17
Release:0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Summary:Cisco router Emulator
+License:GPL-2.0+
+Group: System/Emulators/Other
+Url:https://www.gns3.net
+Source:
https://github.com/GNS3/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch1: define-s390x-arch.patch
BuildRequires: cmake
-BuildRequires: dos2unix
BuildRequires: libelf-devel
BuildRequires: libpcap-devel
-Url:http://www.gns3.net
%ifarch x86_64
%if %{undefined fedora}
BuildRequires: glibc-32bit
BuildRequires: glibc-devel-32bit
%endif
%endif
-Source: %{name}-%{version}.tar.gz
-Patch1: define-s390x-arch.patch
-
-Summary:Cisco router Emulator
-License:GPL-2.0+
-Group: System/Emulators/Other
%description
Cisco Router Emulator supported by GNS3 Community
@@ -52,28 +49,22 @@
%patch1 -p1
%build
-mkdir build
-cd build
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
+%cmake \
%ifarch x86_64
-cmake -DYNAMIPS_ARCH=amd64 -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
-%else
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
+ -DYNAMIPS_ARCH=amd64 \
%endif
-%__make %{?_smp_mflags}
+..
+%make_jobs
%install
-cd build
-make DESTDIR=%{buildroot} install
-cd ..
-dos2unix COPYING README.md README.hypervisor TODO
+%cmake_install
%files
-%defattr(-,root,root)
%{_bindir}/%{name}
%{_bindir}/nvram_export
-%{_mandir}/man*/*
+%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/nvram_export.1%{ext_man}
+%{_mandir}/man7/hypervisor_mode.7%{ext_man}
%{_datadir}/doc/%{name}
%changelog
++ dynamips-0.2.16.tar.gz -> dynamips-0.2.17.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.16/CMakeLists.txt
new/dynamips-0.2.17/CMakeLists.txt
--- old/dynamips-0.2.16/CMakeLists.txt 2016-03-16 10:05:47.0 +0100
+++ new/dynamips-0.2.17/CMakeLists.txt 2017-07-24 13:37:51.0 +0200
@@ -25,14 +25,14 @@
message ( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" )
project ( dynamips C )
-set ( DYNAMIPS_VERSION_TRAIN 0.2.16 )
+set ( DYNAMIPS_VERSION_TRAIN 0.2.17 )
set ( DYNAMIPS_VERSION_SUB )
include ( utils )
include ( dependencies )
include ( configure )
-if(APPLE)
+if( APPLE OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") )
include_directories(include /usr/local/include/)
include_directories(include /opt/local/include/)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.16/ChangeLog
new/dynamips-0.2.17/ChangeLog
--- old/dynamips-0.2.16/ChangeLog 2016-03-16 10:05:47.0 +0100
+++ new/dynamips-0.2.17/ChangeLog 2017-07-24 13:37:51.0 +0200
@@ -2970,3 +2970,16 @@
* Add instructions to build on Windows.
* Remove libuuid dependency and NIO Multicast implementation that depends on
it. NIO Multicast is never used and maybe not even functional. This will
simplify the compilation requirements, especially on Windows with Cygwin.
* EthernetSwitch: Allow to choose ethertype for QinQ outer
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2017-03-03 17:44:26
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is "dynamips"
Fri Mar 3 17:44:26 2017 rev:22 rq:460920 version:0.2.16
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2016-03-26
17:25:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2017-03-03
17:44:27.341802376 +0100
@@ -1,0 +2,5 @@
+Tue Feb 28 15:50:00 UTC 2017 - mp...@suse.com
+
+- Added define-s390x-arch.patch to enable building on s390x.
+
+---
New:
define-s390x-arch.patch
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.0Odgu5/_old 2017-03-03 17:44:27.881726074 +0100
+++ /var/tmp/diff_new_pack.0Odgu5/_new 2017-03-03 17:44:27.881726074 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,8 @@
%endif
%endif
Source: %{name}-%{version}.tar.gz
+Patch1: define-s390x-arch.patch
+
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -47,6 +49,7 @@
%prep
%setup -q
+%patch1 -p1
%build
mkdir build
++ define-s390x-arch.patch ++
--- dynamips-0.2.16/common/dynamips_common.h2016-03-16 05:05:47.0
-0400
+++ dynamips-0.2.16/common/dynamips_common.h2017-02-28 10:47:30.0
-0500
@@ -65,6 +65,8 @@
#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
#elif defined(__arm__) || defined (__aarch64__)
#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
+#elif defined(__s390x__)
+#define ARCH_BYTE_ORDER ARCH_BIG_ENDIAN
#endif
#ifndef ARCH_BYTE_ORDER
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2016-03-26 15:29:45
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is "dynamips"
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2015-06-05
08:46:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2016-03-26
17:25:49.0 +0100
@@ -1,0 +2,8 @@
+Fri Mar 25 21:51:55 UTC 2016 - and...@opensuse.org
+
+- new upstream version 0.2.16
+ * Remove libuuid dependency and NIO Multicast implementation that depends on
it.
+NIO Multicast is never used and maybe not even functional.
+ * EthernetSwitch: Allow to choose ethertype for QinQ outer tag
+
+---
Old:
dynamips-0.2.15.tar.gz
New:
dynamips-0.2.16.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.2OZxae/_old 2016-03-26 17:25:49.0 +0100
+++ /var/tmp/diff_new_pack.2OZxae/_new 2016-03-26 17:25:49.0 +0100
@@ -17,14 +17,13 @@
Name: dynamips
-Version:0.2.15
+Version:0.2.16
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: libelf-devel
BuildRequires: libpcap-devel
-BuildRequires: libuuid-devel
Url:http://www.gns3.net
%ifarch x86_64
%if %{undefined fedora}
@@ -65,11 +64,10 @@
cd build
make DESTDIR=%{buildroot} install
cd ..
-dos2unix COPYING README README.hypervisor TODO
+dos2unix COPYING README.md README.hypervisor TODO
%files
%defattr(-,root,root)
-#%doc COPYING README README.hypervisor TODO
%{_bindir}/%{name}
%{_bindir}/nvram_export
%{_mandir}/man*/*
++ dynamips-0.2.15.tar.gz -> dynamips-0.2.16.tar.gz ++
2175 lines of diff (skipped)
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2015-06-05 08:46:13
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-12-01
14:01:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2015-06-05
08:46:15.0 +0200
@@ -1,0 +2,7 @@
+Thu Jun 4 16:39:22 UTC 2015 - and...@opensuse.org
+
+- New upstream version 0.2.15
+ * minor fixes for OSX
+- removed dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
+
+---
Old:
dynamips-0.2.14.tar.gz
dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
New:
dynamips-0.2.15.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.jEiLYJ/_old 2015-06-05 08:46:16.0 +0200
+++ /var/tmp/diff_new_pack.jEiLYJ/_new 2015-06-05 08:46:16.0 +0200
@@ -17,7 +17,7 @@
Name: dynamips
-Version:0.2.14
+Version:0.2.15
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
@@ -33,7 +33,6 @@
%endif
%endif
Source: %{name}-%{version}.tar.gz
-Patch0: dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -49,7 +48,6 @@
%prep
%setup -q
-%patch0 -p1
%build
mkdir build
++ dynamips-0.2.14.tar.gz - dynamips-0.2.15.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.14/.gitignore
new/dynamips-0.2.15/.gitignore
--- old/dynamips-0.2.14/.gitignore 2014-09-23 20:59:26.0 +0200
+++ new/dynamips-0.2.15/.gitignore 2015-06-02 15:01:25.0 +0200
@@ -3,3 +3,13 @@
.project
/build/*
/CMakeLists.txt.*
+unstable/stable
+unstable/man
+unstable/c7200_i0_log.txt
+unstable/CMakeCache.txt
+unstable/CMakeFiles
+unstable/Makefile
+unstable/cmake_install.cmake
+unstable/cmake_uninstall.cmake
+unstable/common
+unstable/unstable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.14/CMakeLists.txt
new/dynamips-0.2.15/CMakeLists.txt
--- old/dynamips-0.2.14/CMakeLists.txt 2014-09-23 20:59:26.0 +0200
+++ new/dynamips-0.2.15/CMakeLists.txt 2015-06-02 15:01:25.0 +0200
@@ -25,13 +25,18 @@
message ( STATUS CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} )
project ( dynamips C )
-set ( DYNAMIPS_VERSION_TRAIN 0.2.14 )
+set ( DYNAMIPS_VERSION_TRAIN 0.2.15 )
set ( DYNAMIPS_VERSION_SUB )
include ( utils )
include ( dependencies )
include ( configure )
+if(APPLE)
+include_directories(include /usr/local/include/)
+include_directories(include /opt/local/include/)
+endif()
+
add_subdirectory ( man )
add_subdirectory ( common )
add_subdirectory ( stable )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.14/ChangeLog
new/dynamips-0.2.15/ChangeLog
--- old/dynamips-0.2.14/ChangeLog 2014-09-23 20:59:26.0 +0200
+++ new/dynamips-0.2.15/ChangeLog 2015-06-02 15:01:25.0 +0200
@@ -2944,3 +2944,18 @@
| Release: v0.2.14 |
++
+06-Dec-2014
+---
+- Rename _unused to _Unused to fix a clash when building on PPC/PPC64EL
+ * See thread starting at:
+ https://lists.debian.org/debian-mentors/2014/10/msg00272.html
+
+++
+| Release: v0.2.15 |
+++
+
+01-06-2015
+--
+
+Fixed issue #60 - build on Mac OS X
+Fixed packet capture on Mac OS X (echoed packets)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.14/README.md
new/dynamips-0.2.15/README.md
--- old/dynamips-0.2.14/README.md 2014-09-23 20:59:26.0 +0200
+++ new/dynamips-0.2.15/README.md 2015-06-02 15:01:25.0 +0200
@@ -43,6 +43,17 @@
- uuid-dev
- libpcap0.8-dev
+On Redhat based systems (CentOS, Fedora etc) the following build dependencies
are
+required and can be installed using yum:
+- elfutils-libelf-devel
+- libuuid-devel
+- libpcap-devel
+
+MacPort Homebrew:
+- libelf
+- cmake
+
+
Similar packages should be available for most distributions, consult your
distributions package list to find them.
@@ -59,6 +70,11 @@
cmake ..
```
+On OSX Yosemite you need to force usage of GCC 4.9:
+```
+cmake .. -DCMAKE_C_COMPILER=/usr/local/bin/gcc-4.9
+```
+
This will generate the Makefiles required for compiling Dynamips. To just
build
Dynamips
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-12-01 14:01:27
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-09-26
11:21:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-12-01
14:01:49.0 +0100
@@ -1,0 +2,6 @@
+Sun Nov 30 13:35:30 UTC 2014 - and...@opensuse.org
+
+- added dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
+ to fix upstream bug 59 https://github.com/GNS3/dynamips/issues/59
+
+---
New:
dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.ZtA5JU/_old 2014-12-01 14:01:50.0 +0100
+++ /var/tmp/diff_new_pack.ZtA5JU/_new 2014-12-01 14:01:50.0 +0100
@@ -20,11 +20,11 @@
Version:0.2.14
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: libelf-devel
BuildRequires: libpcap-devel
BuildRequires: libuuid-devel
-BuildRequires: cmake
Url:http://www.gns3.net
%ifarch x86_64
%if %{undefined fedora}
@@ -33,6 +33,7 @@
%endif
%endif
Source: %{name}-%{version}.tar.gz
+Patch0: dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -48,6 +49,7 @@
%prep
%setup -q
+%patch0 -p1
%build
mkdir build
++ dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch ++
diff -uNr 0ld-dynamips-0.2.14/common/eth_switch.c
dynamips-0.2.14/common/eth_switch.c
--- 0ld-dynamips-0.2.14/common/eth_switch.c 2014-11-30 15:11:02.417554374
+0100
+++ dynamips-0.2.14/common/eth_switch.c 2014-11-30 15:11:22.916554628 +0100
@@ -359,9 +359,10 @@
static int ethsw_recv_pkt(netio_desc_t *nio,u_char *pkt,ssize_t pkt_len,
ethsw_table_t *t)
{
- ETHSW_LOCK(t);
- ethsw_receive(t,nio,pkt,pkt_len);
- ETHSW_UNLOCK(t);
+ if (ETHSW_TRYLOCK(t) == 0) {
+ ethsw_receive(t,nio,pkt,pkt_len);
+ ETHSW_UNLOCK(t);
+ }
return(0);
}
diff -uNr 0ld-dynamips-0.2.14/common/eth_switch.h
dynamips-0.2.14/common/eth_switch.h
--- 0ld-dynamips-0.2.14/common/eth_switch.h 2014-11-30 15:11:02.417554374
+0100
+++ dynamips-0.2.14/common/eth_switch.h 2014-11-30 15:11:22.916554628 +0100
@@ -74,6 +74,7 @@
#define ETHSW_LOCK(t) pthread_mutex_lock((t)-lock)
#define ETHSW_UNLOCK(t) pthread_mutex_unlock((t)-lock)
+#define ETHSW_TRYLOCK(t) pthread_mutex_trylock((t)-lock)
/* Acquire a reference to an Ethernet switch (increment reference count) */
ethsw_table_t *ethsw_acquire(char *name);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-09-26 10:52:18
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-07-12
17:14:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-09-26
11:21:36.0 +0200
@@ -1,0 +2,13 @@
+Thu Sep 25 08:38:11 UTC 2014 - and...@opensuse.org
+
+- new upstream version 0.2.14
+ * Add optional argument 'format' to hypervisor commands 'send_con_msg' and
+'send_aux_msg'. Report X byte(s) written on succeess.
+ * String formats:
+- plain - plain string (default, old behavior)
+- base64 - base64 encoded string
+ * Fix issue with 7200 IOS crashing after restart
+ * Fixed issue #49 - IOS crashes after router restart
+ * Fixed issue #50 - vm send_con_msg
+
+---
Old:
dynamips-0.2.13.tar.gz
New:
dynamips-0.2.14.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.yz8KbB/_old 2014-09-26 11:21:37.0 +0200
+++ /var/tmp/diff_new_pack.yz8KbB/_new 2014-09-26 11:21:37.0 +0200
@@ -17,7 +17,7 @@
Name: dynamips
-Version:0.2.13
+Version:0.2.14
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dos2unix
++ dynamips-0.2.13.tar.gz - dynamips-0.2.14.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.13/CMakeLists.txt
new/dynamips-0.2.14/CMakeLists.txt
--- old/dynamips-0.2.13/CMakeLists.txt 2014-07-10 17:49:35.0 +0200
+++ new/dynamips-0.2.14/CMakeLists.txt 2014-09-23 20:59:26.0 +0200
@@ -25,7 +25,7 @@
message ( STATUS CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH} )
project ( dynamips C )
-set ( DYNAMIPS_VERSION_TRAIN 0.2.13 )
+set ( DYNAMIPS_VERSION_TRAIN 0.2.14 )
set ( DYNAMIPS_VERSION_SUB )
include ( utils )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.13/ChangeLog
new/dynamips-0.2.14/ChangeLog
--- old/dynamips-0.2.13/ChangeLog 2014-07-10 17:49:35.0 +0200
+++ new/dynamips-0.2.14/ChangeLog 2014-09-23 20:59:26.0 +0200
@@ -2924,3 +2924,23 @@
+.
| Release: v0.2.13 |
+'
+
+10-Jul-2014 to 01-Sep-2014
+--
+ - Add -DUSE_UNSTABLE when making an unstable build (MacOSX)
+ - Add optional argument 'format' to hypervisor commands
+ - 'send_con_msg' and 'send_aux_msg'.
+ - Report X byte(s) written on succeess.
+ - String formats:
+* plain - plain string (default, old behavior)
+* base64 - base64 encoded string
+ - Use an auxiliary variable to record configured ram size for npe-400
+
+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 |
+++
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dynamips-0.2.13/README.hypervisor
new/dynamips-0.2.14/README.hypervisor
--- old/dynamips-0.2.13/README.hypervisor 2014-07-10 17:49:35.0
+0200
+++ new/dynamips-0.2.14/README.hypervisor 2014-09-23 20:59:26.0
+0200
@@ -224,11 +224,29 @@
The instance must exist, cpu_id is ignored.
(since version 0.2.8-RC5-community)
-* vm send_con_msg instance_name str :
- Send a message on the console. (since version 0.2.6-RC3)
+* vm send_con_msg instance_name str [format] :
+ (since version 0.2.6-RC3) Send a message on the console.
+ It only writes the bytes that fit in the console buffer.
-* vm send_aux_msg instance_name str :
- Send a message on the AUX port. (since version 0.2.6-RC3)
+ (since version 0.2.14)
+ The optional argument format indicates the string format.
+ On success it will report X byte(s) written.
+
+ String formats:
+ * plain - plain string (default, old behavior)
+ * base64 - base64 encoded string
+
+* vm send_aux_msg instance_name str [format] :
+ (since version 0.2.6-RC3) Send a message on the AUX port.
+ It only writes the bytes that fit in the aux buffer.
+
+ (since version 0.2.14)
+ The optional argument format indicates the string format.
+ On success it will report X byte(s) written.
+
+ String formats:
+ * plain - plain string (default, old behavior)
+ * base64 - base64 encoded string
* vm slot_bindings instance_name :
Show slot bindings.
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-07-12 17:14:56
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-05-13
20:43:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-07-12
17:14:57.0 +0200
@@ -1,0 +2,55 @@
+Fri Jul 11 07:53:51 UTC 2014 - and...@opensuse.org
+
+- new upstream version 0.2.13
+ - MPC860: Add debug message for the unimplemented CP reset command
+ - Report the partid of dev_am79c971 type AM79C971_TYPE_10BASE_T as Am79C970A.
+- Fixes the AMD Unknown that shows up in show controllers.
+ IOS calls this AMD Presidio or AmdP2.
+ - MPC860 FEC: (logic is inlined in dev_mpc860.c for now)
+- implement PHY LXT970A, which was hardcoded as values in the MII registers
+- if sending with link down, report no heartbeat and lost carrier
+ - PCMCIA disk:
+- annotate the Card Information Structure data
+- add missing CISTPL_END
+ - Document Cisco EEPROM format v1 and v4.
+ - Add CMake build system.
+ - Missing empty line at end of fs_nvram.c
+ - Fix unused function warnings.
+ - Remove unused duplicate of physmem_get_hptr from stable/mips64_jit.c
+ - Add test builds using Travis CI.
+ - Create new README.md based on README for GitHub frontpage.
+ - Add common.h.
+- Move generic includes, types and macros from utils.h to common.h.
+ - Minimize includes in sbox.c/h.
+ - Minimize includes in crc.c/h.
+ - Fix unstable nojit compilation.
+ - Fix unused variable warning in ppc32_jit.c.
+ - Use dev_dec21140.c from unstable.
+- Fix bandwidth statistics
+- Check if the NIO can trasmit
+ - Add #pragma once to common.h
+ - Rename common.h to dynamips_common.h.
+ - Delete ds1620.h.
+- This file is not used and most of the constants are in dev_ds1620.c.
+ - Tell the compiler that mem_bswap32 does not require aligned data.
+ - Minimize headers.
+ - define FD_SETSIZE for Cygwin in dynamips_common.h
+ - Rename double underscore macros:
+- rename __not_aligned to _not_aligned
+- rename __maybe_unused to _maybe_used
+- rename __unused to _unused
+ - Use an exclusive lock while dumping captured packets. (thread safety)
+ - Respect the snapshot length of the descriptor.
+ - Report failed setups of hypervisor command 'nio setup_filter'.
+ - Make a single FAT16 partition when pcmia disks are first created.
+ - Change pcap snapshot length to 65535.
+ - Remove old Makefiles to avoid confusion. (not gonna be maintained)
+ - Improve TX performance of i8254x (PA-GE) by sending up to 16 packets at a
time.
+- Merge pull request #45 from candlerb/candlerb/txperformance
+ - Print the device name when debugging pci accesses.
+ - Indicate the TODO list is from the original author.
+ - Fix for issue #9 - Reproducable crash
+ - Fixed issue #38 - Unknown file system detected
+ - Fixed issue #41 - Frame is Too Long error in Wireshark
+
+---
Old:
dynamips-0.2.12-source.zip
New:
dynamips-0.2.13.tar.gz
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.wFCwoQ/_old 2014-07-12 17:14:58.0 +0200
+++ /var/tmp/diff_new_pack.wFCwoQ/_new 2014-07-12 17:14:58.0 +0200
@@ -17,14 +17,14 @@
Name: dynamips
-Version:0.2.12
+Version:0.2.13
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dos2unix
BuildRequires: libelf-devel
BuildRequires: libpcap-devel
BuildRequires: libuuid-devel
-BuildRequires: unzip
+BuildRequires: cmake
Url:http://www.gns3.net
%ifarch x86_64
%if %{undefined fedora}
@@ -32,7 +32,7 @@
BuildRequires: glibc-devel-32bit
%endif
%endif
-Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip
+Source: %{name}-%{version}.tar.gz
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -50,22 +50,29 @@
%setup -q
%build
+mkdir build
+cd build
+CFLAGS=${CFLAGS:-%optflags} ; export CFLAGS ;
+CXXFLAGS=${CXXFLAGS:-%optflags} ; export CXXFLAGS ;
%ifarch x86_64
-make_opts=DYNAMIPS_ARCH=amd64
+cmake -DYNAMIPS_ARCH=amd64 -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
+%else
+cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} ..
%endif
-export CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
-fstack-protector
-export CXXFLAGS=$CFLAGS
-%{__make} $make_opts
+%__make %{?_smp_mflags}
%install
-%{__make} install
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-05-13 20:43:45
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-04-03
17:07:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-05-13
20:43:46.0 +0200
@@ -1,0 +2,5 @@
+Sun May 11 18:09:37 UTC 2014 - and...@opensuse.org
+
+- Removed some fedora code from spec file, moved to project conf
+
+---
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.1IDue2/_old 2014-05-13 20:43:47.0 +0200
+++ /var/tmp/diff_new_pack.1IDue2/_new 2014-05-13 20:43:47.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2013,2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,20 +20,16 @@
Version:0.2.12
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %{defined fedora}
-BuildRequires: elfutils-libelf-devel
-%else
+BuildRequires: dos2unix
BuildRequires: libelf-devel
-%endif
BuildRequires: libpcap-devel
BuildRequires: libuuid-devel
BuildRequires: unzip
-BuildRequires: dos2unix
Url:http://www.gns3.net
%ifarch x86_64
%if %{undefined fedora}
-BuildRequires: glibc-devel-32bit
BuildRequires: glibc-32bit
+BuildRequires: glibc-devel-32bit
%endif
%endif
Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-04-03 17:07:09
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-03-04
13:21:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-04-03
17:07:11.0 +0200
@@ -1,0 +2,11 @@
+Tue Apr 1 11:35:00 UTC 2014 - and...@opensuse.org
+
+- new upstream version 0.2.12
+ * Fixed all known multicast issues. Patches by Peter Palúch.
+ * New hypervisor command:
+- vm_debug pmem_cfind instance_name cpu_id bytes [first [last]]
+ * Fixed issue #29
+ * Closed issue #31
+- removed multicast patches now merged in upstream code
+
+---
Old:
dynamips-0.2.11-source.zip
dynamips-0.2.11_fix_M_bit.patch
dynamips-0.2.11_fix_mcast_queue.patch
New:
dynamips-0.2.12-source.zip
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.YbANin/_old 2014-04-03 17:07:12.0 +0200
+++ /var/tmp/diff_new_pack.YbANin/_new 2014-04-03 17:07:12.0 +0200
@@ -17,7 +17,7 @@
Name: dynamips
-Version:0.2.11
+Version:0.2.12
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{defined fedora}
@@ -37,8 +37,6 @@
%endif
%endif
Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip
-Patch0:%{name}-%{version}_fix_M_bit.patch
-Patch1:%{name}-%{version}_fix_mcast_queue.patch
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -53,9 +51,7 @@
or people wanting to pass their CCNA/CCNP/CCIE exams.
%prep
-%setup -q -n %{name}-%{version}-source
-%patch0 -p1
-%patch1 -p1
+%setup -q
%build
%ifarch x86_64
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-03-04 13:21:10
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2014-02-20
06:21:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-03-04
13:21:11.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 3 17:15:00 UTC 2014 - and...@opensuse.org
+
+- Fixed multicast related bugs adding the following two patches:
+ * dynamips-0.2.11_fix_M_bit.patch
+ * dynamips-0.2.11_fix_mcast_queue.patch
+
+---
New:
dynamips-0.2.11_fix_M_bit.patch
dynamips-0.2.11_fix_mcast_queue.patch
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.s5lJ1e/_old 2014-03-04 13:21:12.0 +0100
+++ /var/tmp/diff_new_pack.s5lJ1e/_new 2014-03-04 13:21:12.0 +0100
@@ -37,6 +37,8 @@
%endif
%endif
Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip
+Patch0:%{name}-%{version}_fix_M_bit.patch
+Patch1:%{name}-%{version}_fix_mcast_queue.patch
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -52,6 +54,8 @@
%prep
%setup -q -n %{name}-%{version}-source
+%patch0 -p1
+%patch1 -p1
%build
%ifarch x86_64
++ dynamips-0.2.11_fix_M_bit.patch ++
--- dynamips-0.2.11-source.orig/common/dev_gt.c 2014-02-10 17:50:38.0
+0100
+++ dynamips-0.2.11-source.patched/common/dev_gt.c 2014-02-25
07:58:17.000190403 +0100
@@ -328,7 +328,7 @@
#define GT_RXDESC_ES 0x8000/* Error Summary */
#define GT_RXDESC_IGMP 0x4000/* IGMP packet detected */
#define GT_RXDESC_HE 0x2000/* Hash Table Expired */
-#define GT_RXDESC_M0x1000/* Missed Frame */
+#define GT_RXDESC_M0x1000/* Dst MAC Miss in Hash Table */
#define GT_RXDESC_FT 0x0800/* Frame Type (802.3/Ethernet) */
#define GT_RXDESC_SF 0x0100/* Short Frame Error */
#define GT_RXDESC_MFL 0x0080/* Maximum Frame Length Error */
@@ -2354,11 +2354,21 @@
*
* Return values:
* - 0: Discard packet ;
- * - 1: Receive packet ;
- * - 2: Receive packet and set M bit in RX descriptor.
+ * - 1: Receive packet but set M bit in RX descriptor ;
+ * - 2: Receive packet.
*
* The documentation is not clear about the M bit in RX descriptor.
* It is described as Miss or Match depending on the section.
+ * However, it turns out that IOS treats the bit as Miss bit.
+ * If the bit is set, the destination MAC address has not been found
+ * in the hash table, and the frame may be subject to software MAC
+ * address filter associated by IOS with the interface. If the bit
+ * is clear, the destination MAC address has been found in the hash
+ * table and the frame will be accepted by IOS unconditionally.
+ * The M bit is required to correctly handle unicast frames destined
+ * to other MAC addresses when the interface works in promiscuous mode.
+ * IOS puts an interface into promiscuous mode when multicast routing
+ * or bridging has been configured on it.
*/
static inline int gt_eth_handle_rx_daddr(struct gt_data *d,
struct eth_port *port,
@@ -2474,7 +2484,7 @@
if (hash_res == GT_HTLOOKUP_HOP_EXCEEDED)
rxd0.cmd_stat |= GT_RXDESC_HE;
- if (addr_action == 2)
+ if (addr_action == 1)
rxd0.cmd_stat |= GT_RXDESC_M;
if (ntohs(hdr-type) = N_ETH_MTU) /* 802.3 frame */
++ dynamips-0.2.11_fix_mcast_queue.patch ++
--- dynamips-0.2.11-source.orig/common/dev_gt.c 2014-03-02 15:22:17.881753020
+0100
+++ dynamips-0.2.11-source.patched/common/dev_gt.c 2014-03-02
15:15:55.467367795 +0100
@@ -2093,8 +2093,8 @@
int queue)
{
u_char pkt[GT_MAX_PKT_SIZE],*pkt_ptr;
- struct sdma_desc txd0,ctxd,*ptxd;
- m_uint32_t tx_start,tx_current;
+ struct sdma_desc ctxd;
+ m_uint32_t tx_current;
m_uint32_t len,tot_len;
int abort = FALSE;
@@ -2106,17 +2106,29 @@
return(FALSE);
/* Copy the current txring descriptor */
- tx_start = tx_current = port-tx_current[queue];
+ tx_current = port-tx_current[queue];
- if (!tx_start)
+ if (!tx_current)
return(FALSE);
- ptxd = txd0;
- gt_sdma_desc_read(d,tx_start,ptxd);
+ gt_sdma_desc_read(d,tx_current,ctxd);
/* If we don't own the first descriptor, we cannot
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2014-02-20 06:21:34
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2013-11-22
06:54:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2014-02-20
06:21:37.0 +0100
@@ -1,0 +2,22 @@
+Wed Feb 19 18:08:40 UTC 2014 - jungh...@votca.org
+
+- clean up spec file
+
+---
+Mon Feb 17 19:46:00 UTC 2014 - and...@opensuse.org
+
+- new upstream version 0.2.11
+ * Full update of hypervisor documentation.
+ * Change default NPE for c7200 platform from npe-200 to npe-400.
+ * New hypervisor commands
+ * 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.
+ * Old text is replayed when you connect to the console/aux port.
+ * Warn the VM isn't running when connecting to the console/aux port.
+
+---
Old:
dynamips-0.2.10-source.zip
New:
dynamips-0.2.11-source.zip
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.ZdRd4x/_old 2014-02-20 06:21:38.0 +0100
+++ /var/tmp/diff_new_pack.ZdRd4x/_new 2014-02-20 06:21:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013,2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,26 @@
Name: dynamips
-Version:0.2.10
+Version:0.2.11
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{defined fedora}
+BuildRequires: elfutils-libelf-devel
+%else
BuildRequires: libelf-devel
+%endif
BuildRequires: libpcap-devel
BuildRequires: libuuid-devel
BuildRequires: unzip
BuildRequires: dos2unix
Url:http://www.gns3.net
%ifarch x86_64
+%if %{undefined fedora}
BuildRequires: glibc-devel-32bit
+BuildRequires: glibc-32bit
+%endif
%endif
-Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/0.2.10/%{name}-%{version}-source.zip
+Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/%{version}/%{name}-%{version}-source.zip
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
@@ -47,31 +54,17 @@
%setup -q -n %{name}-%{version}-source
%build
-CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
-CXXFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
-CFLAGS=$CFLAGS -fstack-protector
-CXXFLAGS=$CXXFLAGS -fstack-protector
-export CFLAGS
-export CXXFLAGS
-
%ifarch x86_64
-%{__make} DYNAMIPS_ARCH=amd64
-%else
-%{__make}
+make_opts=DYNAMIPS_ARCH=amd64
%endif
+export CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
-fstack-protector
+export CXXFLAGS=$CFLAGS
+%{__make} $make_opts
%install
-
-%ifarch x86_64
-%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot}/usr
mandir=%{_mandir} bindir=%{_bindir} prefix=/usr
-%else
-%{__make} install DESTDIR=%{buildroot}/usr mandir=%{_mandir} bindir=%{_bindir}
-%endif
+%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir}
prefix=/usr $make_opts
dos2unix COPYING README README.hypervisor TODO
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root)
%doc COPYING README README.hypervisor TODO
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2013-11-22 06:54:04
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2012-07-30
09:10:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2013-11-22
06:54:05.0 +0100
@@ -1,0 +2,17 @@
+Sat Nov 16 11:37:26 UTC 2013 - and...@opensuse.org
+
+- Minor spec file clean up
+- Added dos2unix to convert documentation files
+
+---
+Sat Nov 9 11:37:26 UTC 2013 - and...@opensuse.org
+
+- Bump to stable 0.2.10
+
+---
+Fri Jul 12 23:37:26 UTC 2013 - o...@noles.co.uk
+
+- Bump to stable 0.2.8
+- Switch to maintained fork of dynamips
+
+---
Old:
arm-little-endian.diff
dynamips-0.2.8-RC3-make.patch
dynamips-0.2.8-RC3.tar.bz2
New:
dynamips-0.2.10-source.zip
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.yAc5jB/_old 2013-11-22 06:54:06.0 +0100
+++ /var/tmp/diff_new_pack.yAc5jB/_new 2013-11-22 06:54:06.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,23 @@
#
-%define pkg_extraver RC3
-
Name: dynamips
-Version:0.2.8%{pkg_extraver}
+Version:0.2.10
Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libelf-devel
BuildRequires: libpcap-devel
BuildRequires: libuuid-devel
+BuildRequires: unzip
+BuildRequires: dos2unix
Url:http://www.gns3.net
%ifarch x86_64
BuildRequires: glibc-devel-32bit
%endif
-Source: %{name}-0.2.8-%{pkg_extraver}.tar.bz2
+Source:
http://sourceforge.net/projects/gns-3/files/Dynamips/0.2.10/%{name}-%{version}-source.zip
Summary:Cisco router Emulator
License:GPL-2.0+
Group: System/Emulators/Other
-Patch0: dynamips-0.2.8-%{pkg_extraver}-make.patch
-Patch1: arm-little-endian.diff
%description
Cisco Router Emulator supported by GNS3 Community
@@ -46,9 +44,7 @@
or people wanting to pass their CCNA/CCNP/CCIE exams.
%prep
-%setup -q -n %{name}-0.2.8-%{pkg_extraver}
-%patch0 -p1
-%patch1
+%setup -q -n %{name}-%{version}-source
%build
CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
@@ -58,20 +54,29 @@
export CFLAGS
export CXXFLAGS
+%ifarch x86_64
+%{__make} DYNAMIPS_ARCH=amd64
+%else
%{__make}
+%endif
%install
-%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir}
-chmod -x README.community
+
+%ifarch x86_64
+%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot}/usr
mandir=%{_mandir} bindir=%{_bindir} prefix=/usr
+%else
+%{__make} install DESTDIR=%{buildroot}/usr mandir=%{_mandir} bindir=%{_bindir}
+%endif
+dos2unix COPYING README README.hypervisor TODO
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
-%doc README.community COPYING README README.hypervisor TODO
+%doc COPYING README README.hypervisor TODO
%{_bindir}/dynamips
%{_bindir}/nvram_export
-%{_mandir}/man*/*.gz
+%{_mandir}/man*/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2012-07-30 09:08:47
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2012-03-23
12:04:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2012-07-30
09:10:01.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 26 11:47:04 UTC 2012 - dmuel...@suse.com
+
+- fix build on ARM
+
+---
New:
arm-little-endian.diff
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.7QoQ8p/_old 2012-07-30 09:10:03.0 +0200
+++ /var/tmp/diff_new_pack.7QoQ8p/_new 2012-07-30 09:10:03.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dynamips
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,24 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define pkg_extraver RC3
Name: dynamips
Version:0.2.8%{pkg_extraver}
-Release:3
-License:GPL-2.0+
+Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libelf-devel libpcap-devel libuuid-devel
+BuildRequires: libelf-devel
+BuildRequires: libpcap-devel
+BuildRequires: libuuid-devel
Url:http://www.gns3.net
%ifarch x86_64
BuildRequires: glibc-devel-32bit
%endif
Source: %{name}-0.2.8-%{pkg_extraver}.tar.bz2
-Group: System/Emulators/Other
Summary:Cisco router Emulator
+License:GPL-2.0+
+Group: System/Emulators/Other
Patch0: dynamips-0.2.8-%{pkg_extraver}-make.patch
+Patch1: arm-little-endian.diff
%description
Cisco Router Emulator supported by GNS3 Community
@@ -46,6 +48,7 @@
%prep
%setup -q -n %{name}-0.2.8-%{pkg_extraver}
%patch0 -p1
+%patch1
%build
CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
++ arm-little-endian.diff ++
--- stable/utils.h
+++ stable/utils.h
@@ -55,6 +55,8 @@
#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
#elif defined(__ia64__)
#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
+#elif defined(__arm__) __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
#endif
#ifndef ARCH_BYTE_ORDER
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at 2012-03-23 12:04:53
Comparing /work/SRC/openSUSE:Factory/dynamips (Old)
and /work/SRC/openSUSE:Factory/.dynamips.new (New)
Package is dynamips, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/dynamips/dynamips.changes2011-09-23
01:55:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.dynamips.new/dynamips.changes 2012-03-23
12:04:56.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 22 11:01:47 UTC 2012 - dval...@suse.com
+
+- fix ppc and ppc64 builds
+
+---
Other differences:
--
++ dynamips.spec ++
--- /var/tmp/diff_new_pack.HFNOLU/_old 2012-03-23 12:04:59.0 +0100
+++ /var/tmp/diff_new_pack.HFNOLU/_new 2012-03-23 12:04:59.0 +0100
@@ -55,19 +55,10 @@
export CFLAGS
export CXXFLAGS
-%ifarch x86_64
-%{__make} DYNAMIPS_ARCH=amd64
-%else
%{__make}
-%endif
%install
-
-%ifarch x86_64
-%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot} mandir=%{_mandir}
bindir=%{_bindir}
-%else
%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir}
-%endif
chmod -x README.community
%clean
@@ -79,4 +70,5 @@
%{_bindir}/dynamips
%{_bindir}/nvram_export
%{_mandir}/man*/*.gz
+
%changelog
++ dynamips-0.2.8-RC3-make.patch ++
--- /var/tmp/diff_new_pack.HFNOLU/_old 2012-03-23 12:04:59.0 +0100
+++ /var/tmp/diff_new_pack.HFNOLU/_new 2012-03-23 12:04:59.0 +0100
@@ -1,24 +1,42 @@
-diff -uNr old-dynamips-0.2.8-RC3//Makefile dynamips-0.2.8-RC3/Makefile
old-dynamips-0.2.8-RC3//Makefile 2011-03-30 15:01:30.0 +0200
-+++ dynamips-0.2.8-RC3/Makefile2011-04-11 16:33:07.451266220 +0200
-@@ -7,9 +7,13 @@
+Index: dynamips-0.2.8-RC3/Makefile
+===
+--- dynamips-0.2.8-RC3.orig/Makefile
dynamips-0.2.8-RC3/Makefile
+@@ -5,11 +5,28 @@
+ # - Use amd64 for a build on x86_64 (64-bits)
+ # - Use ppc32 for a build on powerpc (32-bits)
# - Use nojit for unsupported architectures.
- export DYNAMIPS_ARCH?=x86
-
+-export DYNAMIPS_ARCH?=x86
+-
-# Do you want to use lib (for 32 bit compiling) or lib64
-export DYNAMIPS_LIB?=lib
-#export DYNAMIPS_LIB?=lib64
-+ifeq ($(DYNAMIPS_ARCH), amd64)
++ifeq ($(shell uname -m),i*86)
++DYNAMIPS_ARCH?=x86
++else
++ifeq ($(shell uname -m),x86_64)
++DYNAMIPS_ARCH?=amd64
++else
++DYNAMIPS_ARCH?=nojit
++endif
++endif
++
++ifeq ($(shell uname -m),x86_64)
++DYNAMIPS_LIB?=lib64
++LIBDIR?=/usr/lib64
++else
++ifeq ($(shell uname -m),ppc64)
+DYNAMIPS_LIB?=lib64
+LIBDIR?=/usr/lib64
+else
+DYNAMIPS_LIB?=lib
+LIBDIR?=/usr/lib
+endif
++endif
# For MAC x64 you can compile the unstable version, which should work
# fine, or use stable if you prefer.
-@@ -33,8 +37,6 @@
+@@ -33,8 +50,6 @@ export VERSION_TRAIN=0.2.8
export VERSION_SUB=-RC3
# Executable binary extension
@@ -27,7 +45,7 @@
.PHONY: all dynamips.stable dynamips.unstable
-@@ -50,13 +52,13 @@
+@@ -50,13 +65,13 @@ dynamips.unstable:
install: dynamips.$(DYNAMIPS_CODE)
@echo Installing
@@ -46,26 +64,45 @@
.PHONY: clean
-diff -uNr old-dynamips-0.2.8-RC3//stable/Makefile
dynamips-0.2.8-RC3/stable/Makefile
old-dynamips-0.2.8-RC3//stable/Makefile2011-03-30 15:01:30.0
+0200
-+++ dynamips-0.2.8-RC3/stable/Makefile 2011-04-11 16:33:05.115266219 +0200
-@@ -10,9 +10,13 @@
- DYNAMIPS_ARCH=x86
+Index: dynamips-0.2.8-RC3/stable/Makefile
+===
+--- dynamips-0.2.8-RC3.orig/stable/Makefile
dynamips-0.2.8-RC3/stable/Makefile
+@@ -3,15 +3,28 @@
+
+ # Replace x86 by amd64 for a build on x86_64.
+ # Use nojit for architectures that are not x86 or x86_64.
++ifeq ($(shell uname -m),i*86)
+ DYNAMIPS_ARCH?=x86
+-#DYNAMIPS_ARCH?=amd64
+-
+-ifeq ($(DYNAMIPS_ARCH),ppc32)
+-DYNAMIPS_ARCH=x86
++else
++ifeq ($(shell uname -m),x86_64)
++DYNAMIPS_ARCH?=amd64
++else
++DYNAMIPS_ARCH?=nojit
++endif
endif
-# Do you want to use lib (for 32 bit compiling) or lib64
-+ifeq ($(DYNAMIPS_ARCH), amd64)
++ifeq ($(shell uname -m),x86_64)
++DYNAMIPS_LIB?=lib64
++LIBDIR?=/usr/lib64
++else
++ifeq ($(shell uname -m),ppc64)
+DYNAMIPS_LIB?=lib64
+LIBDIR?=/usr/lib64
+else
DYNAMIPS_LIB?=lib
--
+LIBDIR?=/usr/lib
+endif
++endif
+
# Get include files from the current directory and from the common directory
- INCLUDE+=-I. -I../common
-@@ -38,8 +42,6 @@
+@@ -38,8 +51,6 @@ VERSION_DEV=$(VERSION_TRAIN)-$(shell dat
VPATH = ../common
# Executable binary extension
@@ -74,7 +111,7 @@
CC?=gcc
LD=ld
-@@ -51,7 +53,7 @@
+@@ -51,7 +62,7 @@
commit dynamips for openSUSE:Factory
Hello community,
here is the log from the commit of package dynamips for openSUSE:Factory
checked in at Wed Jun 1 11:52:42 CEST 2011.
New Changes file:
--- /dev/null 2010-08-26 16:28:41.0 +0200
+++ /mounts/work_src_done/STABLE/dynamips/dynamips.changes 2011-04-11
16:59:46.0 +0200
@@ -0,0 +1,10 @@
+---
+Mon Apr 11 14:57:14 UTC 2011 - and...@opensuse.org
+
+- update to version 0.2.8 RC3 from gns3 community project
+
+---
+Fri Jun 20 21:22:47 CEST 2008 - crrodrig...@suse.de
+
+- update to version 0.2.8 RC2 per user requests
+
calling whatdependson for head-i586
New:
dynamips-0.2.8-RC3-make.patch
dynamips-0.2.8-RC3.tar.bz2
dynamips.changes
dynamips.spec
Other differences:
--
++ dynamips.spec ++
#
# spec file for package dynamips
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define pkg_extraver RC3
Name: dynamips
Version:0.2.8%{pkg_extraver}
Release:1
License:GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libelf-devel libpcap-devel libuuid-devel
Url:http://www.gns3.net
%ifarch x86_64
BuildRequires: glibc-devel-32bit
%endif
Source: %{name}-0.2.8-%{pkg_extraver}.tar.bz2
Group: System/Emulators/Other
Summary:Cisco router Emulator
Patch0: dynamips-0.2.8-%{pkg_extraver}-make.patch
%description
Cisco Router Emulator supported by GNS3 Community
Dynamips emulates Cisco 7200/3600/3725/3745/2691 Routers on a traditional PC.
You can use dynamips to create labs. It uses IOS Images (which are not part
of this package). Of course, this emulator cannot replace a real router. It is
simply a complementary tool to real labs for administrators of Cisco networks
or people wanting to pass their CCNA/CCNP/CCIE exams.
%prep
%setup -q -n %{name}-0.2.8-%{pkg_extraver}
%patch0 -p1
%build
CFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
CXXFLAGS=%{optflags} -I/usr/include/libelf -fno-strict-aliasing
CFLAGS=$CFLAGS -fstack-protector
CXXFLAGS=$CXXFLAGS -fstack-protector
export CFLAGS
export CXXFLAGS
%ifarch x86_64
%{__make} DYNAMIPS_ARCH=amd64
%else
%{__make}
%endif
%install
%ifarch x86_64
%{__make} DYNAMIPS_ARCH=amd64 install DESTDIR=%{buildroot} mandir=%{_mandir}
bindir=%{_bindir}
%else
%{__make} install DESTDIR=%{buildroot} mandir=%{_mandir} bindir=%{_bindir}
%endif
chmod -x README.community
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc README.community COPYING README README.hypervisor TODO
%{_bindir}/dynamips
%{_bindir}/nvram_export
%{_mandir}/man*/*.gz
%changelog
++ dynamips-0.2.8-RC3-make.patch ++
diff -uNr old-dynamips-0.2.8-RC3//Makefile dynamips-0.2.8-RC3/Makefile
--- old-dynamips-0.2.8-RC3//Makefile2011-03-30 15:01:30.0 +0200
+++ dynamips-0.2.8-RC3/Makefile 2011-04-11 16:33:07.451266220 +0200
@@ -7,9 +7,13 @@
# - Use nojit for unsupported architectures.
export DYNAMIPS_ARCH?=x86
-# Do you want to use lib (for 32 bit compiling) or lib64
-export DYNAMIPS_LIB?=lib
-#export DYNAMIPS_LIB?=lib64
+ifeq ($(DYNAMIPS_ARCH), amd64)
+DYNAMIPS_LIB?=lib64
+LIBDIR?=/usr/lib64
+else
+DYNAMIPS_LIB?=lib
+LIBDIR?=/usr/lib
+endif
# For MAC x64 you can compile the unstable version, which should work
# fine, or use stable if you prefer.
@@ -33,8 +37,6 @@
export VERSION_SUB=-RC3
# Executable binary extension
-export DESTDIR?=/usr
-export BIN_EXT?=
.PHONY: all dynamips.stable dynamips.unstable
@@ -50,13 +52,13 @@
install: dynamips.$(DYNAMIPS_CODE)
@echo Installing
- install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7
$(DESTDIR)/etc
+ install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
$(DESTDIR)/usr/share/man/man7 $(DESTDIR)/etc
cp dynamips.$(DYNAMIPS_CODE) dynamips
- install dynamips $(DYNAMIPS_CODE)/nvram_export $(DESTDIR)/bin/
+ install dynamips $(DYNAMIPS_CODE)/nvram_export $(DESTDIR)/usr/bin/
rm -f dynamips
- install -m644 dynamips.1$(DESTDIR)/man/man1
- install -m644 nvram_export.1$(DESTDIR)/man/man1
- install -m644
