update to 2.7.0

diff --git a/Makefile b/Makefile
index 717b0b3578107bc7c2d54024aa245af91335488f..b02d0f0b6890962f0629e041cc2d99f40ccc983b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.3
-
 # also add entry in changelog.Debian
-OVSVER=2.6.0
-PKGRELEASE=2
+OVSVER=2.7.0
+PKGRELEASE=1
 
 OVSDIR=openvswitch-${OVSVER}
 OVSSRC=openvswitch-${OVSVER}.tar.gz

diff --git a/changelog.Debian b/changelog.Debian
index ecd722a327d0ea906365c48f7e10aee47f2947cc..515ca29a97a3bf04269715ec3f522e80baa5cebf 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+openvswitch (2.7.0-1) unstable; urgency=medium
+
+  * update to 2.7.0, recompile for Debian stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Mar 2017 17:11:08 +0100
+
 openvswitch (2.6.0-2) unstable; urgency=medium
 
   * drop System V init script

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

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

diff --git a/pvepatches/install-systemd-services.patch b/pvepatches/install-systemd-services.patch
index 8434b2e4d1649d0d3e7b369aac88a59c75423c9a..2b5bbab17c9e1b0bd20d6f25771cc0cba6586895 100644 (file)
--- a/pvepatches/install-systemd-services.patch
+++ b/pvepatches/install-systemd-services.patch
@@ -1,7 +1,7 @@
-Index: devel/debian/openvswitch-switch.openvswitch-nonetwork.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
 ===================================================================
 --- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch-nonetwork.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch-nonetwork.service
 @@ -0,0 +1,12 @@
 +[Unit]
 +Description=Open vSwitch Internal Unit
@@ -15,10 +15,10 @@ Index: devel/debian/openvswitch-switch.openvswitch-nonetwork.service
 +EnvironmentFile=-/etc/sysconfig/openvswitch
 +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random $OPTIONS
 +ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop
-Index: devel/debian/openvswitch-switch.openvswitch.service
+Index: openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
 ===================================================================
 --- /dev/null
-+++ devel/debian/openvswitch-switch.openvswitch.service
++++ openvswitch-2.7.0/debian/openvswitch-switch.openvswitch.service
 @@ -0,0 +1,13 @@
 +[Unit]
 +Description=Open vSwitch
@@ -33,12 +33,12 @@ Index: devel/debian/openvswitch-switch.openvswitch.service
 +
 +[Install]
 +WantedBy=multi-user.target
-Index: devel/debian/rules
+Index: openvswitch-2.7.0/debian/rules
 ===================================================================
---- devel.orig/debian/rules
-+++ devel/debian/rules
-@@ -53,7 +53,10 @@ override_dh_install:
-       cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
+--- openvswitch-2.7.0.orig/debian/rules
++++ openvswitch-2.7.0/debian/rules
+@@ -56,7 +56,10 @@ override_dh_install-indep:
+       dh_install
  
  override_dh_installinit:
 -      dh_installinit -R
@@ -49,10 +49,10 @@ Index: devel/debian/rules
  
  override_dh_strip:
        dh_strip --dbg-package=openvswitch-dbg
-Index: devel/debian/control
+Index: openvswitch-2.7.0/debian/control
 ===================================================================
---- devel.orig/debian/control
-+++ devel/debian/control
+--- openvswitch-2.7.0.orig/debian/control
++++ openvswitch-2.7.0/debian/control
 @@ -14,6 +14,7 @@ Build-Depends: graphviz,
                 openssl,
                 procps,
@@ -71,11 +71,11 @@ Index: devel/debian/control
  Description: Open vSwitch switch implementations
   Open vSwitch is a production quality, multilayer, software-based,
   Ethernet virtual switch. It is designed to enable massive network
-Index: devel/debian/automake.mk
+Index: openvswitch-2.7.0/debian/automake.mk
 ===================================================================
---- devel.orig/debian/automake.mk
-+++ devel/debian/automake.mk
-@@ -27,7 +27,6 @@ EXTRA_DIST += \
+--- openvswitch-2.7.0.orig/debian/automake.mk
++++ openvswitch-2.7.0/debian/automake.mk
+@@ -24,7 +24,6 @@ EXTRA_DIST += \
        debian/openvswitch-pki.postrm \
        debian/openvswitch-switch.README.Debian \
        debian/openvswitch-switch.dirs \

diff --git a/pvepatches/remove-unneeded-from-control.patch b/pvepatches/remove-unneeded-from-control.patch
index b47c927ce9e8867ad394fb908de7189296bd2333..f8d4330f88c873e928e0141471eb05569edfee85 100644 (file)
--- a/pvepatches/remove-unneeded-from-control.patch
+++ b/pvepatches/remove-unneeded-from-control.patch
@@ -1,7 +1,7 @@
-Index: devel/debian/control
+Index: openvswitch-2.7.0/debian/control
 ===================================================================
---- devel.orig/debian/control
-+++ devel/debian/control
+--- openvswitch-2.7.0.orig/debian/control
++++ openvswitch-2.7.0/debian/control
 @@ -14,46 +14,10 @@ Build-Depends: graphviz,
                 openssl,
                 procps,
@@ -49,7 +49,7 @@ Index: devel/debian/control
  Package: openvswitch-common
  Architecture: linux-any
  Depends: openssl,
-@@ -100,138 +64,6 @@ Description: Open vSwitch switch implementations
+@@ -100,114 +64,6 @@ Description: Open vSwitch switch impleme
   openvswitch-switch provides the userspace components and utilities for
   the Open vSwitch kernel-based switch.
  
@@ -114,7 +114,7 @@ Index: devel/debian/control
 - databases for OVN that is run at a central location.
 -
 -Package: ovn-docker
--Architecture: any
+-Architecture: linux-any
 -Depends: openvswitch-switch (= ${binary:Version}),
 -         openvswitch-common (= ${binary:Version}),
 -         python (>= 2.7),
@@ -131,30 +131,6 @@ Index: devel/debian/control
 - .
 - ovn-docker provides the docker drivers for OVN.
 -
--Package: openvswitch-ipsec
--Architecture: linux-any
--Depends: ipsec-tools (>=0.8~alpha20101208),
--         iproute2,
--         openvswitch-common (= ${binary:Version}),
--         openvswitch-switch (= ${binary:Version}),
--         python,
--         python-openvswitch (= ${source:Version}),
--         racoon (>=0.8~alpha20101208),
--         ${misc:Depends},
--         ${shlibs:Depends}
--Description: Open vSwitch GRE-over-IPsec support
-- 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.
-- .
-- The ovs-monitor-ipsec script provides support for encrypting GRE
-- tunnels with IPsec.
-- IPsec tunnels support is deprecated.
--
 -Package: openvswitch-pki
 -Architecture: all
 -Depends: openvswitch-common (<< ${source:Version}.1~),
@@ -188,7 +164,7 @@ Index: devel/debian/control
  Package: openvswitch-dbg
  Section: debug
  Architecture: linux-any
-@@ -253,72 +85,3 @@ Description: Debug symbols for Open vSwitch packages
+@@ -229,72 +85,3 @@ Description: Debug symbols for Open vSwi
   This package contains the debug symbols for all the other openvswitch-*
   packages.  Install it to debug one of them or to examine a core dump
   produced by one of them.
@@ -261,10 +237,10 @@ Index: devel/debian/control
 - 1000V.
 - .
 - This package provides openvswitch headers and libopenvswitch for developers.
-Index: devel/debian/rules
+Index: openvswitch-2.7.0/debian/rules
 ===================================================================
---- devel.orig/debian/rules
-+++ devel/debian/rules
+--- openvswitch-2.7.0.orig/debian/rules
++++ openvswitch-2.7.0/debian/rules
 @@ -12,7 +12,6 @@
  #export DH_VERBOSE=1
  
@@ -273,7 +249,7 @@ Index: devel/debian/rules
  DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+:)?([0-9][a-zA-Z0-9.+:~-]*)(-[a-zA-Z0-9*.~]*),\2,p')
  
  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-@@ -53,39 +52,6 @@ override_dh_install:
+@@ -53,42 +52,9 @@ override_dh_install-arch:
        # openvswitch-switch
        cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
  
@@ -283,6 +259,9 @@ Index: devel/debian/rules
 -      # ovn-central
 -      cp debian/ovn-central.template debian/ovn-central/usr/share/ovn/central/default.template
 -
+ override_dh_install-indep:
+       dh_install
+ 
 -      # openvswitch-datapath-source
 -      cp debian/rules.modules debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 -      chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules