openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
July 2019
- 2 participants
- 2045 discussions
Hello community,
here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2019-07-31 14:23:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-users (Old)
and /work/SRC/openSUSE:Factory/.yast2-users.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users"
Wed Jul 31 14:23:11 2019 rev:223 rq:714616 version:4.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2019-05-21 10:36:19.951244981 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-users.new.4126/yast2-users.changes 2019-07-31 14:23:12.546440238 +0200
@@ -1,0 +2,21 @@
+Thu Jul 11 09:52:50 UTC 2019 - Steffen Winterfeldt <snwint(a)suse.com>
+
+- hide all password fields in log (bsc#1141017)
+- 4.2.4
+
+-------------------------------------------------------------------
+Wed Jun 19 07:39:49 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip nscd restart in Mode.test() (bsc#1138668)
+- 4.2.3
+
+-------------------------------------------------------------------
+Fri May 31 12:42:14 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.2
+
+-------------------------------------------------------------------
Old:
----
yast2-users-4.2.1.tar.bz2
New:
----
yast2-users-4.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.E1Lfpa/_old 2019-07-31 14:23:12.922440023 +0200
+++ /var/tmp/diff_new_pack.E1Lfpa/_new 2019-07-31 14:23:12.922440023 +0200
@@ -17,10 +17,13 @@
Name: yast2-users
-Version: 4.2.1
+Version: 4.2.4
Release: 0
+Summary: YaST2 - User and Group Configuration
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-users
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: cracklib-devel
@@ -33,7 +36,7 @@
# UI::Widgets
BuildRequires: yast2 >= 3.2.8
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-security
BuildRequires: yast2-testsuite
@@ -49,10 +52,6 @@
Requires: yast2-pam >= 4.2.0
Requires: yast2-security
-Obsoletes: yast2-users-devel-doc
-Conflicts: autoyast2 < 3.1.92
-# older storage uses removed deprecated method, see https://github.com/yast/yast-storage/pull/187
-Conflicts: yast2-storage < 3.1.75
# y2usernote, y2useritem
Requires: yast2-perl-bindings >= 2.18.0
@@ -66,16 +65,16 @@
Requires: yast2-core >= 2.21.0
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - User and Group Configuration
-License: GPL-2.0-only
-Group: System/YaST
+Obsoletes: yast2-users-devel-doc
+Conflicts: autoyast2 < 3.1.92
+# older storage uses removed deprecated method, see https://github.com/yast/yast-storage/pull/187
+Conflicts: yast2-storage < 3.1.75
%description
This package provides GUI for maintenance of linux users and groups.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
@@ -84,30 +83,22 @@
# make testsuite/modules/Ldap.rb visible
export Y2BASE_Y2DIR=`pwd`/testsuite
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/users
-%dir %{yast_moduledir}/YaPI
-%{yast_clientdir}/*.rb
-%{yast_desktopdir}/*.desktop
-%{yast_moduledir}/*.pm
-%{yast_moduledir}/SSHAuthorizedKeys.rb
-%{yast_moduledir}/UsersUI.rb
-%{yast_moduledir}/YaPI/*.pm
-%{yast_yncludedir}/users/*
-%{yast_libdir}/users
-%{yast_schemadir}/autoyast/rnc/users.rnc
+%{yast_clientdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_moduledir}
+%{yast_yncludedir}
+%{yast_libdir}
+%{yast_schemadir}
#agents:
-%{yast_scrconfdir}/*.scr
-%{yast_agentdir}/ag_nis
-%{yast_agentdir}/ag_uid
-%{yast_plugindir}/libpy2ag_crack.so.*
-%{yast_plugindir}/libpy2ag_crack.so
-%{yast_plugindir}/libpy2ag_crack.la
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{yast_plugindir}
%{yast_icondir}
-%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
-%doc %{yast_docdir}/users.html
+%license COPYING
+%doc %{yast_docdir}
%changelog
++++++ yast2-users-4.2.1.tar.bz2 -> yast2-users-4.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/package/yast2-users.changes new/yast2-users-4.2.4/package/yast2-users.changes
--- old/yast2-users-4.2.1/package/yast2-users.changes 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/package/yast2-users.changes 2019-07-11 12:04:40.000000000 +0200
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Thu Jul 11 09:52:50 UTC 2019 - Steffen Winterfeldt <snwint(a)suse.com>
+
+- hide all password fields in log (bsc#1141017)
+- 4.2.4
+
+-------------------------------------------------------------------
+Wed Jun 19 07:39:49 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip nscd restart in Mode.test() (bsc#1138668)
+- 4.2.3
+
+-------------------------------------------------------------------
+Fri May 31 12:42:14 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.2
+
+-------------------------------------------------------------------
Thu May 16 14:13:03 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
- Fix the user creation in the installed systems, obeying the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/package/yast2-users.spec new/yast2-users-4.2.4/package/yast2-users.spec
--- old/yast2-users-4.2.1/package/yast2-users.spec 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/package/yast2-users.spec 2019-07-11 12:04:40.000000000 +0200
@@ -12,15 +12,18 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-users
-Version: 4.2.1
+Version: 4.2.4
Release: 0
+Summary: YaST2 - User and Group Configuration
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-users
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: cracklib-devel
@@ -33,7 +36,7 @@
# UI::Widgets
BuildRequires: yast2 >= 3.2.8
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-security
BuildRequires: yast2-testsuite
@@ -49,10 +52,6 @@
Requires: yast2-pam >= 4.2.0
Requires: yast2-security
-Obsoletes: yast2-users-devel-doc
-Conflicts: autoyast2 < 3.1.92
-# older storage uses removed deprecated method, see https://github.com/yast/yast-storage/pull/187
-Conflicts: yast2-storage < 3.1.75
# y2usernote, y2useritem
Requires: yast2-perl-bindings >= 2.18.0
@@ -66,16 +65,16 @@
Requires: yast2-core >= 2.21.0
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - User and Group Configuration
-License: GPL-2.0-only
-Group: System/YaST
+Obsoletes: yast2-users-devel-doc
+Conflicts: autoyast2 < 3.1.92
+# older storage uses removed deprecated method, see https://github.com/yast/yast-storage/pull/187
+Conflicts: yast2-storage < 3.1.75
%description
This package provides GUI for maintenance of linux users and groups.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
@@ -84,30 +83,22 @@
# make testsuite/modules/Ldap.rb visible
export Y2BASE_Y2DIR=`pwd`/testsuite
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/users
-%dir %{yast_moduledir}/YaPI
-%{yast_clientdir}/*.rb
-%{yast_desktopdir}/*.desktop
-%{yast_moduledir}/*.pm
-%{yast_moduledir}/SSHAuthorizedKeys.rb
-%{yast_moduledir}/UsersUI.rb
-%{yast_moduledir}/YaPI/*.pm
-%{yast_yncludedir}/users/*
-%{yast_libdir}/users
-%{yast_schemadir}/autoyast/rnc/users.rnc
+%{yast_clientdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_moduledir}
+%{yast_yncludedir}
+%{yast_libdir}
+%{yast_schemadir}
#agents:
-%{yast_scrconfdir}/*.scr
-%{yast_agentdir}/ag_nis
-%{yast_agentdir}/ag_uid
-%{yast_plugindir}/libpy2ag_crack.so.*
-%{yast_plugindir}/libpy2ag_crack.so
-%{yast_plugindir}/libpy2ag_crack.la
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{yast_plugindir}
%{yast_icondir}
-%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
-%doc %{yast_docdir}/users.html
+%license COPYING
+%doc %{yast_docdir}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/Makefile.am new/yast2-users-4.2.4/src/Makefile.am
--- old/yast2-users-4.2.1/src/Makefile.am 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/Makefile.am 2019-07-11 12:04:40.000000000 +0200
@@ -91,7 +91,7 @@
autoyast-rnc/users.rnc
desktop_DATA = \
- desktop/users.desktop
+ desktop/org.opensuse.yast.Users.desktop
scalabledir = @icondir@/hicolor/scalable/apps
scalable_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/clients/users_auto.rb new/yast2-users-4.2.4/src/clients/users_auto.rb
--- old/yast2-users-4.2.1/src/clients/users_auto.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/clients/users_auto.rb 2019-07-11 12:04:40.000000000 +0200
@@ -106,7 +106,7 @@
elsif @func == "Change"
@start_dialog = "summary" #look to users.ycp for possible values
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
@ret = AutoSequence(@start_dialog)
Wizard.CloseDialog
elsif @func == "Export"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/clients/users_plugin_ldap_all.rb new/yast2-users-4.2.4/src/clients/users_plugin_ldap_all.rb
--- old/yast2-users-4.2.1/src/clients/users_plugin_ldap_all.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/clients/users_plugin_ldap_all.rb 2019-07-11 12:04:40.000000000 +0200
@@ -248,7 +248,7 @@
)
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
# dialog caption
Wizard.SetContentsButtons(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/clients/users_plugin_ldap_passwordpolicy.rb new/yast2-users-4.2.4/src/clients/users_plugin_ldap_passwordpolicy.rb
--- old/yast2-users-4.2.1/src/clients/users_plugin_ldap_passwordpolicy.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/clients/users_plugin_ldap_passwordpolicy.rb 2019-07-11 12:04:40.000000000 +0200
@@ -123,7 +123,7 @@
)
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
# dialog caption
Wizard.SetContentsButtons(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/clients/users_plugin_ldap_shadowaccount.rb new/yast2-users-4.2.4/src/clients/users_plugin_ldap_shadowaccount.rb
--- old/yast2-users-4.2.1/src/clients/users_plugin_ldap_shadowaccount.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/clients/users_plugin_ldap_shadowaccount.rb 2019-07-11 12:04:40.000000000 +0200
@@ -200,7 +200,7 @@
)
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
# dialog caption
Wizard.SetContentsButtons(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/clients/users_plugin_quota.rb new/yast2-users-4.2.4/src/clients/users_plugin_quota.rb
--- old/yast2-users-4.2.1/src/clients/users_plugin_quota.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/clients/users_plugin_quota.rb 2019-07-11 12:04:40.000000000 +0200
@@ -264,7 +264,7 @@
)
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
Wizard.SetContentsButtons(
UsersPluginQuota.Name(@config, {}),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/desktop/org.opensuse.yast.Users.desktop new/yast2-users-4.2.4/src/desktop/org.opensuse.yast.Users.desktop
--- old/yast2-users-4.2.1/src/desktop/org.opensuse.yast.Users.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-users-4.2.4/src/desktop/org.opensuse.yast.Users.desktop 2019-07-11 12:04:40.000000000 +0200
@@ -0,0 +1,28 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Security;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=users
+
+X-SuSE-YaST-Group=Security
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstMerge=users,groups,user_defaults,login_settings
+X-SuSE-YaST-AutoInstMergeTypes=list,list,map,map
+X-SuSE-YaST-AutoInstRequires=security
+X-SuSE-YaST-AutoInstSchema=users.rnc
+X-SuSE-YaST-Keywords=user,group,authentication,login,password
+
+Icon=yast-users
+Exec=xdg-su -c "/sbin/yast2 users"
+
+Name=YaST User and Group Management
+GenericName=User and Group Management
+Comment=Add, Edit and Delete Users or User Groups
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/desktop/users.desktop new/yast2-users-4.2.4/src/desktop/users.desktop
--- old/yast2-users-4.2.1/src/desktop/users.desktop 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/desktop/users.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Security;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=users
-
-X-SuSE-YaST-Group=Security
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstMerge=users,groups,user_defaults,login_settings
-X-SuSE-YaST-AutoInstMergeTypes=list,list,map,map
-X-SuSE-YaST-AutoInstRequires=security
-X-SuSE-YaST-AutoInstSchema=users.rnc
-X-SuSE-YaST-Keywords=user,group,authentication,login,password
-
-Icon=yast-users
-Exec=xdg-su -c "/sbin/yast2 users"
-
-Name=User and Group Management
-GenericName=Add, Edit, Delete Users or User Groups
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/include/users/widgets.rb new/yast2-users-4.2.4/src/include/users/widgets.rb
--- old/yast2-users-4.2.1/src/include/users/widgets.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/include/users/widgets.rb 2019-07-11 12:04:40.000000000 +0200
@@ -2095,7 +2095,7 @@
return nil
end
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("users")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Users")
ret = WriteDialog(true)
Wizard.CloseDialog
Builtins.y2milestone("WriteDialog returned %1", ret)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/include/users/wizards.rb new/yast2-users-4.2.4/src/include/users/wizards.rb
--- old/yast2-users-4.2.1/src/include/users/wizards.rb 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/include/users/wizards.rb 2019-07-11 12:04:40.000000000 +0200
@@ -263,7 +263,7 @@
contents = Label(_("Initializing..."))
Wizard.OpenNextBackDialog if !Stage.cont
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
ret = Sequencer.Run(aliases, sequence)
@@ -287,7 +287,7 @@
contents = Label(_("Initializing..."))
Wizard.CreateDialog
- Wizard.SetDesktopIcon("users")
+ Wizard.SetDesktopIcon("org.opensuse.yast.Users")
Wizard.SetContentsButtons(
caption,
contents,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/src/modules/Users.pm new/yast2-users-4.2.4/src/modules/Users.pm
--- old/yast2-users-4.2.1/src/modules/Users.pm 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/src/modules/Users.pm 2019-07-11 12:04:40.000000000 +0200
@@ -4569,10 +4569,20 @@
SSHAuthorizedKeys->write_keys($home, $user{"authorized_keys"});
}
- my $save_passwd = $user{"userPassword"};
- $user{"userPassword"} = "*****"; # Reset before logging
+ my %saved_passwords;
+
+ # hide passwords for logging
+ for my $pw (qw (userPassword text_userpassword)) {
+ $saved_passwords{$pw} = $user{$pw};
+ $user{$pw} = "*****";
+ }
+
y2milestone ("User = ", Dumper(\%user));
- $user{"userPassword"} = $save_passwd;
+
+ # restore
+ for my $pw (keys %saved_passwords) {
+ $user{$pw} = $saved_passwords{$pw};
+ }
}
}
}
@@ -4597,7 +4607,7 @@
}
# remove the passwd cache for nscd (bug 24748, 41648)
- if (!$write_only && Package->Installed ("nscd")) {
+ if (!$write_only && !Mode->test() && Package->Installed ("nscd")) {
if ($nscd_passwd) {
my $cmd = "/usr/sbin/nscd -i passwd";
SCR->Execute (".target.bash", $cmd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/testsuite/tests/EditUser.out new/yast2-users-4.2.4/testsuite/tests/EditUser.out
--- old/yast2-users-4.2.1/testsuite/tests/EditUser.out 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/testsuite/tests/EditUser.out 2019-07-11 12:04:40.000000000 +0200
@@ -35,7 +35,6 @@
Execute .target.bash_output "/usr/bin/chown -R 501:100 '/home/hh'" $["stdout":"hh"]
Execute .target.bash "/usr/bin/cp '/etc/shadow' '/etc/shadow.YaST2save'" 0
Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
-Execute .target.bash "/usr/sbin/nscd -i passwd" 0
Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true
Return
Return nil
@@ -63,6 +62,5 @@
Read .target.stat "/new/home/hh" $[]
Execute .target.bash "/usr/bin/cp '/etc/shadow' '/etc/shadow.YaST2save'" 0
Write .target.string "/etc/shadow" "at:!:13636:0:99999:7:::\nbin:*:13636::::::\ndaemon:*:13636::::::\nmail:*:13636::::::\nnobody:*:13636::::::\nroot:password:13636::::::\nuucp:*:13636::::::\nhh:heslo:13727:0:99999:7:::\n+::0:0:0::::\n" true
-Execute .target.bash "/usr/sbin/nscd -i passwd" 0
Return
Dump ==========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.1/testsuite/tests/YaPIGroupAdd.out new/yast2-users-4.2.4/testsuite/tests/YaPIGroupAdd.out
--- old/yast2-users-4.2.1/testsuite/tests/YaPIGroupAdd.out 2019-05-17 09:58:32.000000000 +0200
+++ new/yast2-users-4.2.4/testsuite/tests/YaPIGroupAdd.out 2019-07-11 12:04:40.000000000 +0200
@@ -18,7 +18,6 @@
Execute .target.bash "/usr/bin/cp '/etc/group' '/etc/group.YaST2save'" 0
Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\nusers:x:100:\n+:::\n" true
Execute .target.bash_output "/usr/bin/diff -U 1 '/etc/group.YaST2save' '/etc/group'" $["stdout":"gg"]
-Execute .target.bash "/usr/sbin/nscd -i group" 0
Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true
Return
Dump ============ add new group 'gg' - done ====================
@@ -39,7 +38,6 @@
Execute .target.bash "/usr/bin/cp '/etc/group' '/etc/group.YaST2save'" 0
Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\nusers:x:100:\n+:::\n" true
Execute .target.bash_output "/usr/bin/diff -U 1 '/etc/group.YaST2save' '/etc/group'" $["stdout":"gg2"]
-Execute .target.bash "/usr/sbin/nscd -i group" 0
Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true
Return
Dump ============ add new group 'gg2' - done ====================
@@ -60,7 +58,6 @@
Execute .target.bash "/usr/bin/cp '/etc/group' '/etc/group.YaST2save'" 0
Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\ngg3:x:1002:hh,ii\nusers:x:100:\n+:::\n" true
Execute .target.bash_output "/usr/bin/diff -U 1 '/etc/group.YaST2save' '/etc/group'" $["stdout":"gg3"]
-Execute .target.bash "/usr/sbin/nscd -i group" 0
Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true
Return
Dump ============ add new group 'gg3' - done ====================
1
0
Hello community,
here is the log from the commit of package yast2-samba-provision for openSUSE:Factory checked in at 2019-07-31 14:23:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-provision (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-provision.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-provision"
Wed Jul 31 14:23:02 2019 rev:3 rq:714456 version:1.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-provision/yast2-samba-provision.changes 2018-11-01 14:42:58.130886115 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-samba-provision.new.4126/yast2-samba-provision.changes 2019-07-31 14:23:07.262443253 +0200
@@ -1,0 +2,28 @@
+Wed Jul 10 08:59:29 UTC 2019 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Catch and show internal python exceptions; (bsc#1140548);
+- 1.0.4
+
+-------------------------------------------------------------------
+Fri May 31 12:40:00 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 1.0.3
+
+-------------------------------------------------------------------
+Wed May 22 14:54:28 UTC 2019 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Call samba python API using yast python binding; (bsc#1117597);
+ (CVE-2018-17956)
+- Show a dialog with provision details or errors; (bsc#1132676);
+- Enable and start services after provision
+- 1.0.2
+
+-------------------------------------------------------------------
+Wed Nov 7 17:34:23 UTC 2018 - jengelh(a)inai.de
+
+- Remove TM mark.
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-provision-1.0.1.tar.bz2
New:
----
yast2-samba-provision-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-provision.spec ++++++
--- /var/tmp/diff_new_pack.0RwLUt/_old 2019-07-31 14:23:07.766442966 +0200
+++ /var/tmp/diff_new_pack.0RwLUt/_new 2019-07-31 14:23:07.770442963 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-samba-provision
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,55 +12,54 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: yast2-samba-provision
-Version: 1.0.1
+Version: 1.0.4
Release: 0
+Summary: YaST2 - Samba AD DC provision
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-samba-provision
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2 >= 3.3.8
-BuildRequires: yast2-devtools >= 3.1.46
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
Requires: yast2 >= 3.3.8
-
-BuildArch: noarch
-
Requires: yast2-network
+Requires: yast2-python3-bindings >= 4.0.8
Requires: yast2-ruby-bindings >= 3.3.1
-Summary: YaST2 - Samba AD DC provision
-License: GPL-2.0-only
-Group: System/YaST
+BuildArch: noarch
%description
This package contains the YaST2 component to configure samba as an Active
-Directory (TM) Domain Controller.
+Directory Domain Controller.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/samba-provision
-%{yast_yncludedir}/samba-provision/*
-%{yast_clientdir}/samba-provision.rb
-%{yast_moduledir}/SambaProvision.rb
-%{yast_desktopdir}/samba-provision.desktop
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%doc %{yast_docdir}
%changelog
++++++ yast2-samba-provision-1.0.1.tar.bz2 -> yast2-samba-provision-1.0.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/package/yast2-samba-provision.changes new/yast2-samba-provision-1.0.4/package/yast2-samba-provision.changes
--- old/yast2-samba-provision-1.0.1/package/yast2-samba-provision.changes 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/package/yast2-samba-provision.changes 2019-07-10 16:48:01.000000000 +0200
@@ -1,4 +1,32 @@
-------------------------------------------------------------------
+Wed Jul 10 08:59:29 UTC 2019 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Catch and show internal python exceptions; (bsc#1140548);
+- 1.0.4
+
+-------------------------------------------------------------------
+Fri May 31 12:40:00 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 1.0.3
+
+-------------------------------------------------------------------
+Wed May 22 14:54:28 UTC 2019 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Call samba python API using yast python binding; (bsc#1117597);
+ (CVE-2018-17956)
+- Show a dialog with provision details or errors; (bsc#1132676);
+- Enable and start services after provision
+- 1.0.2
+
+-------------------------------------------------------------------
+Wed Nov 7 17:34:23 UTC 2018 - jengelh(a)inai.de
+
+- Remove TM mark.
+
+-------------------------------------------------------------------
Wed Oct 31 17:17:35 UTC 2018 - Samuel Cabrero <scabrero(a)suse.de>
- Fix required packages after samba-kdc renamed to samba-ad-dc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/package/yast2-samba-provision.spec new/yast2-samba-provision-1.0.4/package/yast2-samba-provision.spec
--- old/yast2-samba-provision-1.0.1/package/yast2-samba-provision.spec 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/package/yast2-samba-provision.spec 2019-07-10 16:48:01.000000000 +0200
@@ -12,54 +12,54 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-samba-provision
-Version: 1.0.1
+Version: 1.0.4
Release: 0
+Summary: YaST2 - Samba AD DC provision
+Group: System/YaST
+License: GPL-2.0
+Url: https://github.com/yast/yast-samba-provision
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0
BuildRequires: yast2 >= 3.3.8
-BuildRequires: yast2-perl-bindings
-BuildRequires: yast2-devtools >= 3.1.46
-BuildRequires: yast2-testsuite
-BuildRequires: perl-XML-Writer
-BuildRequires: update-desktop-files
+BuildRequires: yast2-perl-bindings
+BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: yast2-testsuite
+BuildRequires: perl-XML-Writer
+BuildRequires: update-desktop-files
Requires: yast2 >= 3.3.8
-
-BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 3.3.1
-requires: yast2-network
+Requires: yast2-python3-bindings >= 4.0.8
+Requires: yast2-network
-Summary: YaST2 - Samba AD DC provision
+BuildArch: noarch
%description
This package contains the YaST2 component to configure samba as an Active
-Directory (TM) Domain Controller.
+Directory Domain Controller.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/samba-provision
-%{yast_yncludedir}/samba-provision/*
-%{yast_clientdir}/samba-provision.rb
-%{yast_moduledir}/SambaProvision.rb
-%{yast_desktopdir}/samba-provision.desktop
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%doc %{yast_docdir}
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/Makefile.am new/yast2-samba-provision-1.0.4/src/Makefile.am
--- old/yast2-samba-provision-1.0.1/src/Makefile.am 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/Makefile.am 2019-07-10 16:48:01.000000000 +0200
@@ -1,7 +1,8 @@
# Sources for samba-client
module_DATA = \
- modules/SambaProvision.rb
+ modules/SambaProvision.rb \
+ modules/SambaToolDomainAPI.py
client_DATA = \
clients/samba-provision.rb
@@ -23,7 +24,7 @@
schemafiles_DATA =
desktop_DATA = \
- desktop/samba-provision.desktop
+ desktop/org.opensuse.yast.SambaProvision.desktop
EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/desktop/org.opensuse.yast.SambaProvision.desktop new/yast2-samba-provision-1.0.4/src/desktop/org.opensuse.yast.SambaProvision.desktop
--- old/yast2-samba-provision-1.0.1/src/desktop/org.opensuse.yast.SambaProvision.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/desktop/org.opensuse.yast.SambaProvision.desktop 2019-07-10 16:48:01.000000000 +0200
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=samba-provision
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=samba-provision
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstRequires=lan
+X-SuSE-YaST-AutoInstSchema=samba-provision.rnc
+X-SuSE-YaST-Keywords=authentication,samba,windows
+
+Icon=yast-samba-server
+Exec=xdg-su -c "/sbin/yast2 samba-provision"
+
+Name=YaST Active Directory Domain Controller
+GenericName=Active Directory Domain Controller
+Comment=Provision an Active Directory Domain Controller
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/desktop/samba-provision.desktop new/yast2-samba-provision-1.0.4/src/desktop/samba-provision.desktop
--- old/yast2-samba-provision-1.0.1/src/desktop/samba-provision.desktop 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/desktop/samba-provision.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=samba-provision
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=samba-provision
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstRequires=lan
-X-SuSE-YaST-AutoInstSchema=samba-provision.rnc
-X-SuSE-YaST-Keywords=authentication,samba,windows
-
-Icon=yast-samba-server
-Exec=xdg-su -c "/sbin/yast2 samba-provision"
-
-Name=Provision an Active Directory Domain Controller
-GenericName=Configure an Active Directory Domain Controller
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/include/samba-provision/wizards.rb new/yast2-samba-provision-1.0.4/src/include/samba-provision/wizards.rb
--- old/yast2-samba-provision-1.0.1/src/include/samba-provision/wizards.rb 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/include/samba-provision/wizards.rb 2019-07-10 16:48:01.000000000 +0200
@@ -80,7 +80,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("samba-provision")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.SambaProvision")
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/modules/SambaProvision.rb new/yast2-samba-provision-1.0.4/src/modules/SambaProvision.rb
--- old/yast2-samba-provision-1.0.1/src/modules/SambaProvision.rb 2018-10-31 18:19:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/modules/SambaProvision.rb 2019-07-10 16:48:01.000000000 +0200
@@ -14,6 +14,8 @@
Yast.import "SambaConfig"
Yast.import "Kerberos"
Yast.import "DNS"
+ Yast.import "SambaToolDomainAPI"
+ Yast.import "Service"
@operation = ""
@parent_domain_name = ""
@@ -36,16 +38,18 @@
caption = _("Provisioning Samba Active Directory Domain controller...")
- no_stages = 3
+ no_stages = 4
stages = [
_("Write the settings"),
_("Provision"),
- _("Write kerberos settings")
+ _("Write kerberos settings"),
+ _("Start services")
]
steps = [
_("Writting the settings..."),
_("Provisioning..."),
- _("Writting kerberos settings...")
+ _("Writting kerberos settings..."),
+ _("Starting services...")
]
if @dns
@@ -79,15 +83,25 @@
# Provision
Progress.NextStage
+ result = false
+ output = ""
+
case @operation
when "new_forest"
- if !write_provision
- Report.Error(_("Error provisioning database. Check logs for details."))
+ result, output = write_provision
+ if !result
+ headline = _("An error occurred while provisioning new domain.")
+ msg = RichText(Opt(:plainText), output)
+ Popup.LongText(headline, msg, 60, 20)
return false
end
when "new_dc"
- if !write_join
- Report.Error(_("Error joining to domain. Check logs for details."))
+ result, output = write_join
+ if !result
+ headline = _("An error occurred while joining to domain.")
+ msg = RichText(Opt(:plainText), output)
+ Popup.LongText(headline, msg, 60, 20)
+ return false
end
end
@@ -110,6 +124,22 @@
SCR.Execute(path(".target.bash"), "/sbin/netconfig update")
end
+ headline = _("Provision result")
+ msg = RichText(Opt(:plainText), output)
+ Popup.LongText(headline, msg, 60, 20)
+
+ Progress.NextStage
+
+ if !Service.Adjust("samba-ad-dc", "enable")
+ # translators: error message, do not change winbind
+ Report.Error(_("Cannot enable samba-ad-dc service."))
+ return false
+ end
+ if !Service.Start("samba-ad-dc")
+ Report.Error(_("Cannot start samba-ad-dc daemon."))
+ return false
+ end
+
# Final stage
Progress.Finish
@@ -156,22 +186,14 @@
domain = SambaConfig.GlobalGetStr("workgroup", "")
realm = SambaConfig.GlobalGetStr("realm", "")
- cmd = "samba-tool domain provision " +
- "--server-role=dc " +
- "--realm='#{realm}' " +
- "--domain='#{domain}' " +
- "--adminpass='#{@admin_password}' " +
- "--function-level='#{@forest_level}' " +
- "--dns-backend='#{@dns_backend}' "
-
- if @rfc2307
- cmd += " --use-rfc2307"
- end
+ result, output = SambaToolDomainAPI.provision(realm,
+ domain,
+ admin_password,
+ forest_level,
+ dns_backend,
+ rfc2307)
- output = SCR.Execute(path(".target.bash_output"), cmd)
- Builtins.y2milestone("Samba provision result: #{output}")
-
- output["exit"] == 0
+ return result, output
end
@@ -179,15 +201,12 @@
domain = SambaConfig.GlobalGetStr("realm", "").downcase
role = @rodc ? "RODC" : "DC"
- cmd = "samba-tool domain join #{domain} #{role} " +
- "--dns-backend='#{@dns_backend}' " +
- "--username=\"#{credentials_username}\" " +
- "--password=\"#{credentials_password}\" "
-
- output = SCR.Execute(path(".target.bash_output"), cmd)
- Builtins.y2milestone("Samba domain join result: #{output}")
-
- output["exit"] == 0
+ result, output = SambaToolDomainAPI.join(domain,
+ role,
+ dns_backend,
+ credentials_username,
+ credentials_password)
+ return result, output
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-provision-1.0.1/src/modules/SambaToolDomainAPI.py new/yast2-samba-provision-1.0.4/src/modules/SambaToolDomainAPI.py
--- old/yast2-samba-provision-1.0.1/src/modules/SambaToolDomainAPI.py 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-samba-provision-1.0.4/src/modules/SambaToolDomainAPI.py 2019-07-10 16:48:01.000000000 +0200
@@ -0,0 +1,99 @@
+from io import StringIO
+from yast import ycpbuiltins
+import sys
+
+class YaSTIO(StringIO):
+ def __init__(self, outf):
+ super(YaSTIO, self).__init__()
+ self.outf = outf
+
+ def write(self, s):
+ super(YaSTIO, self).write(s)
+ self.outf(s)
+
+from samba.netcmd import domain as dm
+from samba.getopt import SambaOptions, CredentialsOptions
+from samba.logger import get_samba_logger
+from optparse import OptionParser
+from samba.netcmd import CommandError
+from yast import Declare
+
+@Declare('string', 'string', 'string', 'string', 'string', 'string', 'boolean')
+def provision(realm, domain, adminpass, function_level, dns_backend, use_rfc2307):
+ '''Provision a domain
+ param string realm The realm name
+ param string domain NetBIOS domain name to use
+ param string adminpass Choose an admin password
+ param string function_level The domain and forest function level (2000 | 2003 | 2008 | 2008_R2)
+ param string dns_backend The DNS server backend
+ param boolean use_rfc2307 Use AD to store posix attributes
+ return string Error message, or an empty string
+ '''
+ parser = OptionParser()
+ sambaopts = SambaOptions(parser)
+ lp = sambaopts.get_loadparm()
+ lp.set('realm', realm)
+
+ outlog = YaSTIO(ycpbuiltins.y2debug)
+ errlog = YaSTIO(ycpbuiltins.y2error)
+
+ provision = dm.cmd_domain_provision(errf=errlog)
+ provision.raw_argv = []
+ provision.logger = get_samba_logger(name="provision",
+ stream=outlog,
+ verbose=True,
+ quiet=False,
+ fmt="%(message)s")
+
+ try:
+ provision.run(sambaopts=sambaopts,
+ domain=domain,
+ adminpass=adminpass,
+ function_level=function_level,
+ dns_backend=dns_backend,
+ server_role="dc")
+ except Exception as e:
+ template = "{0} exception:\n{1}"
+ message = template.format(type(e).__name__, str(e))
+ return [False, message]
+ return [True, outlog.getvalue()]
+
+@Declare('string', 'string', 'string', 'string', 'string', 'string')
+def join(domain, role, dns_backend, username, password):
+ '''Join domain as either member or backup domain controller
+ param string domain NetBIOS domain name to use
+ param string role possible values: MEMBER, DC, RODC, SUBDOMAIN
+ param string dns_backend The DNS server backend
+ param string username Username
+ param string password Password
+ return string Error message, or an empty string
+ '''
+ parser = OptionParser()
+ sambaopts = SambaOptions(parser)
+ credopts = CredentialsOptions(parser)
+ credopts.creds.parse_string(username)
+ credopts.creds.set_password(password)
+ credopts.ask_for_password = False
+ credopts.machine_pass = False
+
+ outlog = YaSTIO(ycpbuiltins.y2debug)
+ errlog = YaSTIO(ycpbuiltins.y2error)
+
+ join = dm.cmd_domain_join(errf=errlog)
+ join.logger = get_samba_logger(name="provision",
+ stream=outlog,
+ verbose=True,
+ quiet=False,
+ fmt="%(message)s")
+
+ try:
+ join.run(sambaopts=sambaopts,
+ credopts=credopts,
+ domain=domain,
+ role=role,
+ dns_backend=dns_backend)
+ except Exception as e:
+ template = "{0} exception:\n{1}"
+ message = template.format(type(e).__name__, str(e))
+ return [False, message]
+ return [True, outlog.getvalue()]
1
0
Hello community,
here is the log from the commit of package yast2-sound for openSUSE:Factory checked in at 2019-07-31 14:22:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-sound (Old)
and /work/SRC/openSUSE:Factory/.yast2-sound.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-sound"
Wed Jul 31 14:22:53 2019 rev:94 rq:714230 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-sound/yast2-sound.changes 2018-12-31 09:44:59.258285475 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-sound.new.4126/yast2-sound.changes 2019-07-31 14:22:57.402448879 +0200
@@ -1,0 +2,15 @@
+Tue Jul 9 12:45:06 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Restore back a SLE workaround (disable on 32-bit archs)
+ (related to the previous fix fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:00 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-sound-4.1.1.tar.bz2
New:
----
yast2-sound-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sound.spec ++++++
--- /var/tmp/diff_new_pack.6e3XaV/_old 2019-07-31 14:22:58.070448498 +0200
+++ /var/tmp/diff_new_pack.6e3XaV/_new 2019-07-31 14:22:58.070448498 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-sound
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,14 +17,17 @@
Name: yast2-sound
-Version: 4.1.1
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Sound Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-sound
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# XXX: SLE-12 build packages for x86 and s390, but no runnable kernel, so
-# this package cannot be build here. Remove when SLE stop doing it
+# FIXME: SLE-12/15 builds packages for x86 and s390 (both 32 bit),
+# but no runnable kernel, so this package cannot be built there.
%if !0%{?is_opensuse}
ExcludeArch: %ix86 s390
%endif
@@ -39,45 +42,16 @@
BuildRequires: update-desktop-files
BuildRequires: yast2
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
# Fixed handling of Kernel modules loaded on boot
Requires: alsa
# For proc_modules.scr
Requires: yast2 >= 3.1.180
-
-Provides: yast2-agent-audio
-Provides: yast2-agent-audio-devel
-Provides: yast2-config-sound
-Obsoletes: yast2-agent-audio
-Obsoletes: yast2-agent-audio-devel
-Obsoletes: yast2-config-sound
-Provides: y2c_snd
-Provides: y2t_snd
-Provides: y2t_sndd
-Provides: yast2-trans-sound
-Provides: yast2-trans-soundd
-Obsoletes: y2c_snd
-Obsoletes: y2t_snd
-Obsoletes: y2t_sndd
-Obsoletes: yast2-trans-sound
-Obsoletes: yast2-trans-soundd
-Provides: y2c_sparc
-Provides: y2c_sprc
-Provides: y2d_snd
-Provides: yast2-db-sound
-Obsoletes: y2c_sparc
-Obsoletes: y2c_sprc
-Obsoletes: y2d_snd
-Obsoletes: yast2-db-sound
-Obsoletes: yast2-sound-devel-doc
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - Sound Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
+Obsoletes: yast2-sound-devel-doc
%description
This package contains the YaST2 component for sound card configuration.
@@ -90,8 +64,8 @@
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_audio.la
+%yast_metainfo
%post
# rename the config file to the new modprobe schema
@@ -100,32 +74,20 @@
fi
%files
-%defattr(-,root,root)
-
-# sound
-%dir %{yast_yncludedir}/sound
-%{yast_yncludedir}/sound/*.rb
-%{yast_clientdir}/sound*.rb
-%{yast_desktopdir}/sound.desktop
-%{yast_ybindir}/copyfonts
-%{yast_ybindir}/alsadrivers
-%{yast_moduledir}/Sound.*
-%{yast_moduledir}/PulseAudio.*
-%{yast_schemadir}/autoyast/rnc/sound.rnc
-
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_ybindir}
+%{yast_moduledir}
+%{yast_schemadir}
# database
-%{yast_ydatadir}/sndcards.yml
-%{yast_ydatadir}/alsa_packages.yml
-
+%{yast_ydatadir}
# agents
-%{yast_plugindir}/libpy2ag_audio.so*
-%{yast_scrconfdir}/*.scr
-
-# icons
+%{yast_plugindir}
+%{yast_scrconfdir}
%{yast_icondir}
-
-%dir %{yast_docdir}
-%doc %{yast_docdir}/README
-%license %{yast_docdir}/COPYING
+%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-sound-4.1.1.tar.bz2 -> yast2-sound-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/Dockerfile new/yast2-sound-4.2.1/Dockerfile
--- old/yast2-sound-4.1.1/Dockerfile 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/Dockerfile 2019-07-09 15:08:24.000000000 +0200
@@ -1,4 +1,4 @@
-FROM yastdevel/cpp
+FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
alsa-devel \
kernel-default \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/package/yast2-sound.changes new/yast2-sound-4.2.1/package/yast2-sound.changes
--- old/yast2-sound-4.1.1/package/yast2-sound.changes 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/package/yast2-sound.changes 2019-07-09 15:08:24.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Tue Jul 9 12:45:06 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Restore back a SLE workaround (disable on 32-bit archs)
+ (related to the previous fix fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:00 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Dec 18 16:00:39 UTC 2018 - jreidinger(a)suse.com
- always use absolute path to binaries (bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/package/yast2-sound.spec new/yast2-sound-4.2.1/package/yast2-sound.spec
--- old/yast2-sound-4.1.1/package/yast2-sound.spec 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/package/yast2-sound.spec 2019-07-09 15:08:24.000000000 +0200
@@ -12,19 +12,22 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-sound
-Version: 4.1.1
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Sound Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-sound
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# XXX: SLE-12 build packages for x86 and s390, but no runnable kernel, so
-# this package cannot be build here. Remove when SLE stop doing it
+# FIXME: SLE-12/15 builds packages for x86 and s390 (both 32 bit),
+# but no runnable kernel, so this package cannot be built there.
%if !0%{?is_opensuse}
ExcludeArch: %ix86 s390
%endif
@@ -39,45 +42,16 @@
BuildRequires: update-desktop-files
BuildRequires: yast2
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
# Fixed handling of Kernel modules loaded on boot
Requires: alsa
# For proc_modules.scr
Requires: yast2 >= 3.1.180
-
-Provides: yast2-agent-audio
-Provides: yast2-agent-audio-devel
-Provides: yast2-config-sound
-Obsoletes: yast2-agent-audio
-Obsoletes: yast2-agent-audio-devel
-Obsoletes: yast2-config-sound
-Provides: y2c_snd
-Provides: y2t_snd
-Provides: y2t_sndd
-Provides: yast2-trans-sound
-Provides: yast2-trans-soundd
-Obsoletes: y2c_snd
-Obsoletes: y2t_snd
-Obsoletes: y2t_sndd
-Obsoletes: yast2-trans-sound
-Obsoletes: yast2-trans-soundd
-Provides: y2c_sparc
-Provides: y2c_sprc
-Provides: y2d_snd
-Provides: yast2-db-sound
-Obsoletes: y2c_sparc
-Obsoletes: y2c_sprc
-Obsoletes: y2d_snd
-Obsoletes: yast2-db-sound
-Obsoletes: yast2-sound-devel-doc
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - Sound Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
+Obsoletes: yast2-sound-devel-doc
%description
This package contains the YaST2 component for sound card configuration.
@@ -90,8 +64,8 @@
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_audio.la
+%yast_metainfo
%post
# rename the config file to the new modprobe schema
@@ -100,32 +74,20 @@
fi
%files
-%defattr(-,root,root)
-
-# sound
-%dir %{yast_yncludedir}/sound
-%{yast_yncludedir}/sound/*.rb
-%{yast_clientdir}/sound*.rb
-%{yast_desktopdir}/sound.desktop
-%{yast_ybindir}/copyfonts
-%{yast_ybindir}/alsadrivers
-%{yast_moduledir}/Sound.*
-%{yast_moduledir}/PulseAudio.*
-%{yast_schemadir}/autoyast/rnc/sound.rnc
-
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_ybindir}
+%{yast_moduledir}
+%{yast_schemadir}
# database
-%{yast_ydatadir}/sndcards.yml
-%{yast_ydatadir}/alsa_packages.yml
-
+%{yast_ydatadir}
# agents
-%{yast_plugindir}/libpy2ag_audio.so*
-%{yast_scrconfdir}/*.scr
-
-# icons
+%{yast_plugindir}
+%{yast_scrconfdir}
%{yast_icondir}
-
-%dir %{yast_docdir}
-%doc %{yast_docdir}/README
-%license %{yast_docdir}/COPYING
+%doc %{yast_docdir}
+%license COPYING
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/src/Makefile.am new/yast2-sound-4.2.1/src/Makefile.am
--- old/yast2-sound-4.1.1/src/Makefile.am 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/src/Makefile.am 2019-07-09 15:08:24.000000000 +0200
@@ -43,7 +43,7 @@
data/alsa_packages.yml
desktop_DATA = \
- desktop/sound.desktop
+ desktop/org.opensuse.yast.Sound.desktop
scalabledir = @icondir@/hicolor/scalable/apps
scalable_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/src/desktop/org.opensuse.yast.Sound.desktop new/yast2-sound-4.2.1/src/desktop/org.opensuse.yast.Sound.desktop
--- old/yast2-sound-4.1.1/src/desktop/org.opensuse.yast.Sound.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sound-4.2.1/src/desktop/org.opensuse.yast.Sound.desktop 2019-07-09 15:08:24.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=sound
+
+X-SuSE-YaST-Group=Hardware
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=sound.rnc
+X-SuSE-YaST-Keywords=hardware,system,audio
+
+Icon=yast-sound
+Exec=xdg-su -c "/sbin/yast2 sound"
+
+Name=YaST Sound
+GenericName=Sound
+Comment=Configure your sound card
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/src/desktop/sound.desktop new/yast2-sound-4.2.1/src/desktop/sound.desktop
--- old/yast2-sound-4.1.1/src/desktop/sound.desktop 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/src/desktop/sound.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=sound
-
-X-SuSE-YaST-Group=Hardware
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstSchema=sound.rnc
-X-SuSE-YaST-Keywords=hardware,system,audio
-
-Icon=yast-sound
-Exec=xdg-su -c "/sbin/yast2 sound"
-
-Name=Sound
-GenericName=Configure your sound card
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sound-4.1.1/src/include/sound/wizards.rb new/yast2-sound-4.2.1/src/include/sound/wizards.rb
--- old/yast2-sound-4.1.1/src/include/sound/wizards.rb 2018-12-20 10:57:59.000000000 +0100
+++ new/yast2-sound-4.2.1/src/include/sound/wizards.rb 2019-07-09 15:08:24.000000000 +0200
@@ -228,7 +228,7 @@
Sound.use_ui = true
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("sound")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Sound")
if !Mode.config && !Sound.installation
return :abort if !Sound.Read(true)
1
0
Hello community,
here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2019-07-31 14:22:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client"
Wed Jul 31 14:22:43 2019 rev:112 rq:713621 version:4.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2019-03-21 09:52:10.282807175 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new.4126/yast2-ntp-client.changes 2019-07-31 14:22:49.446453418 +0200
@@ -1,0 +2,28 @@
+Thu Jul 4 10:29:27 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com>
+
+- Fix 'ntp-client' behaviour when running in firstboot
+ (bsc#1140199).
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu Jul 4 10:29:27 UTC 2019 - knut.anderssen(a)suse.com
+
+- Added cwm/popup dependency (bsc#893065, bsc#1039985)
+
+-------------------------------------------------------------------
+Thu Jun 13 16:09:13 CEST 2019 - schubi(a)suse.de
+
+- Enable/disable chronyd service: Enable/disable chrony-wait
+ service too (bsc#1137196).
+
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:08 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-4.1.8.tar.bz2
New:
----
yast2-ntp-client-4.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.0qcKMo/_old 2019-07-31 14:22:49.986453110 +0200
+++ /var/tmp/diff_new_pack.0qcKMo/_new 2019-07-31 14:22:49.986453110 +0200
@@ -17,50 +17,56 @@
Name: yast2-ntp-client
-Version: 4.1.8
+Version: 4.2.2
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: https://github.com/yast/yast-ntp-client
+
Source0: %{name}-%{version}.tar.bz2
+
BuildRequires: augeas-lenses
BuildRequires: autoyast2-installation
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 3.2.21
+# cwm/popup
+BuildRequires: yast2 >= 4.1.15
BuildRequires: yast2-country-data
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# proper acting TargetFile when scr is switched
Requires: augeas-lenses
-Requires: yast2 >= 3.2.21
+# cwm/popup
+Requires: yast2 >= 4.1.15
Requires: yast2-country-data
# needed for network/config agent
# Yast::Lan.dhcp_ntp_servers
Requires: yast2-network >= 4.1.17
Requires: yast2-ruby-bindings >= 1.0.0
Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
-BuildArch: noarch
Obsoletes: yast2-ntp-client-devel-doc
+BuildArch: noarch
+
%description
This package contains the YaST2 component for NTP client configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%post
# upgrade old name and convert it to chrony (bsc#1079122)
@@ -70,21 +76,17 @@
fi
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/ntp-client
-%{yast_clientdir}/*
-%{yast_dir}/lib
-%{yast_yncludedir}/ntp-client/*
-%{yast_moduledir}/*.rb
-%{yast_desktopdir}/ntp-client.desktop
-%{yast_ydatadir}/ntp_servers.yml
-%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
-%{yast_dir}/lib
-%ghost /etc/cron.d/suse-ntp_synchronize
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_yncludedir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_ydatadir}
+%{yast_schemadir}
+%ghost %{_sysconfdir}/cron.d/suse-ntp_synchronize
%{yast_icondir}
-%dir %{yast_docdir}
%license COPYING
-%doc %{yast_docdir}/README.md
-%doc %{yast_docdir}/CONTRIBUTING.md
+%doc %{yast_docdir}
%changelog
++++++ yast2-ntp-client-4.1.8.tar.bz2 -> yast2-ntp-client-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/Dockerfile new/yast2-ntp-client-4.2.2/Dockerfile
--- old/yast2-ntp-client-4.1.8/Dockerfile 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/Dockerfile 2019-07-05 16:08:44.000000000 +0200
@@ -1,3 +1,3 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/package/yast2-ntp-client.changes new/yast2-ntp-client-4.2.2/package/yast2-ntp-client.changes
--- old/yast2-ntp-client-4.1.8/package/yast2-ntp-client.changes 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/package/yast2-ntp-client.changes 2019-07-05 16:08:44.000000000 +0200
@@ -1,4 +1,32 @@
-------------------------------------------------------------------
+Thu Jul 4 10:29:27 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com>
+
+- Fix 'ntp-client' behaviour when running in firstboot
+ (bsc#1140199).
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu Jul 4 10:29:27 UTC 2019 - knut.anderssen(a)suse.com
+
+- Added cwm/popup dependency (bsc#893065, bsc#1039985)
+
+-------------------------------------------------------------------
+Thu Jun 13 16:09:13 CEST 2019 - schubi(a)suse.de
+
+- Enable/disable chronyd service: Enable/disable chrony-wait
+ service too (bsc#1137196).
+
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:08 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Mar 19 16:33:52 UTC 2019 - ancor(a)suse.com
- Activate translations for the SelectFrom widget (bsc#1126523,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/package/yast2-ntp-client.spec new/yast2-ntp-client-4.2.2/package/yast2-ntp-client.spec
--- old/yast2-ntp-client-4.1.8/package/yast2-ntp-client.spec 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/package/yast2-ntp-client.spec 2019-07-05 16:08:44.000000000 +0200
@@ -12,55 +12,61 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-ntp-client
-Version: 4.1.8
+Version: 4.2.2
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: https://github.com/yast/yast-ntp-client
+
Source0: %{name}-%{version}.tar.bz2
+
BuildRequires: augeas-lenses
BuildRequires: autoyast2-installation
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 3.2.21
+# cwm/popup
+BuildRequires: yast2 >= 4.1.15
BuildRequires: yast2-country-data
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
# proper acting TargetFile when scr is switched
Requires: augeas-lenses
-Requires: yast2 >= 3.2.21
+# cwm/popup
+Requires: yast2 >= 4.1.15
Requires: yast2-country-data
# needed for network/config agent
# Yast::Lan.dhcp_ntp_servers
Requires: yast2-network >= 4.1.17
Requires: yast2-ruby-bindings >= 1.0.0
Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.0
-BuildArch: noarch
Obsoletes: yast2-ntp-client-devel-doc
+BuildArch: noarch
+
%description
This package contains the YaST2 component for NTP client configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%post
# upgrade old name and convert it to chrony (bsc#1079122)
@@ -70,21 +76,17 @@
fi
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/ntp-client
-%{yast_clientdir}/*
-%{yast_dir}/lib
-%{yast_yncludedir}/ntp-client/*
-%{yast_moduledir}/*.rb
-%{yast_desktopdir}/ntp-client.desktop
-%{yast_ydatadir}/ntp_servers.yml
-%{yast_schemadir}/autoyast/rnc/ntpclient.rnc
-%{yast_dir}/lib
-%ghost /etc/cron.d/suse-ntp_synchronize
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_yncludedir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_ydatadir}
+%{yast_schemadir}
+%ghost %{_sysconfdir}/cron.d/suse-ntp_synchronize
%{yast_icondir}
-%dir %{yast_docdir}
%license COPYING
-%doc %{yast_docdir}/README.md
-%doc %{yast_docdir}/CONTRIBUTING.md
+%doc %{yast_docdir}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/clients/ntp-client.rb new/yast2-ntp-client-4.2.2/src/clients/ntp-client.rb
--- old/yast2-ntp-client-4.1.8/src/clients/ntp-client.rb 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/clients/ntp-client.rb 2019-07-05 16:08:44.000000000 +0200
@@ -8,6 +8,9 @@
# $Id$
#
# Main file for ntp-client configuration. Uses all other files.
+
+Yast.import "Stage"
+
module Yast
class NtpClientClient < Client
def main
@@ -43,9 +46,11 @@
end
# CommandLine handler for running GUI
- # @return [Boolean] true if settings were saved
+ # @return [Boolean,Symbol] true if settings were saved; :next, :abort or :back
+ # when running in 'firstboot'
def GuiHandler
ret = NtpClientSequence()
+ return ret if Yast::Stage.firstboot
return false if ret == :abort || ret == :back || ret.nil?
true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/desktop/ntp-client.desktop new/yast2-ntp-client-4.2.2/src/desktop/ntp-client.desktop
--- old/yast2-ntp-client-4.1.8/src/desktop/ntp-client.desktop 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/desktop/ntp-client.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=ntp-client
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=ntp-client
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstSchema=ntpclient.rnc
-X-SuSE-YaST-Keywords=time,sync,synchronization,NTP
-
-Icon=yast-ntp-client
-Exec=xdg-su -c "/sbin/yast2 ntp-client"
-
-Name=NTP Configuration
-GenericName=Configure an NTP client or server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/desktop/org.opensuse.yast.NTPClient.desktop new/yast2-ntp-client-4.2.2/src/desktop/org.opensuse.yast.NTPClient.desktop
--- old/yast2-ntp-client-4.1.8/src/desktop/org.opensuse.yast.NTPClient.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/desktop/org.opensuse.yast.NTPClient.desktop 2019-07-05 16:08:44.000000000 +0200
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=ntp-client
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=ntp-client
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=ntpclient.rnc
+X-SuSE-YaST-Keywords=time,sync,synchronization,NTP
+
+Icon=yast-ntp-client
+Exec=xdg-su -c "/sbin/yast2 ntp-client"
+
+Name=YaST NTP Configuration
+GenericName=NTP Configuration
+Comment=Configure an NTP client or server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/include/ntp-client/wizards.rb new/yast2-ntp-client-4.2.2/src/include/ntp-client/wizards.rb
--- old/yast2-ntp-client-4.1.8/src/include/ntp-client/wizards.rb 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/include/ntp-client/wizards.rb 2019-07-05 16:08:44.000000000 +0200
@@ -40,7 +40,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("ntp-client")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.NTPClient")
ret = Sequencer.Run(aliases, sequence)
UI.CloseDialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/lib/y2ntp_client/dialog/main.rb new/yast2-ntp-client-4.2.2/src/lib/y2ntp_client/dialog/main.rb
--- old/yast2-ntp-client-4.1.8/src/lib/y2ntp_client/dialog/main.rb 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/lib/y2ntp_client/dialog/main.rb 2019-07-05 16:08:44.000000000 +0200
@@ -5,7 +5,7 @@
Yast.import "Label"
Yast.import "NtpClient"
-Yast.import "Stage"
+Yast.import "Mode"
module Y2NtpClient
module Dialog
@@ -55,7 +55,8 @@
end
def abort_button
- Yast::Label.CancelButton
+ return Yast::Label.CancelButton unless installation?
+ nil
end
def hardware_clock_widgets
@@ -70,13 +71,23 @@
end
def back_button
- # no back button
- ""
+ return "" unless installation?
+ nil
end
def next_button
- # FIXME: it probably cannot run in initial stage, so not needed
- Yast::Stage.initial ? Yast::Label.AcceptButton : Yast::Label.OKButton
+ return Yast::Label.OKButton unless installation?
+ nil
+ end
+
+ # Determines whether running in installation mode
+ #
+ # We do not use Stage.initial because of firstboot, which runs in 'installation' mode
+ # but in 'firstboot' stage.
+ #
+ # @return [Boolean] Boolean if running in installation or update mode
+ def installation?
+ Yast::Mode.installation || Yast::Mode.update
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/src/modules/NtpClient.rb new/yast2-ntp-client-4.2.2/src/modules/NtpClient.rb
--- old/yast2-ntp-client-4.1.8/src/modules/NtpClient.rb 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/src/modules/NtpClient.rb 2019-07-05 16:08:44.000000000 +0200
@@ -92,9 +92,14 @@
# The interval of synchronization in minutes.
@sync_interval = DEFAULT_SYNC_INTERVAL
- # Service name of the NTP daemon
+ # Service names of the NTP daemon
@service_name = "chronyd"
+ # "chrony-wait" service has also to be handled in order to ensure that
+ # "chronyd" is working correctly and do not depend on the network status.
+ # bsc#1137196, bsc#1129730
+ @wait_service_name = "chrony-wait"
+
# Netconfig policy: for merging and prioritizing static and DHCP config.
# https://github.com/openSUSE/sysconfig/blob/master/doc/README.netconfig
# https://github.com/openSUSE/sysconfig/blob/master/config/sysconfig.config-n…
@@ -795,24 +800,37 @@
success
end
- # Enable or disable ntp service depending on @run_service value
+ # Enable or disable chrony services depending on @run_service value
+ # "chrony-wait" service has also to be handled in order to ensure that
+ # "chronyd" is working correctly and do not depend on the network status.
#
- # * When disabling, it also stops the service.
- # * When enabling, it tries to restart the service unless it's in write
+ # * When disabling, it also stops the services.
+ # * When enabling, it tries to restart the services unless it's in write
# only mode.
def check_service
- adjusted = @run_service ? Service.Enable(@service_name) : Service.Disable(@service_name)
-
- # error report
- Report.Error(Message.CannotAdjustService("NTP")) unless adjusted
-
if @run_service
- unless @write_only
- # error report
- Report.Error(_("Cannot restart the NTP daemon.")) unless Service.Restart(@service_name)
+ # Enable and run services
+ if !Service.Enable(@service_name)
+ Report.Error(Message.CannotAdjustService(@service_name))
+ elsif !Service.Enable(@wait_service_name)
+ Report.Error(Message.CannotAdjustService(@wait_service_name))
+ end
+ if !@write_only
+ if !Service.Restart(@service_name)
+ Report.Error(_("Cannot restart \"%s\" service.") % @service_name)
+ elsif !Service.Restart(@wait_service_name)
+ Report.Error(_("Cannot restart \"%s\" service.") % @wait_service_name)
+ end
end
else
+ # Disable and stop services
+ if !Service.Disable(@service_name)
+ Report.Error(Message.CannotAdjustService(@service_name))
+ elsif !Service.Disable(@wait_service_name)
+ Report.Error(Message.CannotAdjustService(@wait_service_name))
+ end
Service.Stop(@service_name)
+ Service.Stop(@wait_service_name)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.8/test/ntp_client_test.rb new/yast2-ntp-client-4.2.2/test/ntp_client_test.rb
--- old/yast2-ntp-client-4.1.8/test/ntp_client_test.rb 2019-03-20 10:42:42.000000000 +0100
+++ new/yast2-ntp-client-4.2.2/test/ntp_client_test.rb 2019-07-05 16:08:44.000000000 +0200
@@ -283,10 +283,37 @@
subject.Write
end
- it "checks ntp service" do
- expect(subject).to receive(:check_service)
+ context "services will be started" do
+ before do
+ subject.run_service = true
+ subject.write_only = false
+ end
- subject.Write
+ it "enables and restarts services" do
+ allow(subject).to receive(:check_service).and_call_original
+ expect(Yast::Service).to receive(:Enable).with("chronyd").and_return(true)
+ expect(Yast::Service).to receive(:Enable).with("chrony-wait").and_return(true)
+ expect(Yast::Service).to receive(:Restart).with("chronyd").and_return(true)
+ expect(Yast::Service).to receive(:Restart).with("chrony-wait").and_return(true)
+
+ subject.Write
+ end
+ end
+
+ context "services will be stopped" do
+ before do
+ subject.run_service = false
+ end
+
+ it "disables and stops services" do
+ allow(subject).to receive(:check_service).and_call_original
+ expect(Yast::Service).to receive(:Disable).with("chronyd").and_return(true)
+ expect(Yast::Service).to receive(:Disable).with("chrony-wait").and_return(true)
+ expect(Yast::Service).to receive(:Stop).with("chronyd").and_return(true)
+ expect(Yast::Service).to receive(:Stop).with("chrony-wait").and_return(true)
+
+ subject.Write
+ end
end
it "updates cron settings" do
1
0
Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2019-07-31 14:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Wed Jul 31 14:22:23 2019 rev:186 rq:713155 version:0.925
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2018-10-02 19:40:58.954248757 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new.4126/perl-Bootloader.changes 2019-07-31 14:22:27.462465962 +0200
@@ -1,0 +2,16 @@
+Wed Jul 3 06:39:41 UTC 2019 - jreidinger(a)suse.cz
+
+- merge gh#openSUSE/perl-bootloader#122
+- Replace --suse-signed-grub by --suse-force-signed to follow
+ update from boo#1136601
+- 0.925
+
+--------------------------------------------------------------------
+Thu Jun 6 06:22:24 UTC 2019 - jreidinger(a)suse.cz
+
+- merge gh#openSUSE/perl-bootloader#121
+- Fix secureboot on aarch64 (boo#1136601)
+- [RFC] Fix secureboot on aarch64 (boo#1136601)
+- 0.924
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-0.923.tar.xz
New:
----
perl-Bootloader-0.925.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.cH6Fvb/_old 2019-07-31 14:22:28.006465652 +0200
+++ /var/tmp/diff_new_pack.cH6Fvb/_new 2019-07-31 14:22:28.010465649 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Bootloader
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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: perl-Bootloader
-Version: 0.923
+Version: 0.925
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-0.923.tar.xz -> perl-Bootloader-0.925.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.923/VERSION new/perl-Bootloader-0.925/VERSION
--- old/perl-Bootloader-0.923/VERSION 2018-09-27 13:15:33.000000000 +0200
+++ new/perl-Bootloader-0.925/VERSION 2019-07-03 08:39:41.000000000 +0200
@@ -1 +1 @@
-0.923
+0.925
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.923/changelog new/perl-Bootloader-0.925/changelog
--- old/perl-Bootloader-0.923/changelog 2018-09-27 13:15:33.000000000 +0200
+++ new/perl-Bootloader-0.925/changelog 2019-07-03 08:39:41.000000000 +0200
@@ -1,3 +1,12 @@
+2019-07-03: 0.925
+ - merge gh#openSUSE/perl-bootloader#122
+ - Replace --suse-signed-grub by --suse-force-signed to follow
+ update from boo#1136601
+
+2019-06-06: 0.924
+ - merge gh#openSUSE/perl-bootloader#121
+ - Fix secureboot on aarch64 (boo#1136601)
+
2018-09-27: 0.923
- merge gh#openSUSE/perl-bootloader#120
- create temporary files in /tmp (bsc#1108777)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.923/grub2-efi/install new/perl-Bootloader-0.925/grub2-efi/install
--- old/perl-Bootloader-0.923/grub2-efi/install 2018-09-27 13:15:33.000000000 +0200
+++ new/perl-Bootloader-0.925/grub2-efi/install 2019-07-03 08:39:41.000000000 +0200
@@ -56,7 +56,7 @@
append="$append --suse-enable-tpm"
fi
-if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" ] ; then
+if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" -a "$target" != "arm64" ] ; then
if [ -x /usr/sbin/shim-install ] ; then
( set -x ; /usr/sbin/shim-install --config-file=/boot/grub2/grub.cfg $append )
else
@@ -64,6 +64,10 @@
exit 1
fi
elif [ -x /usr/sbin/grub2-install ] ; then
+ # Use '--suse-force-signed' when shim is not used (aarch64 case)
+ if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" ]; then
+ append="$append --suse-force-signed"
+ fi
( set -x ; /usr/sbin/grub2-install --target="$target" $append )
else
echo "grub2-install: command not found"
1
0
Hello community,
here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2019-07-31 14:22:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Wed Jul 31 14:22:14 2019 rev:36 rq:713019 version:4.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2019-04-02 09:18:51.568560178 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-registration.new.4126/yast2-registration.changes 2019-07-31 14:22:17.742473617 +0200
@@ -1,0 +2,36 @@
+Thu Jun 20 14:15:48 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Do not abort when an addon license is refused (bsc#1114018).
+- 4.2.5
+
+-------------------------------------------------------------------
+Wed Jun 12 12:00:17 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Improve error message when migration products could not be found
+ during an offline upgrade (bsc#1078739).
+- 4.2.4
+
+-------------------------------------------------------------------
+Tue Jun 4 18:36:37 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.3
+
+-------------------------------------------------------------------
+Mon Jun 3 09:26:29 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Update labels and help texts related to registration server,
+ replacing SMT by RMT since the former is not longer supported
+ (bsc#1129206, bsc#1136433).
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu May 30 13:37:19 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Properly display the openSUSE Leap to SLES migration summary
+ (bsc#1136325)
+- 4.2.1
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.2.0.tar.bz2
New:
----
yast2-registration-4.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.5U7VM8/_old 2019-07-31 14:22:18.286472842 +0200
+++ /var/tmp/diff_new_pack.5U7VM8/_new 2019-07-31 14:22:18.290472836 +0200
@@ -17,13 +17,28 @@
Name: yast2-registration
-Version: 4.2.0
+Version: 4.2.5
Release: 0
+Summary: YaST2 - Registration Module
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-registration
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
# Y2Packager::ProductLicense
+BuildRequires: update-desktop-files
+BuildRequires: yast2 >= 4.0.63
+BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: yast2-slp >= 3.1.9
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(suse-connect) >= 0.3.11
+BuildRequires: rubygem(yast-rake) >= 0.2.5
+# updated product renames
+BuildRequires: yast2-packager >= 4.0.40
+BuildRequires: yast2-update >= 3.1.36
+
+# Y2Packager::ProductLicense
Requires: yast2 >= 4.0.63
# "dupAllowVendorChange" option in Pkg.SetSolverFlags()
Requires: yast2-pkg-bindings >= 3.1.34
@@ -31,48 +46,29 @@
Requires: yast2-ruby-bindings >= 3.1.12
# SUSE::Connect::YaST.list_installer_updates
Requires: rubygem(suse-connect) >= 0.2.37
-
# NOTE: Workaround for bsc#947482, SUSEConnect is actually not needed by the
# YaST registration module, it is used just to install the Connect dependencies.
#
# TODO: Remove it once the SUSEConnect dependencies are properly moved to the
# suse-connect gem.
Requires: SUSEConnect >= 0.2.37
-
Requires: yast2-add-on >= 3.1.8
Requires: yast2-slp >= 3.1.9
-# packager/product_patterns.rb
-Requires: yast2-packager >= 3.1.95
+# Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action
+Requires: yast2-packager >= 4.2.16
Requires: yast2-update >= 3.1.36
-# Y2Packager::ProductLicense
-BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 4.0.63
-BuildRequires: yast2-devtools >= 3.1.39
-BuildRequires: yast2-slp >= 3.1.9
-BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(suse-connect) >= 0.3.11
-BuildRequires: rubygem(yast-rake) >= 0.2.5
-# updated product renames
-BuildRequires: yast2-packager >= 4.0.40
-BuildRequires: yast2-update >= 3.1.36
-
BuildArch: noarch
# SUSEConnect does not build for i586 and s390 and is not supported on those architectures
# bsc#1088552
ExcludeArch: %ix86 s390
-Summary: YaST2 - Registration Module
-License: GPL-2.0-only
-Group: System/YaST
-Url: https://github.com/yast/yast-registration
-
%description
The registration module to register products and/or to fetch an update
source (mirror) automatically.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
@@ -81,17 +77,16 @@
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_ybindir}/*
-%{yast_desktopdir}/*.desktop
-%{yast_clientdir}/*.rb
-%{yast_ydatadir}/registration
-%{yast_schemadir}/autoyast/rnc/*.rnc
-%{yast_libdir}/registration
-%{yast_libdir}/yast
-%{yast_libdir}/yast/suse_connect.rb
+%{yast_ybindir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_clientdir}
+%{yast_ydatadir}
+%{yast_schemadir}
+%{yast_libdir}
%{yast_icondir}
%doc %{yast_docdir}
%license COPYING
++++++ yast2-registration-4.2.0.tar.bz2 -> yast2-registration-4.2.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/package/yast2-registration.changes new/yast2-registration-4.2.5/package/yast2-registration.changes
--- old/yast2-registration-4.2.0/package/yast2-registration.changes 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/package/yast2-registration.changes 2019-07-02 11:33:49.000000000 +0200
@@ -1,4 +1,40 @@
-------------------------------------------------------------------
+Thu Jun 20 14:15:48 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Do not abort when an addon license is refused (bsc#1114018).
+- 4.2.5
+
+-------------------------------------------------------------------
+Wed Jun 12 12:00:17 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Improve error message when migration products could not be found
+ during an offline upgrade (bsc#1078739).
+- 4.2.4
+
+-------------------------------------------------------------------
+Tue Jun 4 18:36:37 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.3
+
+-------------------------------------------------------------------
+Mon Jun 3 09:26:29 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Update labels and help texts related to registration server,
+ replacing SMT by RMT since the former is not longer supported
+ (bsc#1129206, bsc#1136433).
+- 4.2.2
+
+-------------------------------------------------------------------
+Thu May 30 13:37:19 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Properly display the openSUSE Leap to SLES migration summary
+ (bsc#1136325)
+- 4.2.1
+
+-------------------------------------------------------------------
Fri Mar 29 14:34:42 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
- Update the label used for the option to register the system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/package/yast2-registration.spec new/yast2-registration-4.2.5/package/yast2-registration.spec
--- old/yast2-registration-4.2.0/package/yast2-registration.spec 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/package/yast2-registration.spec 2019-07-02 11:33:49.000000000 +0200
@@ -12,18 +12,33 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-registration
-Version: 4.2.0
+Version: 4.2.5
Release: 0
+Summary: YaST2 - Registration Module
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-registration
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
# Y2Packager::ProductLicense
+BuildRequires: update-desktop-files
+BuildRequires: yast2 >= 4.0.63
+BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: yast2-slp >= 3.1.9
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(suse-connect) >= 0.3.11
+BuildRequires: rubygem(yast-rake) >= 0.2.5
+# updated product renames
+BuildRequires: yast2-packager >= 4.0.40
+BuildRequires: yast2-update >= 3.1.36
+
+# Y2Packager::ProductLicense
Requires: yast2 >= 4.0.63
# "dupAllowVendorChange" option in Pkg.SetSolverFlags()
Requires: yast2-pkg-bindings >= 3.1.34
@@ -31,48 +46,29 @@
Requires: yast2-ruby-bindings >= 3.1.12
# SUSE::Connect::YaST.list_installer_updates
Requires: rubygem(suse-connect) >= 0.2.37
-
# NOTE: Workaround for bsc#947482, SUSEConnect is actually not needed by the
# YaST registration module, it is used just to install the Connect dependencies.
#
# TODO: Remove it once the SUSEConnect dependencies are properly moved to the
# suse-connect gem.
Requires: SUSEConnect >= 0.2.37
-
Requires: yast2-add-on >= 3.1.8
Requires: yast2-slp >= 3.1.9
-# packager/product_patterns.rb
-Requires: yast2-packager >= 3.1.95
+# Packager ProductLicense#HandleLicenseDialogRet allowing "refuse" action
+Requires: yast2-packager >= 4.2.16
Requires: yast2-update >= 3.1.36
-# Y2Packager::ProductLicense
-BuildRequires: update-desktop-files
-BuildRequires: yast2 >= 4.0.63
-BuildRequires: yast2-devtools >= 3.1.39
-BuildRequires: yast2-slp >= 3.1.9
-BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(suse-connect) >= 0.3.11
-BuildRequires: rubygem(yast-rake) >= 0.2.5
-# updated product renames
-BuildRequires: yast2-packager >= 4.0.40
-BuildRequires: yast2-update >= 3.1.36
-
BuildArch: noarch
# SUSEConnect does not build for i586 and s390 and is not supported on those architectures
# bsc#1088552
ExcludeArch: %ix86 s390
-Summary: YaST2 - Registration Module
-License: GPL-2.0-only
-Group: System/YaST
-Url: https://github.com/yast/yast-registration
-
%description
The registration module to register products and/or to fetch an update
source (mirror) automatically.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
@@ -81,17 +77,16 @@
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_ybindir}/*
-%{yast_desktopdir}/*.desktop
-%{yast_clientdir}/*.rb
-%{yast_ydatadir}/registration
-%{yast_schemadir}/autoyast/rnc/*.rnc
-%{yast_libdir}/registration
-%{yast_libdir}/yast
-%{yast_libdir}/yast/suse_connect.rb
+%{yast_ybindir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_clientdir}
+%{yast_ydatadir}
+%{yast_schemadir}
+%{yast_libdir}
%{yast_icondir}
%doc %{yast_docdir}
%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/desktop/add_extensions.desktop new/yast2-registration-4.2.5/src/desktop/add_extensions.desktop
--- old/yast2-registration-4.2.0/src/desktop/add_extensions.desktop 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/desktop/add_extensions.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
-
-X-SuSE-YaST-Call=scc
-X-SuSE-YaST-Argument=select_extensions
-X-SuSE-YaST-RootOnly=yes
-X-SuSE-YaST-Group=Software
-X-SuSE-YaST-Keywords=extensions,modules,software,registration,scc,package,repositories
-
-Icon=yast-addon-extension
-Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc select_extensions"
-
-Name=Add System Extensions or Modules
-GenericName=Add System Extensions or Modules
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/desktop/customer_center.desktop new/yast2-registration-4.2.5/src/desktop/customer_center.desktop
--- old/yast2-registration-4.2.0/src/desktop/customer_center.desktop 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/desktop/customer_center.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
-
-X-SuSE-YaST-Call=registration
-X-SuSE-YaST-AutoInstClient=scc_auto
-X-SuSE-YaST-RootOnly=false
-X-SuSE-YaST-Group=Software
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=false
-X-SuSE-YaST-AutoInstRequires=lan,proxy
-X-SuSE-YaST-AutoInstSchema=registration.rnc
-X-SuSE-YaST-AutoInstResource=suse_register
-X-SuSE-YaST-Keywords=scc,software,registration,smt,rmt,module,extension
-
-Icon=yast-product-registration
-Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc"
-
-Name=Product Registration
-GenericName=Product Registration
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop new/yast2-registration-4.2.5/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop
--- old/yast2-registration-4.2.0/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-4.2.5/src/desktop/org.opensuse.yast.SCC.AddExtensions.desktop 2019-07-02 11:33:49.000000000 +0200
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-SuSE-YaST-Call=scc
+X-SuSE-YaST-Argument=select_extensions
+X-SuSE-YaST-RootOnly=yes
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Keywords=extensions,modules,software,registration,scc,package,repositories
+
+Icon=yast-addon-extension
+Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc select_extensions"
+
+Name=YaST System Extensions
+GenericName=System Extensions
+Comment=Select System Extensions or Modules
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/desktop/org.opensuse.yast.SCC.desktop new/yast2-registration-4.2.5/src/desktop/org.opensuse.yast.SCC.desktop
--- old/yast2-registration-4.2.0/src/desktop/org.opensuse.yast.SCC.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-4.2.5/src/desktop/org.opensuse.yast.SCC.desktop 2019-07-02 11:33:49.000000000 +0200
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-SuSE-YaST-Call=registration
+X-SuSE-YaST-AutoInstClient=scc_auto
+X-SuSE-YaST-RootOnly=false
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=false
+X-SuSE-YaST-AutoInstRequires=lan,proxy
+X-SuSE-YaST-AutoInstSchema=registration.rnc
+X-SuSE-YaST-AutoInstResource=suse_register
+X-SuSE-YaST-Keywords=scc,software,registration,smt,rmt,module,extension
+
+Icon=yast-product-registration
+Exec=/usr/bin/xdg-su -c "/sbin/yast2 scc"
+
+Name=YaST Product Registration
+GenericName=Product Registration
+Comment=Register your Product with the Vendor
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/addon.rb new/yast2-registration-4.2.5/src/lib/registration/addon.rb
--- old/yast2-registration-4.2.0/src/lib/registration/addon.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/addon.rb 2019-07-02 11:33:49.000000000 +0200
@@ -309,12 +309,12 @@
}
end
- # is the addon available? SMT may have mirrored only some extensions,
+ # is the addon available? SMT/RMT may have mirrored only some extensions,
# the not mirrored extensions are marked as not available
# @return [Boolean] true if the addon is available to register
def available?
# explicitly check for false, undefined (nil) means it is available,
- # it's only reported by SMT
+ # it's only reported by SMT/RMT
@pure_addon.available != false
end
@@ -331,6 +331,13 @@
end
end
+ # Whether the EULA acceptance is required
+ #
+ # @return [Boolean] true if a not empty EULA url is present; false otherwise
+ def eula_acceptance_needed?
+ !eula_url.to_s.strip.empty?
+ end
+
def self.dump_addons
# dump the downloaded data to a file for easier debugging,
# avoid write failures when running as an unprivileged user (rspec tests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/clients/inst_migration_repos.rb new/yast2-registration-4.2.5/src/lib/registration/clients/inst_migration_repos.rb
--- old/yast2-registration-4.2.0/src/lib/registration/clients/inst_migration_repos.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/clients/inst_migration_repos.rb 2019-07-02 11:33:49.000000000 +0200
@@ -45,7 +45,7 @@
# copy the old NCC/SCC credentials to inst-sys
SwMgmt.copy_old_credentials(destdir)
- # import the SMT certificate to inst-sys
+ # import the SMT/RMT certificate to inst-sys
import_ssl_certificates
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/connect_helpers.rb new/yast2-registration-4.2.5/src/lib/registration/connect_helpers.rb
--- old/yast2-registration-4.2.0/src/lib/registration/connect_helpers.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/connect_helpers.rb 2019-07-02 11:33:49.000000000 +0200
@@ -98,7 +98,7 @@
report_error(message_prefix + _("Connection to registration server failed."),
error_code_message + error_msg)
when 404
- # update the message when an old SMT server is found
+ # update the message when an old SMT/RMT server is found
check_smt_api(error_msg)
report_error(message_prefix + _("Connection to registration server failed."),
error_code_message + error_msg)
@@ -139,7 +139,7 @@
false
rescue JSON::ParserError => e
log.error "JSON parse error"
- # update the message when an old SMT server is found
+ # update the message when an old SMT/RMT server is found
check_smt_api(e.message)
details_error(message_prefix + _("Cannot parse the data from server."), e.message)
false
@@ -287,10 +287,10 @@
# @param error_msg [String] the received error message, the content might be replaced
def self.check_smt_api(error_msg)
url = UrlHelpers.registration_url
- # no SMT/custom server used
+ # no SMT/RMT/custom server used
return if url == SUSE::Connect::YaST::DEFAULT_URL
- # test old SMT instance
+ # test old SMT/RMT instance
smt_status = SmtStatus.new(url, insecure: Helpers.insecure_registration)
return unless smt_status.ncc_api_present?
@@ -335,7 +335,7 @@
# TRANSLATORS: additional hint for an error message
msg = _("Check that this system is known to the registration server.")
- # probably missing NCC->SCC sync, display a hint unless SMT is used
+ # probably missing NCC->SCC sync, display a hint unless SMT/RMT is used
if [nil, SUSE::Connect::YaST::DEFAULT_URL].include?(UrlHelpers.registration_url)
msg += "\n\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/sw_mgmt.rb new/yast2-registration-4.2.5/src/lib/registration/sw_mgmt.rb
--- old/yast2-registration-4.2.0/src/lib/registration/sw_mgmt.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/sw_mgmt.rb 2019-07-02 11:33:49.000000000 +0200
@@ -486,7 +486,7 @@
log.info "Copying the old credentials from previous installation"
log.info "Copying #{file} to #{new_file}"
- # SMT uses extra ACL permissions, make sure they are kept in the copied file,
+ # SMT/RMT uses extra ACL permissions, make sure they are kept in the copied file,
# (use "cp -a ", ::FileUtils.cp(..., preserve: true) cannot be used as it preserves only
# the traditional Unix file permissions, the extended ACLs are NOT copied!)
Yast::Execute.locally!("cp", "-a", file, new_file)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/addon_eula_dialog.rb new/yast2-registration-4.2.5/src/lib/registration/ui/addon_eula_dialog.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/addon_eula_dialog.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/addon_eula_dialog.rb 2019-07-02 11:33:49.000000000 +0200
@@ -48,22 +48,17 @@
false
)
- # Default: no EULA specified => accepted
- eula_ret = :accepted
-
addons.each do |addon|
- next unless addon.eula_url && !addon.eula_url.empty?
+ next unless addon.eula_acceptance_needed?
+ next if addon.registered?
log.info "Addon '#{addon.name}' has an EULA at #{addon.eula_url}"
eula_ret = accept_eula(addon)
- # any declined license needs to be handled separately
- break if eula_ret != :accepted
+ return eula_ret if eula_ret != :next
end
- # go back or abort if any EULA has not been accepted, let the user
- # deselect the not accepted extension
- eula_ret == :accepted ? :next : eula_ret
+ :next
end
private
@@ -114,7 +109,7 @@
# @return [Symbol] :accepted, :back, :abort, :halt - user input
def run_eula_dialog(eula_reader)
base_product = false
- cancel_action = "abort"
+ cancel_action = "refuse"
ret = Yast::ProductLicense.HandleLicenseDialogRet(arg_ref(eula_reader.licenses),
base_product, cancel_action)
log.debug "EULA dialog result: #{ret}"
@@ -123,17 +118,20 @@
# ask user to accept an addon EULA
# @param [Addon] addon the addon
- # @return [Symbol] :accepted, :back, :abort, :halt
+ # @return [Symbol] :back, :abort, :halt
def accept_eula(addon)
Dir.mktmpdir("extension-eula-") do |tmpdir|
return :back unless download_eula(addon, tmpdir)
+
eula_reader = EulaReader.new(tmpdir)
license = find_license(addon, eula_reader)
- return :accepted if license && license.accepted?
+ return :next if license && license.accepted?
setup_eula_dialog(addon, eula_reader, tmpdir)
ret = run_eula_dialog(eula_reader)
license.accept! if ret == :accepted
+
+ return :next if [:accepted, :refused].include?(ret)
ret
end
ensure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/autoyast_config_dialog.rb new/yast2-registration-4.2.5/src/lib/registration/ui/autoyast_config_dialog.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/autoyast_config_dialog.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/autoyast_config_dialog.rb 2019-07-02 11:33:49.000000000 +0200
@@ -62,8 +62,8 @@
)
help_text += _(
"<p>If your network deploys a custom registration server, set the " \
- "correct URL of the server\nand the location of the SMT " \
- "certificate in <b>SMT Server Settings</b>. Refer\nto your SMT " \
+ "correct URL of the server\nand the location of the RMT " \
+ "certificate in <b>RMT Server Settings</b>. Refer\nto your RMT " \
"manual for further assistance.</p>"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/base_system_registration_dialog.rb new/yast2-registration-4.2.5/src/lib/registration/ui/base_system_registration_dialog.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/base_system_registration_dialog.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/base_system_registration_dialog.rb 2019-07-02 11:33:49.000000000 +0200
@@ -142,7 +142,7 @@
self.action = :register_scc
end
- # Handle selection the 'Register System via local SMT/RMT Server' option
+ # Handle selection the 'Register System via local RMT Server' option
#
# Set the dialog's action to :register_local
def register_local_handler
@@ -282,7 +282,7 @@
end
# Example URL to be used in the :register_local UI
- EXAMPLE_SMT_URL = "https://smt.example.com".freeze
+ EXAMPLE_RMT_URL = "https://rmt.example.com".freeze
# Widgets for :register_local action
#
@@ -294,7 +294,7 @@
Id(:register_local),
Opt(:notify),
# TRANSLATORS: radio button
- _("Register System via local SMT/RMT Server"),
+ _("Register System via local RMT Server"),
action == :register_local
)
),
@@ -608,7 +608,7 @@
VALID_CUSTOM_URL_SCHEMES = ["http", "https"].freeze
- # Determine whether an URL is valid and suitable to be used as local SMT/RMT server
+ # Determine whether an URL is valid and suitable to be used as local RMT server
#
# @return [Boolean] true if it's valid; false otherwise.
def valid_custom_url?(custom_url)
@@ -630,7 +630,7 @@
# use an example URL if no server was found via SLP
urls = slp_urls
- urls.empty? ? [EXAMPLE_SMT_URL] : urls
+ urls.empty? ? [EXAMPLE_RMT_URL] : urls
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/migration_repos_workflow.rb new/yast2-registration-4.2.5/src/lib/registration/ui/migration_repos_workflow.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/migration_repos_workflow.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/migration_repos_workflow.rb 2019-07-02 11:33:49.000000000 +0200
@@ -335,11 +335,22 @@
def load_migrations_for_products(products, remote_product)
log.info "Loading offline migrations for target product: #{remote_product.inspect}"
log.info "Installed products: #{products.inspect}"
+
self.migrations = registration_ui.offline_migration_products(products, remote_product)
if migrations.empty?
- # TRANSLATORS: Error message
- Yast::Report.Error(_("No migration product found."))
+ msg = [
+ # TRANSLATORS. Error message
+ _("No migration product found."),
+ # TRANSLATORS: Help message, %{product} is the product name
+ _("Please, boot the original system and make sure " \
+ "that all registerable products are correctly registered.\n" \
+ "Also check that the installed system is supported for upgrade to \n" \
+ "%{product}.") % { product: Y2Packager::ProductUpgrade.new_base_product.display_name }
+ ]
+
+ Yast::Report.Error(msg.join("\n\n"))
+
return Yast::Mode.auto ? :abort : :empty
end
@@ -541,16 +552,16 @@
end
# check the system status at upgrade and return the symbol for the next step
- # @return [Symabol] workflow symbol, :skip => do not use the SCC/SMT upgrade
+ # @return [Symabol] workflow symbol, :skip => do not use the SCC/SMT/RMT upgrade
# (unregistered system or explicitly requested by user), :next =>
- # continue with the SCC/SMT based upgrade
+ # continue with the SCC/SMT/RMT based upgrade
def system_upgrade_check
log.info "System upgrade mode detected"
# media based upgrade requested by user
if Yast::Linuxrc.InstallInf("MediaUpgrade") == "1"
explicit_media_upgrade
return :skip
- # the system is registered, continue with the SCC/SMT based upgrade
+ # the system is registered, continue with the SCC/SMT/RMT based upgrade
elsif Registration.is_registered?
log.info "The system is registered, using the registration server for upgrade"
return :next
@@ -611,7 +622,7 @@
# @return [String] translated message
def media_upgrade(registered)
# TRANSLATORS: Media based upgrade requested by user (1/3)
- # User requested media based upgrade which does not use SCC/SMT
+ # User requested media based upgrade which does not use SCC/SMT/RMT
# but the downloaded media (physical DVD or shared repo on a local server).
ret = _("<h2>Media Based Upgrade</h2><p>The media based upgrade is requested. " \
"In this mode YaST will not contact the registration server to obtain " \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/migration_selection_dialog.rb new/yast2-registration-4.2.5/src/lib/registration/ui/migration_selection_dialog.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/migration_selection_dialog.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/migration_selection_dialog.rb 2019-07-02 11:33:49.000000000 +0200
@@ -273,17 +273,17 @@
product_name = CGI.escapeHTML(product.friendly_name)
# explicitly check for false, the flag is not returned by SCC, this is
- # a SMT specific check (in SCC all products are implicitly available)
+ # a SMT/RMT specific check (in SCC all products are implicitly available)
if product.available == false
- # a product can be unavailable only when using SMT, the default
+ # a product can be unavailable only when using SMT/RMT, the default
# SCC URL should be never used
url = UrlHelpers.registration_url || SUSE::Connect::YaST::DEFAULT_URL
# TRANSLATORS: An error message displayed in the migration details.
- # The product has not been mirrored to the SMT server and cannot be used
- # for migration. The SMT admin has to mirror the product to allow
+ # The product has not been mirrored to the SMT/RMT server and cannot be used
+ # for migration. The SMT/RMT admin has to mirror the product to allow
# using the selected migration.
- # %{url} is the URL of the registration server (SMT)
+ # %{url} is the URL of the SMT/RMT registration server
# %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
return Yast::HTML.Colorize(
_("ERROR: Product <b>%{product}</b> is not available at the " \
@@ -312,7 +312,8 @@
new_product_name = CGI.escapeHTML(new_product.friendly_name)
installed_version = old_product["version_version"]
- if installed_version == new_product.version
+ # check also the product name (when upgrading Leap 15.1 to SLES15-SP1 both are 15.1)
+ if installed_version == new_product.version && new_product.identifier == old_product["name"]
# TRANSLATORS: Summary message, rich text format
# %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
return _("%s <b>stays unchanged.</b>") % new_product_name
@@ -320,8 +321,9 @@
old_product_name = SwMgmt.product_label(old_product)
- # use Gem::Version for version compare
- if Gem::Version.new(installed_version) < Gem::Version.new(new_product.version)
+ # use Gem::Version for version compare, the versions might be the same
+ # if the products are different
+ if Gem::Version.new(installed_version) <= Gem::Version.new(new_product.version)
# TRANSLATORS: Summary message, rich text format
# %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
# %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/registration_sync_workflow.rb new/yast2-registration-4.2.5/src/lib/registration/ui/registration_sync_workflow.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/registration_sync_workflow.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/registration_sync_workflow.rb 2019-07-02 11:33:49.000000000 +0200
@@ -40,6 +40,12 @@
self.registration_ui = RegistrationUI.new(registration)
end
+ # workaround for rollback from the Leap => SLES migration,
+ # maps installed => activated product
+ SYNC_FALLBACKS = {
+ "openSUSE" => "SLES"
+ }.freeze
+
# restore the registration status
# @return [Symbol] :next on sucess, :abort on error
def run_sequence
@@ -52,7 +58,9 @@
activated = registration.activated_products.map(&:identifier)
products =
SwMgmt.installed_products.each_with_object([]) do |product, result|
- result << product if activated.include?(product["name"])
+ name = product["name"]
+ next unless activated.include?(name) || activated.include?(SYNC_FALLBACKS[name])
+ result << product
end
# Ask the user about adding all the registered but not installed addons
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/ui/regservice_selection_dialog.rb new/yast2-registration-4.2.5/src/lib/registration/ui/regservice_selection_dialog.rb
--- old/yast2-registration-4.2.0/src/lib/registration/ui/regservice_selection_dialog.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/ui/regservice_selection_dialog.rb 2019-07-02 11:33:49.000000000 +0200
@@ -18,7 +18,7 @@
module Registration
module UI
- # This class implements a SCC/SMT service selection dialog.
+ # This class implements a SCC/RMT service selection dialog.
class RegserviceSelectionDialog < Yast::Dialogs::ServiceSelection
Yast.import "UI"
Yast.import "Label"
@@ -27,14 +27,14 @@
# Run dialog
#
# The return value will be:
- # * A service in case one SMT server was selected
+ # * A service in case one RMT server was selected
# * :scc symbol if default SCC was selected
# * :cancel symbol if the SCC was canceled (pressing the 'cancel' button)
#
# @example Select the default SCC service
# Registration::UI::SelectionServiceDialog.run(services) #=> :scc
#
- # @example Select some SMT service
+ # @example Select some RMT service
# Registration::UI::SelectionServiceDialog.run(services)
# #=> #<Yast::SlpServiceClass::Service...>
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/src/lib/registration/widgets/registration_code.rb new/yast2-registration-4.2.5/src/lib/registration/widgets/registration_code.rb
--- old/yast2-registration-4.2.0/src/lib/registration/widgets/registration_code.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/src/lib/registration/widgets/registration_code.rb 2019-07-02 11:33:49.000000000 +0200
@@ -35,7 +35,7 @@
end
def label
- _("Registration Code or SMT Server URL")
+ _("Registration Code or RMT Server URL")
end
# Initialize the widget with stored values
@@ -59,7 +59,7 @@
register
end
- # Try to register the system against SCC or a custom SMT depending on if
+ # Try to register the system against SCC or a custom RMT depending on if
# the value is an URL or not.
#
# @return [Boolean] false if not attempted or failed and true if success
@@ -95,7 +95,7 @@
def help
_(
"<p>\n" \
- "The SMT Server URL must use http or https protocol, " \
+ "The RMT Server URL must use http or https protocol, " \
"other schemes are not supported." \
"</p>\n"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/test/base_system_registration_dialog_test.rb new/yast2-registration-4.2.5/test/base_system_registration_dialog_test.rb
--- old/yast2-registration-4.2.0/test/base_system_registration_dialog_test.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/test/base_system_registration_dialog_test.rb 2019-07-02 11:33:49.000000000 +0200
@@ -145,8 +145,8 @@
end
end
- context "when user enters a local SMT server" do
- it "registers the system via local SMT server" do
+ context "when user enters a local RMT server" do
+ it "registers the system via local RMT server" do
allow(Yast::UI).to receive(:QueryWidget).with(:custom_url, :Value)
.and_return(custom_url)
expect(Yast::UI).to receive(:UserInput).and_return(:register_local, :next)
@@ -165,10 +165,10 @@
end
end
- context "when user enters an invalid local SMT server" do
+ context "when user enters an invalid local RMT server" do
it "shows an error and does not try to register the system" do
allow(Yast::UI).to receive(:QueryWidget).with(:custom_url, :Value)
- .and_return("ftp://smt.suse.com")
+ .and_return("ftp://rmt.suse.com")
expect(Yast::UI).to receive(:UserInput).and_return(:register_local, :next, :abort)
expect(Registration::UI::AbortConfirmation).to receive(:run).and_return(true)
expect(Yast::Report).to receive(:Error).with(_("Invalid URL.")).and_return(true)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/test/registration/ui/addon_eula_dialog_test.rb new/yast2-registration-4.2.5/test/registration/ui/addon_eula_dialog_test.rb
--- old/yast2-registration-4.2.0/test/registration/ui/addon_eula_dialog_test.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/test/registration/ui/addon_eula_dialog_test.rb 2019-07-02 11:33:49.000000000 +0200
@@ -15,13 +15,129 @@
require "registration/ui/addon_eula_dialog"
describe Registration::UI::AddonEulaDialog do
- subject(:dialog) { described_class.new([addon]) }
+ subject(:dialog) { described_class.new(addons) }
- let(:addon) do
- addon_generator("name" => "SLES", "eula_url" => "https://suse.com/download/SLES/eula")
+ let(:params) { { "eula_url" => "http://example.addon-eula.url" } }
+ let(:addons) { [registered_addon, addon_wo_eula, addon_with_eula] }
+
+ let(:addon_wo_eula) { Registration::Addon.new(addon_generator) }
+ let(:addon_with_eula) { Registration::Addon.new(addon_generator(params)) }
+ let(:second_addon_with_eula) { Registration::Addon.new(addon_generator(params)) }
+ let(:registered_addon) { Registration::Addon.new(addon_generator(params)) }
+
+ let(:product_license) do
+ instance_double(Y2Packager::ProductLicense, accepted?: false, accept!: true)
+ end
+
+ describe "#run" do
+ before do
+ allow(Yast::Wizard).to receive(:SetContents)
+ allow(dialog).to receive(:find_license).and_return(product_license)
+ allow(dialog).to receive(:download_eula).and_return(true)
+ registered_addon.registered
+ end
+
+ context "when there are no EULA acceptances to show" do
+ let(:addons) { [registered_addon, addon_wo_eula] }
+
+ it "does not display the EULA dialog" do
+ expect(Yast::ProductLicense).to_not receive(:DisplayLicenseDialogWithTitle)
+
+ dialog.run
+ end
+
+ it "returns :next" do
+ expect(dialog.run).to eq(:next)
+ end
+ end
+
+ context "when there are EULA acceptances pending" do
+ let(:addons) { [addon_with_eula, second_addon_with_eula] }
+ let(:first_dialog_response) { :refused }
+ let(:second_dialog_response) { :accepted }
+
+ before do
+ allow(Yast::ProductLicense).to receive(:HandleLicenseDialogRet)
+ .and_return(first_dialog_response, second_dialog_response)
+ end
+
+ context "and the user wants to go back" do
+ let(:first_dialog_response) { :back }
+
+ it "returns :back" do
+ expect(subject.run).to eq(:back)
+ end
+ end
+
+ context "and the user wants to abort" do
+ let(:first_dialog_response) { :abort }
+
+ it "returns :abort" do
+ expect(subject.run).to eq(:abort)
+ end
+ end
+
+ context "but an EULA cannot be downloaded" do
+ before do
+ allow(dialog).to receive(:download_eula).and_return(false)
+ end
+
+ it "does not display the eula dialog" do
+ expect(Yast::ProductLicense).to_not receive(:DisplayLicenseDialogWithTitle)
+
+ dialog.run
+ end
+
+ it "returns :back" do
+ expect(dialog.run).to eq(:back)
+ end
+ end
+ end
+
+ context "when EULA is accepted" do
+ let(:addons) { [addon_with_eula] }
+
+ before do
+ allow(Yast::ProductLicense).to receive(:HandleLicenseDialogRet)
+ .and_return(:accepted)
+ end
+
+ it "sets it as accepted" do
+ expect(product_license).to receive(:accept!)
+
+ subject.run
+ end
+
+ it "returns :next" do
+ expect(dialog.run).to eq(:next)
+
+ subject.run
+ end
+ end
+
+ context "when EULA is refused" do
+ let(:addons) { [addon_with_eula] }
+
+ before do
+ allow(Yast::ProductLicense).to receive(:HandleLicenseDialogRet)
+ .and_return(:refused)
+ end
+
+ it "does not set it as accepted" do
+ expect(product_license).to_not receive(:accept!)
+ end
+
+ it "returns :next" do
+ expect(dialog.run).to eq(:next)
+ end
+ end
end
describe "#accept_eula" do
+ let(:addon) do
+ addon_generator("name" => "SLES", "eula_url" => "https://suse.com/download/SLES/eula")
+ end
+ let(:addons) { [addon] }
let(:eula_downloader) { instance_double(Registration::EulaDownloader, download: true) }
let(:eula_reader) { instance_double(Registration::EulaReader, licenses: licenses_files) }
let(:licenses_files) do
@@ -78,8 +194,8 @@
context "when the license was previously accepted" do
let(:accepted?) { true }
- it "returns :accepted" do
- expect(dialog.send(:accept_eula, addon)).to eq(:accepted)
+ it "returns :next" do
+ expect(dialog.send(:accept_eula, addon)).to eq(:next)
end
it "does not show the eula" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/test/regservice_selection_dialog_spec.rb new/yast2-registration-4.2.5/test/regservice_selection_dialog_spec.rb
--- old/yast2-registration-4.2.0/test/regservice_selection_dialog_spec.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/test/regservice_selection_dialog_spec.rb 2019-07-02 11:33:49.000000000 +0200
@@ -30,7 +30,7 @@
allow(Yast::SlpServiceClass::DnsCache).to receive(:resolve)
.and_return("somehost")
allow(Yast::SLP).to receive(:GetUnicastAttrMap)
- .and_return(type: "server", description: "SMT")
+ .and_return(type: "server", description: "RMT")
end
describe "#run" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/test/sw_mgmt_spec.rb new/yast2-registration-4.2.5/test/sw_mgmt_spec.rb
--- old/yast2-registration-4.2.0/test/sw_mgmt_spec.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/test/sw_mgmt_spec.rb 2019-07-02 11:33:49.000000000 +0200
@@ -294,15 +294,15 @@
subject.copy_old_credentials(root_dir)
end
- it "copies old SMT credentials at upgrade" do
- smt_credentials = File.join(root_dir, target_dir, "SMT-http_smt_example_com")
+ it "copies old SMT/RMT credentials at upgrade" do
+ credentials = File.join(root_dir, target_dir, "RMT-http_example_com")
allow(Dir).to receive(:[]).with(File.join(root_dir, target_dir, "*"))
- .and_return([smt_credentials])
+ .and_return([credentials])
allow(SUSE::Connect::YaST).to receive(:credentials).and_return(OpenStruct.new)
expect(Yast::Execute).to receive(:locally!)
- .with("cp", "-a", smt_credentials, File.join(target_dir, "SMT-http_smt_example_com"))
+ .with("cp", "-a", credentials, File.join(target_dir, "RMT-http_example_com"))
subject.copy_old_credentials(root_dir)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.2.0/test/url_helpers_spec.rb new/yast2-registration-4.2.5/test/url_helpers_spec.rb
--- old/yast2-registration-4.2.0/test/url_helpers_spec.rb 2019-04-01 12:24:45.000000000 +0200
+++ new/yast2-registration-4.2.5/test/url_helpers_spec.rb 2019-07-02 11:33:49.000000000 +0200
@@ -158,13 +158,13 @@
end
end
- context " when the system has been already registered with SMT server" do
+ context "when the system has been already registered with RMT server" do
before do
allow(File).to receive(:exist?)
.with("/mnt/etc/SUSEConnect").and_return(true)
end
- it "returns URL of SMT server" do
+ it "returns URL of RMT server" do
expect(File).to receive(:exist?).with(fixtures_file("SUSEConnect")).and_return(true)
expect(SUSE::Connect::Config).to receive(:new).with(suse_connect)
.and_return(SUSE::Connect::Config.new(fixtures_file("SUSEConnect")))
1
0
Hello community,
here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2019-07-31 14:22:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dns-server.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dns-server"
Wed Jul 31 14:22:03 2019 rev:78 rq:712904 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2018-12-31 09:40:25.238509746 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new.4126/yast2-dns-server.changes 2019-07-31 14:22:06.190490101 +0200
@@ -1,0 +2,15 @@
+Mon Jul 1 13:44:42 UTC 2019 - Knut Alejandro Anderssen González <knut.anderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:57 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-dns-server-4.1.2.tar.bz2
New:
----
yast2-dns-server-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.zackt3/_old 2019-07-31 14:22:06.762489284 +0200
+++ /var/tmp/diff_new_pack.zackt3/_new 2019-07-31 14:22:06.770489273 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dns-server
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,29 +12,31 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-dns-server
-Version: 4.1.2
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-dns-server
+Summary: YaST2 - DNS Server Configuration
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-ldap >= 3.1.4
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
BuildRequires: rubygem(rspec)
-
# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+BuildRequires: yast2 >= 4.2.11
+
Requires: /usr/bin/host
Requires: perl-gettext
# Exporter Data::Dumper
@@ -50,54 +52,38 @@
# DnsServerUI::CurrentlyUsedIPs
Requires: grep
Requires: sed
-
# Script /sbin/netconfig 0.71.2+?
# FATE #303386: Network setup tools
Requires: yast2-sysconfig
-
# Yast2::ServiceWidget
Requires: yast2 >= 4.1.0
-
-BuildArch: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - DNS Server Configuration
-License: GPL-2.0-only
-Group: System/YaST
+BuildArch: noarch
%description
This package contains the YaST2 component for DNS server configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/dns-server
-%{yast_yncludedir}/dns-server/*
-%dir %{yast_libdir}/dns-server
-%{yast_libdir}/dns-server/*.rb
-%{yast_clientdir}/dns-server.rb
-%{yast_clientdir}/dns-server_*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/dns-server.desktop
-%{yast_scrconfdir}/dns_named.scr
-%{yast_scrconfdir}/dns_zone.scr
-%{yast_scrconfdir}/cfg_named.scr
-%{yast_scrconfdir}/named_forwarders.scr
-%{yast_scrconfdir}/named_forwarders.scr
-%{yast_scrconfdir}/convert_named_conf.scr
-%{yast_agentdir}/ag_dns_zone
-%{yast_agentdir}/ag_named_forwarders
-%{yast_agentdir}/ag_convert_named_conf
-%{yast_schemadir}/autoyast/rnc/dns-server.rnc
+%{yast_yncludedir}
+%{yast_libdir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{yast_schemadir}
%doc %{yast_docdir}
%{yast_icondir}
%license COPYING
++++++ yast2-dns-server-4.1.2.tar.bz2 -> yast2-dns-server-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/Dockerfile new/yast2-dns-server-4.2.1/Dockerfile
--- old/yast2-dns-server-4.1.2/Dockerfile 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/Dockerfile 2019-07-01 19:03:21.000000000 +0200
@@ -1,3 +1,3 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/package/yast2-dns-server.changes new/yast2-dns-server-4.2.1/package/yast2-dns-server.changes
--- old/yast2-dns-server-4.1.2/package/yast2-dns-server.changes 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/package/yast2-dns-server.changes 2019-07-01 19:03:21.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Mon Jul 1 13:44:42 UTC 2019 - Knut Alejandro Anderssen González <knut.anderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:57 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Sun Nov 25 02:10:40 UTC 2018 - Stasiek Michalski <hellcp(a)mailbox.org>
- Provide icon with module (boo#1109310)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/package/yast2-dns-server.spec new/yast2-dns-server-4.2.1/package/yast2-dns-server.spec
--- old/yast2-dns-server-4.1.2/package/yast2-dns-server.spec 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/package/yast2-dns-server.spec 2019-07-01 19:03:21.000000000 +0200
@@ -12,29 +12,31 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-dns-server
-Version: 4.1.2
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-dns-server
+Summary: YaST2 - DNS Server Configuration
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-ldap >= 3.1.4
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
BuildRequires: rubygem(rspec)
-
# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+BuildRequires: yast2 >= 4.2.11
+
Requires: /usr/bin/host
Requires: perl-gettext
# Exporter Data::Dumper
@@ -50,54 +52,38 @@
# DnsServerUI::CurrentlyUsedIPs
Requires: grep
Requires: sed
-
# Script /sbin/netconfig 0.71.2+?
# FATE #303386: Network setup tools
Requires: yast2-sysconfig
-
# Yast2::ServiceWidget
Requires: yast2 >= 4.1.0
-
-BuildArch: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - DNS Server Configuration
-License: GPL-2.0-only
-Group: System/YaST
+BuildArch: noarch
%description
This package contains the YaST2 component for DNS server configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/dns-server
-%{yast_yncludedir}/dns-server/*
-%dir %{yast_libdir}/dns-server
-%{yast_libdir}/dns-server/*.rb
-%{yast_clientdir}/dns-server.rb
-%{yast_clientdir}/dns-server_*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/dns-server.desktop
-%{yast_scrconfdir}/dns_named.scr
-%{yast_scrconfdir}/dns_zone.scr
-%{yast_scrconfdir}/cfg_named.scr
-%{yast_scrconfdir}/named_forwarders.scr
-%{yast_scrconfdir}/named_forwarders.scr
-%{yast_scrconfdir}/convert_named_conf.scr
-%{yast_agentdir}/ag_dns_zone
-%{yast_agentdir}/ag_named_forwarders
-%{yast_agentdir}/ag_convert_named_conf
-%{yast_schemadir}/autoyast/rnc/dns-server.rnc
+%{yast_yncludedir}
+%{yast_libdir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
+%{yast_schemadir}
%doc %{yast_docdir}
%{yast_icondir}
%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/src/Makefile.am new/yast2-dns-server-4.2.1/src/Makefile.am
--- old/yast2-dns-server-4.1.2/src/Makefile.am 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/src/Makefile.am 2019-07-01 19:03:21.000000000 +0200
@@ -51,7 +51,7 @@
autoyast-rnc/dns-server.rnc
desktop_DATA = \
- desktop/dns-server.desktop
+ desktop/org.opensuse.yast.DNSServer.desktop
symbolicdir = @icondir@/hicolor/symbolic/apps
symbolic_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/src/desktop/dns-server.desktop new/yast2-dns-server-4.2.1/src/desktop/dns-server.desktop
--- old/yast2-dns-server-4.1.2/src/desktop/dns-server.desktop 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/src/desktop/dns-server.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=dns-server
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=dns-server
-X-SuSE-YaST-AutoInstRequires=lan,ldap,ldap-server,ldap-client
-X-SuSE-YaST-AutoInstSchema=dns-server.rnc
-X-SuSE-YaST-Keywords=dns,domain,nameserver,network,lookup
-
-Icon=yast-dns-server
-Exec=xdg-su -c "/sbin/yast2 dns-server"
-
-Name=DNS Server
-GenericName=Configure a DNS server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/src/desktop/org.opensuse.yast.DNSServer.desktop new/yast2-dns-server-4.2.1/src/desktop/org.opensuse.yast.DNSServer.desktop
--- old/yast2-dns-server-4.1.2/src/desktop/org.opensuse.yast.DNSServer.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-dns-server-4.2.1/src/desktop/org.opensuse.yast.DNSServer.desktop 2019-07-01 19:03:21.000000000 +0200
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=dns-server
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=dns-server
+X-SuSE-YaST-AutoInstRequires=lan,ldap,ldap-server,ldap-client
+X-SuSE-YaST-AutoInstSchema=dns-server.rnc
+X-SuSE-YaST-Keywords=dns,domain,nameserver,network,lookup
+
+Icon=yast-dns-server
+Exec=xdg-su -c "/sbin/yast2 dns-server"
+
+Name=YaST DNS Server
+GenericName=DNS Server
+Comment=Configure a DNS server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/src/include/dns-server/misc.rb new/yast2-dns-server-4.2.1/src/include/dns-server/misc.rb
--- old/yast2-dns-server-4.1.2/src/include/dns-server/misc.rb 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/src/include/dns-server/misc.rb 2019-07-01 19:03:21.000000000 +0200
@@ -18,7 +18,7 @@
end
def SetDNSSErverIcon
- Wizard.SetDesktopIcon("dns-server")
+ Wizard.SetDesktopIcon("org.opensuse.yast.DNSServer")
nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/src/modules/DnsServer.pm new/yast2-dns-server-4.2.1/src/modules/DnsServer.pm
--- old/yast2-dns-server-4.1.2/src/modules/DnsServer.pm 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/src/modules/DnsServer.pm 2019-07-01 19:03:21.000000000 +0200
@@ -1309,6 +1309,7 @@
# when applying configuration in AutoYast config module
sub check_and_install_package {
my $self = shift;
+ return 1 if (Mode->test ());
return 1 if (PackageSystem->Installed("bind"));
my $installed = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-4.1.2/testsuite/tests/DnsServerAPI.rb new/yast2-dns-server-4.2.1/testsuite/tests/DnsServerAPI.rb
--- old/yast2-dns-server-4.1.2/testsuite/tests/DnsServerAPI.rb 2018-11-28 12:56:09.000000000 +0100
+++ new/yast2-dns-server-4.2.1/testsuite/tests/DnsServerAPI.rb 2019-07-01 19:03:21.000000000 +0200
@@ -84,32 +84,6 @@
}
},
"sysconfig" => {
- "SuSEfirewall2" => {
- "FW_ALLOW_FW_TRACEROUTE" => "yes",
- "FW_AUTOPROTECT_SERVICES" => "no",
- "FW_DEV_DMZ" => "",
- "FW_DEV_EXT" => "eth-id-00:c0:df:22:c6:a8",
- "FW_DEV_INT" => "",
- "FW_IPSEC_TRUST" => "no",
- "FW_LOG_ACCEPT_ALL" => "no",
- "FW_LOG_ACCEPT_CRIT" => "yes",
- "FW_LOG_DROP_ALL" => "no",
- "FW_LOG_DROP_CRIT" => "yes",
- "FW_MASQUERADE" => "no",
- "FW_MASQ_NETS" => "",
- "FW_PROTECT_FROM_INTERNAL" => "yes",
- "FW_ROUTE" => "no",
- "FW_SERVICES_DMZ_IP" => "",
- "FW_SERVICES_DMZ_TCP" => "",
- "FW_SERVICES_DMZ_UDP" => "",
- "FW_SERVICES_EXT_IP" => "",
- "FW_SERVICES_EXT_RPC" => "nlockmgr status nfs nfs_acl mountd ypserv fypxfrd ypbind ypasswdd",
- "FW_SERVICES_EXT_TCP" => "32768 5801 5901 dixie domain hostname microsoft-ds netbios-dgm netbios-ns netbios-ssn nfs ssh sunrpc",
- "FW_SERVICES_EXT_UDP" => "222 bftp domain ipp sunrpc",
- "FW_SERVICES_INT_IP" => "",
- "FW_SERVICES_INT_TCP" => "ddd eee fff 44 55 66",
- "FW_SERVICES_INT_UDP" => "aaa bbb ccc 11 22 33"
- },
"personal-firewall" => { "REJECT_ALL_INCOMING_CONNECTIONS" => "" },
"network" => {
"config" => {
1
0
Hello community,
here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2019-07-31 14:21:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server"
Wed Jul 31 14:21:55 2019 rev:57 rq:712899 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2018-12-31 09:43:43.582347464 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new.4126/yast2-dhcp-server.changes 2019-07-31 14:21:56.954503279 +0200
@@ -1,0 +2,15 @@
+Mon Jul 1 16:18:15 UTC 2019 - Knut Anderssen <kanderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:42 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-dhcp-server-4.1.5.tar.bz2
New:
----
yast2-dhcp-server-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-dhcp-server.spec ++++++
--- /var/tmp/diff_new_pack.YwfokH/_old 2019-07-31 14:21:57.326502748 +0200
+++ /var/tmp/diff_new_pack.YwfokH/_new 2019-07-31 14:21:57.334502737 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dhcp-server
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,10 +17,13 @@
Name: yast2-dhcp-server
-Version: 4.1.5
+Version: 4.2.1
Release: 0
+Summary: YaST2 - DHCP Server Configuration
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast-dhcp-server
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: docbook-xsl-stylesheets
@@ -29,15 +32,16 @@
BuildRequires: perl-Digest-SHA1
BuildRequires: perl-X500-DN
BuildRequires: perl-XML-Writer
+BuildRequires: perl-XML-Writer
BuildRequires: popt-devel
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-dns-server
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
-# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+# Fix old testsuite bind package absence mocks
+BuildRequires: yast2 >= 4.2.11
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
@@ -50,48 +54,40 @@
Requires: yast2-perl-bindings
# firewalld_wrapper.rb
Requires: yast2 >= 4.1.22
-
# DnsServerAPI::IsServiceConfigurableExternally
Requires: yast2-dns-server >= 2.13.16
-
-BuildArch: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - DHCP Server Configuration
-License: GPL-2.0-only
-Group: System/YaST
+BuildArch: noarch
%description
This package contains the YaST2 component for DHCP server
configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%yast_build
%install
%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/dhcp-server
-%{yast_yncludedir}/dhcp-server/*
-%{yast_clientdir}/dhcp-server.rb
-%{yast_clientdir}/dhcp-server_*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/dhcp-server.desktop
-%{yast_scrconfdir}/cfg_dhcpd.scr
-%{yast_scrconfdir}/etc_dhcpd_conf.scr
-%{yast_agentdir}/ag_dhcpd_conf
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%doc %{yast_docdir}
%license COPYING
%{yast_icondir}
-%{yast_schemadir}/autoyast/rnc/dhcp-server.rnc
+%{yast_schemadir}
%changelog
++++++ yast2-dhcp-server-4.1.5.tar.bz2 -> yast2-dhcp-server-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/Dockerfile new/yast2-dhcp-server-4.2.1/Dockerfile
--- old/yast2-dhcp-server-4.1.5/Dockerfile 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/Dockerfile 2019-07-01 18:37:30.000000000 +0200
@@ -1,4 +1,4 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
yast2-dns-server
COPY . /usr/src/app
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.changes new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.changes
--- old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.changes 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.changes 2019-07-01 18:37:30.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Mon Jul 1 16:18:15 UTC 2019 - Knut Anderssen <kanderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip bind absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:28:42 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Wed Dec 12 13:16:55 UTC 2018 - lslezak(a)suse.cz
- Always use absolute path to binaries (bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.spec new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.spec
--- old/yast2-dhcp-server-4.1.5/package/yast2-dhcp-server.spec 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/package/yast2-dhcp-server.spec 2019-07-01 18:37:30.000000000 +0200
@@ -12,69 +12,82 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-dhcp-server
-Version: 4.1.5
+Version: 4.2.1
Release: 0
+Summary: YaST2 - DHCP Server Configuration
+Group: System/YaST
+License: GPL-2.0-only
+Url: https://github.com/yast-dhcp-server
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0-only
-BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2-perl-bindings yast2-testsuite yast2-dns-server
-BuildRequires: yast2-devtools >= 3.1.10
-# Yast2::ServiceWidget
-BuildRequires: yast2 >= 4.1.0
+BuildRequires: perl-Digest-SHA1
+BuildRequires: perl-X500-DN
+BuildRequires: perl-XML-Writer
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: doxygen
+BuildRequires: libxslt
+BuildRequires: perl-XML-Writer
+BuildRequires: popt-devel
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
+BuildRequires: yast2-perl-bindings
+BuildRequires: yast2-testsuite
+BuildRequires: yast2-dns-server
+BuildRequires: yast2-devtools >= 4.2.2
+# Fix old testsuite bind package absence mocks
+BuildRequires: yast2 >= 4.2.11
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
-Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent
+Requires: perl-gettext
+Requires: yast2-perl-bindings
+Requires: bind-utils
+Requires: perl-X500-DN
+Requires: yast2-ldap
+Requires: perl-Digest-SHA1
+Requires: perl-Parse-RecDescent
# firewalld_wrapper.rb
Requires: yast2 >= 4.1.22
-
# DnsServerAPI::IsServiceConfigurableExternally
Requires: yast2-dns-server >= 2.13.16
-
-BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - DHCP Server Configuration
+BuildArch: noarch
%description
This package contains the YaST2 component for DHCP server
configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%yast_build
%install
%yast_install
-
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/dhcp-server
-%{yast_yncludedir}/dhcp-server/*
-%{yast_clientdir}/dhcp-server.rb
-%{yast_clientdir}/dhcp-server_*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/dhcp-server.desktop
-%{yast_scrconfdir}/cfg_dhcpd.scr
-%{yast_scrconfdir}/etc_dhcpd_conf.scr
-%{yast_agentdir}/ag_dhcpd_conf
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%doc %{yast_docdir}
%license COPYING
%{yast_icondir}
-%{yast_schemadir}/autoyast/rnc/dhcp-server.rnc
+%{yast_schemadir}
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/Makefile.am new/yast2-dhcp-server-4.2.1/src/Makefile.am
--- old/yast2-dhcp-server-4.1.5/src/Makefile.am 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/Makefile.am 2019-07-01 18:37:30.000000000 +0200
@@ -40,7 +40,7 @@
autoyast-rnc/dhcp-server.rnc
desktop_DATA = \
- desktop/dhcp-server.desktop
+ desktop/org.opensuse.yast.DHCPServer.desktop
symbolicdir = @icondir@/hicolor/symbolic/apps
symbolic_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/desktop/dhcp-server.desktop new/yast2-dhcp-server-4.2.1/src/desktop/dhcp-server.desktop
--- old/yast2-dhcp-server-4.1.5/src/desktop/dhcp-server.desktop 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/desktop/dhcp-server.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=dhcp-server
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=dhcp-server
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstRequires=network,dhcp,lan,ip,address
-X-SuSE-YaST-AutoInstSchema=dhcp-server.rnc
-
-Icon=yast-dhcp-server
-Exec=xdg-su -c "/sbin/yast2 dhcp-server"
-
-Name=DHCP Server
-GenericName=Configure a DHCP server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/desktop/org.opensuse.yast.DHCPServer.desktop new/yast2-dhcp-server-4.2.1/src/desktop/org.opensuse.yast.DHCPServer.desktop
--- old/yast2-dhcp-server-4.1.5/src/desktop/org.opensuse.yast.DHCPServer.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/desktop/org.opensuse.yast.DHCPServer.desktop 2019-07-01 18:37:30.000000000 +0200
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=dhcp-server
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=dhcp-server
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstRequires=network,dhcp,lan,ip,address
+X-SuSE-YaST-AutoInstSchema=dhcp-server.rnc
+
+Icon=yast-dhcp-server
+Exec=xdg-su -c "/sbin/yast2 dhcp-server"
+
+Name=YaST DHCP Server
+GenericName=DHCP Server
+Comment=Configure a DHCP server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-management.rb new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-management.rb
--- old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-management.rb 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-management.rb 2019-07-01 18:37:30.000000000 +0200
@@ -1091,7 +1091,7 @@
Label.CancelButton,
Label.OKButton
)
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
InitDNSServerConfiguration(@current_settings)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-wizard.rb new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-wizard.rb
--- old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/dns-server-wizard.rb 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/dns-server-wizard.rb 2019-07-01 18:37:30.000000000 +0200
@@ -1384,7 +1384,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
dns_server_settings = DnsServer.Export
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/wizards.rb new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/wizards.rb
--- old/yast2-dhcp-server-4.1.5/src/include/dhcp-server/wizards.rb 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/include/dhcp-server/wizards.rb 2019-07-01 18:37:30.000000000 +0200
@@ -140,7 +140,7 @@
# @return sequence result
def DhcpAutoSequence
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
Wizard.SetContentsButtons(
"",
VBox(),
@@ -172,7 +172,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("dhcp-server")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.DHCPServer")
ret = Sequencer.Run(aliases, sequence)
UI.CloseDialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-4.1.5/src/modules/DhcpServer.pm new/yast2-dhcp-server-4.2.1/src/modules/DhcpServer.pm
--- old/yast2-dhcp-server-4.1.5/src/modules/DhcpServer.pm 2018-12-12 14:26:47.000000000 +0100
+++ new/yast2-dhcp-server-4.2.1/src/modules/DhcpServer.pm 2019-07-01 18:37:30.000000000 +0200
@@ -1611,7 +1611,7 @@
Progress->NextStage ();
- $dns_server_available = DnsServerAPI->IsServiceConfigurableExternally();
+ $dns_server_available = (!Mode->test () && DnsServerAPI->IsServiceConfigurableExternally());
if ($dns_server_available) {
DnsServerAPI->Read();
}
@@ -1656,7 +1656,7 @@
my $ok = 1;
- $modified = $modified || FirewalldWrapper->is_modified ();
+ $modified = $modified || (!Mode->test () && FirewalldWrapper->is_modified ());
if (! $modified)
{
1
0
Hello community,
here is the log from the commit of package rubygem-yast-rake for openSUSE:Factory checked in at 2019-07-31 14:21:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-yast-rake (Old)
and /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-yast-rake"
Wed Jul 31 14:21:47 2019 rev:29 rq:712267 version:0.2.34
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-yast-rake/rubygem-yast-rake.changes 2019-04-12 09:12:06.585606669 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new.4126/rubygem-yast-rake.changes 2019-07-31 14:21:50.658512263 +0200
@@ -1,0 +2,13 @@
+Thu Jun 27 12:10:33 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com>
+
+- support proper rubocop version in rake check:rubocop
+ (bsc#1139270)
+- 0.2.34
+
+-------------------------------------------------------------------
+Thu Jun 20 11:39:40 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- :sle_latest is SLE15-SP2 now (bsc#1138835)
+- 0.2.33
+
+-------------------------------------------------------------------
Old:
----
yast-rake-0.2.32.gem
New:
----
yast-rake-0.2.34.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-yast-rake.spec ++++++
--- /var/tmp/diff_new_pack.GUnuFD/_old 2019-07-31 14:21:51.226511453 +0200
+++ /var/tmp/diff_new_pack.GUnuFD/_new 2019-07-31 14:21:51.230511447 +0200
@@ -12,12 +12,12 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: rubygem-yast-rake
-Version: 0.2.32
+Version: 0.2.34
Release: 0
%define mod_name yast-rake
%define mod_full_name %{mod_name}-%{version}
++++++ yast-rake-0.2.32.gem -> yast-rake-0.2.34.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION
--- old/VERSION 2018-04-11 12:13:28.000000000 +0200
+++ new/VERSION 2019-06-27 16:55:34.000000000 +0200
@@ -1 +1 @@
-0.2.32
+0.2.34
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/targets.yml new/data/targets.yml
--- old/data/targets.yml 2018-04-11 12:13:28.000000000 +0200
+++ new/data/targets.yml 2019-06-27 16:55:34.000000000 +0200
@@ -78,8 +78,8 @@
:sle_latest:
obs_api: "https://api.suse.de/"
obs_project: "Devel:YaST:Head"
- obs_sr_project: "SUSE:SLE-15-SP1:GA"
- obs_target: "SUSE_SLE-15-SP1_GA"
+ obs_sr_project: "SUSE:SLE-15-SP2:GA"
+ obs_target: "SUSE_SLE-15-SP2_GA"
:factory:
obs_project: "YaST:Head"
obs_sr_project: "openSUSE:Factory"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/install.rake new/lib/tasks/install.rake
--- old/lib/tasks/install.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/install.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -76,13 +78,13 @@
config.install_locations.each_pair do |glob, install_to|
FileUtils.mkdir_p(install_to, verbose: true) unless File.directory?(install_to)
Dir[glob].each do |source|
- begin
- # do not use FileUtils.cp_r as it have different behavior if target
- # exists and we copy a symlink
- sh "cp -r '#{source}' '#{install_to}'"
- rescue => e
- raise "Cannot install file #{source} to #{install_to}: #{e.message}"
- end
+
+ # do not use FileUtils.cp_r as it have different behavior if target
+ # exists and we copy a symlink
+ sh "cp -r '#{source}' '#{install_to}'"
+ rescue StandardError => e
+ raise "Cannot install file #{source} to #{install_to}: #{e.message}"
+
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/pot.rake new/lib/tasks/pot.rake
--- old/lib/tasks/pot.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/pot.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -27,16 +29,16 @@
namespace :check do
# print failed lines and a hint to STDERR
def report_pot_errors(lines)
- $stderr.puts "Failed lines:"
- $stderr.puts "-" * 30
- $stderr.puts lines
- $stderr.puts "-" * 30
+ warn "Failed lines:"
+ warn "-" * 30
+ warn lines
+ warn "-" * 30
$stderr.puts
- $stderr.puts "Note: \#{foo} substitution in translatable strings does" \
+ warn "Note: \#{foo} substitution in translatable strings does" \
" not work properly, use"
- $stderr.puts " _(\"foo %{bar} baz\") % { :bar => bar }"
- $stderr.puts "or"
- $stderr.puts " _(\"foo %s baz\") % bar"
+ warn " _(\"foo %{bar} baz\") % { :bar => bar }"
+ warn "or"
+ warn " _(\"foo %s baz\") % bar"
$stderr.puts
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/rubocop.rake new/lib/tasks/rubocop.rake
--- old/lib/tasks/rubocop.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/rubocop.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -13,6 +15,20 @@
#
#++
+def rubocop_bin
+ return @rubocop_bin if @rubocop_bin
+ return @rubocop_bin = ENV["RUBOCOP_BIN"] if ENV["RUBOCOP_BIN"]
+
+ version = File.read(".rubocop.yml").include?("rubocop-0.71.0") ? "0.71.0" : "0.41.2"
+ binary = `/usr/sbin/update-alternatives --list rubocop | grep '#{version}'`.strip
+ if !system("which #{binary}")
+ raise "cannot find proper version of rubocop binary in " \
+ "'/usr/sbin/update-alternatives --list rubocop'." \
+ "If rubocop is installed via gem, define its binary name via env variable RUBOCOP_BIN."
+ end
+ @rubocop_bin = binary
+end
+
# run Rubocop in parallel
# @param params [String] optional Rubocop parameters
def run_rubocop(params = "")
@@ -26,8 +42,8 @@
# a) use -P with number of processors to run the commands in parallel
# b) use -n to set the maximum number of files per process, this number
# is computed to equally distribute the files across the workers
- sh "rubocop -L | sort -R | xargs -P`nproc` -n$(expr `rubocop -L | wc -l` / " \
- "`nproc` + 1) rubocop #{params}"
+ sh "#{rubocop_bin} -L | sort -R | xargs -P`nproc` -n$(expr `#{rubocop_bin} -L | wc -l` / " \
+ "`nproc` + 1) #{rubocop_bin} #{params}"
end
namespace :check do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/run.rake new/lib/tasks/run.rake
--- old/lib/tasks/run.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/run.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -32,8 +34,9 @@
clients = Dir["**/src/clients/*.rb"]
client = clients.reduce do |min, n|
next n if min.nil?
+
# use client with shortest name by default
- min.size > n.size ? n : min
+ (min.size > n.size) ? n : min
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/spellcheck.rake new/lib/tasks/spellcheck.rake
--- old/lib/tasks/spellcheck.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/spellcheck.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/spellcheck_task.rb new/lib/tasks/spellcheck_task.rb
--- old/lib/tasks/spellcheck_task.rb 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/spellcheck_task.rb 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -33,8 +35,8 @@
module Yast
# Defines a spellcheck rake task
class SpellcheckTask < Rake::TaskLib
- GLOBAL_SPELL_CONFIG_FILE = File.expand_path("../spell.yml", __FILE__)
- CUSTOM_SPELL_CONFIG_FILE = ".spell.yml".freeze
+ GLOBAL_SPELL_CONFIG_FILE = File.expand_path("spell.yml", __dir__)
+ CUSTOM_SPELL_CONFIG_FILE = ".spell.yml"
# define the Rake task in the constructor
def initialize
@@ -65,11 +67,12 @@
# @return [Aspell] the speller object
def speller
return @speller if @speller
+
# raspell is an optional dependency, handle the missing case nicely
begin
require "raspell"
rescue LoadError
- $stderr.puts "ERROR: Ruby gem \"raspell\" is not installed."
+ warn "ERROR: Ruby gem \"raspell\" is not installed."
exit 1
end
@@ -105,9 +108,9 @@
duplicates = dict1 & dict2
return if duplicates.empty?
- $stderr.puts "Warning: Found dictionary duplicates in the local dictionary " \
+ warn "Warning: Found dictionary duplicates in the local dictionary " \
"(#{CUSTOM_SPELL_CONFIG_FILE}):\n"
- duplicates.each { |duplicate| $stderr.puts " #{duplicate}" }
+ duplicates.each { |duplicate| warn " #{duplicate}" }
$stderr.puts
end
@@ -161,6 +164,7 @@
def misspelled_on_line(text)
switch_block_tag if block_line?(text)
return [] if inside_block
+
speller.list_misspelled([text]) - config["dictionary"]
end
@@ -179,7 +183,7 @@
if files_to_check.all? { |file| check_file(file) }
puts "Spelling OK."
else
- $stderr.puts "Spellcheck failed! (Fix it or add the words to " \
+ warn "Spellcheck failed! (Fix it or add the words to " \
"'#{CUSTOM_SPELL_CONFIG_FILE}' file if it is OK.)"
exit 1
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/test_unit.rake new/lib/tasks/test_unit.rake
--- old/lib/tasks/test_unit.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/test_unit.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -36,6 +38,8 @@
Coveralls::RakeTask.new
Rake::Task["coveralls:push"].invoke
end
+
+ nil
end
def run_sequential_tests(files)
@@ -56,7 +60,7 @@
run_parallel_tests(files)
else
if parallel_tests_wanted?
- $stderr.puts "WARNING: parallel tests enabled, but 'parallel_rspec' is" \
+ warn "WARNING: parallel tests enabled, but 'parallel_rspec' is" \
" not installed, falling back to the standard 'rspec' runner."
end
run_sequential_tests(files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/version.rake new/lib/tasks/version.rake
--- old/lib/tasks/version.rake 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/tasks/version.rake 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/yast/rake.rb new/lib/yast/rake.rb
--- old/lib/yast/rake.rb 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/yast/rake.rb 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -36,7 +38,7 @@
end
# load own tasks
-task_path = File.expand_path("../../tasks", __FILE__)
+task_path = File.expand_path("../tasks", __dir__)
Dir["#{task_path}/*.rake"].each do |f|
load f
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/yast/tasks.rb new/lib/yast/tasks.rb
--- old/lib/yast/tasks.rb 2018-04-11 12:13:28.000000000 +0200
+++ new/lib/yast/tasks.rb 2019-06-27 16:55:34.000000000 +0200
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#--
# Yast rake
#
@@ -23,7 +25,7 @@
# Yast::Task module contains helper methods
module Tasks
# Targets definition
- TARGETS_FILE = File.expand_path("../../../data/targets.yml", __FILE__)
+ TARGETS_FILE = File.expand_path("../../data/targets.yml", __dir__)
def self.configuration(&block)
::Packaging.configuration(&block)
@@ -34,7 +36,7 @@
# use the first *.spec file found, assume all spec files
# contain the same version
File.readlines(Dir.glob("package/*.spec").first)
- .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
+ .grep(/^\s*Version:\s*/).first.sub("Version:", "").strip
end
def self.submit_to(target, file = TARGETS_FILE)
@@ -43,6 +45,7 @@
if config.nil?
raise "No configuration found for #{target}. Known values: #{targets.keys.join(", ")}"
end
+
Yast::Tasks.configuration do |conf|
config.each do |meth, val|
conf.public_send("#{meth}=", val)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2019-04-10 13:10:40.000000000 +0200
+++ new/metadata 2019-06-27 16:55:37.000000000 +0200
@@ -1,43 +1,43 @@
--- !ruby/object:Gem::Specification
name: yast-rake
version: !ruby/object:Gem::Version
- version: 0.2.32
+ version: 0.2.34
platform: ruby
authors:
- Josef Reidinger
autorequire:
bindir: bin
cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
- name: rake
+ name: packaging_rake_tasks
requirement: !ruby/object:Gem::Requirement
requirements:
- - ">="
- !ruby/object:Gem::Version
- version: '0'
+ version: 1.1.4
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - ">="
- !ruby/object:Gem::Version
- version: '0'
+ version: 1.1.4
- !ruby/object:Gem::Dependency
- name: packaging_rake_tasks
+ name: rake
requirement: !ruby/object:Gem::Requirement
requirements:
- - ">="
- !ruby/object:Gem::Version
- version: 1.1.4
+ version: '0'
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - ">="
- !ruby/object:Gem::Version
- version: 1.1.4
+ version: '0'
description: |
Rake tasks that support work-flow of Yast developer. It allows packaging repo,
send it to build service, create submit request to target repo or run client
1
0
Hello community,
here is the log from the commit of package yast2-squid for openSUSE:Factory checked in at 2019-07-31 14:21:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old)
and /work/SRC/openSUSE:Factory/.yast2-squid.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid"
Wed Jul 31 14:21:34 2019 rev:51 rq:711071 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2018-12-31 09:43:34.778354673 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-squid.new.4126/yast2-squid.changes 2019-07-31 14:21:37.422531149 +0200
@@ -1,0 +2,15 @@
+Thu Jun 20 11:19:29 UTC 2019 - Knut Anderssen <kanderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip log firewall absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:14 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-squid-4.1.4.tar.bz2
New:
----
yast2-squid-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.rocesU/_old 2019-07-31 14:21:37.802530607 +0200
+++ /var/tmp/diff_new_pack.rocesU/_new 2019-07-31 14:21:37.806530601 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-squid
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,21 +17,20 @@
Name: yast2-squid
-Version: 4.1.4
+Version: 4.2.1
Release: 0
+Summary: Configuration of squid
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-squid
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# Yast2::ServiceWidget
-Requires: yast2 >= 4.1.0
-
%if 0%{?suse_version} > 1325
BuildRequires: libboost_regex-devel
%else
BuildRequires: boost-devel
%endif
-
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
@@ -39,46 +38,38 @@
# Yast2::ServiceWidget
BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
-#BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: Configuration of squid
-License: GPL-2.0-only
-Group: System/YaST
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
%description
Configuration of squid
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_squid.la
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/squid
%config /etc/sysconfig/SuSEfirewall2.d/services/squid
-%{yast_yncludedir}/squid/*
-%{yast_clientdir}/squid.rb
-%{yast_clientdir}/squid_*.rb
-%{yast_moduledir}/Squid.*
-%{yast_moduledir}/SquidACL.*
-%{yast_moduledir}/SquidErrorMessages.*
-%{yast_desktopdir}/squid.desktop
-%{yast_schemadir}/autoyast/rnc/squid.rnc
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-%{yast_plugindir}/libpy2ag_squid.so*
-%{yast_scrconfdir}/*.scr
+%{yast_plugindir}
+%{yast_scrconfdir}
%doc %{yast_docdir}
%license COPYING
++++++ yast2-squid-4.1.4.tar.bz2 -> yast2-squid-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/Dockerfile new/yast2-squid-4.2.1/Dockerfile
--- old/yast2-squid-4.1.4/Dockerfile 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/Dockerfile 2019-06-20 13:30:11.000000000 +0200
@@ -1,4 +1,4 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
libboost_regex-devel \
gcc-c++ \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/package/yast2-squid.changes new/yast2-squid-4.2.1/package/yast2-squid.changes
--- old/yast2-squid-4.1.4/package/yast2-squid.changes 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/package/yast2-squid.changes 2019-06-20 13:30:11.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Jun 20 11:19:29 UTC 2019 - Knut Anderssen <kanderssen(a)suse.com>
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip log firewall absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:14 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Wed Dec 12 12:24:20 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com>
- Fix name of exception (related to fix for bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/package/yast2-squid.spec new/yast2-squid-4.2.1/package/yast2-squid.spec
--- old/yast2-squid-4.1.4/package/yast2-squid.spec 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/package/yast2-squid.spec 2019-06-20 13:30:11.000000000 +0200
@@ -12,26 +12,25 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-squid
-Version: 4.1.4
+Version: 4.2.1
Release: 0
+Summary: Configuration of squid
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-squid
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# Yast2::ServiceWidget
-Requires: yast2 >= 4.1.0
-
%if 0%{?suse_version} > 1325
BuildRequires: libboost_regex-devel
%else
BuildRequires: boost-devel
%endif
-
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
@@ -39,46 +38,38 @@
# Yast2::ServiceWidget
BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
-#BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: Configuration of squid
-License: GPL-2.0-only
-Group: System/YaST
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
%description
Configuration of squid
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_squid.la
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/squid
%config /etc/sysconfig/SuSEfirewall2.d/services/squid
-%{yast_yncludedir}/squid/*
-%{yast_clientdir}/squid.rb
-%{yast_clientdir}/squid_*.rb
-%{yast_moduledir}/Squid.*
-%{yast_moduledir}/SquidACL.*
-%{yast_moduledir}/SquidErrorMessages.*
-%{yast_desktopdir}/squid.desktop
-%{yast_schemadir}/autoyast/rnc/squid.rnc
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-%{yast_plugindir}/libpy2ag_squid.so*
-%{yast_scrconfdir}/*.scr
+%{yast_plugindir}
+%{yast_scrconfdir}
%doc %{yast_docdir}
%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/Makefile.am new/yast2-squid-4.2.1/src/Makefile.am
--- old/yast2-squid-4.1.4/src/Makefile.am 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/Makefile.am 2019-06-20 13:30:11.000000000 +0200
@@ -30,7 +30,7 @@
autoyast-rnc/squid.rnc
desktop_DATA = \
- desktop/squid.desktop
+ desktop/org.opensuse.yast.Squid.desktop
scalabledir = @icondir@/hicolor/scalable/apps
scalable_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/desktop/org.opensuse.yast.Squid.desktop new/yast2-squid-4.2.1/src/desktop/org.opensuse.yast.Squid.desktop
--- old/yast2-squid-4.1.4/src/desktop/org.opensuse.yast.Squid.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-squid-4.2.1/src/desktop/org.opensuse.yast.Squid.desktop 2019-06-20 13:30:11.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=squid
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=squid
+X-SuSE-YaST-AutoInstSchema=squid.rnc
+X-SuSE-YaST-Keywords=proxy,network,internet
+
+Icon=yast-squid
+Exec=xdg-su -c "/sbin/yast2 squid"
+
+Name=YaST Squid
+GenericName=Squid
+Comment=Configure a Squid cache proxy server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/desktop/squid.desktop new/yast2-squid-4.2.1/src/desktop/squid.desktop
--- old/yast2-squid-4.1.4/src/desktop/squid.desktop 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/desktop/squid.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=squid
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=squid
-X-SuSE-YaST-AutoInstSchema=squid.rnc
-X-SuSE-YaST-Keywords=proxy,network,internet
-
-Icon=yast-squid
-Exec=xdg-su -c "/sbin/yast2 squid"
-
-Name=Squid
-GenericName=Configure a Squid cache proxy server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/include/squid/wizards.rb new/yast2-squid-4.2.1/src/include/squid/wizards.rb
--- old/yast2-squid-4.1.4/src/include/squid/wizards.rb 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/include/squid/wizards.rb 2019-06-20 13:30:11.000000000 +0200
@@ -69,7 +69,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("squid")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Squid")
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/modules/Squid.rb new/yast2-squid-4.2.1/src/modules/Squid.rb
--- old/yast2-squid-4.1.4/src/modules/Squid.rb 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/modules/Squid.rb 2019-06-20 13:30:11.000000000 +0200
@@ -1099,7 +1099,7 @@
Progress.NextStage
Progress.set(false)
- if !firewalld.read
+ if !firewalld.read && !Mode.test
# bnc#808722: yast2 squid fail if SuSEfirewall in not installed
# other or no firewall can be installed
Builtins.y2warning("Cannot read firewall settings.")
1
0