Hello community, here is the log from the commit of package yast2-vpn for openSUSE:Factory checked in at 2020-03-03 10:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vpn (Old) and /work/SRC/openSUSE:Factory/.yast2-vpn.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vpn" Tue Mar 3 10:14:58 2020 rev:13 rq:779408 version:4.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vpn/yast2-vpn.changes 2019-10-17 12:20:30.515440334 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-vpn.new.26092/yast2-vpn.changes 2020-03-03 10:15:17.494532586 +0100 @@ -1,0 +2,7 @@ +Wed Feb 26 10:27:01 CET 2020 - sch...@suse.de + +- Using SysctlConfig class: Handle sysctl entries in different + directories (bsc#1151649). +- 4.2.4 + +------------------------------------------------------------------- Old: ---- yast2-vpn-4.2.3.tar.bz2 New: ---- yast2-vpn-4.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vpn.spec ++++++ --- /var/tmp/diff_new_pack.OucMBW/_old 2020-03-03 10:15:18.830535351 +0100 +++ /var/tmp/diff_new_pack.OucMBW/_new 2020-03-03 10:15:18.874535441 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-vpn # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-vpn -Version: 4.2.3 +Version: 4.2.4 Release: 0 Url: https://github.com/yast/yast-vpn Source0: %{name}-%{version}.tar.bz2 @@ -25,9 +25,9 @@ License: GPL-2.0-only Group: System/YaST -# CFA::Sysctl +# CFA::SysctlConfig BuildRequires: update-desktop-files -BuildRequires: yast2 >= 4.2.25 +BuildRequires: yast2 >= 4.2.67 BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) @@ -35,8 +35,8 @@ PreReq: %fillup_prereq -# CFA::Sysctl -Requires: yast2 >= 4.2.25 +# CFA::SysctlConfig +Requires: yast2 >= 4.2.67 Requires: yast2-ruby-bindings BuildArch: noarch ++++++ yast2-vpn-4.2.3.tar.bz2 -> yast2-vpn-4.2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.2.3/package/yast2-vpn.changes new/yast2-vpn-4.2.4/package/yast2-vpn.changes --- old/yast2-vpn-4.2.3/package/yast2-vpn.changes 2019-10-07 15:04:05.000000000 +0200 +++ new/yast2-vpn-4.2.4/package/yast2-vpn.changes 2020-02-26 13:44:47.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 26 10:27:01 CET 2020 - sch...@suse.de + +- Using SysctlConfig class: Handle sysctl entries in different + directories (bsc#1151649). +- 4.2.4 + +------------------------------------------------------------------- Fri Oct 4 14:26:08 UTC 2019 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> - Write sysctl settings to a file under /etc/sysctl.d (jsc#SLE-9077). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.2.3/package/yast2-vpn.spec new/yast2-vpn-4.2.4/package/yast2-vpn.spec --- old/yast2-vpn-4.2.3/package/yast2-vpn.spec 2019-10-07 15:04:05.000000000 +0200 +++ new/yast2-vpn-4.2.4/package/yast2-vpn.spec 2020-02-26 13:44:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-vpn -Version: 4.2.3 +Version: 4.2.4 Release: 0 Url: https://github.com/yast/yast-vpn Source0: %{name}-%{version}.tar.bz2 @@ -25,8 +25,8 @@ License: GPL-2.0 Group: System/YaST -# CFA::Sysctl -BuildRequires: yast2 >= 4.2.25 +# CFA::SysctlConfig +BuildRequires: yast2 >= 4.2.67 BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: update-desktop-files BuildRequires: yast2-ruby-bindings @@ -35,8 +35,8 @@ PreReq: %fillup_prereq -# CFA::Sysctl -Requires: yast2 >= 4.2.25 +# CFA::SysctlConfig +Requires: yast2 >= 4.2.67 Requires: yast2-ruby-bindings BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.2.3/src/modules/IPSecConf.rb new/yast2-vpn-4.2.4/src/modules/IPSecConf.rb --- old/yast2-vpn-4.2.3/src/modules/IPSecConf.rb 2019-10-07 15:04:05.000000000 +0200 +++ new/yast2-vpn-4.2.4/src/modules/IPSecConf.rb 2020-02-26 13:44:47.000000000 +0100 @@ -20,7 +20,7 @@ # Authors: Howard Guo <h...@suse.com> require "yast" -require "cfa/sysctl" +require "cfa/sysctl_config" Yast.import "Package" Yast.import "Service" @@ -182,27 +182,35 @@ Service.Stop("strongswan") end # Configure IP forwarding - sysctl_modified = false + sysctlconfig_modified = false if @ipsec_conns.any? { |name, conf| leftsubnet = conf["leftsubnet"] !leftsubnet.nil? && leftsubnet.include?(".") } - sysctl_file.forward_ipv4 = true - sysctl_file.ipv4_forwarding_all = true - sysctl_file.ipv4_forwarding_default = true - sysctl_modified = true + sysctlconfig_file.forward_ipv4 = true + sysctlconfig_file.ipv4_forwarding_all = true + sysctlconfig_file.ipv4_forwarding_default = true + sysctlconfig_modified = true end if @ipsec_conns.any? { |name, conf| leftsubnet = conf["leftsubnet"] !leftsubnet.nil? && leftsubnet.include?(":") } - sysctl_file.ipv6_forwarding_all = true - sysctl_file.ipv6_forwarding_default = true - sysctl_modified = true - end - if sysctl_modified - sysctl_file.save - sysctl_apply = SCR.Execute(Yast::Path.new(".target.bash_output"), "/sbin/sysctl -p/etc/sysctl.conf 2>&1") + sysctlconfig_file.ipv6_forwarding_all = true + sysctlconfig_file.ipv6_forwarding_default = true + sysctlconfig_modified = true + end + if sysctlconfig_modified + sysctlconfig_file.save unless sysctlconfig_file.conflict? + # --system : Load settings from all system configuration files. + # /boot/sysctl.conf-<kernelversion> + # /run/sysctl.d/*.conf + # /etc/sysctl.d/*.conf + # /usr/local/lib/sysctl.d/*.conf + # /usr/lib/sysctl.d/*.conf + # /lib/sysctl.d/*.conf + # /etc/sysctl.conf + sysctl_apply = SCR.Execute(Yast::Path.new(".target.bash_output"), "/sbin/sysctl --system 2>&1") if !sysctl_apply["exit"].zero? Report.LongError(_("Failed to apply IP forwarding settings using sysctl:") + sysctl_apply["stdout"]) successful = false @@ -549,12 +557,12 @@ # # @note It memoizes the value until {#main} is called. # - # @return [Yast2::CFA::Sysctl] - def sysctl_file - return @sysctl_file if @sysctl_file - @sysctl_file = CFA::Sysctl.new - @sysctl_file.load - @sysctl_file + # @return [Yast2::CFA::SysctlConfig] + def sysctlconfig_file + return @sysctlconfig_file if @sysctlconfig_file + @sysctlconfig_file = CFA::SysctlConfig.new + @sysctlconfig_file.load + @sysctlconfig_file end end IPSecConf = IPSecConfModule.new
