diff -Nru dynamips-0.2.19/ChangeLog dynamips-0.2.20/ChangeLog --- dynamips-0.2.19/ChangeLog 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/ChangeLog 2019-02-20 12:22:46.000000000 +0000 @@ -3001,3 +3001,12 @@ ---------- * Fix segmentation fault when using localtime() (64-bit only). Fixes #91 + ++--------------------+ +| Release: v0.2.20 | ++--------------------+ + +20-02-2019 +---------- + +* New fix for segmentation fault when using localtime() (64-bit only). Fixes #91 diff -Nru dynamips-0.2.19/CMakeLists.txt dynamips-0.2.20/CMakeLists.txt --- dynamips-0.2.19/CMakeLists.txt 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/CMakeLists.txt 2019-02-20 12:22:46.000000000 +0000 @@ -25,7 +25,7 @@ message ( STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" ) project ( dynamips C ) -set ( DYNAMIPS_VERSION_TRAIN 0.2.19 ) +set ( DYNAMIPS_VERSION_TRAIN 0.2.20 ) set ( DYNAMIPS_VERSION_SUB ) include ( utils ) diff -Nru dynamips-0.2.19/common/dev_nvram.c dynamips-0.2.20/common/dev_nvram.c --- dynamips-0.2.19/common/dev_nvram.c 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/common/dev_nvram.c 2019-02-20 12:22:46.000000000 +0000 @@ -50,15 +50,11 @@ { m_uint64_t res; struct tm *tmx; - struct tm tmn; time_t ct; - + time(&ct); - if (timezone == 0) - tmx = gmtime_r(&ct,&tmn); - else - tmx = localtime_r(&ct,&tmn); - + tmx = localtime(&ct); + res = u8_to_bcd(tmx->tm_sec) << 8; res += u8_to_bcd(tmx->tm_min) << 16; res += u8_to_bcd(tmx->tm_hour) << 24; diff -Nru dynamips-0.2.19/common/dynamips.c dynamips-0.2.20/common/dynamips.c --- dynamips-0.2.19/common/dynamips.c 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/common/dynamips.c 2019-02-20 12:22:46.000000000 +0000 @@ -19,6 +19,7 @@ #include #include #include +#include #include "dynamips.h" #include "cpu.h" @@ -73,7 +74,7 @@ const char *sw_version = DYNAMIPS_VERSION"-"JIT_ARCH; /* Software version tag */ -const char *sw_version_tag = "2019011912"; +const char *sw_version_tag = "2019022012"; /* Hypervisor */ int hypervisor_mode = 0; @@ -906,6 +907,13 @@ printf("Copyright (c) 2005-2011 Christophe Fillot.\n"); printf("Build date: %s %s\n\n",__DATE__,__TIME__); + /* Force a timezone to avoid a bug with UTC/GMT */ + tzset(); + if (timezone == 0 && !getenv("TZ")) { + setenv("TZ", "Europe/London", 1); + tzset(); + } + /* Register platforms */ register_default_platforms(); diff -Nru dynamips-0.2.19/common/utils.c dynamips-0.2.20/common/utils.c --- dynamips-0.2.19/common/utils.c 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/common/utils.c 2019-02-20 12:22:46.000000000 +0000 @@ -265,11 +265,7 @@ if (fd != NULL) { gettimeofday(&now,0); ct = now.tv_sec; - - if (timezone == 0) - gmtime_r(&ct,&tmn); - else - localtime_r(&ct,&tmn); + localtime_r(&ct,&tmn); strftime(buf,sizeof(buf),"%b %d %H:%M:%S",&tmn); diff -Nru dynamips-0.2.19/debian/changelog dynamips-0.2.20/debian/changelog --- dynamips-0.2.19/debian/changelog 2019-01-19 17:01:26.000000000 +0000 +++ dynamips-0.2.20/debian/changelog 2019-02-20 12:22:50.000000000 +0000 @@ -1,8 +1,14 @@ -dynamips (0.2.19-1~cosmic1) cosmic; urgency=low +dynamips (0.2.20-1~cosmic1) cosmic; urgency=low - * Release 0.2.19 + * Release 0.2.20 * Release for cosmic + -- Jeremy Grossmann Wed, 20 Feb 2019 23:00:00 +0000 + +dynamips (0.2.19-1~cosmic1) trusty; urgency=low + + * Release 0.2.19 + -- Jeremy Grossmann Sat, 19 Jan 2019 23:00:00 +0000 dynamips (0.2.18-1~cosmic1) trusty; urgency=low diff -Nru dynamips-0.2.19/.git/FETCH_HEAD dynamips-0.2.20/.git/FETCH_HEAD --- dynamips-0.2.19/.git/FETCH_HEAD 2019-01-19 17:01:26.000000000 +0000 +++ dynamips-0.2.20/.git/FETCH_HEAD 2019-02-20 12:22:50.000000000 +0000 @@ -1,4 +1,4 @@ -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 branch 'master' of https://github.com/GNS3/dynamips +10a75c119d007172d3bba064c23d2b8a98f12abc branch 'master' of https://github.com/GNS3/dynamips be56f963b0e4d050725f02fc665452f6b1b78aeb not-for-merge tag 'old/mercurial-repository/end' of https://github.com/GNS3/dynamips 657662a1639c48914a40e8c7950afb14c21cd44c not-for-merge tag 'old/mercurial-repository/start' of https://github.com/GNS3/dynamips aa2098fc37af5a513546a7aa0e25e2d33616e904 not-for-merge tag 'old/official-releases/end' of https://github.com/GNS3/dynamips @@ -15,6 +15,7 @@ f6a2ad1aa02b8ec6409d7066642a3be0dc7287ad not-for-merge tag 'v0.2.17' of https://github.com/GNS3/dynamips 2b08d40cb19155387662459cc6efa1202bb4c0ab not-for-merge tag 'v0.2.18' of https://github.com/GNS3/dynamips d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 not-for-merge tag 'v0.2.19' of https://github.com/GNS3/dynamips +10a75c119d007172d3bba064c23d2b8a98f12abc not-for-merge tag 'v0.2.20' of https://github.com/GNS3/dynamips 6bdd9c139c2caa0d60c902a162092f4eb8fc5c61 not-for-merge tag 'v0.2.3b' of https://github.com/GNS3/dynamips 6d44840778ed67bf5d158179fa1355da429831eb not-for-merge tag 'v0.2.3c' of https://github.com/GNS3/dynamips b03e7c67644a15dad3489a2f87cb386eb1c86c12 not-for-merge tag 'v0.2.4' of https://github.com/GNS3/dynamips diff -Nru dynamips-0.2.19/.git/HEAD dynamips-0.2.20/.git/HEAD --- dynamips-0.2.19/.git/HEAD 2019-01-19 17:01:26.000000000 +0000 +++ dynamips-0.2.20/.git/HEAD 2019-02-20 12:22:50.000000000 +0000 @@ -1 +1 @@ -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 +10a75c119d007172d3bba064c23d2b8a98f12abc Binary files /tmp/tmpsZi_xQ/nKoERAy2Yv/dynamips-0.2.19/.git/index and /tmp/tmpsZi_xQ/eDzSpX8Uu5/dynamips-0.2.20/.git/index differ diff -Nru dynamips-0.2.19/.git/logs/HEAD dynamips-0.2.20/.git/logs/HEAD --- dynamips-0.2.19/.git/logs/HEAD 2019-01-19 17:01:26.000000000 +0000 +++ dynamips-0.2.20/.git/logs/HEAD 2019-02-20 12:22:50.000000000 +0000 @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 root 1547917283 +0000 clone: from https://github.com/GNS3/dynamips.git -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 root 1547917286 +0000 checkout: moving from master to master -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 root 1547917286 +0000 checkout: moving from master to v0.2.19 +0000000000000000000000000000000000000000 10a75c119d007172d3bba064c23d2b8a98f12abc root 1550665366 +0100 clone: from https://github.com/GNS3/dynamips.git +10a75c119d007172d3bba064c23d2b8a98f12abc 10a75c119d007172d3bba064c23d2b8a98f12abc root 1550665370 +0100 checkout: moving from master to master +10a75c119d007172d3bba064c23d2b8a98f12abc 10a75c119d007172d3bba064c23d2b8a98f12abc root 1550665370 +0100 checkout: moving from master to v0.2.20 diff -Nru dynamips-0.2.19/.git/logs/refs/heads/master dynamips-0.2.20/.git/logs/refs/heads/master --- dynamips-0.2.19/.git/logs/refs/heads/master 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/.git/logs/refs/heads/master 2019-02-20 12:22:46.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 root 1547917283 +0000 clone: from https://github.com/GNS3/dynamips.git +0000000000000000000000000000000000000000 10a75c119d007172d3bba064c23d2b8a98f12abc root 1550665366 +0100 clone: from https://github.com/GNS3/dynamips.git diff -Nru dynamips-0.2.19/.git/logs/refs/remotes/origin/HEAD dynamips-0.2.20/.git/logs/refs/remotes/origin/HEAD --- dynamips-0.2.19/.git/logs/refs/remotes/origin/HEAD 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/.git/logs/refs/remotes/origin/HEAD 2019-02-20 12:22:46.000000000 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 root 1547917283 +0000 clone: from https://github.com/GNS3/dynamips.git +0000000000000000000000000000000000000000 10a75c119d007172d3bba064c23d2b8a98f12abc root 1550665366 +0100 clone: from https://github.com/GNS3/dynamips.git Binary files /tmp/tmpsZi_xQ/nKoERAy2Yv/dynamips-0.2.19/.git/objects/pack/pack-051925c4facd5818168605d765dc36009919d1af.idx and /tmp/tmpsZi_xQ/eDzSpX8Uu5/dynamips-0.2.20/.git/objects/pack/pack-051925c4facd5818168605d765dc36009919d1af.idx differ Binary files /tmp/tmpsZi_xQ/nKoERAy2Yv/dynamips-0.2.19/.git/objects/pack/pack-051925c4facd5818168605d765dc36009919d1af.pack and /tmp/tmpsZi_xQ/eDzSpX8Uu5/dynamips-0.2.20/.git/objects/pack/pack-051925c4facd5818168605d765dc36009919d1af.pack differ Binary files /tmp/tmpsZi_xQ/nKoERAy2Yv/dynamips-0.2.19/.git/objects/pack/pack-449cca6713e8bb83b04811020cba31b35fd2e4e3.idx and /tmp/tmpsZi_xQ/eDzSpX8Uu5/dynamips-0.2.20/.git/objects/pack/pack-449cca6713e8bb83b04811020cba31b35fd2e4e3.idx differ Binary files /tmp/tmpsZi_xQ/nKoERAy2Yv/dynamips-0.2.19/.git/objects/pack/pack-449cca6713e8bb83b04811020cba31b35fd2e4e3.pack and /tmp/tmpsZi_xQ/eDzSpX8Uu5/dynamips-0.2.20/.git/objects/pack/pack-449cca6713e8bb83b04811020cba31b35fd2e4e3.pack differ diff -Nru dynamips-0.2.19/.git/ORIG_HEAD dynamips-0.2.20/.git/ORIG_HEAD --- dynamips-0.2.19/.git/ORIG_HEAD 2019-01-19 17:01:26.000000000 +0000 +++ dynamips-0.2.20/.git/ORIG_HEAD 2019-02-20 12:22:50.000000000 +0000 @@ -1 +1 @@ -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 +10a75c119d007172d3bba064c23d2b8a98f12abc diff -Nru dynamips-0.2.19/.git/packed-refs dynamips-0.2.20/.git/packed-refs --- dynamips-0.2.19/.git/packed-refs 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/.git/packed-refs 2019-02-20 12:22:46.000000000 +0000 @@ -1,5 +1,5 @@ # pack-refs with: peeled fully-peeled -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 refs/remotes/origin/master +10a75c119d007172d3bba064c23d2b8a98f12abc refs/remotes/origin/master be56f963b0e4d050725f02fc665452f6b1b78aeb refs/tags/old/mercurial-repository/end 657662a1639c48914a40e8c7950afb14c21cd44c refs/tags/old/mercurial-repository/start aa2098fc37af5a513546a7aa0e25e2d33616e904 refs/tags/old/official-releases/end @@ -16,6 +16,7 @@ f6a2ad1aa02b8ec6409d7066642a3be0dc7287ad refs/tags/v0.2.17 2b08d40cb19155387662459cc6efa1202bb4c0ab refs/tags/v0.2.18 d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 refs/tags/v0.2.19 +10a75c119d007172d3bba064c23d2b8a98f12abc refs/tags/v0.2.20 6bdd9c139c2caa0d60c902a162092f4eb8fc5c61 refs/tags/v0.2.3b 6d44840778ed67bf5d158179fa1355da429831eb refs/tags/v0.2.3c b03e7c67644a15dad3489a2f87cb386eb1c86c12 refs/tags/v0.2.4 diff -Nru dynamips-0.2.19/.git/refs/heads/master dynamips-0.2.20/.git/refs/heads/master --- dynamips-0.2.19/.git/refs/heads/master 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/.git/refs/heads/master 2019-02-20 12:22:46.000000000 +0000 @@ -1 +1 @@ -d2b8de0150bc56469bae1e2ee72cdf4eaa88bc83 +10a75c119d007172d3bba064c23d2b8a98f12abc diff -Nru dynamips-0.2.19/RELEASE-NOTES dynamips-0.2.20/RELEASE-NOTES --- dynamips-0.2.19/RELEASE-NOTES 2019-01-19 17:01:23.000000000 +0000 +++ dynamips-0.2.20/RELEASE-NOTES 2019-02-20 12:22:46.000000000 +0000 @@ -1,19 +1,19 @@ Release Notes for Cisco router simulator (Dynamips) =================================================== -Version: v0.2.19 +Version: v0.2.20 -Release date: Saturday, January 19th, 2019 (2019-01-19) +Release date: Wednesday, February 20th, 2019 (2019-02-20) -Source code: https://github.com/GNS3/dynamips/tree/v0.2.19 +Source code: https://github.com/GNS3/dynamips/tree/v0.2.20 License: GNU GPLv2 -What's New since v0.2.18 +What's New since v0.2.19 ======================== -* Fix segmentation fault when using localtime() (64-bit only). Fixes #91 +* New fix for segmentation fault when using localtime() (64-bit only). Fixes #91 Known Issues