commit openvswitch for openSUSE:Factory

29 Apr 2013

Hello community,

here is the log from the commit of package openvswitch for openSUSE:Factory checked in at 2013-04-29 14:15:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openvswitch (Old)
 and      /work/SRC/openSUSE:Factory/.openvswitch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openvswitch", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null	2013-04-05 00:01:41.916011506 +0200
+++ /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes	2013-04-29 14:15:27.000000000 +0200
@@ -0,0 +1,220 @@
+-------------------------------------------------------------------
+Wed Apr  3 09:30:20 UTC 2013 - tpaszkowski@novell.com
+
+- %make_install macro no longer works on SLE11. Spec file now uses %makeinstall.
+
+
+-------------------------------------------------------------------
+Tue Mar 26 11:21:37 UTC 2013 - speilicke@suse.com
+
+- Use build conditionals instead of %define and disable GUI by default
+  everywhere
+
+-------------------------------------------------------------------
+Thu Mar 21 13:23:36 UTC 2013 - tpaszkowski@novell.com
+
+- Fix openvswitch-controller init script
+- Add openflow-controller sysconfig file with default binding to ptcp:
+
+-------------------------------------------------------------------
+Tue Mar 12 13:36:57 UTC 2013 - tpaszkowski@suse.com
+
+- ipsec build temporary disabled
+
+-------------------------------------------------------------------
+Fri Mar  8 14:16:57 UTC 2013 - tpaszkowski@suse.com
+
+- Provides and Obsolete for former openvswitch-common package 
+
+-------------------------------------------------------------------
+Thu Mar  7 21:49:09 UTC 2013 - tpaszkowski@suse.com
+
+- always build in openvswitch kernel module (gre tunelling not present
+  within the standard kernel module)
+- removed unnedded build rquirements (move to appropriate subpackage)
+- moved common stuff to main pkg
+- added group filed to packages and sub packages
+- switch pkg suggest kernel module pkg
+- moved python test stuff to python-openvswitch-test sub pkg
+- moved ui interface requirements to ovsdbmonitor sub pkg
+- ovsdbmonitor will not be build on sles (for now)
+- sub pkg test require python-twisted (ovs-test)
+- don't call boot.sh on sles11 (old autoconf). Shipped configuration stuff
+  is ok (we don't patch plenty of stuff)
+- ovs-parse-backtrace now part of main pkg
+- addes ovs-l3ping,ovs-vlan-test to test sub pkg
+
+
+-------------------------------------------------------------------
+Thu Feb 28 22:17:11 UTC 2013 - e.istomin@edss.ee
+
+- New upstream version 1.9.0
+  http://openvswitch.org/releases/NEWS-1.9.0
+
+-------------------------------------------------------------------
+Thu Nov 15 08:59:41 UTC 2012 - rhafer@suse.com
+
+- New patch openvswitch-1.7.1-ovs-pki-permissions.patch: Avoid
+  creating world writeable directory (bnc#774332, CVE-2012-3449)
+
+-------------------------------------------------------------------
+Sun Sep  9 15:33:08 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.7.1
+  * This release only contain bug fixes.
+
+-------------------------------------------------------------------
+Tue Jul 31 12:41:19 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.7.0
+  * kernel modules are renamed. openvswitch_mod.ko is now
+    openvswitch.ko and brcompat_mod.ko is now brcompat.ko.
+  * Increased the number of NXM registers to 8.
+  * Added ability to configure DSCP setting for manager and controller
+    connections.  By default, these connections have a DSCP value of
+    Internetwork Control (0xc0).
+  * Added the granular link health statistics, 'cfm_health', to an
+    interface.
+  * OpenFlow:
+      - Added support to mask nd_target for ICMPv6 neighbor discovery flows.
+      - Added support for OpenFlow 1.3 port description (OFPMP_PORT_DESC)
+        multipart messages.
+  * ovs-ofctl:
+      - Added the "dump-ports-desc" command to retrieve port
+        information using the new port description multipart messages.
+  * ovs-test:
+      - Added support for spawning ovs-test server from the client.
+      - Now ovs-test is able to automatically create test bridges and ports.
+  * "ovs-dpctl dump-flows" now prints observed TCP flags in TCP flows.
+  * Tripled flow setup performance.
+  * The "coverage/log" command previously available through ovs-appctl
+    has been replaced by "coverage/show".  The new command replies with
+    coverage counter values, instead of logging them.
+- Adjusted openvswitch-1.1.0-stp-fwd-delay.patch (new filename)
+
+-------------------------------------------------------------------
+Thu Jul 26 11:47:36 UTC 2012 - rhafer@suse.com
+
+- The kernel modules where renamed in recent kernels. Backported a
+  patch from the 1.7 branch to use the new kernel names when
+  building on openSUSE > 12.1.
+
+-------------------------------------------------------------------
+Tue Jun 26 15:09:02 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.6.1
+  * Added support for bitwise matching on TCP and UDP ports.
+  * Support for limiting the number of flows in an OpenFlow flow
+    table, with configurable policy for evicting flows upon
+    overflow.
+  * Added an OpenFlow extension that allows controllers more precise
+    control over which messages they receive asynchronously.
+  * CFM module CCM broadcasts can now be tagged with an 802.1p priority.
+  * Load balancing for bonds can be disabled.
+
+-------------------------------------------------------------------
+Wed Jun  6 15:04:45 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.5.0
+  * OpenFlow:
+      - Added support for querying, modifying, and deleting flows
+        based on flow cookie when using NXM.
+      - Added new NXM_PACKET_IN format.
+  * ovs-ofctl:
+      - Added daemonization support to the monitor and snoop commands.
+  * ovs-vsctl:
+      - The "find" command supports new set relational operators
+        {=}, {!=}, {<}, {>}, {<=}, and {>=}.
+  * ovsdb-tool now uses the typical database and schema installation
+    directories as defaults.
+
+-------------------------------------------------------------------
+Thu May 10 22:32:34 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.4.1
+  * The default MAC learning timeout has been increased from 60 seconds
+    to 300 seconds. The MAC learning timeout is now configurable.
+  * Bug fixes
+
+-------------------------------------------------------------------
+Thu Apr  5 10:08:32 UTC 2012 - on@morlock.nu
+
+- Build KMP packages from kernel-source on openSuSE > 12.1.
+
+-------------------------------------------------------------------
+Tue Mar 13 12:16:43 UTC 2012 - mvidner@suse.com
+
+- Specify defattr for pki subpackage to fix 11.4 build.
+
+-------------------------------------------------------------------
+Thu Mar  1 13:35:52 UTC 2012 - dmacvicar@suse.de
+
+- Rewrite the package based on the debian version instead
+  * current package was tied to xenserver config without
+    even requiring it
+  * instead of one big package depending even on qt4, there
+    are -switch, -controller, -test subpackages now
+
+-------------------------------------------------------------------
+Mon Feb 20 23:39:50 UTC 2012 - on@morlock.nu
+
+- New upstream version 1.4.0
+  * Compatible with Open vSwitch kernel module included in Linux 3.3.
+  * Don't require the "normal" action to use mirrors.
+  * New "VLAN splinters" feature to work around buggy device driver in old Linux versions.
+  * Added ability to match ECN and TTL in IPv4 and IPv6 headers.
+  * Added ability to match IPv6 flow label.
+  * Added ability to modify ECN bits and TTL in IPv4 headers.
+  * And many others. See the full change log here:
+	 http://openvswitch.org/releases/NEWS-1.4.0
+
+-------------------------------------------------------------------
+Fri Sep  2 09:11:21 UTC 2011 - andrea@opensuse.org
+
+- new uopstream version 1.2.1
+  * The release only contains bug fixes for the 1.2.0 release 
+
+-------------------------------------------------------------------
+Mon Aug  8 17:47:58 UTC 2011 - andrea@opensuse.org
+
+- new upstream version 1.2.0
+   * New abstraction layer to make better use of switching ASICs
+   * Packaging for Red Hat (RHEL) 5.6 and 6.0
+   * Datapath support for Linux kernels up to 3.0
+   * And many others.  See the full change log here:
+         http://openvswitch.org/releases/ChangeLog-1.2.0 
+- rebased openvswitch-1.1.0-suse.patch as 
+  openvswitch-1.2.0-suse.patch to apply to the files
+-------------------------------------------------------------------
+Thu Jun 23 06:49:16 UTC 2011 - andrea@opensuse.org
+
+- new upstream version 1.1.1
+  * bug fix release 
+
+-------------------------------------------------------------------
+Wed May 18 10:09:45 UTC 2011 - andrea@opensuse.org
+ 
+- re-enabled kmp package since openvswitch_mod.ko and
++++ 23 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.openvswitch.new/openvswitch.changes

New:
----
  Module.supported
  README.packager
  openvswitch-1.7.0-stp-fwd-delay.patch
  openvswitch-1.9.0.tar.gz
  openvswitch-controller.init
  openvswitch-controller.sysconfig
  openvswitch-ipsec.init
  openvswitch-switch.init
  openvswitch-switch.logrotate
  openvswitch-switch.template
  openvswitch.changes
  openvswitch.spec
  preamble

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openvswitch.spec ++++++
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


# Enable KMP building by default:
%bcond_without kmp
# Don't build in-kernel module, the shipped one is more feature rich:
%bcond_with kernel_kmp
# IpSec build disabled temporarily (need to upgrade ipsec-tools):
%bcond_with ipsec
# Disable GUI building by default (heavy Qt4 dependencies):
%bcond_with gui

Name:           openvswitch
Version:        1.9.0
Release:        0
License:        Apache-2.0
Summary:        An open source, production quality, multilayer virtual switch
Url:            http://openswitch.org/
Group:          Productivity/Networking/System
Source0:        http://openvswitch.org/releases/%{name}-%{version}.tar.gz
Source1:        preamble
Source2:        openvswitch-switch.init
Source3:        openvswitch-switch.template
Source4:        openvswitch-switch.logrotate
Source5:        openvswitch-controller.init
Source6:        openvswitch-controller.sysconfig
# brcompat is going to be deprecated soon
# PATCH-FEATURE-UPSTREAM openvswitch-1.7.0-stp-fwd-delay.patch -- Set STP bridge forward delay
Patch1:         %{name}-1.7.0-stp-fwd-delay.patch
BuildRequires:  autoconf
BuildRequires:  automake
BuildRequires:  gcc
BuildRequires:  glibc-devel
BuildRequires:  graphviz
BuildRequires:  libopenssl-devel
BuildRequires:  libtool
BuildRequires:  make
BuildRequires:  openssl
BuildRequires:  perl
BuildRequires:  pkg-config
BuildRequires:  python-devel
BuildRequires:  valgrind-devel
BuildRequires:  fdupes
Requires:       logrotate
Requires:       openssl
Requires:       python
Provides:       openvswitch-common = %{version}
Obsoletes:      openvswitch-common < %{version}
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
%py_requires

%description
Open vSwitch is a production quality, multilayer virtual switch licensed under
the open source Apache 2.0 license. It is designed to enable massive network automation
through programmatic extension, while still supporting standard management interfaces
and protocols (e.g. NetFlow, sFlow, RSPAN, ERSPAN, 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.

%if %{with kmp}
%package kmp
Summary:        Open vSwitch kernel modules
Group:          System/Kernel
BuildRequires:  %kernel_module_package_buildreqs
%if %{with kernel_kmp}
BuildRequires:  kernel-source
%endif
%suse_kernel_module_package -p %_sourcedir/preamble ec2 xen xenpae vmi um

%description -n %{name}-kmp
Kernel modules supporting the openvswitch datapath
%endif

%if %{with ipsec}
%package ipsec
Summary:        Open vSwitch GRE-over-IPsec support
Group:          Productivity/Networking/System
Requires:       %{name} = %{version}
Requires:       %{name}-switch = %{version}
Requires:       ipsec-tools >= 0.8
Requires:       python
Requires:       python-argparse
Requires:       python-openvswitch = %{version}
Requires:       racoon >= 0.8

%description ipsec
The ovs-monitor-ipsec script provides support for encrypting GRE
tunnels with IPsec.

Open vSwitch is a full-featured software-based Ethernet switch.
%endif

%package switch
Summary:        Open vSwitch switch implementations
Group:          Productivity/Networking/System
Requires(pre):  %fillup_prereq
Requires(pre):  %insserv_prereq
Requires:       module-init-tools
Requires:       openvswitch = %{version}
Requires:       procps
Requires:       python
Requires:       uuid-runtime
Suggests:       openvswitch-kmp
Suggests:	logrotate
%description switch
openvswitch-switch provides the userspace components and utilities for
the Open vSwitch kernel-based switch.

Open vSwitch is a full-featured software-based Ethernet switch.

%package pki
Summary:        Open vSwitch public key infrastructure dependency package
Group:          Productivity/Networking/System
Requires:       openvswitch = %{version}

%description pki
openvswitch-pki provides PKI (public key infrastructure) support for
Open vSwitch switches and controllers, reducing the risk of
man-in-the-middle attacks on the Open vSwitch network infrastructure.

Open vSwitch is a full-featured software-based Ethernet switch.

%package controller
Summary:        Open vSwitch controller implementation
Group:          Productivity/Networking/System
Requires:       openvswitch = %{version}

%description controller
The Open vSwitch controller enables OpenFlow switches that connect to it
to act as MAC-learning Ethernet switches.

Open vSwitch is a full-featured software-based Ethernet switch.

%package brcompat
Summary:        Open vSwitch bridge compatibility support (deprecated)
Group:          Productivity/Networking/System
Requires:       openvswitch-switch = %{version}
Recommends:     bridge-utils

%description brcompat
openvswitch-brcompat provides a way for applications that use the
Linux bridge to gradually migrate to Open vSwitch.  Programs that
ordinarily control the Linux bridge module, such as "brctl", instead
control the Open vSwitch kernel-based switch. Please note that this
feature is deprecated and will ve removed soon.

Once this package is installed, adding BRCOMPAT=yes in
/etc/default/openvswitch-switch enables bridge compatibility.

Open vSwitch is a full-featured software-based Ethernet switch.

%package -n python-openvswitch
Summary:        Python bindings for Open vSwitch
Group:          Productivity/Networking/System
Requires:       python

%description -n python-openvswitch
This package contains the full Python bindings for Open vSwitch database.

%package -n python-openvswitch-test
Summary:        Python bindings for Open vSwitch
Group:          Productivity/Networking/System
Requires:       python

%description -n python-openvswitch-test
This package contains the full Python bindings for Open vSwitch database.

%if %{with gui}
%package ovsdbmonitor
Summary:        Open vSwitch graphical monitoring tool
Group:          Productivity/Networking/System
BuildRequires:  python-pyside
BuildRequires:  python-qt4-devel
BuildRequires:  python-twisted
BuildRequires:  python-zopeinterface
Requires:       python-openvswitch
Requires:       python-pyasn1
Requires:       python-pyside
Requires:       python-qt4
Requires:       python-twisted
Requires:       python-zopeinterface

%description ovsdbmonitor
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>").

Open vSwitch is a full-featured software-based Ethernet switch.
%endif

%package test
Summary:        Open vSwitch test package
Group:          Productivity/Networking/System
Requires:       python
Requires:       python-argparse
Requires:       python-openvswitch-test = %{version}
Requires:       python-twisted

%description test
This package contains utilities that are useful to diagnose
performance and connectivity issues in Open vSwitch setup.

Open vSwitch is a full-featured software-based Ethernet switch.

%prep
%setup -q
%patch1 -p1

set -- *
mkdir source
mv "$@" source/
mkdir obj

%build
pushd source
# don't call boot.sh, we don't have appropriate autoconf there
%if ! 0%{?sles_version}
    bash -x boot.sh
%endif
popd
%if %{with kmp}
%if %{with kernel_kmp}
for flavor in %flavors_to_build; do
    mkdir -p $flavor
    cp -a $RPM_SOURCE_DIR/Module.supported $flavor/
    krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease)
    kernel_source_dir=$(readlink /lib/modules/$krel/source)
    cp -a $kernel_source_dir/net/openvswitch/* $flavor/
    make -C %{kernel_source $flavor} modules M=$PWD/$flavor
done
%else
export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'
for flavor in %flavors_to_build; do
    rm -rf obj/$flavor
    cp -r source obj/$flavor
    pushd obj/$flavor
    %configure \
	--with-logdir=/var/log \
	--with-linux=/usr/src/linux-obj/%_target_cpu/$flavor \
	--with-linux-source=/usr/src/linux
    cd datapath/linux
    make
    popd
done
%endif
%endif
ls source
pushd source
%configure \
	--with-logdir=/var/log
make %{?_smp_mflags}
popd

%install
%if %{with kmp}
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
for flavor in %flavors_to_build; do
%if %{with kernel_kmp}
    make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor
%else
    pushd obj/$flavor/datapath/linux
    make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD
    popd
%endif
done
%endif
pushd source

%makeinstall
install -d -m 755 %{buildroot}/%{_sysconfdir}/init.d
install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates

install -m 644 %{SOURCE3}  \
         %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}-switch
install -m 644 %{SOURCE6}  \
         %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}-controller
install -m 755 %{SOURCE2} \
         %{buildroot}/%{_sysconfdir}/init.d/%{name}-switch
         ln -s %{_sysconfdir}/init.d/%{name}-switch %{buildroot}%{_sbindir}/rc%{name}-switch
install -m 755 %{SOURCE5} \
         %{buildroot}/%{_sysconfdir}/init.d/%{name}-controller
         ln -s %{_sysconfdir}/init.d/%{name}-controller %{buildroot}%{_sbindir}/rc%{name}-controller


install -d -m 755 %{buildroot}/%{_sysconfdir}/sysconfig
install -d -m 755 %{buildroot}/%{_sysconfdir}/logrotate.d
install -d -m 755 %{buildroot}/var/log/openvswitch

install -m 644 %{SOURCE4} \
         %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-switch
install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d

install -d -m 755 %{buildroot}/%{_datadir}/%{name}/scripts
install -m 644 vswitchd/vswitch.ovsschema \
         %{buildroot}/%{_datadir}/%{name}/vswitch.ovsschema
%if %{with ipsec}
install -m 755 debian/ovs-monitor-ipsec \
	%{buildroot}/%{_datadir}/%{name}/ovs-monitor-ipsec
%endif

popd

mkdir -p %{buildroot}%{py_sitedir}
mv %{buildroot}%{_datadir}/%{name}/python/* %{buildroot}%{py_sitedir}
rmdir %{buildroot}%{_datadir}/%{name}/python

%fdupes %{buildroot}%{py_sitedir}

%post switch
%{fillup_and_insserv openvswitch-switch}

%preun switch
%stop_on_removal openvswitch-switch

%postun switch
%restart_on_update openvswitch-switch
%insserv_cleanup

%preun controller
%stop_on_removal openvswitch-controller

%postun controller
%restart_on_update openvswitch-controller
%insserv_cleanup

%files brcompat
%defattr(-,root,root)
%{_sbindir}/ovs-brcompatd
%{_mandir}/man8/ovs-brcompatd.8.gz

%files
%defattr(-,root,root)
%dir %{_datadir}/openvswitch
%doc source/AUTHORS source/DESIGN source/INSTALL.* source/NOTICE
%doc source/REPORTING-BUGS source/PORTING
%doc source/SubmittingPatches source/CodingStyle source/README
%doc source/WHY-OVS source/COPYING source/README-gcov
%{_bindir}/ovs-appctl
%{_bindir}/ovs-benchmark
%{_bindir}/ovs-ofctl
%{_bindir}/ovs-parse-leaks
%{_bindir}/ovsdb-client
%{_bindir}/ovs-parse-backtrace
%{_sbindir}/ovs-bugtool
%{_sbindir}/ovs-vlan-bug-workaround
%dir %{_datadir}/openvswitch/scripts
%{_datadir}/openvswitch/bugtool-plugins
%{_datadir}/openvswitch/scripts/ovs-bugtool-cfm-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-lacp-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-tc-class-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-ovsdb-dump
%{_datadir}/openvswitch/scripts/ovs-bugtool-bond-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-coverage-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-daemons-ver
%{_datadir}/openvswitch/scripts/ovs-bugtool-vsctl-show
%{_datadir}/openvswitch/scripts/ovs-bugtool-memory-show
%{_mandir}/man1/ovs-benchmark.1.gz
%{_mandir}/man1/ovsdb-client.1.gz
%{_mandir}/man8/ovs-appctl.8.gz
%{_mandir}/man8/ovs-bugtool.8.gz
%{_mandir}/man8/ovs-ofctl.8.gz
%{_mandir}/man8/ovs-parse-leaks.8.gz
%{_mandir}/man8/ovs-vlan-bug-workaround.8.gz
%{_mandir}/man8/ovs-parse-backtrace.8.gz

%files pki
%defattr(-,root,root)
%{_mandir}/man8/ovs-pki.8.gz
%{_bindir}/ovs-pki

%files controller
%defattr(-,root,root)
%{_bindir}/ovs-controller
%{_sysconfdir}/init.d/openvswitch-controller
%{_sbindir}/rc%{name}-controller
%{_mandir}/man8/ovs-controller.8.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch-controller

%files -n python-openvswitch
%defattr(-,root,root)
%{py_sitedir}/ovs/

%files -n python-openvswitch-test
%defattr(-,root,root)
%{py_sitedir}/ovstest/

%if %{with ipsec}
%files ipsec
%defattr(-,root,root)
%{_datadir}/openvswitch/ovs-monitor-ipsec
%endif

%files switch
%defattr(-,root,root)
%{_bindir}/ovs-dpctl
%{_bindir}/ovs-tcpundump
%{_bindir}/ovs-pcap
%{_bindir}/ovs-vsctl
%{_bindir}/ovsdb-tool
%{_sbindir}/ovs-vswitchd
%{_sbindir}/ovsdb-server
%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
%{_datadir}/openvswitch/scripts/ovs-ctl
%{_datadir}/openvswitch/scripts/ovs-lib
%{_datadir}/openvswitch/scripts/ovs-save
%{_datadir}/openvswitch/vswitch.ovsschema
%{_localstatedir}/adm/fillup-templates/sysconfig.openvswitch-switch
%{_sysconfdir}/init.d/openvswitch-switch
%{_sbindir}/rc%{name}-switch
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch-switch
%{_mandir}/man8/ovs-dpctl.8.gz
%{_mandir}/man1/ovs-tcpundump.1.gz
%{_mandir}/man1/ovs-pcap.1.gz
%{_mandir}/man8/ovs-vsctl.8.gz
%{_mandir}/man1/ovsdb-tool.1.gz
%{_mandir}/man8/ovs-vswitchd.8.gz
%{_mandir}/man1/ovsdb-server.1.gz
%{_mandir}/man5/ovs-vswitchd.conf.db.5.gz
%{_mandir}/man8/ovs-ctl.8.gz
%dir /var/log/openvswitch

%files test
%defattr(-,root,root)
%{_bindir}/ovs-test
%{_bindir}/ovs-l3ping
%{_bindir}/ovs-vlan-test
%{_mandir}/man8/ovs-test.8.gz
%{_mandir}/man8/ovs-l3ping.8.gz
%{_mandir}/man8/ovs-vlan-test.8.gz

%if %{with gui}
%files ovsdbmonitor
%defattr(-,root,root)
%{_bindir}/ovsdbmonitor
%dir %{_datadir}/ovsdbmonitor
%{_datadir}/applications/ovsdbmonitor.desktop
%{_datadir}/ovsdbmonitor/*
%{_mandir}/man1/ovsdbmonitor.1.gz
%endif

%changelog
++++++ Module.supported ++++++
-		kernel/net/openvswitch/openvswitch
++++++ README.packager ++++++

This package is based on the Debian openvswitch package as the
original openvswitch package in the build service was next to useless
due of being based on the xenserver/ directory of the sources, which
tied the package completely to xen.

Also, the original package was one big package depending even on Qt4.
This package splits in varius subpackages.

The xen part was removed. If it needs to be added again, it needs to
be its subpackage.

TODO:

- [DONE] sysconfig is bogus, as the init scripts do not source it yet (uses debian defaults file)
- pki component does not have the postun postin scripts yet

++++++ openvswitch-1.7.0-stp-fwd-delay.patch ++++++
diff -ruN openvswitch-1.7.0/datapath/brcompat_main.c openvswitch-1.7.0.new/datapath/brcompat_main.c
--- openvswitch-1.7.0/datapath/brcompat_main.c	2012-07-19 00:24:18.000000000 +0200
+++ openvswitch-1.7.0.new/datapath/brcompat_main.c	2012-07-31 13:51:47.319114805 +0200
@@ -327,6 +327,19 @@
 	return -ENOMEM;
 }
 
+static int brc_set_bridge_forward_delay(struct net_device *dev,
+					unsigned long delay)
+{
+	printk("attempting to set bridge forward delay %u\n", delay);
+	return 0;
+}
+
+static int brc_stp_set_enabled(struct net_device *dev, unsigned long state)
+{
+	printk("attempting to set bridge STP to %u\n", state);
+	return 0;
+}
+
 /* Legacy ioctl's through SIOCDEVPRIVATE.  Called with rtnl_lock. */
 static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
@@ -350,6 +363,11 @@
 	case BRCTL_GET_FDB_ENTRIES:
 		return brc_get_fdb_entries(dev, (void __user *)args[1],
 					   args[2], args[3]);
+	case BRCTL_SET_BRIDGE_FORWARD_DELAY:
+		return brc_set_bridge_forward_delay(dev, args[1]);
+
+	case BRCTL_SET_BRIDGE_STP_STATE:
+                return brc_stp_set_enabled(dev, args[1]);
 	}
 
 	return -EOPNOTSUPP;
++++++ openvswitch-controller.init ++++++
#!/bin/sh
#
# Copyright (c) 2011 Nicira Networks Inc.
# Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org>
#
# This is free software; you may redistribute it and/or modify
# it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2,
# or (at your option) any later version.
#
# This is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License with
# the Debian operating system, in /usr/share/common-licenses/GPL;  if
# not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
#
### BEGIN INIT INFO
# Provides:          openvswitch-controller
# Required-Start:    $network $local_fs $remote_fs
# Required-Stop:     $remote_fs
# Should-Start:      $named
# Should-Stop:       $null
# Default-Start:     2 3 5
# Default-Stop:      0 1 6
# Short-Description: Open vSwitch controller
### END INIT INFO

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

DAEMON=/usr/bin/ovs-controller # Introduce the server's location here
NAME=ovs-controller         # Introduce the short server's name here
DESC=ovs-controller         # Introduce a short description here
LOGDIR=/var/log/openvswitch # Log directory to use

PIDFILE=/var/run/openvswitch/$NAME.pid 

test -x $DAEMON || exit 0

. /lib/lsb/init-functions

# Default options, these can be overriden by the information
# at /etc/default/openvswitch-controller
DAEMON_OPTS=""          # Additional options given to the server 

DODTIME=10              # Time to wait for the server to die, in seconds
                        # If this value is set too low you might not
                        # let some servers to die gracefully and
                        # 'restart' will not work
                        
LOGFILE=$LOGDIR/$NAME.log  # Server logfile
#DAEMONUSER=            # User to run the daemons as. If this value
                        # is set start-stop-daemon will chuid the server

# Include defaults if available
default=/etc/sysconfig/openvswitch-controller
if [ -f $default ] ; then
    . $default
fi

# Check that the user exists (if we set a user)
# Does the user exist?
if [ -n "$DAEMONUSER" ] ; then
    if getent passwd | grep -q "^$DAEMONUSER:"; then
        # Obtain the uid and gid
        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
    else
        echo "The user $DAEMONUSER, required to run $NAME does not exist."
        exit 1
    fi
fi


set -e

running_pid() {
# Check if a given process pid's cmdline matches a given name
    pid=$1
    name=$2
    [ -z "$pid" ] && return 1 
    [ ! -d /proc/$pid ] &&  return 1
    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
    # Is this the expected server
    [ "$cmd" != "$name" ] &&  return 1
    return 0
}

running() {
# Check if the process is running looking at /proc
# (works for all users)

    # No pidfile, probably no daemon present
    [ ! -f "$PIDFILE" ] && return 1
    pid=`cat $PIDFILE`
    running_pid $pid $DAEMON || return 1
    return 0
}

start_server() {
    if [ -z "$LISTEN" ]; then
        echo "$default: No connection methods configured, controller disabled" >&2
        exit 0
    fi

    if [ ! -d /var/run/openvswitch ]; then
        install -d -m 755 -o root -g root /var/run/openvswitch
    fi

    SSL_OPTS=
    case $LISTEN in
        *ssl*)
            : ${PRIVKEY:=/etc/openvswitch-controller/privkey.pem}
            : ${CERT:=/etc/openvswitch-controller/cert.pem}
            : ${CACERT:=/etc/openvswitch-controller/cacert.pem}
            if test ! -e "$PRIVKEY" || test ! -e "$CERT" ||
                test ! -e "$CACERT"; then
                if test ! -e "$PRIVKEY"; then
                    echo "$PRIVKEY: private key missing" >&2
                fi
                if test ! -e "$CERT"; then
                    echo "$CERT: certificate for private key missing" >&2
                fi
                if test ! -e "$CACERT"; then
                    echo "$CACERT: CA certificate missing" >&2
                fi
                exit 1
            fi
            SSL_OPTS="--private-key=$PRIVKEY --certificate=$CERT --ca-cert=$CACERT"
            ;;
    esac

# Start the process using the wrapper
        if [ -z "$DAEMONUSER" ] ; then
            start-stop-daemon --start --quiet --pidfile $PIDFILE \
                        --exec $DAEMON -- --detach --pidfile=$PIDFILE \
                        $LISTEN $DAEMON_OPTS $SSL_OPTS
            errcode=$?
        else
# if we are using a daemonuser then change the user id
            start-stop-daemon --start --quiet --pidfile $PIDFILE \
                        --chuid $DAEMONUSER --exec $DAEMON -- \
                        --detach --pidfile=$PIDFILE $LISTEN $DAEMON_OPTS \
                        $SSL_OPTS
            errcode=$?
        fi
        return $errcode
}

stop_server() {
# Stop the process using the wrapper
        if [ -z "$DAEMONUSER" ] ; then
            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
                        --exec $DAEMON
            errcode=$?
        else
# if we are using a daemonuser then look for process that match
            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
                        --user $DAEMONUSER --exec $DAEMON
            errcode=$?
        fi

        return $errcode
}

reload_server() {
    [ ! -f "$PIDFILE" ] && return 1
    pid=`cat $PIDFILE` # This is the daemon's pid
    # Send a SIGHUP
    kill -1 $pid
    return $?
}

force_stop() {
# Force the process to die killing it manually
    [ ! -e "$PIDFILE" ] && return
    if running ; then
        kill -15 $pid
        # Is it really dead?
        sleep "$DODTIME"
        if running ; then
            kill -9 $pid
            sleep "$DODTIME"
            if running ; then
                echo "Cannot kill $NAME (pid=$pid)!"
                exit 1
            fi
        fi
    fi
    rm -f $PIDFILE
}


case "$1" in
  start)
        echo "Starting $DESC " "$NAME"
        # Check if it's running first
        if running ;  then
            echo "apparently already running"
            exit 0
        fi
        if start_server && running ;  then
            # It's ok, the server started and is running
            :
        else
            # Either we could not start it or it is not running
            # after we did
            # NOTE: Some servers might die some time after they start,
            # this code does not try to detect this and might give
            # a false positive (use 'status' for that)
	    :
        fi
        ;;
  stop)
        echo "Stopping $DESC" "$NAME"
        if running ; then
            # Only stop the server if we see it running
            stop_server
        else
            # If it's not running don't do anything
            echo "apparently not running"
            exit 0
        fi
        ;;
  force-stop)
        # First try to stop gracefully the program
        $0 stop
        if running; then
            # If it's still running try to kill it more forcefully
            echo "Stopping (force) $DESC" "$NAME"
            force_stop
        fi
        ;;
  restart|force-reload)
        echo "Restarting $DESC" "$NAME"
        stop_server
        # Wait some sensible amount, some server need this
        [ -n "$DODTIME" ] && sleep $DODTIME
        start_server
        running
        ;;
  status)

        echo "Checking status of $DESC" "$NAME"
        if running ;  then
            echo "running"
        else
            echo "apparently not running"
            exit 1
        fi
        ;;
  # Use this if the daemon cannot reload
  reload)
        echo "Reloading $NAME daemon: not implemented, as the daemon"
        echo "cannot re-read the config file (use restart)."
        ;;
  *)
        N=/etc/init.d/openvswitch-controller
        echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
        exit 1
        ;;
esac

exit 0
++++++ openvswitch-controller.sysconfig ++++++
# This is a POSIX shell fragment                -*- sh -*-

# listen arguments
#
LISTEN="ptcp:"
++++++ openvswitch-ipsec.init ++++++
#!/bin/sh
#
# Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org>
#
# This is free software; you may redistribute it and/or modify
# it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2,
# or (at your option) any later version.
#
# This is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License with
# the Debian operating system, in /usr/share/common-licenses/GPL;  if
# not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
#
### BEGIN INIT INFO
# Provides:          openvswitch-ipsec
# Required-Start:    $network $local_fs $remote_fs openvswitch-switch
# Required-Stop:     $remote_fs
# Default-Start:     2 3 4 5
# Default-Stop:      0 1 6
# Short-Description: Open vSwitch GRE-over-IPsec daemon
### END INIT INFO

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

DAEMON=/usr/share/openvswitch/scripts/ovs-monitor-ipsec # Daemon's location
NAME=ovs-monitor-ipsec          # Introduce the short server's name here
LOGDIR=/var/log/openvswitch     # Log directory to use

PIDFILE=/var/run/openvswitch/$NAME.pid 

test -x $DAEMON || exit 0

. /lib/lsb/init-functions

DODTIME=10              # Time to wait for the server to die, in seconds
                        # If this value is set too low you might not
                        # let some servers to die gracefully and
                        # 'restart' will not work
                        
set -e

running_pid() {
# Check if a given process pid's cmdline matches a given name
    pid=$1
    name=$2
    [ -z "$pid" ] && return 1 
    [ ! -d /proc/$pid ] &&  return 1
    cmd=`cat /proc/$pid/cmdline | tr "\000" " "|cut -d " " -f 2`
    # Is this the expected server
    [ "$cmd" != "$name" ] &&  return 1
    return 0
}

running() {
# Check if the process is running looking at /proc
# (works for all users)

    # No pidfile, probably no daemon present
    [ ! -f "$PIDFILE" ] && return 1
    pid=`cat $PIDFILE`
    running_pid $pid $DAEMON || return 1
    return 0
}

start_server() {
    if [ ! -d /var/run/openvswitch ]; then
        install -d -m 755 -o root -g root /var/run/openvswitch
    fi

    /usr/share/openvswitch/scripts/ovs-monitor-ipsec \
           --pidfile=$PIDFILE --log-file --detach --monitor \
           unix:/var/run/openvswitch/db.sock

    return 0
}

stop_server() {
    if [ -e $PIDFILE ]; then
        kill `cat $PIDFILE`
    fi

    return 0
}

force_stop() {
# Force the process to die killing it manually
    [ ! -e "$PIDFILE" ] && return
    if running ; then
        kill -15 $pid
        # Is it really dead?
        sleep "$DODTIME"
        if running ; then
            kill -9 $pid
            sleep "$DODTIME"
            if running ; then
                echo "Cannot kill $NAME (pid=$pid)!"
                exit 1
            fi
        fi
    fi
    rm -f $PIDFILE
}


case "$1" in
  start)
        log_daemon_msg "Starting $NAME"
        # Check if it's running first
        if running ;  then
            log_progress_msg "apparently already running"
            log_end_msg 0
            exit 0
        fi
        if start_server && running ;  then
            # It's ok, the server started and is running
            log_end_msg 0
        else
            # Either we could not start it or it is not running
            # after we did
            # NOTE: Some servers might die some time after they start,
            # this code does not try to detect this and might give
            # a false positive (use 'status' for that)
            log_end_msg 1
        fi
        ;;
  stop)
        log_daemon_msg "Stopping $NAME"
        if running ; then
            # Only stop the server if we see it running
            stop_server
            log_end_msg $?
        else
            # If it's not running don't do anything
            log_progress_msg "apparently not running"
            log_end_msg 0
            exit 0
        fi
        ;;
  force-stop)
        # First try to stop gracefully the program
        $0 stop
        if running; then
            # If it's still running try to kill it more forcefully
            log_daemon_msg "Stopping (force) $NAME"
            force_stop
            log_end_msg $?
        fi
        ;;
  restart|force-reload)
        log_daemon_msg "Restarting $NAME"
        stop_server
        # Wait some sensible amount, some server need this
        [ -n "$DODTIME" ] && sleep $DODTIME
        start_server
        running
        log_end_msg $?
        ;;
  status)
        log_daemon_msg "Checking status of $NAME"
        if running ;  then
            log_progress_msg "running"
            log_end_msg 0
        else
            log_progress_msg "apparently not running"
            log_end_msg 1
            exit 1
        fi
        ;;
  # Use this if the daemon cannot reload
  reload)
        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
        log_warning_msg "cannot re-read the config file (use restart)."
        ;;
  *)
        N=/etc/init.d/openvswitch-ipsec
        echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
        exit 1
        ;;
esac

exit 0
++++++ openvswitch-switch.init ++++++
#! /bin/sh
#
# Copyright (C) 2011 Nicira Networks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
### BEGIN INIT INFO
# Provides:          openvswitch-switch
# Required-Start:    $local_fs
# Required-Stop:     $local_fs
# Default-Start:     2 3 5
# Default-Stop:      0 1 6
# Short-Description: Open vSwitch switch
### END INIT INFO

(test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0

. /usr/share/openvswitch/scripts/ovs-lib
test -e /etc/sysconfig/openvswitch-switch && . /etc/sysconfig/openvswitch-switch

if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
    BRCOMPAT=no
    log_warning_msg "ovs-brcompatd missing, disabling bridge compatibility"
fi

ovs_ctl () {
    set /usr/share/openvswitch/scripts/ovs-ctl "$@"
    if test X"$BRCOMPAT" = Xyes; then
        set "$@" --brcompat
    fi
    "$@"
}

load_kmod () {
    ovs_ctl load-kmod || exit $?
}

start () {
    if ovs_ctl load-kmod; then
	:
    else
	echo "Module has probably not been built for this kernel."
	if ! test -d /usr/share/doc/openvswitch-datapath-source; then
	    echo "Install the openvswitch-datapath-source package, then read"
	else
            echo "For instructions, read"
	fi
	echo "/usr/share/doc/openvswitch-datapath-source/README.Debian"
    fi
    set ovs_ctl ${1-start} --system-id=random
    if test X"$FORCE_COREFILES" != X; then
	set "$@" --force-corefiles="$FORCE_COREFILES"
    fi
    "$@" || exit $?

    ovs_ctl --protocol=gre enable-protocol
}

stop () {
    ovs_ctl stop
}

case $1 in
    start)
        start
	;;
    stop | force-stop)
        stop
        ;;
    reload | force-reload)
        # The OVS daemons keep up-to-date.
        ;;
    restart)
        stop
        start
        ;;
    status)
        ovs_ctl status
        ;;
    force-reload-kmod)
        start force-reload-kmod
        ;;
    load-kmod)
        load_kmod
        ;;
    *)
        echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop|force-reload-kmod|load-kmod}" >&2
        exit 1
        ;;
esac

exit 0
++++++ openvswitch-switch.logrotate ++++++
/var/log/openvswitch/*.log {
    daily
    compress
    create 640 root adm
    delaycompress
    missingok
    rotate 30
    postrotate
    # Tell Open vSwitch daemons to reopen their log files
    if [ -e /var/run/openvswitch/ovs-vswitchd.pid ]; then
        ovs-appctl --t ovs-vswitchd vlog/reopen
    fi
    if [ -e /var/run/openvswitch/ovsdb-server.pid ]; then
        ovs-appctl --t ovsdb-server vlog/reopen
    fi
    endscript
}
++++++ openvswitch-switch.template ++++++
# This is a POSIX shell fragment                -*- sh -*-

# FORCE_COREFILES: If 'yes' then core files will be enabled.
# FORCE_COREFILES=yes

# BRCOMPAT: If 'yes' and the openvswitch-brcompat package is installed, then
# Linux bridge compatibility will be enabled.
# BRCOMPAT=no
++++++ preamble ++++++
Requires: kernel-%1
Enhances: kernel-%1
Supplements: packageand(kernel-%1:%{-n*})
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit openvswitch for openSUSE:Factory

root＠hilbert.suse.de