Hello community,

here is the log from the commit of package golang-github-docker-libnetwork for 
openSUSE:Factory checked in at 2019-11-12 11:54:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-github-docker-libnetwork (Old)
 and      /work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new.2990 
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "golang-github-docker-libnetwork"

Tue Nov 12 11:54:18 2019 rev:19 rq:742816 version:0.7.0.1+gitr2877_3eb39382bfa6

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/golang-github-docker-libnetwork/golang-github-docker-libnetwork.changes
  2019-10-23 15:47:25.862472841 +0200
+++ 
/work/SRC/openSUSE:Factory/.golang-github-docker-libnetwork.new.2990/golang-github-docker-libnetwork.changes
        2019-11-12 11:54:28.087282336 +0100
@@ -1,0 +2,5 @@
+Fri Oct 25 05:13:00 UTC 2019 - Aleksa Sarai <[email protected]>
+
+- Update to libnetwork 3eb39382bfa6, which is required for Docker 19.03.4-ce.
+
+-------------------------------------------------------------------

Old:
----
  libnetwork-git.45c710223c5f.tar.xz

New:
----
  libnetwork-git.3eb39382bfa6.tar.xz

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

Other differences:
------------------
++++++ golang-github-docker-libnetwork.spec ++++++
--- /var/tmp/diff_new_pack.jyqp9P/_old  2019-11-12 11:54:29.539283883 +0100
+++ /var/tmp/diff_new_pack.jyqp9P/_new  2019-11-12 11:54:29.543283887 +0100
@@ -29,14 +29,14 @@
 %endif
 
 # MANUAL: Update the git_version and git_revision
-%define git_version 45c710223c5fbf04dc3028b9a90b51892e36ca7f
-%define git_short   45c710223c5f
+%define git_version 3eb39382bfa6a3c42f83674ab080ae13b0e34e5d
+%define git_short   3eb39382bfa6
 # How to get the git_revision
 # git clone https://github.com/docker/libnetwork.git libnetwork
 # cd libnetwork
 # git checkout $git_version
 # git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r2874
+%define git_revision r2877
 
 %global provider        github
 %global provider_tld    com

++++++ _service ++++++
--- /var/tmp/diff_new_pack.jyqp9P/_old  2019-11-12 11:54:29.579283925 +0100
+++ /var/tmp/diff_new_pack.jyqp9P/_new  2019-11-12 11:54:29.579283925 +0100
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">git.%h</param>
-    <param name="revision">45c710223c5fbf04dc3028b9a90b51892e36ca7f</param>
+    <param name="revision">3eb39382bfa6a3c42f83674ab080ae13b0e34e5d</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">libnetwork-*.tar</param>

++++++ libnetwork-git.45c710223c5f.tar.xz -> libnetwork-git.3eb39382bfa6.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libnetwork-git.45c710223c5f/firewall_linux.go 
new/libnetwork-git.3eb39382bfa6/firewall_linux.go
--- old/libnetwork-git.45c710223c5f/firewall_linux.go   2019-09-13 
17:19:09.000000000 +0200
+++ new/libnetwork-git.3eb39382bfa6/firewall_linux.go   2019-10-11 
21:00:26.000000000 +0200
@@ -2,7 +2,6 @@
 
 import (
        "github.com/docker/libnetwork/iptables"
-       "github.com/docker/libnetwork/netlabel"
        "github.com/sirupsen/logrus"
 )
 
@@ -10,44 +9,15 @@
 
 func (c *controller) arrangeUserFilterRule() {
        c.Lock()
-
-       if c.hasIPTablesEnabled() {
-               arrangeUserFilterRule()
-       }
-
+       arrangeUserFilterRule()
        c.Unlock()
-
        iptables.OnReloaded(func() {
                c.Lock()
-
-               if c.hasIPTablesEnabled() {
-                       arrangeUserFilterRule()
-               }
-
+               arrangeUserFilterRule()
                c.Unlock()
        })
 }
 
-func (c *controller) hasIPTablesEnabled() bool {
-       // Locking c should be handled in the calling method.
-       if c.cfg == nil || c.cfg.Daemon.DriverCfg[netlabel.GenericData] == nil {
-               return false
-       }
-
-       genericData, ok := c.cfg.Daemon.DriverCfg[netlabel.GenericData]
-       if !ok {
-               return false
-       }
-
-       optMap := genericData.(map[string]interface{})
-       enabled, ok := optMap["EnableIPTables"].(bool)
-       if !ok {
-               return false
-       }
-
-       return enabled
-}
-
 // This chain allow users to configure firewall policies in a way that persists
 // docker operations/restarts. Docker will not delete or modify any 
pre-existing
 // rules from the DOCKER-USER filter chain.


Reply via email to