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 skelcd-control-openSUSE for openSUSE:Factory checked in at 2019-07-31 14:24:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Wed Jul 31 14:24:25 2019 rev:208 rq:717083 version:20190719
Changes:
--------
--- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2019-05-05 21:16:55.624542912 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.4126/skelcd-control-openSUSE-promo.changes 2019-07-31 14:24:25.938366395 +0200
@@ -1,0 +2,22 @@
+Fri Jul 19 12:25:45 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org>
+
+- Select product on installation [boo#1124590]
+- 20190719
+
+-------------------------------------------------------------------
+Fri Jun 28 08:16:39 UTC 2019 - Simon Lees <sflees(a)suse.de>
+
+- Generic Desktop should also now install basic_desktop patterns
+ as it now pulls in icewm rather then X11 (boo#1124865)
+- Gnome, KDE and XFCE system roles now pull in enhanced_base as
+ they have always done so in the past.
+- 20190628
+
+-------------------------------------------------------------------
+Wed Jun 12 07:16:39 UTC 2019 - Guillaume GARDET <guillaume.gardet(a)opensuse.org>
+
+- Update link to https://download.opensuse.org/YaST/Repos/*
+ for non-x86 (boo#1120938 and boo#1132748)
+- 20190612
+
+-------------------------------------------------------------------
@@ -1819 +1840,0 @@
-
skelcd-control-openSUSE.changes: same change
Old:
----
skelcd-control-openSUSE-20190430.tar.bz2
New:
----
skelcd-control-openSUSE-20190719.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.lH50ra/_old 2019-07-31 14:24:26.818365397 +0200
+++ /var/tmp/diff_new_pack.lH50ra/_new 2019-07-31 14:24:26.822365392 +0200
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE-promo
-Version: 20190430
+Version: 20190719
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
@@ -140,6 +140,8 @@
sed -i -e "s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$…," %{buildroot}%{?skelcdpath}/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/update/leap/,http://download.opensuse.org/po…," %{buildroot}%{?skelcdpath}/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.…," %{buildroot}%{?skelcdpath}/CD1/control.xml
+ # Update external link
+ sed -i -e "s,https://download.opensuse.org/YaST/Repos/openSUSE_Factory_Servers.xml,htt…," %{buildroot}%{?skelcdpath}/CD1/control.xml
#we parse out non existing non-oss repo for ports
xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control_ports.xml control/nonoss.xsl %{buildroot}%{?skelcdpath}/CD1/control.xml
mv %{buildroot}%{?skelcdpath}/CD1/control{_ports,}.xml
skelcd-control-openSUSE.spec: same change
++++++ skelcd-control-openSUSE-20190430.tar.bz2 -> skelcd-control-openSUSE-20190719.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190430/control/control.openSUSE.xml new/skelcd-control-openSUSE-20190719/control/control.openSUSE.xml
--- old/skelcd-control-openSUSE-20190430/control/control.openSUSE.xml 2019-04-30 13:03:39.000000000 +0200
+++ new/skelcd-control-openSUSE-20190719/control/control.openSUSE.xml 2019-07-19 14:36:08.000000000 +0200
@@ -186,6 +186,8 @@
</window_manager>
</window_managers>
</upgrade>
+ <!-- boo#1124590 - Ensure correct product is selected -->
+ <select_product>openSUSE</select_product>
</software>
@@ -321,7 +323,7 @@
<network_manager>always</network_manager>
</network>
<software>
- <default_patterns>kde x11 base x11_yast yast2_basis</default_patterns>
+ <default_patterns>kde x11 base enhanced_base x11_yast yast2_basis</default_patterns>
</software>
<order config:type="integer">100</order>
<no_default config:type="boolean">true</no_default>
@@ -333,7 +335,7 @@
<network_manager>always</network_manager>
</network>
<software>
- <default_patterns>gnome x11 base x11_yast yast2_basis</default_patterns>
+ <default_patterns>gnome x11 base enhanced_base x11_yast yast2_basis</default_patterns>
</software>
<order config:type="integer">200</order>
</system_role>
@@ -344,7 +346,7 @@
<network_manager>always</network_manager>
</network>
<software>
- <default_patterns>xfce x11 base x11_yast yast2_basis</default_patterns>
+ <default_patterns>xfce x11 base enhanced_base x11_yast yast2_basis</default_patterns>
</software>
<order config:type="integer">220</order>
</system_role>
@@ -352,7 +354,7 @@
<system_role>
<id>generic_desktop</id>
<software>
- <default_patterns>x11 base x11_yast yast2_basis</default_patterns>
+ <default_patterns>basic_desktop x11 base x11_yast yast2_basis</default_patterns>
</software>
<order config:type="integer">250</order>
</system_role>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-20190719/package/skelcd-control-openSUSE.changes
--- old/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.changes 2019-04-30 13:03:39.000000000 +0200
+++ new/skelcd-control-openSUSE-20190719/package/skelcd-control-openSUSE.changes 2019-07-19 14:36:08.000000000 +0200
@@ -1,10 +1,32 @@
-------------------------------------------------------------------
+Fri Jul 19 12:25:45 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org>
+
+- Select product on installation [boo#1124590]
+- 20190719
+
+-------------------------------------------------------------------
+Fri Jun 28 08:16:39 UTC 2019 - Simon Lees <sflees(a)suse.de>
+
+- Generic Desktop should also now install basic_desktop patterns
+ as it now pulls in icewm rather then X11 (boo#1124865)
+- Gnome, KDE and XFCE system roles now pull in enhanced_base as
+ they have always done so in the past.
+- 20190628
+
+-------------------------------------------------------------------
+Wed Jun 12 07:16:39 UTC 2019 - Guillaume GARDET <guillaume.gardet(a)opensuse.org>
+
+- Update link to https://download.opensuse.org/YaST/Repos/*
+ for non-x86 (boo#1120938 and boo#1132748)
+- 20190612
+
+-------------------------------------------------------------------
Tue Apr 30 10:01:57 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com>
-- make sure yast gets installed with Xfce system role too
+- make sure yast gets installed with Xfce system role too
(boo#1130998)
- cleaned white spaces around Xfce system role
-- 20190430
+- 20190430
-------------------------------------------------------------------
Tue Apr 16 07:55:54 UTC 2019 - lnussel(a)suse.de
@@ -120,7 +142,7 @@
-------------------------------------------------------------------
Sat Nov 10 21:05:05 UTC 2018 - hellcp(a)opensuse.org
-- Switch installation UI for openSUSE to sidebar (boo#1088785)
+- Switch installation UI for openSUSE to sidebar (boo#1088785)
- 20181113
-------------------------------------------------------------------
@@ -234,7 +256,7 @@
-------------------------------------------------------------------
Tue Dec 12 17:11:12 UTC 2017 - rbrown(a)suse.com
-- adjust subvolume list to have NoCOW /var instead of many
+- adjust subvolume list to have NoCOW /var instead of many
subvolumes (boo#1075369)
- 42.3.99.17
@@ -1816,4 +1838,3 @@
Thu Mar 25 03:37:53 CET 2004 - nashif(a)suse.de
- Initial release
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-20190719/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-20190430/package/skelcd-control-openSUSE.spec 2019-04-30 13:03:39.000000000 +0200
+++ new/skelcd-control-openSUSE-20190719/package/skelcd-control-openSUSE.spec 2019-07-19 14:36:08.000000000 +0200
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 20190430
+Version: 20190719
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
@@ -140,6 +140,8 @@
sed -i -e "s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$…," %{buildroot}%{?skelcdpath}/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/update/leap/,http://download.opensuse.org/po…," %{buildroot}%{?skelcdpath}/CD1/control.xml
sed -i -e "s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.…," %{buildroot}%{?skelcdpath}/CD1/control.xml
+ # Update external link
+ sed -i -e "s,https://download.opensuse.org/YaST/Repos/openSUSE_Factory_Servers.xml,htt…," %{buildroot}%{?skelcdpath}/CD1/control.xml
#we parse out non existing non-oss repo for ports
xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control_ports.xml control/nonoss.xsl %{buildroot}%{?skelcdpath}/CD1/control.xml
mv %{buildroot}%{?skelcdpath}/CD1/control{_ports,}.xml
1
0
Hello community,
here is the log from the commit of package yast2-sudo for openSUSE:Factory checked in at 2019-07-31 14:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-sudo (Old)
and /work/SRC/openSUSE:Factory/.yast2-sudo.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-sudo"
Wed Jul 31 14:24:17 2019 rev:39 rq:716997 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-sudo/yast2-sudo.changes 2019-02-28 21:48:13.529401545 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-sudo.new.4126/yast2-sudo.changes 2019-07-31 14:24:18.890374391 +0200
@@ -1,0 +2,15 @@
+Fri Jul 19 09:49:14 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:44 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-sudo-4.1.0.tar.bz2
New:
----
yast2-sudo-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sudo.spec ++++++
--- /var/tmp/diff_new_pack.EreYds/_old 2019-07-31 14:24:19.538373656 +0200
+++ /var/tmp/diff_new_pack.EreYds/_new 2019-07-31 14:24:19.538373656 +0200
@@ -17,33 +17,28 @@
Name: yast2-sudo
-Version: 4.1.0
+Summary: YaST2 - Sudo configuration
+License: GPL-2.0-only
+Group: System/YaST
+Version: 4.2.1
Release: 0
+Url: https://github.com/yast/yast-sudo
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Url: http://github.com/yast/yast-sudo
Requires: yast2-users
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
-#ycp::PathComponents
-Conflicts: yast2-core < 2.13.29
-#Sudo icons
-Conflicts: yast2_theme < 2.13.9
+Requires: yast2-ruby-bindings >= 1.0.0
+
+BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-users
BuildRequires: rubygem(yast-rake)
BuildArch: noarch
-Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - sudo configuration
-License: GPL-2.0-only
-Group: System/YaST
-
%description
The YaST2 component for sudo configuration. It configures capabilities
of users to run commands as root or other user.
@@ -57,17 +52,17 @@
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/sudo
-%{yast_yncludedir}/sudo/*
-%{yast_clientdir}/sudo.rb
-%{yast_moduledir}/Sudo.*
-%{yast_desktopdir}/sudo.desktop
-%{yast_scrconfdir}/sudo.scr
-%{yast_agentdir}/ag_etc_sudoers
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%{yast_icondir}
%doc %{yast_docdir}
%license COPYING
++++++ yast2-sudo-4.1.0.tar.bz2 -> yast2-sudo-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sudo-4.1.0/package/yast2-sudo.changes new/yast2-sudo-4.2.1/package/yast2-sudo.changes
--- old/yast2-sudo-4.1.0/package/yast2-sudo.changes 2019-02-27 15:46:48.000000000 +0100
+++ new/yast2-sudo-4.2.1/package/yast2-sudo.changes 2019-07-19 11:53:16.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Jul 19 09:49:14 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:44 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Feb 26 13:55:34 UTC 2019 - José Iván López González <jlopez(a)suse.com>
- Version bump (bsc#1124009)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sudo-4.1.0/package/yast2-sudo.spec new/yast2-sudo-4.2.1/package/yast2-sudo.spec
--- old/yast2-sudo-4.1.0/package/yast2-sudo.spec 2019-02-27 15:46:48.000000000 +0100
+++ new/yast2-sudo-4.2.1/package/yast2-sudo.spec 2019-07-19 11:53:16.000000000 +0200
@@ -12,36 +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-sudo
-Version: 4.1.0
+Summary: YaST2 - Sudo configuration
+Version: 4.2.1
Release: 0
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %{name}-%{version}.tar.bz2
-
-url: http://github.com/yast/yast-sudo
+Url: https://github.com/yast/yast-sudo
Group: System/YaST
License: GPL-2.0-only
-Requires: yast2-users
-# Wizard::SetDesktopTitleAndIcon
-Requires: yast2 >= 2.21.22
-#ycp::PathComponents
-Conflicts: yast2-core < 2.13.29
-#Sudo icons
-Conflicts: yast2_theme < 2.13.9
-BuildRequires: yast2 yast2-users
-BuildRequires: yast2-devtools >= 3.0.6
-BuildRequires: rubygem(yast-rake)
-BuildArchitectures: noarch
+Source0: %{name}-%{version}.tar.bz2
+Requires: yast2-users
+# Wizard::SetDesktopTitleAndIcon
+Requires: yast2 >= 2.21.22
Requires: yast2-ruby-bindings >= 1.0.0
-Summary: YaST2 - sudo configuration
+BuildRequires: yast2 yast2-users
+BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: rubygem(yast-rake)
+BuildRequires: update-desktop-files
+
+BuildArch: noarch
%description
The YaST2 component for sudo configuration. It configures capabilities
@@ -56,18 +51,19 @@
%build
%install
-rake install DESTDIR="%{buildroot}"
-
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/sudo
-%{yast_yncludedir}/sudo/*
-%{yast_clientdir}/sudo.rb
-%{yast_moduledir}/Sudo.*
-%{yast_desktopdir}/sudo.desktop
-%{yast_scrconfdir}/sudo.scr
-%{yast_agentdir}/ag_etc_sudoers
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_agentdir}
%{yast_icondir}
%doc %{yast_docdir}
%license COPYING
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sudo-4.1.0/src/desktop/org.opensuse.yast.Sudo.desktop new/yast2-sudo-4.2.1/src/desktop/org.opensuse.yast.Sudo.desktop
--- old/yast2-sudo-4.1.0/src/desktop/org.opensuse.yast.Sudo.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sudo-4.2.1/src/desktop/org.opensuse.yast.Sudo.desktop 2019-07-19 11:53:16.000000000 +0200
@@ -0,0 +1,24 @@
+[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=sudo
+
+X-SuSE-YaST-Group=Security
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=sudo
+X-SuSE-YaST-Keywords=root,permissions,users,authentication,administrator
+
+Icon=yast-sudo
+Exec=xdg-su -c "/sbin/yast2 sudo"
+
+Name=YaST Sudo
+GenericName=Sudo
+Comment=Configure sudo
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sudo-4.1.0/src/desktop/sudo.desktop new/yast2-sudo-4.2.1/src/desktop/sudo.desktop
--- old/yast2-sudo-4.1.0/src/desktop/sudo.desktop 2019-02-27 15:46:48.000000000 +0100
+++ new/yast2-sudo-4.2.1/src/desktop/sudo.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +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=sudo
-
-X-SuSE-YaST-Group=Security
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=sudo
-X-SuSE-YaST-Keywords=root,permissions,users,authentication,administrator
-
-Icon=yast-sudo
-Exec=xdg-su -c "/sbin/yast2 sudo"
-
-Name=Sudo
-GenericName=Configure sudo
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-sudo-4.1.0/src/include/sudo/wizards.rb new/yast2-sudo-4.2.1/src/include/sudo/wizards.rb
--- old/yast2-sudo-4.1.0/src/include/sudo/wizards.rb 2019-02-27 15:46:48.000000000 +0100
+++ new/yast2-sudo-4.2.1/src/include/sudo/wizards.rb 2019-07-19 11:53:16.000000000 +0200
@@ -114,7 +114,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("sudo")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Sudo")
return :abort if !Sudo.Read
ret = Sequencer.Run(aliases, sequence)
1
0
Hello community,
here is the log from the commit of package yast2-online-update for openSUSE:Factory checked in at 2019-07-31 14:24:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-online-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-online-update.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-online-update"
Wed Jul 31 14:24:10 2019 rev:107 rq:716995 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-online-update/yast2-online-update.changes 2019-02-28 21:47:48.777412115 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-online-update.new.4126/yast2-online-update.changes 2019-07-31 14:24:11.714382533 +0200
@@ -1,0 +2,15 @@
+Fri Jul 19 09:38:47 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:20 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-online-update-4.1.0.tar.bz2
New:
----
yast2-online-update-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.ZMNDUR/_old 2019-07-31 14:24:12.054382147 +0200
+++ /var/tmp/diff_new_pack.ZMNDUR/_new 2019-07-31 14:24:12.058382142 +0200
@@ -17,40 +17,41 @@
Name: yast2-online-update
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-online-update
+Summary: YaST2 - Online Update (YOU)
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: update-desktop-files
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-packager
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
+
# Product EOL tag
Requires: yast2-pkg-bindings >= 3.1.6
# Kernel::InformAboutKernelChange
Requires: yast2 >= 2.23.8
# PackageCallbacks::FormatPatchName
Requires: yast2-packager >= 2.13.159
+# Added Logger (replacement for y2error, y2milestone, ...)
+Requires: yast2-ruby-bindings >= 3.1.7
Provides: y2c_online_update
-Provides: yast2-config-online-update
-Obsoletes: y2c_online_update
-Obsoletes: yast2-config-online-update
Provides: y2t_online_update
+Provides: yast2-config-online-update
Provides: yast2-trans-online-update
+
+Obsoletes: y2c_online_update
Obsoletes: y2t_online_update
+Obsoletes: yast2-config-online-update
Obsoletes: yast2-trans-online-update
-BuildArch: noarch
-
-# Added Logger (replacement for y2error, y2milestone, ...)
-Requires: yast2-ruby-bindings >= 3.1.7
-Summary: YaST2 - Online Update (YOU)
-License: GPL-2.0-only
-Group: System/YaST
+BuildArch: noarch
%description
YaST Online Update (YOU) provides a convenient way to download and
@@ -62,19 +63,30 @@
used with or without the X Window System. It can be started from the
YaST control center.
+%package frontend
+Summary: YaST2 - Online Update (YOU)
+Group: System/YaST
+Requires: yast2-online-update
+
+# PatchCD desktop file moved to yast2-wagon
+Conflicts: yast2-wagon <= 2.17.3
+
+%description frontend
+Desktop files for YaST2 online update
+
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
%{yast_scrconfdir}/*.scr
%{yast_clientdir}/online*.rb
%{yast_clientdir}/cd_update.rb
@@ -85,19 +97,8 @@
%doc %{yast_docdir}
%license COPYING
-%package frontend
-Summary: YaST2 - Online Update (YOU)
-Group: System/YaST
-Requires: yast2-online-update
-
-# PatchCD desktop file moved to yast2-wagon
-Conflicts: yast2-wagon <= 2.17.3
-
-%description frontend
-Desktop files for YaST2 online update
-
%files frontend
-%defattr(-,root,root)
-%{yast_desktopdir}/online_update.desktop
+%{yast_desktopdir}
+%{yast_metainfodir}
%changelog
++++++ yast2-online-update-4.1.0.tar.bz2 -> yast2-online-update-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-4.1.0/Dockerfile new/yast2-online-update-4.2.1/Dockerfile
--- old/yast2-online-update-4.1.0/Dockerfile 2019-02-27 15:41:58.000000000 +0100
+++ new/yast2-online-update-4.2.1/Dockerfile 2019-07-19 11:46:25.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-online-update-4.1.0/package/yast2-online-update.changes new/yast2-online-update-4.2.1/package/yast2-online-update.changes
--- old/yast2-online-update-4.1.0/package/yast2-online-update.changes 2019-02-27 15:41:58.000000000 +0100
+++ new/yast2-online-update-4.2.1/package/yast2-online-update.changes 2019-07-19 11:46:25.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Jul 19 09:38:47 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:20 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Feb 26 11:35:36 UTC 2019 - José Iván López González <jlopez(a)suse.com>
- Version bump (bsc#1124009)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-4.1.0/package/yast2-online-update.spec new/yast2-online-update-4.2.1/package/yast2-online-update.spec
--- old/yast2-online-update-4.1.0/package/yast2-online-update.spec 2019-02-27 15:41:58.000000000 +0100
+++ new/yast2-online-update-4.2.1/package/yast2-online-update.spec 2019-07-19 11:46:25.000000000 +0200
@@ -12,41 +12,42 @@
# 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-online-update
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-online-update
+Summary: YaST2 - Online Update (YOU)
+Group: System/YaST
+License: GPL-2.0-only
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0-only
BuildRequires: yast2-packager
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
+BuildRequires: update-desktop-files
+
# Product EOL tag
-Requires: yast2-pkg-bindings >= 3.1.6
+Requires: yast2-pkg-bindings >= 3.1.6
# Kernel::InformAboutKernelChange
-Requires: yast2 >= 2.23.8
+Requires: yast2 >= 2.23.8
# PackageCallbacks::FormatPatchName
-Requires: yast2-packager >= 2.13.159
-
-Provides: y2c_online_update yast2-config-online-update
-Obsoletes: y2c_online_update yast2-config-online-update
-Provides: yast2-trans-online-update y2t_online_update
-Obsoletes: yast2-trans-online-update y2t_online_update
-BuildArch: noarch
-
+Requires: yast2-packager >= 2.13.159
# Added Logger (replacement for y2error, y2milestone, ...)
Requires: yast2-ruby-bindings >= 3.1.7
-Summary: YaST2 - Online Update (YOU)
+Provides: y2c_online_update yast2-config-online-update
+Provides: yast2-trans-online-update y2t_online_update
+
+Obsoletes: y2c_online_update yast2-config-online-update
+Obsoletes: yast2-trans-online-update y2t_online_update
+
+BuildArch: noarch
%description
YaST Online Update (YOU) provides a convenient way to download and
@@ -58,19 +59,30 @@
used with or without the X Window System. It can be started from the
YaST control center.
+%package frontend
+Summary: YaST2 - Online Update (YOU)
+Requires: yast2-online-update
+Group: System/YaST
+
+# PatchCD desktop file moved to yast2-wagon
+Conflicts: yast2-wagon <= 2.17.3
+
+%description frontend
+Desktop files for YaST2 online update
+
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
%{yast_scrconfdir}/*.scr
%{yast_clientdir}/online*.rb
%{yast_clientdir}/cd_update.rb
@@ -81,17 +93,8 @@
%doc %{yast_docdir}
%license COPYING
-%package frontend
-Summary: YaST2 - Online Update (YOU)
-Requires: yast2-online-update
-Group: System/YaST
-
-# PatchCD desktop file moved to yast2-wagon
-Conflicts: yast2-wagon <= 2.17.3
-
-%description frontend
-Desktop files for YaST2 online update
-
%files frontend
-%defattr(-,root,root)
-%{yast_desktopdir}/online_update.desktop
+%{yast_desktopdir}
+%{yast_metainfodir}
+
+%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-4.1.0/src/clients/online_update.rb new/yast2-online-update-4.2.1/src/clients/online_update.rb
--- old/yast2-online-update-4.1.0/src/clients/online_update.rb 2019-02-27 15:41:58.000000000 +0100
+++ new/yast2-online-update-4.2.1/src/clients/online_update.rb 2019-07-19 11:46:25.000000000 +0200
@@ -124,7 +124,7 @@
# Main sequence for Online Update
def OnlineUpdateSequence
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("online_update")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.OnlineUpdate")
# help text for online-update initialization
Wizard.RestoreHelp(
_(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-4.1.0/src/desktop/online_update.desktop new/yast2-online-update-4.2.1/src/desktop/online_update.desktop
--- old/yast2-online-update-4.1.0/src/desktop/online_update.desktop 2019-02-27 15:41:58.000000000 +0100
+++ new/yast2-online-update-4.2.1/src/desktop/online_update.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=online_update
-
-X-SuSE-YaST-Group=Software
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=10
-X-SuSE-YaST-AutoInstResource=
-X-SuSE-YaST-AutoInst=
-X-SuSE-YaST-Keywords=software,update,online,YOU,packages,RPM
-
-Icon=yast-update-online
-Exec=xdg-su -c "/sbin/yast2 online_update"
-
-Name=Online Update
-GenericName=Get patches to correct and improve your existing installation
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-online-update-4.1.0/src/desktop/org.opensuse.yast.OnlineUpdate.desktop new/yast2-online-update-4.2.1/src/desktop/org.opensuse.yast.OnlineUpdate.desktop
--- old/yast2-online-update-4.1.0/src/desktop/org.opensuse.yast.OnlineUpdate.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-online-update-4.2.1/src/desktop/org.opensuse.yast.OnlineUpdate.desktop 2019-07-19 11:46:25.000000000 +0200
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Software;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=online_update
+
+X-SuSE-YaST-Group=Software
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=10
+X-SuSE-YaST-AutoInstResource=
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Keywords=software,update,online,YOU,packages,RPM
+
+Icon=yast-update-online
+Exec=xdg-su -c "/sbin/yast2 online_update"
+
+Name=YaST Online Update
+GenericName=Online Update
+Comment=Get patches to correct and improve your existing installation
+StartupNotify=true
1
0
Hello community,
here is the log from the commit of package yast2-alternatives for openSUSE:Factory checked in at 2019-07-31 14:24:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-alternatives (Old)
and /work/SRC/openSUSE:Factory/.yast2-alternatives.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-alternatives"
Wed Jul 31 14:24:01 2019 rev:6 rq:716993 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-alternatives/yast2-alternatives.changes 2019-01-03 18:05:43.308188689 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-alternatives.new.4126/yast2-alternatives.changes 2019-07-31 14:24:02.354393152 +0200
@@ -1,0 +2,15 @@
+Fri Jul 19 09:09:41 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:24:51 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-alternatives-4.1.0.tar.bz2
New:
----
yast2-alternatives-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-alternatives.spec ++++++
--- /var/tmp/diff_new_pack.ZZUrOd/_old 2019-07-31 14:24:02.890392544 +0200
+++ /var/tmp/diff_new_pack.ZZUrOd/_new 2019-07-31 14:24:02.890392544 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-alternatives
#
-# 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,46 +17,44 @@
Name: yast2-alternatives
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Summary: YaST2 - Manage Update-alternatives switching
License: GPL-2.0-only
Group: System/Yast
Url: https://github.com/yast/yast-alternatives
+
Source0: %{name}-%{version}.tar.bz2
+
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-ruby-bindings
# For install
BuildRequires: rubygem(yast-rake)
# For test
+BuildRequires: update-desktop-files
BuildRequires: rubygem(rspec)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A YaST2 module to manage update alternatives switching
+
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%check
-rake test:unit
+%yast_check
%install
-rake install DESTDIR=%{buildroot}
-
-%post
-
-%postun
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_dir}/clients/*.rb
-%{yast_dir}/lib/y2_alternatives/
-%{yast_dir}/lib/y2_alternatives/dialog
-%{yast_dir}/lib/y2_alternatives/control
-%{yast_desktopdir}/alternatives.desktop
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%{yast_icondir}
%doc COPYING
%doc README.md
++++++ yast2-alternatives-4.1.0.tar.bz2 -> yast2-alternatives-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-alternatives-4.1.0/Dockerfile new/yast2-alternatives-4.2.1/Dockerfile
--- old/yast2-alternatives-4.1.0/Dockerfile 2018-11-28 12:09:57.000000000 +0100
+++ new/yast2-alternatives-4.2.1/Dockerfile 2019-07-19 11:45:34.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-alternatives-4.1.0/package/yast2-alternatives.changes new/yast2-alternatives-4.2.1/package/yast2-alternatives.changes
--- old/yast2-alternatives-4.1.0/package/yast2-alternatives.changes 2018-11-28 12:09:57.000000000 +0100
+++ new/yast2-alternatives-4.2.1/package/yast2-alternatives.changes 2019-07-19 11:45:34.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Jul 19 09:09:41 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:24:51 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Fri Nov 23 19:02:13 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-alternatives-4.1.0/package/yast2-alternatives.spec new/yast2-alternatives-4.2.1/package/yast2-alternatives.spec
--- old/yast2-alternatives-4.1.0/package/yast2-alternatives.spec 2018-11-28 12:09:57.000000000 +0100
+++ new/yast2-alternatives-4.2.1/package/yast2-alternatives.spec 2019-07-19 11:45:34.000000000 +0200
@@ -12,50 +12,48 @@
# 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-alternatives
-Version: 4.1.0
+Version: 4.2.1
Release: 0
License: GPL-2.0
Summary: YaST2 - Manage Update-alternatives switching
Url: https://github.com/yast/yast-alternatives
Group: System/Yast
+
Source0: %{name}-%{version}.tar.bz2
+
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-ruby-bindings
# For install
BuildRequires: rubygem(yast-rake)
# For test
BuildRequires: rubygem(rspec)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: update-desktop-files
%description
A YaST2 module to manage update alternatives switching
+
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%check
-rake test:unit
+%yast_check
%install
-rake install DESTDIR=%{buildroot}
-
-%post
-
-%postun
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_dir}/clients/*.rb
-%{yast_dir}/lib/y2_alternatives/
-%{yast_dir}/lib/y2_alternatives/dialog
-%{yast_dir}/lib/y2_alternatives/control
-%{yast_desktopdir}/alternatives.desktop
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
%{yast_icondir}
%doc COPYING
%doc README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-alternatives-4.1.0/src/desktop/alternatives.desktop new/yast2-alternatives-4.2.1/src/desktop/alternatives.desktop
--- old/yast2-alternatives-4.1.0/src/desktop/alternatives.desktop 2018-11-28 12:09:57.000000000 +0100
+++ new/yast2-alternatives-4.2.1/src/desktop/alternatives.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=alternatives
-
-X-SuSE-YaST-Group=Misc
-X-SuSE-YaST-RootOnly=true
-
-Icon=yast-alternatives
-Exec=/sbin/yast2 alternatives
-
-Name=Alternatives
-GenericName=Manage update-alternatives switching
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-alternatives-4.1.0/src/desktop/org.opensuse.yast.Alternatives.desktop new/yast2-alternatives-4.2.1/src/desktop/org.opensuse.yast.Alternatives.desktop
--- old/yast2-alternatives-4.1.0/src/desktop/org.opensuse.yast.Alternatives.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-alternatives-4.2.1/src/desktop/org.opensuse.yast.Alternatives.desktop 2019-07-19 11:45:34.000000000 +0200
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=alternatives
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-RootOnly=true
+
+Icon=yast-alternatives
+Exec=/sbin/yast2 alternatives
+
+Name=YaST Alternatives
+GenericName=Alternatives
+Comment=Manage update-alternatives switching
+StartupNotify=true
1
0
Hello community,
here is the log from the commit of package yast2-auth-server for openSUSE:Factory checked in at 2019-07-31 14:23:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-auth-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-auth-server.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-auth-server"
Wed Jul 31 14:23:54 2019 rev:21 rq:716991 version:4.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-auth-server/yast2-auth-server.changes 2018-12-31 09:40:16.482516903 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-auth-server.new.4126/yast2-auth-server.changes 2019-07-31 14:23:55.534400889 +0200
@@ -1,0 +2,21 @@
+Fri Jul 19 09:16:56 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Mon Jul 1 15:24:00 UTC 2019 - William Brown <wbrown(a)suse.de>
+
+- Add dependency on krb5-plugin-kdb-ldap
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:26:05 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-auth-server-4.1.0.tar.bz2
New:
----
yast2-auth-server-4.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-auth-server.spec ++++++
--- /var/tmp/diff_new_pack.7Mrzyq/_old 2019-07-31 14:23:55.886400490 +0200
+++ /var/tmp/diff_new_pack.7Mrzyq/_new 2019-07-31 14:23:55.890400485 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-auth-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
@@ -20,18 +20,22 @@
Summary: A tool for creating identity management server instances
License: GPL-2.0-or-later
Group: System/YaST
-Version: 4.1.0
+Version: 4.2.2
Release: 0
-Source0: %{name}-%{version}.tar.bz2
Url: https://github.com/yast/yast-auth-server
-BuildArch: noarch
+
+Source0: %{name}-%{version}.tar.bz2
+
+BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(yast-rake)
+
Requires: net-tools
Requires: yast2
Requires: yast2-ruby-bindings
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+BuildArch: noarch
%description
The program assists system administrators to create new directory server and
@@ -39,19 +43,20 @@
database for a network.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
%doc %{yast_docdir}
-%{yast_libdir}/
-%{yast_desktopdir}/
-%{yast_clientdir}/
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_clientdir}
%{yast_icondir}
%license COPYING
++++++ yast2-auth-server-4.1.0.tar.bz2 -> yast2-auth-server-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/Dockerfile new/yast2-auth-server-4.2.2/Dockerfile
--- old/yast2-auth-server-4.1.0/Dockerfile 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/Dockerfile 2019-07-19 11:45:17.000000000 +0200
@@ -1,2 +1,2 @@
-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-auth-server-4.1.0/README.md new/yast2-auth-server-4.2.2/README.md
--- old/yast2-auth-server-4.1.0/README.md 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/README.md 2019-07-19 11:45:17.000000000 +0200
@@ -12,7 +12,83 @@
## Install
To install the latest stable version on openSUSE or SLE, use zypper:
- $ sudo zypper install yast2-auth-server
+```
+$ sudo zypper install yast2-auth-server
+```
# Run
-Visit Yast control panel and launch "Create New Kerberos Server" or "Create New Directory Server".
\ No newline at end of file
+Visit Yast control panel and launch "Create New Kerberos Server" or "Create New Directory Server".
+
+
+# Development
+
+You need to prepare your environment with:
+
+```
+ruby_version=$(ruby -e "puts RbConfig::CONFIG['ruby_version']")
+zypper install -C "rubygem(ruby:$ruby_version:yast-rake)"
+zypper install -C "rubygem(ruby:$ruby_version:rspec)"
+zypper install git yast2-devtools yast2-testsuite yast
+```
+
+You can then run the auth-server module with:
+
+```
+rake run
+rake run[module name]
+rake run[ldap-server]
+```
+
+For the 389-ds setup, you'll require a CA + pkcs12 bundle with a cert to use. You can generate
+these with certutil from the package mozilla-nss-tools.
+
+```
+mkdir local_ca
+cd local_ca
+echo "password" > password.txt
+certutil -N -f password.txt -d .
+certutil -S -n CAissuer -t "C,C,C" -x -f password.txt -d . -v 24 -g 4096 -Z SHA256 --keyUsage certSigning -2 --nsCertType sslCA -s "CN=ca.nss.dev.example.com,O=Testing,L=example,ST=Queensland,C=AU"
+
+certutil -S -n Server-Cert -t ",," -c CAissuer -f password.txt -d . -s "CN=test_b.dev.example.com,O=Testing,L=example,ST=Queensland,C=AU"
+
+certutil -L -n CAissuer -a -d . > ca.pem
+pk12util -o server-export.p12 -d . -k password.txt -n Server-Cert
+```
+
+# Tests
+
+```
+rake test:unit
+```
+
+# Logs
+
+If you are running as a non-root user, the logs are located in:
+
+```
+~/.y2log
+```
+
+If you are running as root, these logs are in:
+
+```
+/var/log/YaST2/y2log
+```
+
+For more detailed logging, you are able to execute YaST with debugging environment variables:
+
+```
+Y2DEBUG=1 rake run[ldap-server]
+```
+
+# Build
+
+You can build the package with:
+
+```
+rake osc:build
+```
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/package/yast2-auth-server.changes new/yast2-auth-server-4.2.2/package/yast2-auth-server.changes
--- old/yast2-auth-server-4.1.0/package/yast2-auth-server.changes 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/package/yast2-auth-server.changes 2019-07-19 11:45:17.000000000 +0200
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Fri Jul 19 09:16:56 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Mon Jul 1 15:24:00 UTC 2019 - William Brown <wbrown(a)suse.de>
+
+- Add dependency on krb5-plugin-kdb-ldap
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:26:05 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Fri Nov 23 23:00:04 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-auth-server-4.1.0/package/yast2-auth-server.spec new/yast2-auth-server-4.2.2/package/yast2-auth-server.spec
--- old/yast2-auth-server-4.1.0/package/yast2-auth-server.spec 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/package/yast2-auth-server.spec 2019-07-19 11:45:17.000000000 +0200
@@ -12,25 +12,29 @@
# 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-auth-server
-Group: System/YaST
-Summary: A tool for creating identity management server instances
-Version: 4.1.0
+Group: System/YaST
+Summary: A tool for creating identity management server instances
+Version: 4.2.2
Release: 0
License: GPL-2.0-or-later
-Source0: %{name}-%{version}.tar.bz2
Url: https://github.com/yast/yast-auth-server
-BuildArch: noarch
+
+Source0: %{name}-%{version}.tar.bz2
+
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: rubygem(yast-rake)
+BuildRequires: update-desktop-files
+
Requires: net-tools
Requires: yast2-ruby-bindings
Requires: yast2
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+BuildArch: noarch
%description
The program assists system administrators to create new directory server and
@@ -38,19 +42,20 @@
database for a network.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
%doc %{yast_docdir}
-%{yast_libdir}/
-%{yast_desktopdir}/
-%{yast_clientdir}/
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_clientdir}
%{yast_icondir}
%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/desktop/krb-server.desktop new/yast2-auth-server-4.2.2/src/desktop/krb-server.desktop
--- old/yast2-auth-server-4.1.0/src/desktop/krb-server.desktop 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/desktop/krb-server.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +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=krb-server
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-Keywords=authentication,kerberos,krb,krb5
-
-Icon=yast-kerberos-server
-Exec=xdg-su -c "/sbin/yast2 krb-server"
-
-Name=Create New Kerberos Server
-GenericName=Create New Kerberos Server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/desktop/ldap-server.desktop new/yast2-auth-server-4.2.2/src/desktop/ldap-server.desktop
--- old/yast2-auth-server-4.1.0/src/desktop/ldap-server.desktop 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/desktop/ldap-server.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +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=ldap-server
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-Keywords=authentication,directory,ldap
-
-Icon=yast-ldap-server
-Exec=xdg-su -c "/sbin/yast2 ldap-server"
-
-Name=Create New Directory Server
-GenericName=Create New Directory Server
-StartupNotify=true
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/desktop/org.opensuse.yast.KrbServer.desktop new/yast2-auth-server-4.2.2/src/desktop/org.opensuse.yast.KrbServer.desktop
--- old/yast2-auth-server-4.1.0/src/desktop/org.opensuse.yast.KrbServer.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/desktop/org.opensuse.yast.KrbServer.desktop 2019-07-19 11:45:17.000000000 +0200
@@ -0,0 +1,19 @@
+[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=krb-server
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Keywords=authentication,kerberos,krb,krb5
+
+Icon=yast-kerberos-server
+Exec=xdg-su -c "/sbin/yast2 krb-server"
+
+Name=YaST New Kerberos Server
+GenericName=New Kerberos Server
+Comment=Create a New Kerberos Server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/desktop/org.opensuse.yast.LDAPServer.desktop new/yast2-auth-server-4.2.2/src/desktop/org.opensuse.yast.LDAPServer.desktop
--- old/yast2-auth-server-4.1.0/src/desktop/org.opensuse.yast.LDAPServer.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/desktop/org.opensuse.yast.LDAPServer.desktop 2019-07-19 11:45:17.000000000 +0200
@@ -0,0 +1,19 @@
+[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=ldap-server
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Keywords=authentication,directory,ldap
+
+Icon=yast-ldap-server
+Exec=xdg-su -c "/sbin/yast2 ldap-server"
+
+Name=YaST New Directory Server
+GenericName=New Directory Server
+Comment=Create a New Directory Server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/lib/authserver/dir/client.rb new/yast2-auth-server-4.2.2/src/lib/authserver/dir/client.rb
--- old/yast2-auth-server-4.1.0/src/lib/authserver/dir/client.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/lib/authserver/dir/client.rb 2019-07-19 11:45:17.000000000 +0200
@@ -14,6 +14,8 @@
# LDAPClient serves utility functions for using LDAP command line client to interact with 389 directory server.
class LDAPClient
+ include Yast::Logger
+
# Initialise a client with specified connectivity details.
def initialize(url, bind_dn, bind_pw)
@url = url
@@ -23,6 +25,7 @@
# modify invokes ldapmodify and returns tuple of command output and boolean (success or not).
def modify(ldif_input, ignore_existing)
+ log.info('modify: #{ldif_input}')
stdin, stdouterr, result = Open3.popen2e('/usr/bin/ldapmodify', '-H', @url, '-x', '-D', @bind_dn, '-w', @bind_pw)
stdin.puts(ldif_input)
stdin.close
@@ -32,6 +35,7 @@
# add invokes ldapadd and returns tuple of command output and boolean (success or not).
def add(ldif_input, ignore_existing)
+ log.info('add: %s' % ldif_input)
stdin, stdouterr, result = Open3.popen2e('/usr/bin/ldapadd', '-H', @url, '-x', '-D', @bind_dn, '-w', @bind_pw)
stdin.puts(ldif_input)
stdin.close
@@ -53,6 +57,7 @@
# Most directory servers require LDAPS or StartTLS for this operation.
# Returns tuple of command output and boolean (success or not).
def change_password(dn, new_pass)
+ log.info('change password: %s' % dn)
stdin, stdouterr, result = Open3.popen2e('/usr/bin/ldappasswd', '-H', @url, '-x', '-D', @bind_dn, '-w', @bind_pw, '-s', new_pass, dn)
stdin.close
return [stdouterr.readlines.join('\n'), result.value.exitstatus == 0]
@@ -68,4 +73,4 @@
(version 3.0; acl \"#{rule_nickname}\"; allow (all)
userdn = \"ldap:///#{user_dn}\";)", true)
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/lib/authserver/dir/ds389.rb new/yast2-auth-server-4.2.2/src/lib/authserver/dir/ds389.rb
--- old/yast2-auth-server-4.1.0/src/lib/authserver/dir/ds389.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/lib/authserver/dir/ds389.rb 2019-07-19 11:45:17.000000000 +0200
@@ -9,13 +9,12 @@
# this program; if not, contact SUSE LINUX GmbH.
# Authors: Howard Guo <hguo(a)suse.com>
+# William Brown <wbrown(a)suse.de>
require 'yast'
require 'open3'
require 'fileutils'
-# DS_SETUP_LOG_PATH is the path to progress and debug log file for setting up a new directory instance.
-DS_SETUP_LOG_PATH = '/root/yast2-auth-server-dir-setup.log'
# DS_SETUP_INI_PATH is the path to parameter file for setting up new directory instance.
# Place the file under root directory because there are sensitive details in it.
DS_SETUP_INI_PATH = '/root/yast2-auth-server-dir-setup.ini'
@@ -23,6 +22,7 @@
# DS389 serves utility functions for setting up a new instance of 389 directory server.
class DS389
include Yast
+ include Yast::Logger
# install_pkgs installs software packages mandatory for setting up 389 directory server.
def self.install_pkgs
@@ -37,29 +37,42 @@
end
# gen_setup_ini generates INI file content with parameters for setting up directory server.
- def self.gen_setup_ini(fqdn, instance_name, suffix, dm_dn, dm_pass)
- return "[General]
-FullMachineName=#{fqdn}
-SuiteSpotUserID=dirsrv
-SuiteSpotGroup=dirsrv
+ def self.gen_setup_ini(fqdn, instance_name, suffix, dm_pass)
+ return "# Generated by yast-auth-server
+[general]
+config_version = 2
+full_machine_name = #{fqdn}
+# This may be need to be tweaked, it could break setups ...
+# strict_host_checking = true/false
[slapd]
-ServerPort=389
-ServerIdentifier=#{instance_name}
-Suffix=#{suffix}
-RootDN=#{dm_dn}
-RootDNPwd=#{dm_pass}
-AddSampleEntries=No
+root_password = #{dm_pass}
+instance_name = #{instance_name}
+
+[backend-userroot]
+sample_entries = yes
+suffix = #{suffix}
"
end
# exec_setup runs setup-ds.pl using input parameters file content.
- # The output of setup script is written into file /root/yast2-auth-server-dir-setup.log
+ # The output of setup script is written into file .y2log or /var/log/YaST/y2log
# Returns true only if setup was successful.
def self.exec_setup(content)
+ append_to_log('Beginning YAST auth server installation ...')
+
open(DS_SETUP_INI_PATH, 'w') {|fh| fh.puts(content)}
- stdin, stdouterr, result = Open3.popen2e('/usr/sbin/setup-ds.pl', '--debug', '--silent', '-f', DS_SETUP_INI_PATH)
- append_to_log(stdouterr.readlines.join('\n'))
+ # dry run first to see if it breaks ...
+ stdin, stdouterr, result = Open3.popen2e('/usr/sbin/dscreate', '-v', 'from-file', '-n', DS_SETUP_INI_PATH)
+ stdouterr.readlines.map { |l| append_to_log(l) }
+
+ if result.value.exitstatus != 0
+ return false
+ end
+
+ # Right do the real thing.
+ stdin, stdouterr, result = Open3.popen2e('/usr/sbin/dscreate', '-v', 'from-file', DS_SETUP_INI_PATH)
+ stdouterr.readlines.map { |l| append_to_log(l) }
stdin.close
return result.value.exitstatus == 0
end
@@ -71,17 +84,7 @@
# append_to_log appends current time and content into log file placed under /root/.
def self.append_to_log(content)
- open(DS_SETUP_LOG_PATH, 'a') {|fh|
- fh.puts(Time.now)
- fh.puts(content)
- }
- end
-
- # enable_krb_schema enables kerberos schema in the directory server and then restarts the directory server.
- # Returns true only if server restarted successfully.
- def self.enable_krb_schema(instance_name)
- ::FileUtils.copy('/usr/share/dirsrv/data/60kerberos.ldif', '/etc/dirsrv/slapd-' + instance_name + '/schema/60kerberos.ldif')
- return self.restart(instance_name)
+ log.info(content)
end
# restart the directory service specified by the instance name. Returns true only on success.
@@ -94,48 +97,21 @@
def self.install_tls_in_nss(instance_name, ca_path, p12_path)
instance_dir = '/etc/dirsrv/slapd-' + instance_name
# Put CA certificate into NSS database
- _, stdouterr, result = Open3.popen2e('/usr/bin/certutil', '-A', '-d', instance_dir, '-n', 'ca_cert', '-t', 'C,,', '-i', ca_path)
- append_to_log(stdouterr.readlines.join('\n'))
+ _, stdouterr, result = Open3.popen2e('/usr/bin/certutil', '-A', '-f', instance_dir + '/pwdfile.txt', '-d', instance_dir, '-n', 'ca_cert', '-t', 'C,,', '-i', ca_path)
+ stdouterr.readlines.map { |l| append_to_log(l) }
if result.value.exitstatus != 0
return false
end
- # Put TLS certificate and key into NSS database
- _, stdouterr, result = Open3.popen2e('/usr/bin/pk12util', '-d', instance_dir, '-W', '', '-K', '', '-i', p12_path)
- append_to_log(stdouterr.readlines.join('\n'))
+ # Delete the automatically created Server-Cert - we don't care if it fails ...
+ _, stdouterr, result = Open3.popen2e('/usr/bin/certutil', '-F', '-d', instance_dir, '-n', 'Server-Cert', '-f', instance_dir + '/pwdfile.txt')
+ stdouterr.readlines.map { |l| append_to_log(l) }
+ # Put TLS certificate and key into NSS database - and hope it's named Server-Cert ...
+ _, stdouterr, result = Open3.popen2e('/usr/bin/pk12util', '-i', p12_path, '-k', instance_dir + '/pwdfile.txt', '-d', instance_dir, '-W', '')
+ stdouterr.readlines.map { |l| append_to_log(l) }
if result.value.exitstatus != 0
return false
end
return true
end
- # get_enable_tls_ldif returns LDIF data that can be
- def self.get_enable_tls_ldif
- return 'dn: cn=encryption,cn=config
-changetype: modify
-replace: nsSSL3
-nsSSL3: off
--
-replace: nsSSLClientAuth
-nsSSLClientAuth: allowed
--
-add: nsSSL3Ciphers
-nsSSL3Ciphers: +all
-
-dn: cn=config
-changetype: modify
-add: nsslapd-security
-nsslapd-security: on
--
-replace: nsslapd-ssl-check-hostname
-nsslapd-ssl-check-hostname: off
-
-dn: cn=RSA,cn=encryption,cn=config
-changetype: add
-objectclass: top
-objectclass: nsEncryptionModule
-cn: RSA
-nsSSLPersonalitySSL: Server-Cert
-nsSSLToken: internal (software)
-nsSSLActivation: on'
- end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/lib/authserver/krb/mit.rb new/yast2-auth-server-4.2.2/src/lib/authserver/krb/mit.rb
--- old/yast2-auth-server-4.1.0/src/lib/authserver/krb/mit.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/lib/authserver/krb/mit.rb 2019-07-19 11:45:17.000000000 +0200
@@ -13,18 +13,16 @@
require 'yast'
require 'open3'
-# KDC_SETUP_LOG_PATH is the path to progress and debug log file for setting up a new KDC.
-KDC_SETUP_LOG_PATH = '/root/yast2-auth-server-kdc-setup.log'
-
# MITKerberos serves utility functions for setting up a new directory connected KDC.
class MITKerberos
include Yast
+ include Yast::Logger
# install_pkgs installs software packages mandatory for setting up MIT Kerberos server.
def self.install_pkgs
Yast.import 'Package'
# DoInstall never fails
- Package.DoInstall(['krb5-client', 'krb5-server'].delete_if{|name| Package.Installed(name)})
+ Package.DoInstall(['krb5-client', 'krb5-server', 'krb5-plugin-kdb-ldap'].delete_if{|name| Package.Installed(name)})
end
# is_configured returns true only if there kerberos configuration has been altered.
@@ -110,7 +108,7 @@
# init_dir uses kerberos LDAP utility to prepare a directory server for kerberos operation.
# Returns tuple of command output and boolean (success or not).
def self.init_dir(ldaps_addr, dir_admin_dn, dir_admin_pass, realm_name, container_dn, master_pass)
- puts ['/usr/lib/mit/sbin/kdb5_ldap_util', '-H', 'ldaps://'+ldaps_addr, '-D', dir_admin_dn, '-w', dir_admin_pass, 'create', '-r', realm_name, '-subtrees', container_dn, '-s', '-P', master_pass].join(' ')
+ log.info( ['/usr/lib/mit/sbin/kdb5_ldap_util', '-H', 'ldaps://'+ldaps_addr, '-D', dir_admin_dn, '-w', '********', 'create', '-r', realm_name, '-subtrees', container_dn, '-s', '-P', '********'].join(' '))
stdin, stdouterr, result = Open3.popen2e('/usr/lib/mit/sbin/kdb5_ldap_util', '-H', 'ldaps://'+ldaps_addr, '-D', dir_admin_dn, '-w', dir_admin_pass, 'create', '-r', realm_name, '-subtrees', container_dn, '-s', '-P', master_pass)
stdin.close
return [stdouterr.readlines.join('\n'), result.value.exitstatus == 0]
@@ -130,9 +128,6 @@
# append_to_log appends current time and content into log file placed under /root/.
def self.append_to_log(content)
- open(KDC_SETUP_LOG_PATH, 'a') {|fh|
- fh.puts(Time.now)
- fh.puts(content)
- }
+ log.info(content)
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/lib/authserver/ui/new_dir_inst.rb new/yast2-auth-server-4.2.2/src/lib/authserver/ui/new_dir_inst.rb
--- old/yast2-auth-server-4.1.0/src/lib/authserver/ui/new_dir_inst.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/lib/authserver/ui/new_dir_inst.rb 2019-07-19 11:45:17.000000000 +0200
@@ -9,6 +9,7 @@
# this program; if not, contact SUSE LINUX GmbH.
# Authors: Howard Guo <hguo(a)suse.com>
+# William Brown <wbrown(a)suse.de>
require 'yast'
require 'ui/dialog'
@@ -44,20 +45,25 @@
Left(Heading(_('Create New Directory Instance'))),
HBox(
Frame(_('General options (mandatory)'),
- VBox(
- InputField(Id(:fqdn), Opt(:hstretch), _('Fully qualified domain name (e.g. dir.example.net)'), ''),
- InputField(Id(:instance_name), Opt(:hstretch), _('Directory server instance name (e.g. MyOrgDirectory)'), ''),
- InputField(Id(:suffix), Opt(:hstretch), _('Directory suffix (e.g. dc=example,dc=net)'), ''),
- InputField(Id(:dm_dn), Opt(:hstretch), _('Directory manager DN (e.g. cn=root)'), ''),
- ),
+ VBox(
+ InputField(Id(:fqdn), Opt(:hstretch), _('Fully qualified domain name (e.g. dir.example.net)'), ''),
+ InputField(Id(:instance_name), Opt(:hstretch), _('Directory server instance name (e.g. localhost)'), ''),
+ InputField(Id(:suffix), Opt(:hstretch), _('Directory suffix (e.g. dc=example,dc=net)'), ''),
+ ),
),
- Frame(_('Security options (mandatory)'),
- VBox(
- Password(Id(:dm_pass), Opt(:hstretch), _('Directory manager password'), ''),
- Password(Id(:dm_pass_repeat), Opt(:hstretch), _('Repeat directory manager password'), ''),
- InputField(Id(:tls_ca), Opt(:hstretch), _('Server TLS certificate authority in PEM format'), ''),
- InputField(Id(:tls_p12), Opt(:hstretch), _('Server TLS certificate and key in PKCS12 format'), ''),
- ),
+ VBox(
+ Frame(_('Security options (mandatory)'),
+ VBox(
+ Password(Id(:dm_pass), Opt(:hstretch), _('"cn=Directory Manager" password'), ''),
+ Password(Id(:dm_pass_repeat), Opt(:hstretch), _('Repeat "cn=Directory Manager" password'), ''),
+ ),
+ ),
+ Frame(_('Security options (optional)'),
+ VBox(
+ InputField(Id(:tls_ca), Opt(:hstretch), _('Server TLS certificate authority in PEM format'), ''),
+ InputField(Id(:tls_p12), Opt(:hstretch), _('Server TLS certificate and key in PKCS12 format with friendly name "Server-Cert"'), ''),
+ ),
+ ),
),
),
HBox(
@@ -72,64 +78,72 @@
fqdn = UI.QueryWidget(Id(:fqdn), :Value)
instance_name = UI.QueryWidget(Id(:instance_name), :Value)
suffix = UI.QueryWidget(Id(:suffix), :Value)
- dm_dn = UI.QueryWidget(Id(:dm_dn), :Value)
dm_pass = UI.QueryWidget(Id(:dm_pass), :Value)
dm_pass_repeat = UI.QueryWidget(Id(:dm_pass_repeat), :Value)
tls_ca = UI.QueryWidget(Id(:tls_ca), :Value)
tls_p12 = UI.QueryWidget(Id(:tls_p12), :Value)
+ UI.ReplaceWidget(Id(:busy), Empty())
+
# Validate input
- if fqdn == '' || instance_name == ''|| suffix == '' || dm_dn == '' || dm_pass == '' || tls_ca == '' || tls_p12 == ''
- Popup.Error(_('Please complete setup details. All input fields are mandatory.'))
+ if fqdn == '' || instance_name == ''|| suffix == '' || dm_pass == ''
+ Popup.Error(_('Please complete mandatory setup fields.'))
return
end
if dm_pass_repeat != dm_pass
Popup.Error(_('Two password entries do not match.'))
return
end
- if !File.exists?(tls_ca) || !File.exists?(tls_p12)
- Popup.Error(_('TLS certificate authority or certificate/key file does not exist.'))
+ if ! ((tls_ca == '' && tls_p12 == '') || (tls_ca != '' && tls_p12 != ''))
+ Popup.Error(_('Both TLS Certificate authority and PKCS12 must be provided, or none provided.'))
return
end
- if DS389.get_instance_names.include?(instance_name)
- Popup.Error(_('The instance name is already used.'))
+ if (tls_ca != '' && tls_p12 != '') && (!File.exists?(tls_ca) || !File.exists?(tls_p12))
+ Popup.Error(_('TLS certificate authority PEM OR certificate/key PKCS12 file does not exist.'))
return
end
+ # The dscreate tool has an instance name checker that is much more aware of instance
+ # rules than this ruby tool can be.
+ UI.ReplaceWidget(Id(:busy), Label(_('Preparing to install new instance, this may take a minute ...')))
- UI.ReplaceWidget(Id(:busy), Label(_('Installing new instance, this may take a minute or two.')))
- begin
- DS389.install_pkgs
- # Collect setup parameters into an INI file and feed it into 389 setup script
- ok = DS389.exec_setup(DS389.gen_setup_ini(fqdn, instance_name, suffix, dm_dn, dm_pass))
- DS389.remove_setup_ini
- if !ok
- Popup.Error(_('Failed to set up new instance! Log output may be found in %s') % [DS_SETUP_LOG_PATH])
- raise
- end
+ if !DS389.install_pkgs
+ Popup.Error(_('Error during package installation.'))
+ return
+ end
+
+ # Collect setup parameters into an INI file and feed it into 389 setup script
+ ini_content = DS389.gen_setup_ini(fqdn, instance_name, suffix, dm_pass)
+ ini_safe_content = DS389.gen_setup_ini(fqdn, instance_name, suffix, "********")
+ log.info(ini_safe_content)
+ UI.ReplaceWidget(Id(:busy), Label(_('Installing new instance, this may take a minute ...')))
+ ok = DS389.exec_setup(ini_content)
+ # Always remove the ini file
+ DS389.remove_setup_ini
+ if !ok
+ Popup.Error(_('Failed to set up new instance! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+
+ if (tls_ca != '' && tls_p12 != '')
+ UI.ReplaceWidget(Id(:busy), Label(_('Configuring instance TLS ...')))
# Turn on TLS
if !DS389.install_tls_in_nss(instance_name, tls_ca, tls_p12)
- Popup.Error(_('Failed to set up new instance! Log output may be found in %s') % [DS_SETUP_LOG_PATH])
- raise
- end
- ldap = LDAPClient.new('ldap://'+fqdn, dm_dn, dm_pass)
- out, ok = ldap.modify(DS389.get_enable_tls_ldif, true)
- DS389.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to enable TLS! Log output may be found in %s') % [DS_SETUP_LOG_PATH])
- raise
+ Popup.Error(_('Failed to set up new instance! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
end
+
if !DS389.restart(instance_name)
- Popup.Error(_('Failed to restart directory instance, please inspect the journal of dirsrv(a)%s.service') % [instance_name])
- raise
+ Popup.Error(_('Failed to restart directory instance, please inspect the journal of dirsrv(a)%s.service and /var/log/dirsrv/slapd-%s') % [instance_name, instance_name])
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
end
-
- UI.ReplaceWidget(Id(:busy), Empty())
- Popup.Message(_('New instance has been set up! Log output may be found in %s') % [DS_SETUP_LOG_PATH])
- finish_dialog(:next)
- rescue
- # Give user an opportunity to correct mistake
- UI.ReplaceWidget(Id(:busy), Empty())
end
+ UI.ReplaceWidget(Id(:busy), Empty())
+ Popup.Message(_('New instance has been set up! Log output may be found in /var/log/YaST/y2log'))
+ finish_dialog(:next)
+ UI.ReplaceWidget(Id(:busy), Empty())
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/src/lib/authserver/ui/new_krb_inst.rb new/yast2-auth-server-4.2.2/src/lib/authserver/ui/new_krb_inst.rb
--- old/yast2-auth-server-4.1.0/src/lib/authserver/ui/new_krb_inst.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/src/lib/authserver/ui/new_krb_inst.rb 2019-07-19 11:45:17.000000000 +0200
@@ -53,12 +53,9 @@
),
Frame(_('389 directory server connectivity (mandatory)'),
VBox(
- InputField(Id(:dir_addr), Opt(:hstretch), _('Directory server address (e.g. dir.example.net)'), ''),
- InputField(Id(:dir_inst), Opt(:hstretch), _('Directory instance name'), ''),
+ InputField(Id(:dir_addr), Opt(:hstretch), _('Fully qualified domain name (e.g. dir.example.net)'), ''),
InputField(Id(:dir_suffix), Opt(:hstretch), _('Directory suffix (e.g. dc=example,dc=net)'), ''),
- InputField(Id(:container_dn), Opt(:hstretch), _('Container DN of existing users (e.g. ou=users,dc=example,dc=net)'), ''),
- InputField(Id(:dm_dn), Opt(:hstretch), _('Directory manager DN (e.g. cn=root)'), ''),
- Password(Id(:dm_pass), Opt(:hstretch), _('Directory manager password'), ''),
+ Password(Id(:dm_pass), Opt(:hstretch), _('"cn=Directory Manager" password'), ''),
),
),
),
@@ -72,6 +69,7 @@
InputField(Id(:admin_dn), Opt(:hstretch), _('Admin account to create (e.g. cn=krbadm)'), ''),
Password(Id(:admin_pass), Opt(:hstretch), _('Password of admin account'), ''),
Password(Id(:admin_pass_repeat), Opt(:hstretch), _('Repeat password of admin account'), ''),
+ InputField(Id(:container_dn), Opt(:hstretch), _('KDC container DN (e.g. cn=kdc)'), ''),
),
),
),
@@ -95,10 +93,9 @@
realm = UI.QueryWidget(Id(:realm), :Value)
dir_addr = UI.QueryWidget(Id(:dir_addr), :Value)
- dir_inst = UI.QueryWidget(Id(:dir_inst), :Value)
dir_suffix = UI.QueryWidget(Id(:dir_suffix), :Value)
- container_dn = UI.QueryWidget(Id(:container_dn), :Value)
- dm_dn = UI.QueryWidget(Id(:dm_dn), :Value)
+ container_dn = UI.QueryWidget(Id(:container_dn), :Value) + ',' + dir_suffix
+ dm_dn = 'cn=Directory Manager'
dm_pass = UI.QueryWidget(Id(:dm_pass), :Value)
master_pass = UI.QueryWidget(Id(:master_pass), :Value)
@@ -112,7 +109,7 @@
# Validate input
if fqdn == '' || realm == '' ||
- dir_addr == '' || dir_inst == '' || dir_suffix == '' || container_dn == '' ||
+ dir_addr == '' || dir_suffix == '' || container_dn == '' ||
master_pass == '' || master_pass_repeat == '' ||
dm_dn == '' || dm_pass == '' ||
kdc_dn_prefix == '' || kdc_pass == '' || kdc_pass_repeat == '' ||
@@ -142,105 +139,117 @@
UI.ReplaceWidget(Id(:busy), Label(_('Installing new instance, this may take a minute or two.')))
- begin
- MITKerberos.install_pkgs
- # Enable kerberos schema on 389
- if !DS389.enable_krb_schema(dir_inst)
- Popup.Error(_('Failed to enable Kerberos schema.'))
- raise
- end
-
- # Create kerberos users and give them password in LDAP
- kdc_dn = kdc_dn_prefix+','+dir_suffix
- admin_dn = admin_dn_prefix+','+dir_suffix
- ldap = LDAPClient.new('ldaps://'+fqdn, dm_dn, dm_pass)
- out, ok = ldap.create_person(kdc_dn_prefix, 'Kerberos KDC Connection', dir_suffix)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create Kerberos KDC connection user! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
- out, ok = ldap.change_password(kdc_dn,kdc_pass)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create Kerberos KDC connection user! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
- out, ok = ldap.create_person(admin_dn_prefix, 'Kerberos Administration Connection', dir_suffix)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create Kerberos administration user! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
- out, ok = ldap.change_password(admin_dn,admin_pass)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create Kerberos KDC administration user! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
-
- # Create password file for KDC
- pass_file_path = '/etc/dirsrv/kdc'
- out, ok = MITKerberos.save_password_into_file(kdc_dn, kdc_pass, pass_file_path)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create password file! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
- out, ok = MITKerberos.save_password_into_file(admin_dn, admin_pass, pass_file_path)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to create password file! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
+ MITKerberos.install_pkgs
+ # Enable kerberos schema on 389
+ # By default 389-ds ships with this schema enabled today.
+
+ # Create kerberos users and give them password in LDAP
+ kdc_dn = kdc_dn_prefix+','+dir_suffix
+ MITKerberos.append_to_log(kdc_dn)
+ admin_dn = admin_dn_prefix+','+dir_suffix
+ MITKerberos.append_to_log(admin_dn)
+ ldap = LDAPClient.new('ldaps://'+dir_addr, dm_dn, dm_pass)
+ MITKerberos.append_to_log('Created ldap client')
+ out, ok = ldap.create_person(kdc_dn_prefix, 'Kerberos KDC Connection', dir_suffix)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create Kerberos KDC connection user! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ out, ok = ldap.change_password(kdc_dn,kdc_pass)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create Kerberos KDC connection user! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ out, ok = ldap.create_person(admin_dn_prefix, 'Kerberos Administration Connection', dir_suffix)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create Kerberos administration user! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ out, ok = ldap.change_password(admin_dn,admin_pass)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create Kerberos KDC administration user! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
- # Make common and KDC configuration files
- open('/etc/krb5.conf', 'w') {|fh|
- fh.puts(MITKerberos.gen_common_conf(realm, fqdn))
- }
- open('/var/lib/kerberos/krb5kdc/kdc.conf', 'w') {|fh|
- fh.puts(MITKerberos.gen_kdc_conf(realm, kdc_dn, admin_dn, container_dn, pass_file_path, dir_addr))
- }
-
- # Give kerberos rights to modify directory
- out, ok = ldap.aci_allow_modify(container_dn, 'kerberos-admin', admin_dn)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to modify directory permission! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
- out, ok = ldap.aci_allow_modify(container_dn, 'kerberos-kdc', kdc_dn)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Failed to modify directory permission! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
+ # Make common and KDC configuration files
+ # This has to occur the PW files else the default realm is not known
+ # to the pwstash command below.
+ pass_file_path = '/var/lib/kerberos/krb5kdc/ldap.creds'
+
+ MITKerberos.append_to_log('Generating /etc/krb5.conf')
+ open('/etc/krb5.conf', 'w') {|fh|
+ fh.puts(MITKerberos.gen_common_conf(realm, fqdn))
+ }
+ MITKerberos.append_to_log('Generating /var/lib/kerberos/krb5kdc/kdc.conf')
+ open('/var/lib/kerberos/krb5kdc/kdc.conf', 'w') {|fh|
+ fh.puts(MITKerberos.gen_kdc_conf(realm, kdc_dn, admin_dn, container_dn, pass_file_path, dir_addr))
+ }
+
+ # Create password file for KDC
+ MITKerberos.append_to_log('Generating KRBADM/KDC Passwords to %s' % pass_file_path)
+ out, ok = MITKerberos.save_password_into_file(kdc_dn, kdc_pass, pass_file_path)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create password file! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ out, ok = MITKerberos.save_password_into_file(admin_dn, admin_pass, pass_file_path)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to create password file! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
- # Let kerberos do its initialisation sequence
- out, ok = MITKerberos.init_dir(dir_addr, dm_dn, dm_pass, realm, container_dn, master_pass)
- MITKerberos.append_to_log(out)
- if !ok
- Popup.Error(_('Kerberos initialisation failure! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- raise
- end
+ # Let kerberos do its initialisation sequence
+ out, ok = MITKerberos.init_dir(dir_addr, dm_dn, dm_pass, realm, container_dn, master_pass)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Kerberos initialisation failure! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
- # Kerberos may finally start
- if !MITKerberos.restart_kdc
- Popup.Error(_('Failed to start KDC, please inspect the journal of krb5kdc.service'))
- raise
- end
- if !MITKerberos.restart_kadmind
- Popup.Error(_('Failed to start kadmind, please inspect the journal of kadmind.service'))
- raise
- end
+ # Give kerberos rights to modify directory, relies on the kdc container existing
+ out, ok = ldap.aci_allow_modify(container_dn, 'kerberos-admin', admin_dn)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to modify directory permission! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ out, ok = ldap.aci_allow_modify(container_dn, 'kerberos-kdc', kdc_dn)
+ MITKerberos.append_to_log('%s' % out)
+ if !ok
+ Popup.Error(_('Failed to modify directory permission! Log output may be found in /var/log/YaST/y2log'))
+ UI.ReplaceWidget(Id(:busy), Empty())
+ return
+ end
+ # Kerberos may finally start
+ if !MITKerberos.restart_kdc
+ Popup.Error(_('Failed to start KDC, please inspect the journal of krb5kdc.service'))
UI.ReplaceWidget(Id(:busy), Empty())
- Popup.Message(_('New instance has been set up! Log output may be found in %s') % [KDC_SETUP_LOG_PATH])
- finish_dialog(:next)
- rescue Exception => e
- Popup.Error('There was an error ' + e.message)
- # Give user an opportunity to correct mistake
+ return
+ end
+ if !MITKerberos.restart_kadmind
+ Popup.Error(_('Failed to start kadmind, please inspect the journal of kadmind.service'))
UI.ReplaceWidget(Id(:busy), Empty())
+ return
end
+
+ UI.ReplaceWidget(Id(:busy), Empty())
+ Popup.Message(_('New instance has been set up! Log output may be found in /var/log/YaST/y2log'))
+ finish_dialog(:next)
+ UI.ReplaceWidget(Id(:busy), Empty())
end
-end
\ No newline at end of file
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-4.1.0/test/dir_test.rb new/yast2-auth-server-4.2.2/test/dir_test.rb
--- old/yast2-auth-server-4.1.0/test/dir_test.rb 2018-11-28 12:09:25.000000000 +0100
+++ new/yast2-auth-server-4.2.2/test/dir_test.rb 2019-07-19 11:45:17.000000000 +0200
@@ -10,6 +10,7 @@
# this program; if not, contact SUSE LINUX GmbH.
# Authors: Howard Guo <hguo(a)suse.com>
+# William Brown <wbrown(a)suse.de>
ENV['Y2DIR'] = File.expand_path('../../src', __FILE__)
@@ -20,19 +21,21 @@
describe DS389 do
it 'gen_setup_ini' do
- match = '[General]
-FullMachineName=dir.example.com
-SuiteSpotUserID=dirsrv
-SuiteSpotGroup=dirsrv
+ match = '# Generated by yast-auth-server
+[general]
+config_version = 2
+full_machine_name = dir.example.com
+# This may be need to be tweaked, it could break setups ...
+# strict_host_checking = true/false
[slapd]
-ServerPort=389
-ServerIdentifier=ExampleDotCom
-Suffix=dc=example,dc=com
-RootDN=cn=admin
-RootDNPwd=pass
-AddSampleEntries=No
+root_password = pass
+instance_name = ExampleDotCom
+
+[backend-userroot]
+sample_entries = yes
+suffix = dc=example,dc=com
'
- expect(DS389.gen_setup_ini('dir.example.com', 'ExampleDotCom', 'dc=example,dc=com', 'cn=admin', 'pass')).to eq(match)
+ expect(DS389.gen_setup_ini('dir.example.com', 'ExampleDotCom', 'dc=example,dc=com', 'pass')).to eq(match)
end
-end
\ No newline at end of file
+end
1
0
Hello community,
here is the log from the commit of package yast2-vpn for openSUSE:Factory checked in at 2019-07-31 14:23:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-vpn (Old)
and /work/SRC/openSUSE:Factory/.yast2-vpn.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vpn"
Wed Jul 31 14:23:47 2019 rev:10 rq:716978 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-vpn/yast2-vpn.changes 2019-02-28 21:44:13.105504216 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-vpn.new.4126/yast2-vpn.changes 2019-07-31 14:23:48.774408559 +0200
@@ -1,0 +2,15 @@
+Fri Jul 19 08:56:40 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:42:39 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-vpn-4.1.0.tar.bz2
New:
----
yast2-vpn-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vpn.spec ++++++
--- /var/tmp/diff_new_pack.Ve3xD1/_old 2019-07-31 14:23:49.122408164 +0200
+++ /var/tmp/diff_new_pack.Ve3xD1/_new 2019-07-31 14:23:49.122408164 +0200
@@ -17,23 +17,26 @@
Name: yast2-vpn
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-vpn
Source0: %{name}-%{version}.tar.bz2
Summary: A YaST module for configuring VPN gateway and clients
License: GPL-2.0-only
Group: System/YaST
-BuildArch: noarch
-Requires: yast2
-Requires: yast2-ruby-bindings
+
+BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-ruby-bindings
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
PreReq: %fillup_prereq
+Requires: yast2
+Requires: yast2-ruby-bindings
+
+BuildArch: noarch
%description
A YaST module for managing VPN gateway and client connections to secure site-to-site communication via IPSec VPN.
@@ -42,22 +45,23 @@
%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%doc %yast_docdir
-%yast_desktopdir
-%yast_moduledir
-%yast_clientdir
-%yast_schemadir
-%yast_libdir
-%yast_scrconfdir
+%doc %{yast_docdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_moduledir}
+%{yast_clientdir}
+%{yast_schemadir}
+%{yast_libdir}
+%{yast_scrconfdir}
%{yast_icondir}
%changelog
++++++ yast2-vpn-4.1.0.tar.bz2 -> yast2-vpn-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.1.0/Dockerfile new/yast2-vpn-4.2.1/Dockerfile
--- old/yast2-vpn-4.1.0/Dockerfile 2019-02-27 15:42:49.000000000 +0100
+++ new/yast2-vpn-4.2.1/Dockerfile 2019-07-19 11:42:52.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-vpn-4.1.0/package/yast2-vpn.changes new/yast2-vpn-4.2.1/package/yast2-vpn.changes
--- old/yast2-vpn-4.1.0/package/yast2-vpn.changes 2019-02-27 15:42:49.000000000 +0100
+++ new/yast2-vpn-4.2.1/package/yast2-vpn.changes 2019-07-19 11:42:52.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Jul 19 08:56:40 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:42:39 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Tue Feb 26 11:42:31 UTC 2019 - José Iván López González <jlopez(a)suse.com>
- Version bump (bsc#1124009)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.1.0/package/yast2-vpn.spec new/yast2-vpn-4.2.1/package/yast2-vpn.spec
--- old/yast2-vpn-4.1.0/package/yast2-vpn.spec 2019-02-27 15:42:49.000000000 +0100
+++ new/yast2-vpn-4.2.1/package/yast2-vpn.spec 2019-07-19 11:42:52.000000000 +0200
@@ -12,28 +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-vpn
-Version: 4.1.0
+Version: 4.2.1
Release: 0
Url: https://github.com/yast/yast-vpn
Source0: %{name}-%{version}.tar.bz2
Summary: A YaST module for configuring VPN gateway and clients
License: GPL-2.0
Group: System/YaST
-BuildArch: noarch
-Requires: yast2
-Requires: yast2-ruby-bindings
+
BuildRequires: yast2
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
+BuildRequires: update-desktop-files
BuildRequires: yast2-ruby-bindings
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
PreReq: %fillup_prereq
+Requires: yast2
+Requires: yast2-ruby-bindings
+
+BuildArch: noarch
%description
A YaST module for managing VPN gateway and client connections to secure site-to-site communication via IPSec VPN.
@@ -42,22 +45,23 @@
%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%doc %yast_docdir
-%yast_desktopdir
-%yast_moduledir
-%yast_clientdir
-%yast_schemadir
-%yast_libdir
-%yast_scrconfdir
+%doc %{yast_docdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_moduledir}
+%{yast_clientdir}
+%{yast_schemadir}
+%{yast_libdir}
+%{yast_scrconfdir}
%{yast_icondir}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.1.0/src/desktop/org.opensuse.yast.VPN.desktop new/yast2-vpn-4.2.1/src/desktop/org.opensuse.yast.VPN.desktop
--- old/yast2-vpn-4.1.0/src/desktop/org.opensuse.yast.VPN.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-vpn-4.2.1/src/desktop/org.opensuse.yast.VPN.desktop 2019-07-19 11:42:52.000000000 +0200
@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact SUSE Linux GmbH.
+#
+# ------------------------------------------------------------------------------
+#
+# Authors: Howard Guo <hguo(a)suse.com>
+
+[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=vpn
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstResource=vpn
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-Keywords=vpn,ipsec,gateway
+
+Icon=yast-vpn
+Exec=xdg-su -c "/sbin/yast2 vpn"
+
+Name=YaST VPN
+GenericName=VPN Gateway and Clients
+Comment=Configure VPN gateway and clients using IPSec
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vpn-4.1.0/src/desktop/vpn.desktop new/yast2-vpn-4.2.1/src/desktop/vpn.desktop
--- old/yast2-vpn-4.1.0/src/desktop/vpn.desktop 2019-02-27 15:42:49.000000000 +0100
+++ new/yast2-vpn-4.2.1/src/desktop/vpn.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-# encoding: utf-8
-
-# ------------------------------------------------------------------------------
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact SUSE Linux GmbH.
-#
-# ------------------------------------------------------------------------------
-#
-# Authors: Howard Guo <hguo(a)suse.com>
-
-[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=vpn
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstResource=vpn
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-Keywords=vpn,ipsec,gateway
-
-Icon=yast-vpn
-Exec=xdg-su -c "/sbin/yast2 vpn"
-
-Name=VPN Gateway and Clients
-GenericName=Configure VPN gateway and clients using IPSec
-StartupNotify=true
1
0
Hello community,
here is the log from the commit of package yast2-configuration-management for openSUSE:Factory checked in at 2019-07-31 14:23:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-configuration-management (Old)
and /work/SRC/openSUSE:Factory/.yast2-configuration-management.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-configuration-management"
Wed Jul 31 14:23:40 2019 rev:12 rq:716958 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-configuration-management/yast2-configuration-management.changes 2019-03-06 19:02:20.145091822 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-configuration-management.new.4126/yast2-configuration-management.changes 2019-07-31 14:23:41.338416995 +0200
@@ -1,0 +2,15 @@
+Fri Jul 19 09:24:05 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:27:52 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-configuration-management-4.1.6.tar.bz2
New:
----
yast2-configuration-management-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-configuration-management.spec ++++++
--- /var/tmp/diff_new_pack.gd1sXQ/_old 2019-07-31 14:23:41.674416614 +0200
+++ /var/tmp/diff_new_pack.gd1sXQ/_new 2019-07-31 14:23:41.674416614 +0200
@@ -17,17 +17,19 @@
Name: yast2-configuration-management
-Version: 4.1.6
+Version: 4.2.1
Release: 0
+Url: https://github.com/yast/yast-migration
+Summary: YaST2 - YaST Configuration Management
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Url: http://github.com/yast/yast-migration
-
# CWM DateField and TimeField widgets
+BuildRequires: update-desktop-files
BuildRequires: yast2 >= 4.1.53
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-installation
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
@@ -38,35 +40,29 @@
BuildArch: noarch
-Summary: YaST2 - YaST Configuration Management
-License: GPL-2.0-only
-Group: System/YaST
-
%description
This package contains the YaST2 component for Configuration Management Provisioning.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_clientdir}/*.rb
-%{yast_libdir}/y2configuration_management
-%{yast_desktopdir}/*.desktop
-%{yast_schemadir}/autoyast/rnc/*.rnc
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-
-%dir %{yast_docdir}
+%doc %{yast_docdir}
%license COPYING
-%doc %{yast_docdir}/README.md
-%doc %{yast_docdir}/CONTRIBUTING.md
%changelog
++++++ yast2-configuration-management-4.1.6.tar.bz2 -> yast2-configuration-management-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.1.6/Dockerfile new/yast2-configuration-management-4.2.1/Dockerfile
--- old/yast2-configuration-management-4.1.6/Dockerfile 2019-03-04 10:25:34.000000000 +0100
+++ new/yast2-configuration-management-4.2.1/Dockerfile 2019-07-19 11:36:52.000000000 +0200
@@ -1,2 +1,2 @@
-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-configuration-management-4.1.6/package/yast2-configuration-management.changes new/yast2-configuration-management-4.2.1/package/yast2-configuration-management.changes
--- old/yast2-configuration-management-4.1.6/package/yast2-configuration-management.changes 2019-03-04 10:25:34.000000000 +0100
+++ new/yast2-configuration-management-4.2.1/package/yast2-configuration-management.changes 2019-07-19 11:36:52.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Jul 19 09:24:05 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Added "BuildRequires: update-desktop-files"
+- Related to the previous desktop file changes (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:27:52 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Thu Feb 28 19:22:52 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com>
- Fix $visibleIf condition evaluation when the left value is "false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.1.6/package/yast2-configuration-management.spec new/yast2-configuration-management-4.2.1/package/yast2-configuration-management.spec
--- old/yast2-configuration-management-4.1.6/package/yast2-configuration-management.spec 2019-03-04 10:25:34.000000000 +0100
+++ new/yast2-configuration-management-4.2.1/package/yast2-configuration-management.spec 2019-07-19 11:36:52.000000000 +0200
@@ -12,25 +12,27 @@
# 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-configuration-management
-Version: 4.1.6
+Version: 4.2.1
Release: 0
+Url: https://github.com/yast/yast-migration
+Summary: YaST2 - YaST Configuration Management
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Url: http://github.com/yast/yast-migration
-
# CWM DateField and TimeField widgets
BuildRequires: yast2 >= 4.1.53
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-installation
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
+BuildRequires: update-desktop-files
# CWM DateField and TimeField widgets
Requires: yast2 => 4.1.53
@@ -38,35 +40,29 @@
BuildArch: noarch
-Summary: YaST2 - YaST Configuration Management
-License: GPL-2.0-only
-Group: System/YaST
-
%description
This package contains the YaST2 component for Configuration Management Provisioning.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_clientdir}/*.rb
-%{yast_libdir}/y2configuration_management
-%{yast_desktopdir}/*.desktop
-%{yast_schemadir}/autoyast/rnc/*.rnc
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-
-%dir %{yast_docdir}
+%doc %{yast_docdir}
%license COPYING
-%doc %{yast_docdir}/README.md
-%doc %{yast_docdir}/CONTRIBUTING.md
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.1.6/src/desktop/configuration_management.desktop new/yast2-configuration-management-4.2.1/src/desktop/configuration_management.desktop
--- old/yast2-configuration-management-4.1.6/src/desktop/configuration_management.desktop 2019-03-04 10:25:34.000000000 +0100
+++ new/yast2-configuration-management-4.2.1/src/desktop/configuration_management.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-X-SuSE-YaST-Call=configuration_management
-
-X-SuSE-YaST-Group=Misc
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=false
-X-SuSE-YaST-AutoInstRequires=lan
-X-SuSE-YaST-AutoInstSchema=configuration_management.rnc
-X-SuSE-YaST-AutoInstResource=configuration_management
-X-SuSE-YaST-AutoInstClient=configuration_management_auto
-X-SuSE-YaST-Keywords=salt,privisioning,configuration_management
-
-Icon=yast-configuration-management
-Exec=/usr/bin/xdg-su -c "/sbin/yast2 configuration_management"
-
-Name=YaST2 Configuration Management
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.1.6/src/desktop/org.opensuse.yast.ConfigurationManagement.desktop new/yast2-configuration-management-4.2.1/src/desktop/org.opensuse.yast.ConfigurationManagement.desktop
--- old/yast2-configuration-management-4.1.6/src/desktop/org.opensuse.yast.ConfigurationManagement.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-configuration-management-4.2.1/src/desktop/org.opensuse.yast.ConfigurationManagement.desktop 2019-07-19 11:36:52.000000000 +0200
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+X-SuSE-YaST-Call=configuration_management
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-AutoInstClonable=false
+X-SuSE-YaST-AutoInstRequires=lan
+X-SuSE-YaST-AutoInstSchema=configuration_management.rnc
+X-SuSE-YaST-AutoInstResource=configuration_management
+X-SuSE-YaST-AutoInstClient=configuration_management_auto
+X-SuSE-YaST-Keywords=salt,privisioning,configuration_management
+
+Icon=yast-configuration-management
+Exec=/usr/bin/xdg-su -c "/sbin/yast2 configuration_management"
+
+Name=YaST Configuration Management
+GenericName=Configuration Management
+Comment= Manage System Configuration
1
0
Hello community,
here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2019-07-31 14:23:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old)
and /work/SRC/openSUSE:Factory/.yast2-devtools.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools"
Wed Jul 31 14:23:32 2019 rev:98 rq:716006 version:4.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2019-04-30 12:56:37.466202174 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-devtools.new.4126/yast2-devtools.changes 2019-07-31 14:23:35.590423516 +0200
@@ -1,0 +2,33 @@
+Wed Jul 17 07:25:46 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Fixed syntax error in the RPM macros causing
+ "line 53: [: missing `]'" error during package build
+- Related to the desktop file changes (boo#1084864)
+- 4.2.5
+
+-------------------------------------------------------------------
+Tue Jun 25 11:43:00 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Allow smooth adaptation of newer rubocop by adding defaults for
+ it (bsc#1139270)
+- 4.2.4
+
+-------------------------------------------------------------------
+Sat Jun 1 21:58:50 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Adapt to desktop file changes (boo#1084864)
+- 4.2.3
+
+-------------------------------------------------------------------
+Wed May 29 11:46:25 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Create a directory for metainfo files (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Mon May 20 15:28:02 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Generate metainfo appstream for desktop files (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
Old:
----
yast2-devtools-4.2.0.tar.bz2
New:
----
yast2-devtools-4.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-devtools.spec ++++++
--- /var/tmp/diff_new_pack.6H8izv/_old 2019-07-31 14:23:35.990423063 +0200
+++ /var/tmp/diff_new_pack.6H8izv/_new 2019-07-31 14:23:35.994423058 +0200
@@ -17,11 +17,13 @@
Name: yast2-devtools
-Version: 4.2.0
+Version: 4.2.5
Release: 0
-Url: http://github.com/yast/yast-devtools
+Url: https://github.com/yast/yast-devtools
+Summary: YaST2 - Development Tools
+License: GPL-2.0-or-later
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: automake
@@ -33,11 +35,8 @@
BuildRequires: perl-XML-Writer
BuildRequires: pkgconfig
BuildRequires: sgml-skel
-Requires: yast2-buildtools
-Summary: YaST2 - Development Tools
-License: GPL-2.0-or-later
-Group: System/YaST
+Requires: yast2-buildtools
BuildArch: noarch
@@ -75,7 +74,7 @@
modules and components (both ruby and C++).
%prep
-%setup -n yast2-devtools-%{version}
+%setup -q
%build
make -f Makefile.cvs all
@@ -84,32 +83,31 @@
make
%install
-make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/%{_prefix}/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2 -name "*.desktop"` ; do
+make install DESTDIR="%{buildroot}"
+[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR="%{buildroot}"
+for f in `find %{buildroot}%{_datadir}/applications/YaST2 -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
%if 0%{?qemu_user_space_build}
# disable testsuite on QEMU builds, will fail
-cat > "$RPM_BUILD_ROOT/%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
+cat > "%{buildroot}%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
Disabling testsuite on QEMU builds, as the userspace emulation
is not complete enough for yast2-core
EOF
%endif
# Change false to true in the following line when yast2 core is broken
-false && cat > "$RPM_BUILD_ROOT/%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
+false && cat > "%{buildroot}%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
When yast2 core is broken and the interpreter does not work,
submitting yast2-devtools with the flag file existing will
prevent ycp developers being flooded by testsuite failures.
EOF
-%fdupes %buildroot/%_prefix
+%fdupes %{buildroot}%{_prefix}
%files
-%defattr(-,root,root)
%dir %{_datadir}/emacs
%dir %{_datadir}/emacs/site-lisp
%{_datadir}/emacs/site-lisp/*ycp-mode.el
@@ -121,7 +119,6 @@
%{_datadir}/vim/site/ftdetect/ycp_filetype.vim
%dir %{_prefix}/lib/YaST2
%{_datadir}/cmake
-
%dir %{_datadir}/YaST2
%doc %{_datadir}/doc/packages/%{name}
%dir %{_prefix}/lib/YaST2/bin
@@ -143,11 +140,11 @@
%{_datadir}/YaST2/data/devtools/bin/gettextdomains
%{_datadir}/YaST2/data/devtools/bin/ycp_puttext
%{_datadir}/YaST2/data/devtools/data/rubocop_yast_style.yml
+%{_datadir}/YaST2/data/devtools/data/rubocop-0.71.0_yast_style.yml
%dir %{_datadir}/YaST2/control/
%{_datadir}/YaST2/control/control_to_glade.xsl
%files -n yast2-buildtools
-%defattr(-,root,root)
%{_sysconfdir}/rpm/macros.yast
%{_bindir}/y2tool
%{_datadir}/aclocal/*.m4
@@ -167,6 +164,7 @@
%{_datadir}/YaST2/data/devtools/data/YaST2.dict.txt
%{_datadir}/YaST2/data/devtools/bin/y2autoconf
%{_datadir}/YaST2/data/devtools/bin/y2automake
+%{_datadir}/YaST2/data/devtools/bin/y2metainfo
%license COPYING
%changelog
++++++ yast2-devtools-4.2.0.tar.bz2 -> yast2-devtools-4.2.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/build-tools/aclocal/y2autoconf.m4 new/yast2-devtools-4.2.5/build-tools/aclocal/y2autoconf.m4
--- old/yast2-devtools-4.2.0/build-tools/aclocal/y2autoconf.m4 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/build-tools/aclocal/y2autoconf.m4 2019-07-17 10:09:26.000000000 +0200
@@ -44,6 +44,7 @@
ydatadir=${yast2dir}/data
imagedir=${yast2dir}/images
icondir=\${prefix}/share/icons
+metainfodir=\${prefix}/share/metainfo
themedir=${yast2dir}/theme
localedir=${yast2dir}/locale
clientdir=${yast2dir}/clients
@@ -72,6 +73,7 @@
AC_SUBST(ydatadir)
AC_SUBST(imagedir)
AC_SUBST(icondir)
+AC_SUBST(metainfodir)
AC_SUBST(themedir)
AC_SUBST(localedir)
AC_SUBST(clientdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/build-tools/rpm/macros.yast new/yast2-devtools-4.2.5/build-tools/rpm/macros.yast
--- old/yast2-devtools-4.2.0/build-tools/rpm/macros.yast 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/build-tools/rpm/macros.yast 2019-07-17 10:09:26.000000000 +0200
@@ -7,6 +7,7 @@
%yast_ydatadir %{yast_dir}/data
%yast_imagedir %{yast_dir}/images
%yast_icondir %{_datadir}/icons
+%yast_metainfodir %{_datadir}/metainfo
%yast_themedir %{yast_dir}/theme
%yast_localedir %{yast_dir}/locale
%yast_clientdir %{yast_dir}/clients
@@ -102,6 +103,13 @@
fi \
%endif
+%yast_metainfo \
+ \
+ mkdir -p %{buildroot}%{yast_metainfodir}/ \
+ for f in $(%{_bindir}/find %{buildroot}/%{yast_desktopdir}/ -name '*.desktop') ; do \
+ %{yast_ydatadir}/devtools/bin/y2metainfo -f ${f} -l "%{license}" -o %{buildroot}/%{yast_metainfodir}/ -u "%{url}" -v "%{version}" \
+ done
+
%yast_desktop_files \
\
# on SUSE we use %%suse_update_desktop_file \
@@ -135,6 +143,6 @@
echo "Cannot install the package, no configure.{ac|in}.in or Rakefile found" 1>&2 \
exit 1 \
fi \
- if [ -d "%{buildroot}/%{yast_desktopdir}"]; then \
+ if [ -d "%{buildroot}/%{yast_desktopdir}" ]; then \
%yast_desktop_files \
fi \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/build-tools/scripts/Makefile.am new/yast2-devtools-4.2.5/build-tools/scripts/Makefile.am
--- old/yast2-devtools-4.2.0/build-tools/scripts/Makefile.am 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/build-tools/scripts/Makefile.am 2019-07-17 10:09:26.000000000 +0200
@@ -8,7 +8,8 @@
dist_pkgdata_SCRIPTS = \
y2autoconf \
y2automake \
- y2makepot
+ y2makepot \
+ y2metainfo
# This file should have 0644 perms, since it gets
# sourced by 'check-textdomain' and 'y2makepot'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/build-tools/scripts/y2metainfo new/yast2-devtools-4.2.5/build-tools/scripts/y2metainfo
--- old/yast2-devtools-4.2.0/build-tools/scripts/y2metainfo 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-4.2.5/build-tools/scripts/y2metainfo 2019-07-17 10:09:26.000000000 +0200
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+#
+# y2metainfo - Automatically generate appstream data for YaST modules based on
+# their desktop files
+# Based on upstream appstream spec:
+# https://www.freedesktop.org/wiki/Distributions/AppStream/
+#
+# Fixes: https://features.opensuse.org/319035
+#
+# Author: Stasiek Michalski <hellcp(a)opensuse.org>
+# Copyright 2019
+#
+
+require "rexml/document"
+require "optparse"
+
+options = {}
+
+OptionParser.new do |parser|
+ parser.banner = "Usage: y2metainfo [options]"
+ parser.on("-h", "--help", "Show this help message") do
+ puts parser
+ end
+ parser.on("-f", "--file FILEPATH", "The desktop file of the module") do |v|
+ options[:file] = v
+ end
+ parser.on("-l", "--license LICENSE", "The license of the module") do |v|
+ options[:license] = v
+ end
+ parser.on("-o", "--output DIRECTORY", "The output directory") do |v|
+ options[:output] = v
+ end
+ parser.on("-u", "--url URL", "The project url") do |v|
+ options[:url] = v
+ end
+ parser.on("-v", "--version VERSION", "Current version of the component") do |v|
+ options[:version] = v
+ end
+end.parse!
+
+def metainfo_gen(desktop, license, url, version)
+ output = ""
+ xml = REXML::Document.new
+ xml << REXML::XMLDecl.new("1.0", "UTF-8")
+ base = xml.add_element("component", "type" => "addon", "xmlns" => "https://specifications.freedesktop.org/metainfo/1.0")
+
+ file = File.open(desktop).read
+ data = Hash[file.scan(/(.*)?=\s*?(.*)/).map { |k,v| [k.strip, v.strip] }]
+ base.add_element("id").add_text(File.basename(desktop, ".desktop"))
+ # Exectutes based on id of desktop file https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-…
+ base.add_element("launchable", "type" => "desktop-id").add_text(File.basename(desktop))
+ data.select{ |x| x.start_with?("GenericName") }.each do |key, value|
+ name = base.add_element("name").add_text(value)
+ lang = (/(?<=\[).*(?=\])/).match(key)
+ name.add_attribute("xml:lang", lang) if lang
+ end
+ data.select{ |x| x.start_with?("Comment") }.each do |key, value|
+ name = base.add_element("summary").add_text(value)
+ lang = (/(?<=\[).*(?=\])/).match(key)
+ name.add_attribute("xml:lang", lang) if lang
+ end
+ cat = base.add_element("categories")
+ data["Categories"].split(";").each do |category|
+ cat.add_element("category").add_text(category)
+ end
+ rel = base.add_element("releases")
+ rel.add_element("release").add_attribute("version", version)
+ if data["Mimetype"]
+ mime = base.add_element("mimetypes")
+ data["Mimetype"].split(";").each do |mimetype|
+ mime.add_element("mimetype").add_text(mimetype)
+ end
+ end
+ if license
+ base.add_element("metadata_license").add_text(license)
+ base.add_element("project_license").add_text(license)
+ end
+ base.add_element("extends").add_text("org.opensuse.YaST")
+ if url
+ base.add_element("url", "type" => "homepage").add_text(url)
+ else
+ base.add_element("url", "type" => "homepage").add_text("https://yast.opensuse.org")
+ end
+ base.add_element("url", "type" => "bugtracker").add_text("https://bugzilla.opensuse.org")
+ base.add_element("update_contact").add_text("yast-devel(a)opensuse.org")
+
+ formatter = REXML::Formatters::Pretty.new(2)
+ formatter.compact = true
+ formatter.write(xml, output)
+ output
+end
+
+result = metainfo_gen(options[:file], options[:license], options[:url], options[:version])
+if options[:output] && options[:file]
+ filename = options[:output] + File.basename(options[:file], ".desktop") + ".metainfo.xml"
+ File.write(filename, result)
+elsif options[:file]
+ puts result
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/package/yast2-devtools.changes new/yast2-devtools-4.2.5/package/yast2-devtools.changes
--- old/yast2-devtools-4.2.0/package/yast2-devtools.changes 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/package/yast2-devtools.changes 2019-07-17 10:09:26.000000000 +0200
@@ -1,4 +1,37 @@
-------------------------------------------------------------------
+Wed Jul 17 07:25:46 UTC 2019 - Ladislav Slezák <lslezak(a)suse.cz>
+
+- Fixed syntax error in the RPM macros causing
+ "line 53: [: missing `]'" error during package build
+- Related to the desktop file changes (boo#1084864)
+- 4.2.5
+
+-------------------------------------------------------------------
+Tue Jun 25 11:43:00 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Allow smooth adaptation of newer rubocop by adding defaults for
+ it (bsc#1139270)
+- 4.2.4
+
+-------------------------------------------------------------------
+Sat Jun 1 21:58:50 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Adapt to desktop file changes (boo#1084864)
+- 4.2.3
+
+-------------------------------------------------------------------
+Wed May 29 11:46:25 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Create a directory for metainfo files (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
+Mon May 20 15:28:02 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Generate metainfo appstream for desktop files (fate#319035)
+- 4.2.1
+
+-------------------------------------------------------------------
Thu Apr 25 15:56:13 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
- Check if directory exists before updating desktop files (boo#1133433)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/package/yast2-devtools.spec new/yast2-devtools-4.2.5/package/yast2-devtools.spec
--- old/yast2-devtools-4.2.0/package/yast2-devtools.spec 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/package/yast2-devtools.spec 2019-07-17 10:09:26.000000000 +0200
@@ -12,16 +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-devtools
-Version: 4.2.0
+Version: 4.2.5
Release: 0
-Url: http://github.com/yast/yast-devtools
+Url: https://github.com/yast/yast-devtools
+Summary: YaST2 - Development Tools
+License: GPL-2.0-or-later
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: automake
@@ -33,11 +35,8 @@
BuildRequires: perl-XML-Writer
BuildRequires: pkgconfig
BuildRequires: sgml-skel
-Requires: yast2-buildtools
-Summary: YaST2 - Development Tools
-License: GPL-2.0-or-later
-Group: System/YaST
+Requires: yast2-buildtools
BuildArch: noarch
@@ -69,13 +68,12 @@
# weak dependency, "make pot" is usually not needed
Suggests: rubygem(gettext)
-
%description -n yast2-buildtools
Scripts and templates required for rebuilding the existing YaST2
modules and components (both ruby and C++).
%prep
-%setup -n yast2-devtools-%{version}
+%setup -q
%build
make -f Makefile.cvs all
@@ -84,32 +82,31 @@
make
%install
-make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/%{_prefix}/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2 -name "*.desktop"` ; do
+make install DESTDIR="%{buildroot}"
+[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR="%{buildroot}"
+for f in `find %{buildroot}%{_datadir}/applications/YaST2 -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
%if 0%{?qemu_user_space_build}
# disable testsuite on QEMU builds, will fail
-cat > "$RPM_BUILD_ROOT/%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
+cat > "%{buildroot}%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
Disabling testsuite on QEMU builds, as the userspace emulation
is not complete enough for yast2-core
EOF
%endif
# Change false to true in the following line when yast2 core is broken
-false && cat > "$RPM_BUILD_ROOT/%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
+false && cat > "%{buildroot}%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" <<EOF
When yast2 core is broken and the interpreter does not work,
submitting yast2-devtools with the flag file existing will
prevent ycp developers being flooded by testsuite failures.
EOF
-%fdupes %buildroot/%_prefix
+%fdupes %{buildroot}%{_prefix}
%files
-%defattr(-,root,root)
%dir %{_datadir}/emacs
%dir %{_datadir}/emacs/site-lisp
%{_datadir}/emacs/site-lisp/*ycp-mode.el
@@ -121,7 +118,6 @@
%{_datadir}/vim/site/ftdetect/ycp_filetype.vim
%dir %{_prefix}/lib/YaST2
%{_datadir}/cmake
-
%dir %{_datadir}/YaST2
%doc %{_datadir}/doc/packages/%{name}
%dir %{_prefix}/lib/YaST2/bin
@@ -143,12 +139,11 @@
%{_datadir}/YaST2/data/devtools/bin/gettextdomains
%{_datadir}/YaST2/data/devtools/bin/ycp_puttext
%{_datadir}/YaST2/data/devtools/data/rubocop_yast_style.yml
+%{_datadir}/YaST2/data/devtools/data/rubocop-0.71.0_yast_style.yml
%dir %{_datadir}/YaST2/control/
%{_datadir}/YaST2/control/control_to_glade.xsl
-
%files -n yast2-buildtools
-%defattr(-,root,root)
%{_sysconfdir}/rpm/macros.yast
%{_bindir}/y2tool
%{_datadir}/aclocal/*.m4
@@ -168,9 +163,7 @@
%{_datadir}/YaST2/data/devtools/data/YaST2.dict.txt
%{_datadir}/YaST2/data/devtools/bin/y2autoconf
%{_datadir}/YaST2/data/devtools/bin/y2automake
+%{_datadir}/YaST2/data/devtools/bin/y2metainfo
%license COPYING
-
-
-
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/ytools/y2tool/Makefile.am new/yast2-devtools-4.2.5/ytools/y2tool/Makefile.am
--- old/yast2-devtools-4.2.0/ytools/y2tool/Makefile.am 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/ytools/y2tool/Makefile.am 2019-07-17 10:09:26.000000000 +0200
@@ -15,4 +15,4 @@
tagversion
confdatadir = @YAST2DEVTOOLS@/data
-dist_confdata_DATA = rubocop_yast_style.yml
+dist_confdata_DATA = rubocop_yast_style.yml rubocop-0.71.0_yast_style.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/ytools/y2tool/rubocop-0.71.0_yast_style.yml new/yast2-devtools-4.2.5/ytools/y2tool/rubocop-0.71.0_yast_style.yml
--- old/yast2-devtools-4.2.0/ytools/y2tool/rubocop-0.71.0_yast_style.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-devtools-4.2.5/ytools/y2tool/rubocop-0.71.0_yast_style.yml 2019-07-17 10:09:26.000000000 +0200
@@ -0,0 +1,197 @@
+Layout/EndAlignment:
+ EnforcedStyleAlignWith: variable
+
+AllCops:
+ Exclude:
+ # avoid confusion of rpm spec and gem spec
+ - "**/*.spec"
+ TargetRubyVersion: 2.6
+
+Metrics/AbcSize:
+ Max: 30
+
+Metrics/LineLength:
+ Max: 100
+ # To make it possible to copy or click on URIs in the code, we allow lines
+ # contaning a URI to be longer than Max.
+ AllowURI: true
+ URISchemes:
+ - http
+ - https
+
+Layout/AlignHash:
+ EnforcedHashRocketStyle: table
+ EnforcedColonStyle: table
+
+Style/CollectionMethods:
+ Enabled: false
+
+Layout/EmptyLinesAroundBlockBody:
+ Enabled: false
+
+Layout/MultilineOperationIndentation:
+ EnforcedStyle: indented
+
+Style/StringLiterals:
+ EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+ EnforcedStyle: double_quotes
+
+Style/WordArray:
+ Enabled: false
+
+Style/SymbolArray:
+ EnforcedStyle: brackets
+
+Style/RegexpLiteral:
+ Enabled: false
+
+Style/SignalException:
+ EnforcedStyle: only_raise
+
+# Do not require an underscore each three digits. Both 65536 and 65_536 are allowed.
+Style/NumericLiterals:
+ Enabled: false
+
+# no extra indentation for multiline function calls.
+# Reason is that some legacy ruby API call have a lot of parameters and it makes
+# looking it ugly. Especially UI constructions with helpers cannot fit into line
+# lenght. Same applies to method calls separated by dot.
+# required style ( and by default forbidden by rubocop ):
+#
+# SmartClass.smart_method(boring_parameter1, boring_parameter2,
+# boring_parameter3, boring_parameter4)
+#
+# forbidden style ( require by default by rubocop )
+#
+# SmartClass.smart_method(boring_parameter1, boring_parameter2,
+# boring_parameter3, boring_parameter4)
+#
+Layout/AlignParameters:
+ EnforcedStyle: with_fixed_indentation
+Layout/AlignArguments:
+ EnforcedStyle: with_fixed_indentation
+Layout/MultilineMethodCallIndentation:
+ EnforcedStyle: indented
+
+# no extra indentation for case.
+# We prefer style
+# case a
+# when 0
+# action_a
+# when 1
+# action_b
+# else
+# action_c
+# end
+#
+# before longer and from our POV without advantage style which can confuse as it
+# indicate double nesting
+# case a
+# when 0
+# action_a
+# when 1
+# action_b
+# else
+# action_c
+# end
+Layout/CaseIndentation:
+ EnforcedStyle: end
+
+# "unless" has a different connotation than "if not" so disable this check
+Style/NegatedIf:
+ Enabled: false
+
+# allow more than 10 lines for methods as some team member feel unconfortable with it
+Metrics/MethodLength:
+ Max: 30
+
+# allow more than 100 lines for class as some team member feel unconfortable with it
+Metrics/ClassLength:
+ Max: 250
+
+# Allow using and/or for driving code flow as its original intention.
+# Forbid it only in conditionals
+# So this rule allow something like
+#
+# a = action_a or raise "Cannot do a"
+#
+# and forbids ( due to confusing operator precedence for work-flow and/or )
+#
+# if a == 5 and b == 6
+#
+Style/AndOr:
+ EnforcedStyle: conditionals
+
+# Access modified affect globally all following method definition, so
+# it deserve bigger visibility then hiddin in method definition block.
+# for that reason we found better style:
+# class C
+# ...
+#
+# private
+#
+# ...
+# end
+#
+# then style where access modifier can be easier to overlook in longer class:
+# class C
+# ...
+#
+# private
+#
+# ...
+# end
+Layout/AccessModifierIndentation:
+ EnforcedStyle: outdent
+
+# Forcing ascii only comments prevents examples in code that deal with UTF
+# strings so we allow using it
+Style/AsciiComments:
+ Enabled: false
+
+# YaST code still have to deal with types in component system, so we allow
+# double negation to enforce boolean value
+# so this change allow code
+#
+# return !!result
+#
+Style/DoubleNegation:
+ Enabled: false
+
+# alias method is more convenient method for method aliasing even when in class
+# context self scope is not so clear
+# see https://github.com/bbatsov/ruby-style-guide#alias-method-lexically
+# so force
+# class C
+# alias_method :a, :b
+#
+# instead of:
+# class C
+# alias b a
+Style/Alias:
+ EnforcedStyle: prefer_alias_method
+
+# often return code of shell call is compared and using `exitstatus == 0`
+# is more obvious then exitstatus.zero? especially when SCR can return nil
+Style/NumericPredicate:
+ Enabled: false
+
+# no strong preference if 5 == a or a == 5 should be enforced
+Style/YodaCondition:
+ Enabled: false
+
+# Do not enforce neither style of access modifiers as both are useful
+Style/AccessModifierDeclarations:
+ Enabled: false
+
+# when ternany is complex is should be clear enclosed in parentheses for easier read
+Style/TernaryParentheses:
+ EnforcedStyle: require_parentheses_when_complex
+
+# format string is not unified and depending on usage. All three usages has advantages
+# simple style is understandable for translators, but when there are more params it needs names.
+# And template version is needed if there are more params and it needs some formatting.
+Style/FormatStringToken:
+ Enabled: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.0/ytools/y2tool/rubocop_yast_style.yml new/yast2-devtools-4.2.5/ytools/y2tool/rubocop_yast_style.yml
--- old/yast2-devtools-4.2.0/ytools/y2tool/rubocop_yast_style.yml 2019-04-25 18:03:32.000000000 +0200
+++ new/yast2-devtools-4.2.5/ytools/y2tool/rubocop_yast_style.yml 2019-07-17 10:09:26.000000000 +0200
@@ -1,26 +1,13 @@
-################################################################################
-#
-# This part contains the shared Rubocop configuration for SUSE projects. It is
-# maintained at https://github.com/SUSE/style-guides/blob/master/rubocop-suse.yml
-#
-# NOTE: some rules have been commented out, see the YaST specific changes
-# at the end of the file!
-#
-################################################################################
-
Lint/EndAlignment:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#lintendalignment
AlignWith: variable
AllCops:
TargetRubyVersion: 2.1
Metrics/AbcSize:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricsabcsize
Max: 30
Metrics/LineLength:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength
Max: 100
# To make it possible to copy or click on URIs in the code, we allow lines
# contaning a URI to be longer than Max.
@@ -30,58 +17,37 @@
- https
Style/AlignHash:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignhash
EnforcedHashRocketStyle: table
EnforcedColonStyle: table
-# Disabled, see the YaST default at the end of the file
-#Style/AlignParameters:
-# StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignparamete…
-# Enabled: false
-
Style/CollectionMethods:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylecollectionmet…
Enabled: false
Style/EmptyLinesAroundBlockBody:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#styleemptylinesaro…
Enabled: false
Style/MultilineOperationIndentation:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylemultilineoper…
EnforcedStyle: indented
Style/StringLiterals:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliterals
EnforcedStyle: double_quotes
Style/StringLiteralsInInterpolation:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliteral…
EnforcedStyle: double_quotes
Style/WordArray:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-th…
Enabled: false
Style/RegexpLiteral:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-th…
Enabled: false
Style/SignalException:
- StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
EnforcedStyle: only_raise
# Do not require an underscore each three digits. Both 65536 and 65_536 are allowed.
Style/NumericLiterals:
- StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylenumericlitera…
Enabled: false
-################################################################################
-#
-# This part contains the YaST specific changes to the shared SUSE configuration
-#
-################################################################################
-
# no extra indentation for multiline function calls.
# Reason is that some legacy ruby API call have a lot of parameters and it makes
# looking it ugly. Especially UI constructions with helpers cannot fit into line
1
0
Hello community,
here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2019-07-31 14:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation-control.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation-control"
Wed Jul 31 14:23:25 2019 rev:26 rq:715611 version:4.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2019-05-05 21:16:47.552520922 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new.4126/yast2-installation-control.changes 2019-07-31 14:23:25.334432942 +0200
@@ -1,0 +2,14 @@
+Mon Jul 15 16:08:18 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Add the separate_vgs and separate_vg_name elements
+ (part of jsc#SLE-7238).
+- 4.2.4
+
+-------------------------------------------------------------------
+Fri Jul 12 15:54:21 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Add the delete_resize_configurable and allocate_volume_mode
+ elements to the partitioning section (part of jsc#SLE-7238).
+- 4.2.3
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-control-4.2.2.tar.bz2
New:
----
yast2-installation-control-4.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation-control.spec ++++++
--- /var/tmp/diff_new_pack.1umVYS/_old 2019-07-31 14:23:25.730432715 +0200
+++ /var/tmp/diff_new_pack.1umVYS/_new 2019-07-31 14:23:25.734432714 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation-control
-Version: 4.2.2
+Version: 4.2.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-control-4.2.2.tar.bz2 -> yast2-installation-control-4.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.2/control/control.rnc new/yast2-installation-control-4.2.4/control/control.rnc
--- old/yast2-installation-control-4.2.2/control/control.rnc 2019-04-29 17:15:10.000000000 +0200
+++ new/yast2-installation-control-4.2.4/control/control.rnc 2019-07-16 10:27:17.000000000 +0200
@@ -565,23 +565,30 @@
partitioning_proposal_elements =
ng_lvm?
+ & ng_separate_vgs?
& ng_resize_windows?
& ng_windows_delete_mode?
& ng_linux_delete_mode?
& ng_other_delete_mode?
& ng_lvm_vg_strategy?
& ng_lvm_vg_size?
+ & ng_delete_resize_configurable?
+ & ng_allocate_volume_mode?
& proposal_settings_editable?
ng_lvm = element lvm { BOOLEAN }
+ng_separate_vgs = element separate_vgs { BOOLEAN }
ng_resize_windows = element resize_windows { BOOLEAN }
ng_windows_delete_mode = element windows_delete_mode { SYMBOL, ng_delete_mode_enum }
ng_linux_delete_mode = element linux_delete_mode { SYMBOL, ng_delete_mode_enum }
ng_other_delete_mode = element other_delete_mode { SYMBOL, ng_delete_mode_enum }
ng_lvm_vg_strategy = element lvm_vg_strategy { SYMBOL, ng_lvm_vg_strategy_enum }
ng_lvm_vg_size = element lvm_vg_size { DISKSIZE }
+ng_delete_resize_configurable = element delete_resize_configurable { BOOLEAN }
+ng_allocate_volume_mode = element allocate_volume_mode { SYMBOL, ng_allocate_volume_mode_enum }
ng_delete_mode_enum = "none" | "ondemand" | "all"
+ng_allocate_volume_mode_enum = "auto" | "device"
ng_lvm_vg_strategy_enum = "use_available" | "use_needed" | "use_vg_size"
partitioning_volumes = element volumes {
@@ -616,6 +623,7 @@
& ng_btrfs_default_subvolume?
& ng_disable_order?
& ng_btrfs_read_only?
+ & ng_separate_vg_name?
ng_snapshots_size_or_percentage = ng_snapshots_size | ng_snapshots_percentage
@@ -644,6 +652,7 @@
ng_btrfs_default_subvolume = element btrfs_default_subvolume { text }
ng_disable_order = element disable_order { INTEGER }
ng_btrfs_read_only = element btrfs_read_only { BOOLEAN }
+ng_separate_vg_name = element separate_vg_name { text }
## Partitioning-related variables
partitioning = element partitioning {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.2/control/control.rng new/yast2-installation-control-4.2.4/control/control.rng
--- old/yast2-installation-control-4.2.2/control/control.rng 2019-04-29 17:15:10.000000000 +0200
+++ new/yast2-installation-control-4.2.4/control/control.rng 2019-07-16 10:27:17.000000000 +0200
@@ -1168,6 +1168,9 @@
<ref name="ng_lvm"/>
</optional>
<optional>
+ <ref name="ng_separate_vgs"/>
+ </optional>
+ <optional>
<ref name="ng_resize_windows"/>
</optional>
<optional>
@@ -1186,6 +1189,12 @@
<ref name="ng_lvm_vg_size"/>
</optional>
<optional>
+ <ref name="ng_delete_resize_configurable"/>
+ </optional>
+ <optional>
+ <ref name="ng_allocate_volume_mode"/>
+ </optional>
+ <optional>
<ref name="proposal_settings_editable"/>
</optional>
</interleave>
@@ -1195,6 +1204,11 @@
<ref name="BOOLEAN"/>
</element>
</define>
+ <define name="ng_separate_vgs">
+ <element name="separate_vgs">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
<define name="ng_resize_windows">
<element name="resize_windows">
<ref name="BOOLEAN"/>
@@ -1229,6 +1243,17 @@
<ref name="DISKSIZE"/>
</element>
</define>
+ <define name="ng_delete_resize_configurable">
+ <element name="delete_resize_configurable">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
+ <define name="ng_allocate_volume_mode">
+ <element name="allocate_volume_mode">
+ <ref name="SYMBOL"/>
+ <ref name="ng_allocate_volume_mode_enum"/>
+ </element>
+ </define>
<define name="ng_delete_mode_enum">
<choice>
<value>none</value>
@@ -1236,6 +1261,12 @@
<value>all</value>
</choice>
</define>
+ <define name="ng_allocate_volume_mode_enum">
+ <choice>
+ <value>auto</value>
+ <value>device</value>
+ </choice>
+ </define>
<define name="ng_lvm_vg_strategy_enum">
<choice>
<value>use_available</value>
@@ -1330,6 +1361,9 @@
<optional>
<ref name="ng_btrfs_read_only"/>
</optional>
+ <optional>
+ <ref name="ng_separate_vg_name"/>
+ </optional>
</interleave>
</define>
<define name="ng_snapshots_size_or_percentage">
@@ -1461,6 +1495,11 @@
<ref name="BOOLEAN"/>
</element>
</define>
+ <define name="ng_separate_vg_name">
+ <element name="separate_vg_name">
+ <text/>
+ </element>
+ </define>
<define name="partitioning">
<a:documentation>Partitioning-related variables</a:documentation>
<element name="partitioning">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.2/package/yast2-installation-control.changes new/yast2-installation-control-4.2.4/package/yast2-installation-control.changes
--- old/yast2-installation-control-4.2.2/package/yast2-installation-control.changes 2019-04-29 17:15:10.000000000 +0200
+++ new/yast2-installation-control-4.2.4/package/yast2-installation-control.changes 2019-07-16 10:27:17.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Jul 15 16:08:18 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Add the separate_vgs and separate_vg_name elements
+ (part of jsc#SLE-7238).
+- 4.2.4
+
+-------------------------------------------------------------------
+Fri Jul 12 15:54:21 UTC 2019 - David Diaz <dgonzalez(a)suse.com>
+
+- Add the delete_resize_configurable and allocate_volume_mode
+ elements to the partitioning section (part of jsc#SLE-7238).
+- 4.2.3
+
+-------------------------------------------------------------------
Thu Apr 25 13:26:09 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com>
- fix cpu_mitigations to allow selection(bsc#1098559)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-4.2.2/package/yast2-installation-control.spec new/yast2-installation-control-4.2.4/package/yast2-installation-control.spec
--- old/yast2-installation-control-4.2.2/package/yast2-installation-control.spec 2019-04-29 17:15:10.000000000 +0200
+++ new/yast2-installation-control-4.2.4/package/yast2-installation-control.spec 2019-07-16 10:27:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation-control
-Version: 4.2.2
+Version: 4.2.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
1
0
Hello community,
here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2019-07-31 14:23:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old)
and /work/SRC/openSUSE:Factory/.yast2-proxy.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-proxy"
Wed Jul 31 14:23:18 2019 rev:18 rq:714786 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2018-12-31 09:42:22.830413567 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-proxy.new.4126/yast2-proxy.changes 2019-07-31 14:23:20.806435525 +0200
@@ -1,0 +2,14 @@
+Thu Jul 4 13:49:19 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com>
+
+- Fix 'proxy' behaviour when running in firstboot (bsc#1140199).
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:58 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-proxy-4.1.0.tar.bz2
New:
----
yast2-proxy-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-proxy.spec ++++++
--- /var/tmp/diff_new_pack.59NKTp/_old 2019-07-31 14:23:21.270435260 +0200
+++ /var/tmp/diff_new_pack.59NKTp/_new 2019-07-31 14:23:21.274435258 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-proxy
#
-# 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,58 +17,55 @@
Name: yast2-proxy
-Version: 4.1.0
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Proxy Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-proxy
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-BuildRequires: yast2-buildtools >= 3.1.10
+BuildRequires: yast2
+BuildRequires: yast2-buildtools >= 4.2.2
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-BuildRequires: yast2
Requires: yast2
+Requires: yast2-ruby-bindings >= 1.0.0
# we split off that one
Conflicts: yast2-network < 2.22.6
BuildArch: noarch
-Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - Proxy Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
-Url: http://en.opensuse.org/Portal:YaST
-
%description
This package contains the YaST2 component for proxy configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_clientdir}/*.rb
-%{yast_libdir}/proxy
-%{yast_moduledir}/*.rb
-%{yast_yncludedir}/proxy
-%{yast_desktopdir}/*.desktop
-%{yast_scrconfdir}/*.scr
-%{yast_schemadir}/autoyast/rnc/proxy.rnc
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_moduledir}
+%{yast_yncludedir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_schemadir}
%{yast_icondir}
%license COPYING
-
%doc %{yast_docdir}
%changelog
++++++ yast2-proxy-4.1.0.tar.bz2 -> yast2-proxy-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/Dockerfile new/yast2-proxy-4.2.1/Dockerfile
--- old/yast2-proxy-4.1.0/Dockerfile 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/Dockerfile 2019-07-12 09:54:53.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-proxy-4.1.0/package/yast2-proxy.changes new/yast2-proxy-4.2.1/package/yast2-proxy.changes
--- old/yast2-proxy-4.1.0/package/yast2-proxy.changes 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/package/yast2-proxy.changes 2019-07-12 09:54:53.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Thu Jul 4 13:49:19 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com>
+
+- Fix 'proxy' behaviour when running in firstboot (bsc#1140199).
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:35:58 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Wed Dec 5 11:06:17 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-proxy-4.1.0/package/yast2-proxy.spec new/yast2-proxy-4.2.1/package/yast2-proxy.spec
--- old/yast2-proxy-4.1.0/package/yast2-proxy.spec 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/package/yast2-proxy.spec 2019-07-12 09:54:53.000000000 +0200
@@ -12,63 +12,60 @@
# 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-proxy
-Version: 4.1.0
+Version: 4.2.1
Release: 0
+Summary: YaST2 - Proxy Configuration
+License: GPL-2.0-or-later
+Group: System/YaST
+Url: https://github.com/yast/yast-proxy
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-BuildRequires: yast2-buildtools >= 3.1.10
+BuildRequires: yast2-buildtools >= 4.2.2
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-
BuildRequires: yast2
+
Requires: yast2
+Requires: yast2-ruby-bindings >= 1.0.0
# we split off that one
Conflicts: yast2-network < 2.22.6
BuildArch: noarch
-Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - Proxy Configuration
-License: GPL-2.0-or-later
-Group: System/YaST
-Url: http://en.opensuse.org/Portal:YaST
-
%description
This package contains the YaST2 component for proxy configuration.
%prep
-%setup -n %{name}-%{version}
+%setup -q
%check
-rake test:unit
+%yast_check
%build
%install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
%files
-%defattr(-,root,root)
-%{yast_clientdir}/*.rb
-%{yast_libdir}/proxy
-%{yast_moduledir}/*.rb
-%{yast_yncludedir}/proxy
-%{yast_desktopdir}/*.desktop
-%{yast_scrconfdir}/*.scr
-%{yast_schemadir}/autoyast/rnc/proxy.rnc
+%{yast_clientdir}
+%{yast_libdir}
+%{yast_moduledir}
+%{yast_yncludedir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
+%{yast_schemadir}
%{yast_icondir}
%license COPYING
-
%doc %{yast_docdir}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/desktop/org.opensuse.yast.Proxy.desktop new/yast2-proxy-4.2.1/src/desktop/org.opensuse.yast.Proxy.desktop
--- old/yast2-proxy-4.1.0/src/desktop/org.opensuse.yast.Proxy.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-proxy-4.2.1/src/desktop/org.opensuse.yast.Proxy.desktop 2019-07-12 09:54:53.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=proxy
+
+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=proxy
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=proxy.rnc
+X-SuSE-YaST-Keywords=network,internet,access
+
+Icon=yast-proxy
+Exec=xdg-su -c "/sbin/yast2 proxy"
+
+Name=YaST Proxy
+GenericName=Proxy
+Comment=Configure a proxy
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/desktop/proxy.desktop new/yast2-proxy-4.2.1/src/desktop/proxy.desktop
--- old/yast2-proxy-4.1.0/src/desktop/proxy.desktop 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/src/desktop/proxy.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=proxy
-
-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=proxy
-X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstSchema=proxy.rnc
-X-SuSE-YaST-Keywords=network,internet,access
-
-Icon=yast-proxy
-Exec=xdg-su -c "/sbin/yast2 proxy"
-
-Name=Proxy
-GenericName=Configure a proxy
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/include/proxy/dialogs.rb new/yast2-proxy-4.2.1/src/include/proxy/dialogs.rb
--- old/yast2-proxy-4.1.0/src/include/proxy/dialogs.rb 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/src/include/proxy/dialogs.rb 2019-07-12 09:54:53.000000000 +0200
@@ -376,7 +376,7 @@
# If modified, ask for confirmation
# @return true if abort is confirmed
def ReallyAbortCond
- !modified || Popup.ReallyAbort(true)
+ (!modified || installation?) || Popup.ReallyAbort(true)
end
# Proxy dialog
@@ -541,11 +541,9 @@
contents,
help,
Label.BackButton,
- Label.FinishButton
+ Label.NextButton
)
- Wizard.SetNextButton(:next, Label.OKButton)
- Wizard.SetAbortButton(:abort, Label.CancelButton)
- Wizard.HideBackButton
+ adjust_wizard_buttons unless installation?
# #103841, relaxed. now avoiding only quotes
# #337048 allow using space as well
@@ -752,5 +750,24 @@
deep_copy(ret)
end
+
+ private
+
+ # Sets OK/Cancel wizard buttons
+ def adjust_wizard_buttons
+ Wizard.SetNextButton(:next, Label.OKButton)
+ Wizard.SetAbortButton(:abort, Label.CancelButton)
+ Wizard.HideBackButton
+ 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?
+ Mode.installation || Mode.update
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/lib/proxy/auto_client.rb new/yast2-proxy-4.2.1/src/lib/proxy/auto_client.rb
--- old/yast2-proxy-4.1.0/src/lib/proxy/auto_client.rb 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/src/lib/proxy/auto_client.rb 2019-07-12 09:54:53.000000000 +0200
@@ -53,7 +53,7 @@
# Change configuration (run AutoSequence)
elsif @func == "Change"
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("proxy")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Proxy")
@ret = ProxyMainDialog(true)
UI.CloseDialog
# return required package list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-proxy-4.1.0/src/lib/proxy/client.rb new/yast2-proxy-4.2.1/src/lib/proxy/client.rb
--- old/yast2-proxy-4.1.0/src/lib/proxy/client.rb 2018-12-05 12:22:55.000000000 +0100
+++ new/yast2-proxy-4.2.1/src/lib/proxy/client.rb 2019-07-12 09:54:53.000000000 +0200
@@ -148,8 +148,7 @@
Proxy.Read
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("proxy")
- Wizard.SetNextButton(:next, Label.FinishButton)
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Proxy")
# main ui function
ret = ProxyMainDialog(true)
1
0