[pve-devel] [PATCH] openvswitch : bump to 2.5 v2
Alexandre Derumier
aderumier at odiso.com
Fri Apr 22 09:32:06 CEST 2016
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
Makefile | 6 +--
changelog.Debian | 6 +++
pvepatches/fix-init-depends.patch | 24 +++++------
pvepatches/install-systemd-services.patch | 61 ++++++++++++---------------
pvepatches/remove-unneeded-from-control.patch | 28 ++++++------
pvepatches/series | 1 -
6 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/Makefile b/Makefile
index ea9cb84..7578b27 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.1
+RELEASE=4.2
# also add entry in changelog.Debian
-OVSVER=2.3.2
-PKGRELEASE=3
+OVSVER=2.5.0
+PKGRELEASE=1
OVSDIR=openvswitch-${OVSVER}
OVSSRC=openvswitch-${OVSVER}.tar.gz
diff --git a/changelog.Debian b/changelog.Debian
index 759f391..bbab232 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+openvswitch (2.5.0-1) unstable; urgency=medium
+
+ * update to 2.5.0
+
+ -- Proxmox Support Team <support at proxmox.com> Wed, 20 Apr 2016 07:00:45 +0200
+
openvswitch (2.3.2-3) unstable; urgency=medium
* Fix CVE-2016-2074
diff --git a/pvepatches/fix-init-depends.patch b/pvepatches/fix-init-depends.patch
index 5d5ab78..d77b701 100644
--- a/pvepatches/fix-init-depends.patch
+++ b/pvepatches/fix-init-depends.patch
@@ -10,7 +10,7 @@ Index: new/debian/openvswitch-switch.init
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-+# Required-Start: pvenetcommit $local_fs
++# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# X-Start-Before: networking
+# X-Stop-After: networking
@@ -45,15 +45,15 @@ Index: new/debian/openvswitch-switch.init
set "$@" --force-corefiles="$FORCE_COREFILES"
Index: new/debian/rules
===================================================================
---- 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
+--- a/debian/rules
++++ b/debian/rules
+@@ -82,7 +82,8 @@ override_dh_install:
+ debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/xenserver/LICENSE
+
+ override_dh_installinit:
- dh_installinit -R
-+ dh_installinit -p "openvswitch-switch" -R -- start 20 S . stop 80 0 6 .
-+ dh_installinit --remaining-packages -R
- dh_installcron
- dh_installman --language=C
- dh_link
++ dh_installinit -p "openvswitch-switch" -R -- start 20 S . stop 80 0 6 .
++ dh_installinit --remaining-packages -R
+
+ override_dh_strip:
+ dh_strip --dbg-package=openvswitch-dbg
diff --git a/pvepatches/install-systemd-services.patch b/pvepatches/install-systemd-services.patch
index 1314148..645d048 100644
--- a/pvepatches/install-systemd-services.patch
+++ b/pvepatches/install-systemd-services.patch
@@ -7,7 +7,7 @@ Index: new/debian/openvswitch-switch.openvswitch-nonetwork.service
+Description=Open vSwitch Internal Unit
+
+DefaultDependencies=no
-+After=local-fs.target systemd-tmpfiles-setup.service
++After=local-fs.target systemd-tmpfiles-setup.service pvenetcommit.service
+
+[Service]
+Type=oneshot
@@ -35,49 +35,40 @@ Index: new/debian/openvswitch-switch.openvswitch.service
+WantedBy=multi-user.target
Index: new/debian/rules
===================================================================
---- new.orig/debian/rules
-+++ new/debian/rules
-@@ -40,6 +40,7 @@ configure-stamp:
- dh_testdir
- test -e configure || ./boot.sh
- test -d _debian || mkdir _debian
-+ rm debian/openvswitch-switch.init
- echo $(DEB_BUILD_OPTIONS)
- echo $$CC
- cd _debian && ( \
-@@ -130,8 +131,10 @@ binary-common:
- dh_installexamples
- dh_installdebconf
- dh_installlogrotate
-- dh_installinit -p "openvswitch-switch" -R -- start 20 S . stop 80 0 6 .
-- dh_installinit --remaining-packages -R
+--- a/debian/rules
++++ b/debian/rules
+@@ -82,8 +82,10 @@ override_dh_install:
+ debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/xenserver/LICENSE
+
+ override_dh_installinit:
+- dh_installinit -p "openvswitch-switch" -R -- start 20 S . stop 80 0 6 .
+- dh_installinit --remaining-packages -R
+ dh_systemd_enable -p "openvswitch-switch" --name openvswitch
+ dh_systemd_enable -p "openvswitch-switch" --name openvswitch-nonetwork
+ dh_installinit
+ dh_systemd_start -p "openvswitch-switch" --name openvswitch-nonetwork --restart-after-upgrade
- dh_installcron
- dh_installman --language=C
- dh_link
+
+ override_dh_strip:
+ dh_strip --dbg-package=openvswitch-dbg
Index: new/debian/control
===================================================================
---- new.orig/debian/control
-+++ new/debian/control
-@@ -6,7 +6,8 @@ Uploaders: Ben Pfaff <pfaffben at debian.or
- Build-Depends:
- debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10,
- libssl-dev, bzip2, openssl, graphviz,
-- python-all (>= 2.6.6-3~), procps, libtool
-+ python-all (>= 2.6.6-3~), procps, libtool,
-+ dh-systemd (>= 1.4)
+--- a/debian/control
++++ b/debian/control
+@@ -14,6 +14,7 @@ Build-Depends: graphviz,
+ openssl,
+ procps,
+ python-all (>= 2.7),
++ dh-systemd (>= 1.4)
Standards-Version: 3.9.3
Homepage: http://openvswitch.org/
-@@ -48,7 +49,7 @@ Description: Open vSwitch common compone
- Package: openvswitch-switch
- Architecture: linux-any
- Suggests: openvswitch-datapath-module
--Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, openvswitch-common (= ${binary:Version}), kmod | module-init-tools, procps, uuid-runtime, netbase, python-argparse
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, openvswitch-common (= ${binary:Version}), kmod | module-init-tools, procps, uuid-runtime, netbase, python-argparse, systemd
+@@ -66,7 +67,8 @@ Depends: kmod | module-init-tools,
+ uuid-runtime,
+ ${misc:Depends},
+ ${python:Depends},
+- ${shlibs:Depends}
++ ${shlibs:Depends},
++ systemd
Description: Open vSwitch switch implementations
Open vSwitch is a production quality, multilayer, software-based,
Ethernet virtual switch. It is designed to enable massive network
diff --git a/pvepatches/remove-unneeded-from-control.patch b/pvepatches/remove-unneeded-from-control.patch
index a60dde2..8507fd4 100644
--- a/pvepatches/remove-unneeded-from-control.patch
+++ b/pvepatches/remove-unneeded-from-control.patch
@@ -1,24 +1,24 @@
-Index: new/debian/control
-===================================================================
---- 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, libtool
-+ python-all (>= 2.6.6-3~), procps, libtool
+diff --git a/debian/control b/debian/control
+index 49d6f5f..71011e6 100644
+--- a/debian/control
++++ b/debian/control
+@@ -14,9 +14,6 @@ Build-Depends: graphviz,
+ openssl,
+ procps,
+ python-all (>= 2.7),
+- python-qt4,
+- python-twisted-conch,
+- python-zopeinterface
Standards-Version: 3.9.3
Homepage: http://openvswitch.org/
-@@ -29,22 +28,6 @@
+@@ -38,22 +35,6 @@ Description: Open vSwitch datapath module source - module-assistant version
from it using module-assistant or make-kpkg. README.Debian in this
package provides further instructions.
-Package: openvswitch-datapath-dkms
-Architecture: all
--Depends: dkms (>= 1.95), make, libc6-dev, ${misc:Depends}, ${python:Depends}
+-Depends: dkms (>= 1.95), libc6-dev, make, ${misc:Depends}, ${python:Depends}
-Description: Open vSwitch datapath module source - DKMS version
- Open vSwitch is a production quality, multilayer, software-based,
- Ethernet virtual switch. It is designed to enable massive network
@@ -34,4 +34,4 @@ Index: new/debian/control
-
Package: openvswitch-common
Architecture: linux-any
- Depends:
+ Depends: openssl,
diff --git a/pvepatches/series b/pvepatches/series
index d810d02..e810b29 100644
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -3,4 +3,3 @@ fix-init-script-patch
fix-init-depends.patch
install-systemd-services.patch
use-systemctl-inside-ifupdown.patch
-CVE-2016-2074.patch
--
2.1.4
More information about the pve-devel
mailing list