update to 2.3.0

diff --git a/Makefile b/Makefile
index 82df271962ca5b39e7790832d5d8a3a1d1cd97c7..79983f753cd690df7d6d1564df652897dc258f81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.2
+RELEASE=3.3
 
 # also add entry in changelog.Debian
-OVSVER=2.0.90
-PKGRELEASE=4
+OVSVER=2.3.0
+PKGRELEASE=1
 
 OVSDIR=openvswitch-${OVSVER}
 OVSSRC=openvswitch-${OVSVER}.tar.gz
@@ -32,11 +32,12 @@ ${DEBS}: ${OVSSRC}
 
 .PHONY: download
 ${OVSSRC} download:
-       rm -rf ${OVSDIR} ${OVSSRC}
-       git clone git://git.openvswitch.org/openvswitch ${OVSDIR}
-       rm -rf ${OVSDIR}/.git
-       tar czf ${OVSSRC}.tmp ${OVSDIR}
-       mv ${OVSSRC}.tmp ${OVSSRC}
+       wget http://openvswitch.org/releases/${OVSSRC}
+       #rm -rf ${OVSDIR} ${OVSSRC}
+       #git clone git://git.openvswitch.org/openvswitch ${OVSDIR}
+       #rm -rf ${OVSDIR}/.git
+       #tar czf ${OVSSRC}.tmp ${OVSDIR}
+       #mv ${OVSSRC}.tmp ${OVSSRC}
 
 .PHONY: upload
 upload: ${DEBS}

diff --git a/README b/README
index 350c0b04185ba4e960604e1d8ef93c4bc22aac9f..144332355b0d48d517151db6859407942465a143 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
 We compile our own package, because current debian packages are too old.
 
-Sources are copied from:
-
-git clone git://git.openvswitch.org/openvswitch
+Sources are copied from: http://openvswitch.org/releases/

diff --git a/changelog.Debian b/changelog.Debian
index ddb42ceff6443affff271c9c19f06b991822632d..d3edc95e1fe3399747a38f6efb0a193fe4f1c424 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+openvswitch (2.3.0-1) unstable; urgency=low
+
+  * update to latest stable upstream version 2.3.0
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 18 Sep 2014 07:39:32 +0200
+
 openvswitch (2.0.90-4) unstable; urgency=low
 
   * fix bug #528: start after $local_fs

diff --git a/openvswitch-2.0.90.tar.gz b/openvswitch-2.0.90.tar.gz
deleted file mode 100644 (file)
index 3c0e924..0000000
Binary files a/openvswitch-2.0.90.tar.gz and /dev/null differ

diff --git a/openvswitch-2.3.0.tar.gz b/openvswitch-2.3.0.tar.gz
new file mode 100644 (file)
index 0000000..6090fb2
Binary files /dev/null and b/openvswitch-2.3.0.tar.gz differ

diff --git a/pvepatches/fix-init-depends.patch b/pvepatches/fix-init-depends.patch
index 260cfd86aab598e94ed6caa68427ffcd3b5697d2..5d5ab78593bbd8de1f7b616e81ac5a35c6050484 100644 (file)
--- a/pvepatches/fix-init-depends.patch
+++ b/pvepatches/fix-init-depends.patch
@@ -1,7 +1,7 @@
 Index: new/debian/openvswitch-switch.init
 ===================================================================
---- new.orig/debian/openvswitch-switch.init    2014-06-11 10:31:50.000000000 +0200
-+++ new/debian/openvswitch-switch.init 2014-06-11 10:32:50.000000000 +0200
+--- new.orig/debian/openvswitch-switch.init    2014-09-18 08:09:17.000000000 +0200
++++ new/debian/openvswitch-switch.init 2014-09-18 08:09:23.000000000 +0200
 @@ -16,10 +16,12 @@
  #
  ### BEGIN INIT INFO
@@ -45,9 +45,9 @@ Index: new/debian/openvswitch-switch.init
        set "$@" --force-corefiles="$FORCE_COREFILES"
 Index: new/debian/rules
 ===================================================================
---- new.orig/debian/rules      2013-12-18 07:59:19.000000000 +0100
-+++ new/debian/rules   2014-06-11 10:32:30.000000000 +0200
-@@ -131,7 +131,8 @@
+--- new.orig/debian/rules      2014-08-14 22:33:18.000000000 +0200
++++ new/debian/rules   2014-09-18 08:09:23.000000000 +0200
+@@ -130,7 +130,8 @@
        dh_installexamples
        dh_installdebconf
        dh_installlogrotate

diff --git a/pvepatches/remove-unneeded-from-control.patch b/pvepatches/remove-unneeded-from-control.patch
index 3ad7bf2678e2d0dd3de9996572eeca38fe3ed1b7..a60dde2747c4d0db4b4a7f9c48705d1b26666a7d 100644 (file)
--- a/pvepatches/remove-unneeded-from-control.patch
+++ b/pvepatches/remove-unneeded-from-control.patch
@@ -1,14 +1,14 @@
 Index: new/debian/control
 ===================================================================
---- new.orig/debian/control    2013-12-18 07:59:19.000000000 +0100
-+++ new/debian/control 2013-12-18 09:13:33.433526213 +0100
+--- new.orig/debian/control    2014-08-14 22:28:37.000000000 +0200
++++ new/debian/control 2014-09-18 08:17:46.000000000 +0200
 @@ -6,8 +6,7 @@
  Build-Depends:
   debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, 
   libssl-dev, bzip2, openssl, graphviz,
 - python-all (>= 2.6.6-3~), procps, python-qt4,
-- python-zopeinterface, python-twisted-conch
-+ python-all (>= 2.6.6-3~), procps
+- python-zopeinterface, python-twisted-conch, libtool
++ python-all (>= 2.6.6-3~), procps, libtool
  Standards-Version: 3.9.3
  Homepage: http://openvswitch.org/
  
@@ -35,29 +35,3 @@ Index: new/debian/control
  Package: openvswitch-common
  Architecture: linux-any
  Depends:
-@@ -152,25 +135,6 @@
-  .
-  This package contains the full Python bindings for Open vSwitch database.
- 
--Package: ovsdbmonitor
--Architecture: all
--Section: utils
--Depends: ${python:Depends}, python-openvswitch, ${misc:Depends}
--Description: Open vSwitch graphical monitoring tool
-- Open vSwitch is a production quality, multilayer, software-based,
-- Ethernet virtual switch. It is designed to enable massive network
-- automation through programmatic extension, while still supporting
-- standard management interfaces and protocols (e.g. NetFlow, IPFIX,
-- sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
-- to support distribution across multiple physical servers similar to
-- VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
-- .
-- This package is a GUI tool for monitoring and troubleshooting local
-- or remote Open vSwitch installations.  It presents GUI tables that
-- graphically represent an Open vSwitch kernel flow table (similar to
-- "ovs-dpctl dump-flows") and Open vSwitch database contents (similar
-- to "ovs-vsctl list <table>").
--
- Package: openvswitch-test
- Architecture: all
- Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web, python (>= 2.7) | python-argparse

diff --git a/pvepatches/use-log-cons-for-syslog.patch b/pvepatches/use-log-cons-for-syslog.patch
index 48287de1713a789671e28630f587e9e1d5f1fc26..d92eb2606f3fc4134ee21dac8a09d7c70e559b21 100644 (file)
--- a/pvepatches/use-log-cons-for-syslog.patch
+++ b/pvepatches/use-log-cons-for-syslog.patch
@@ -7,14 +7,14 @@ available. So we log to console if syslog fails.
 
 Index: new/lib/vlog.c
 ===================================================================
---- new.orig/lib/vlog.c        2013-12-18 07:59:19.000000000 +0100
-+++ new/lib/vlog.c     2013-12-21 06:12:18.760775259 +0100
-@@ -604,7 +604,7 @@
-      * private copy to suppress memory leak warnings in case openlog() does
-      * make its own copy.) */
-     program_name_copy = program_name ? xstrdup(program_name) : NULL;
--    openlog(program_name_copy, LOG_NDELAY, LOG_DAEMON);
-+    openlog(program_name_copy, LOG_NDELAY|LOG_CONS, LOG_DAEMON);
+--- new.orig/lib/vlog.c        2014-08-14 22:28:37.000000000 +0200
++++ new/lib/vlog.c     2014-09-18 08:12:27.000000000 +0200
+@@ -613,7 +613,7 @@
+          * a pointer to the private copy to suppress memory leak warnings in
+          * case openlog() does make its own copy.) */
+         program_name_copy = program_name ? xstrdup(program_name) : NULL;
+-        openlog(program_name_copy, LOG_NDELAY, LOG_DAEMON);
++        openlog(program_name_copy, LOG_NDELAY|LOG_CONS, LOG_DAEMON);
+         ovsthread_once_done(&once);
  
-     now = time_wall_msec();
-     if (now < 0) {
+         /* Now do anything that we want to happen only once but doesn't have to