Makefile.in | 6 4 + 2 - 0 !
datapath/Makefile.in | 4 2 + 2 - 0 !
utilities/automake.mk | 2 1 + 1 - 0 !
3 files changed, 7 insertions(+), 5 deletions(-)

 upstream changes introduced in version 1.4.2+git20120612-6
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 openvswitch (1.4.2+git20120612-6) unstable; urgency=low
 .
   * utilities/automake.mk: Fix duplicate mention of ovs-vsctl in
     bin_PROGRAMS and bin_SCRIPTS; it should only have been in the former.
     Closes: #682384.  Thanks to Bastian Blank <waldi@debian.org> for
     reporting this bug.
 .
 The person named in the Author field signed this changelog entry.

utilities/ovs-ctl.in | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

 [patch] ovs-ctl: start the rest of open vswitch if loading brcompat module fails.

This may be more useful in practice than failing the entire OVS startup
sequence.

Debian bug #681955.
CC: 681955@bugs.debian.org
Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>

lib/lockfile.c | 48 15 + 33 - 0 !
tests/lockfile.at | 1 1 + 0 - 0 !
tests/test-lockfile.c | 36 36 + 0 - 0 !
3 files changed, 52 insertions(+), 33 deletions(-)

 [patch 1/3] lockfile: fix hang locking through a dangling symlink.

open() with O_CREAT|O_EXCL yields EEXIST if the file being opened is a
symlink.  lockfile_try_lock() interpreted that error code to mean that
some other process had created the lock file in the meantime, so it went
around its loop again, which found out the same thing, which led to a hang.

This commit fixes the problem by dropping O_EXCL.  I don't see any reason
that it's actually necessary.  That means that the loop itself is
unnecessary, so this commit drops that too.

Debian bug #681880.
CC: 681880@bugs.debian.org
Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>

ovsdb/log.c | 11 10 + 1 - 0 !
1 file changed, 10 insertions(+), 1 deletion(-)

 [patch 2/3] ovsdb: make "ovsdb-tool create" work through a dangling symlink.

open() with O_CREAT|O_EXCL yields EEXIST if the name passed in is a
symlink, but we would like "ovsdb-tool create /etc/openvswitch/conf.db" to
work if /etc/openvswitch/conf.db is a symlink to elsewhere in the file
system.  This commit fixes the problem.  It introduces a theoretical race,
but no one should be doing "ovsdb-tool create" in parallel anyhow; O_EXCL
is just an idiot check here, not required to be fail-safe.

Debian bug #681880.
CC: 681880@bugs.debian.org
Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>

Makefile.am | 1 1 + 0 - 0 !
configure.ac | 1 1 + 0 - 0 !
lib/automake.mk | 2 2 + 0 - 0 !
lib/dirs.c.in | 7 7 + 0 - 0 !
lib/dirs.h | 1 1 + 0 - 0 !
m4/openvswitch.m4 | 10 10 + 0 - 0 !
ovsdb/ovsdb-server.1.in | 2 1 + 1 - 0 !
ovsdb/ovsdb-server.c | 2 1 + 1 - 0 !
python/automake.mk | 1 1 + 0 - 0 !
python/ovs/dirs.py | 1 1 + 0 - 0 !
tests/ofproto-macros.at | 3 2 + 1 - 0 !
tests/ovs-monitor-ipsec.at | 1 1 + 0 - 0 !
tests/ovs-xapi-sync.at | 1 1 + 0 - 0 !
utilities/bugtool/ovs-bugtool.in | 2 1 + 1 - 0 !
utilities/bugtool/plugins/system-logs/openvswitch.xml | 3 2 + 1 - 0 !
utilities/ovs-ctl.8 | 3 2 + 1 - 0 !
utilities/ovs-ctl.in | 7 4 + 3 - 0 !
utilities/ovs-lib.in | 2 2 + 0 - 0 !
18 files changed, 41 insertions(+), 9 deletions(-)

 [patch 1/7] make the location of the database separately configurable.

The default is unchanged, /etc/openvswitch/conf.db.

This makes it possible to transition each Open vSwitch packaging from
/etc/openvswitch/conf.db to /var/lib/openvswitch/conf.db independently.

Signed-off-by: Ben Pfaff <blp@nicira.com>

tests/library.at | 10 7 + 3 - 0 !
tests/test-util.c | 44 36 + 8 - 0 !
2 files changed, 43 insertions(+), 11 deletions(-)

 [patch 2/7] tests: slightly generalize utility function tests.

This will allow passing arguments in for an upcoming test.

Signed-off-by: Ben Pfaff <blp@nicira.com>

lib/util.c | 85 85 + 0 - 0 !
lib/util.h | 3 3 + 0 - 0 !
tests/file_name.at | 97 97 + 0 - 0 !
tests/test-util.c | 13 13 + 0 - 0 !
4 files changed, 198 insertions(+)

 [patch 3/7] util: new function follow_symlinks().

It will acquire its first user in an upcoming commit.

Signed-off-by: Ben Pfaff <blp@nicira.com>

lib/lockfile.c | 29 21 + 8 - 0 !
tests/lockfile.at | 1 1 + 0 - 0 !
tests/test-lockfile.c | 30 30 + 0 - 0 !
3 files changed, 52 insertions(+), 8 deletions(-)

 [patch 4/7] lockfile: be more forgiving about lockfiles for symlinks.

As the database is being transitioned from /etc to /var, there is a symlink
from the old to the new location for the database and a symlink for its
lockfile.  This works OK, but it would be more user-friendly to still work
correctly in case the symlink for the lockfile isn't there (since its
existence is non-obvious), so this commit implements that behavior.

Signed-off-by: Ben Pfaff <blp@nicira.com>

ovsdb/file.c | 5 4 + 1 - 0 !
ovsdb/ovsdb-tool.c | 22 16 + 6 - 0 !
tests/ovsdb-server.at | 15 14 + 1 - 0 !
tests/ovsdb-tool.at | 14 13 + 1 - 0 !
4 files changed, 47 insertions(+), 9 deletions(-)

 [patch 5/7] ovsdb: do not replace symlinks by regular files during compaction.

Signed-off-by: Ben Pfaff <blp@nicira.com>

python/ovs/dirs.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] fix a typo in commit f973f2af2.

Signed-off-by: Mehak Mahajan <mmahajan@nicira.com>

lib/dirs.c.in | 15 13 + 2 - 0 !
python/automake.mk | 29 23 + 6 - 0 !
python/ovs/dirs.py | 20 12 + 8 - 0 !
python/ovs/dirs.py.template | 17 17 + 0 - 0 !
utilities/ovs-lib.in | 11 9 + 2 - 0 !
5 files changed, 74 insertions(+), 18 deletions(-)

 [patch] dirs: dbdir default must be based on sysconfdir.

Some in-tree and out-of-tree code sets the OVS_SYSCONFDIR environment
variable to control where /etc files go (mostly for test purposes).  When
the database directory (dbdir) was split off from the sysconfdir, the
configure-time default continued to be based on the sysconfdir, but
overriding the sysconfdir at runtime with OVS_SYSCONFDIR didn't have any
effect on the dbdir, which caused a visible change in behavior for code
that set the OVS_SYSCONFDIR environment variable.  This commit reverts that
change in behavior, by basing the dbdir on OVS_SYSCONFDIR if that
environment variable is set (but the OVS_DBDIR environment variable is
not).

Signed-off-by: Ben Pfaff <blp@nicira.com>

utilities/ovs-pki.in | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 use mode 0700 for ovs-pki incoming directory, instead of 0733.

Andreas Beckmann <debian@abeckmann.de> reported in bug #683665 that
the openvswitch-pki package creates a world-writable directory during
installation.  I believe that the intended use of this directory is
safe, because the file names are supposed to be the SHA-1 hash of a
freshly generated SSL client certificate, but the feature in question
is one that has not been widely used in Open vSwitch.  I'm not aware of
even a single user, the intended client software is not packaged
for Debian, and I intend to remove the feature from a later version
of Open vSwitch entirely.  Therefore, this patch simply changes the
directory's permissions to be only writable by root.

utilities/ovs-ctl.in | 41 31 + 10 - 0 !
1 file changed, 31 insertions(+), 10 deletions(-)

 [patch] ovs-ctl: add support for newer name for open vswitch kernel module.

Open vSwitch 1.4 and later is compatible with the upstream Linux kernel
module but the init scripts hadn't been adapted to work with the upstream
module name.

Debian bug #684057.
Signed-off-by: Ben Pfaff <blp@nicira.com>

Makefile.in | 41 32 + 9 - 0 !
configure | 12 12 + 0 - 0 !
datapath/Makefile.in | 5 3 + 2 - 0 !
tests/testsuite | 15776 8263 + 7513 - 0 !
4 files changed, 8310 insertions(+), 7524 deletions(-)

 upstream changes introduced in version 1.4.2+git20120612-9
 This patch has been created by dpkg-source during the package build.
 Here's the last changelog entry, hopefully it gives details on why
 those changes were made:
 .
 openvswitch (1.4.2+git20120612-9) unstable; urgency=low
 .
   * Apply bug-684057-ovs-ctl-Add-support-for-newer-module-name.patch to
     allow use of the openvswitch kernel module integrated into 3.3 and
     later.  Closes: #684057.
 .
 The person named in the Author field signed this changelog entry.

datapath/vport-internal_dev.c | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 datapath: reset upper layer protocol info on internal devices.
 It's possible that packets that are sent on internal devices (from
 the OVS perspective) have already traversed the local IP stack.
 After they go through the internal device, they will again travel
 through the IP stack which may get confused by the presence of
 existing information in the skb. The problem can be observed
 when switching between namespaces. This clears out that information
 to avoid problems but deliberately leaves other metadata alone.
 This is to provide maximum flexibility in chaining together OVS
 and other Linux components.

datapath/tunnel.c | 15 15 + 0 - 0 !
1 file changed, 15 insertions(+)

---