From 49410eda5472a3d0fd554810c19223ecfbc0f35a Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Mon, 10 Mar 2008 12:18:17 -0700 Subject: Add vlan dependancy for vyatta-cfg. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c359bcd..8714661 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,8 @@ Depends: bash (>= 3.1), vyatta-config-migrate, dhcp3-client | vyatta-dhcp3-client, bsdutils (>=1:2.13), - libc6 (>= 2.7-6) + libc6 (>= 2.7-6), + vlan Replaces: vyatta-cfg-firewall Suggests: util-linux (>= 2.13-5), net-tools, -- cgit v1.2.3 From 053d42ea27a5b89f0a19a09dd347bc37c6f07948 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Tue, 1 Apr 2008 10:08:14 -0700 Subject: fix for bug 2689: sort tag nodes appropriately --- debian/control | 1 + scripts/VyattaConfigOutput.pm | 3 +++ 2 files changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 5a06588..2fdbcfe 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Depends: sed (>= 4.1.5), dhcp3-client | vyatta-dhcp3-client, bsdutils (>=1:2.13), libc6 (>= 2.7-6), + libsort-versions-perl, vlan Replaces: vyatta-cfg-firewall Suggests: util-linux (>= 2.13-5), diff --git a/scripts/VyattaConfigOutput.pm b/scripts/VyattaConfigOutput.pm index b7c5499..2766b64 100755 --- a/scripts/VyattaConfigOutput.pm +++ b/scripts/VyattaConfigOutput.pm @@ -32,6 +32,7 @@ package VyattaConfigOutput; use strict; use lib '/opt/vyatta/share/perl5/'; use VyattaConfig; +use Sort::Versions; # whether to show default values my $show_all = 0; @@ -190,6 +191,7 @@ sub displayDeletedOrigChildren { $dont_show_as_deleted); } elsif (scalar($#cnames) >= 0) { if ($is_tag) { + @cnames = sort versioncmp @cnames; foreach my $cname (@cnames) { if ($cname eq 'node.val') { # should not happen @@ -244,6 +246,7 @@ sub displayChildren { displayValues([ @cur_path, $child ], $prefix, $child); } elsif (scalar($#cnames) >= 0) { if ($is_tag) { + @cnames = sort versioncmp @cnames; foreach my $cname (@cnames) { if ($cname eq 'node.val') { # should not happen -- cgit v1.2.3 From 9ebc57f00be76b13c5c25776c43e4be0fb749ac1 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Wed, 23 Apr 2008 17:22:14 -0700 Subject: Add parted debian package for install-system use --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 2fdbcfe..8ba2bff 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Depends: sed (>= 4.1.5), vyatta-quagga | quagga, vyatta-op, vyatta-config-migrate, + parted, dhcp3-client | vyatta-dhcp3-client, bsdutils (>=1:2.13), libc6 (>= 2.7-6), -- cgit v1.2.3 From 2c53162fa68e033670c2dfbdc006dc9041a2b99c Mon Sep 17 00:00:00 2001 From: rbalocca Date: Wed, 7 May 2008 14:56:35 -0700 Subject: Convert to our method of changelog creation --- .gitignore | 1 - ChangeLog | 1 + debian/autogen.sh | 26 -------------------------- 3 files changed, 1 insertion(+), 27 deletions(-) create mode 120000 ChangeLog (limited to 'debian') diff --git a/.gitignore b/.gitignore index 765492c..082e2ef 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ libtool /aclocal.m4 /autom4te.cache /build-stamp -/ChangeLog /config /config.log /config.guess diff --git a/ChangeLog b/ChangeLog new file mode 120000 index 0000000..d526672 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +debian/changelog \ No newline at end of file diff --git a/debian/autogen.sh b/debian/autogen.sh index ff125d1..e8c94af 100755 --- a/debian/autogen.sh +++ b/debian/autogen.sh @@ -1,32 +1,6 @@ #!/bin/sh -if [ -d .git ] ; then -# generate GNU/Debian format ChangeLog from git log - - rm -f ChangeLog - - if which git2cl >/dev/null ; then - git-log --pretty --numstat --summary | git2cl >> ChangeLog - else - git-log --pretty=short >> ChangeLog - fi - -# append repository reference - - url=` git repo-config --get remote.origin.url` - test "x$url" = "x" && url=`pwd` - - branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'` - test "x$branch" = "x" && branch=master - - sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8` - test "x$sha" = "x" && sha=00000000 - - echo "$url#$branch-$sha" >> ChangeLog - -fi - rm -rf config rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL -- cgit v1.2.3 From 9ecac28234e11b5df607fe338fdebc8956c9e349 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Tue, 17 Jun 2008 09:26:38 -0700 Subject: 3.1.0 --- debian/changelog | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 734169c..856faaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +vyatta-cfg (0.10) unstable; urgency=low + + 3.1.0 + [ Mark O'Brien ] + + + [ Stig Thormodsrud ] + * Block reboot from config mode. + * Add exception for /31 and /32 for ipv4 and /128 for ipv6 + * Fix 920: System allows configuration of invalid IP Address for + subnet + + [ rbalocca ] + * Ignore log file + * Fix for bug #3274 https://bugzilla.vyatta.com/show_bug.cgi?id=3274 + + [ Stig Thormodsrud ] + * Force "protocols ospf parameters" to be committed before other ospf + config. + + [ Stephen Hemminger ] + * Avoid any problems with non-device entries in /sys/class/net + * Remove unused dependencies + + [ Stig Thormodsrud ] + * Fix vlan regex. + + [ An-Cheng Huang ] + * fix for bug 3239: now support regex-based ordering for startup + config + + [ Stig Thormodsrud ] + * Add more granularity to config rank (commit rip, ospf, bgp + separately). + + [ rbalocca ] + * Fix problem with Default-Stop + * Convert to our method of changelog creation + + [ Stig Thormodsrud ] + * Only check for dhcp client on eth, vlan, and bridge. + * Fix 3233 dhcp client doesn't work on bridge interface + + [ An-Cheng Huang ] + * support "wildcard" ranking at boot time. only VRRP uses this for + now. + * partial fix for bug 3216: display escaped edit path correctly. + + [ Michael Larson ] + * fix for show -all. note there is a change in how config files are + saved--only set values are now save as opposed to set + + [ rbalocca ] + * Add parted debian package for install-system use + + [ Michael Larson ] + * backing out show cmd change for now on existence of def + * final checkin as fix for bug 1219. + * mask out def markers in config script + * create def file to mark configuration nodes that are created by + default, rather than a node with a default value created by a + * modified fix for 2525--fixes problem introduced with last fix (bug + 3163) + * revert fix for 2525 until delete on commit warnings are resolved. + * reverse sort order on delete + * modified node ordering code. + * partial revert of priority support--will reapply after additional + changes. + * temp removal of free--possible corruption. + * support for node priority. higher value in node.def is higher + priority. + + [ Mohit Mehta ] + * Fix Bug 3069 Help strings should be standardized + + [ An-Cheng Huang ] + * partial fix for bug 2181: add new template field "priority". + + [ Michael Larson ] + * alternate fix for 2525--force directory evaluation upstream. + * Revert "fix for bug 2525" + + [ Mohit Mehta ] + * Fix Bug 3069 Help strings should be standardized + + [ Michael Larson ] + * fix for bug 2525 + * fix for bug 2549. + * fix for bug 2507 + + [ An-Cheng Huang ] + * fix for bug 2689: sort tag nodes appropriately + + [ Mohit Mehta ] + * Fix Bug 2825 Load should read config file from default location when + no argument is provided. + + [ Stig Thormodsrud ] + * Add vlan dependancy for vyatta-cfg. + + [ rbalocca ] + * Fix a changelog problem + + [ Mark O'Brien ] + + -- Mark O'Brien Tue, 17 Jun 2008 09:26:38 -0700 + vyatta-cfg (0.9) unstable; urgency=low 3.0.5 -- cgit v1.2.3 From 2c51694d9a1791078e6ceef843f0259bc98ae180 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Sat, 21 Jun 2008 23:00:52 -0700 Subject: Add dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 8ba2bff..c469fb8 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Depends: sed (>= 4.1.5), vyatta-quagga | quagga, vyatta-op, vyatta-config-migrate, + vyatta-cfg-system, parted, dhcp3-client | vyatta-dhcp3-client, bsdutils (>=1:2.13), -- cgit v1.2.3