openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- 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
October 2014
- 1 participants
- 1615 discussions
Hello community,
here is the log from the commit of package yast2-slide-show for openSUSE:Factory checked in at 2014-10-02 14:13:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-slide-show (Old)
and /work/SRC/openSUSE:Factory/.yast2-slide-show.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-slide-show"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-slide-show/yast2-slide-show.changes 2014-09-24 13:10:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-slide-show.new/yast2-slide-show.changes 2014-10-02 14:14:29.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 1 13:41:47 UTC 2014 - ke(a)suse.de
+
+- 3.1.13
+- Update openSUSE slide show text by awafaa at opensuse org;
+ bnc#897929.
+
+-------------------------------------------------------------------
Old:
----
yast2-slide-show-3.1.12.tar.bz2
New:
----
yast2-slide-show-3.1.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-slide-show.spec ++++++
--- /var/tmp/diff_new_pack.b3vOBc/_old 2014-10-02 14:14:34.000000000 +0200
+++ /var/tmp/diff_new_pack.b3vOBc/_new 2014-10-02 14:14:34.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-slide-show
-Version: 3.1.12
+Version: 3.1.13
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-slide-show-3.1.12.tar.bz2 -> yast2-slide-show-3.1.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.12/MAINTAINER new/yast2-slide-show-3.1.13/MAINTAINER
--- old/yast2-slide-show-3.1.12/MAINTAINER 2014-09-23 17:46:11.000000000 +0200
+++ new/yast2-slide-show-3.1.13/MAINTAINER 2014-10-01 13:36:11.000000000 +0200
@@ -1 +1 @@
-Karl Eichwalder <ke(a)suse.de>
+Deprecated file. Use `osc maintainer yast2-slide-show` instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.12/SuSELinux/slideshow.xml new/yast2-slide-show-3.1.13/SuSELinux/slideshow.xml
--- old/yast2-slide-show-3.1.12/SuSELinux/slideshow.xml 2014-09-23 17:46:16.000000000 +0200
+++ new/yast2-slide-show-3.1.13/SuSELinux/slideshow.xml 2014-10-01 13:36:11.000000000 +0200
@@ -4,7 +4,7 @@
<!ENTITY suse "SUSE">
<!ENTITY suselinux "&suse; Linux">
<!ENTITY opensuse "openSUSE">
-<!ENTITY suse-version "12.3">
+<!ENTITY suse-version "13.2">
]>
<!-- <table cellspacing="10" cellpadding="5"> -->
<!-- <tr> -->
@@ -57,16 +57,16 @@
<para>
You can communicate more effectively with openSUSE &suse-version; because it
provides a complete set of tools for Web browsing and e-mail
-management—it even includes the newest Voice over IP technology.
+management — it even includes the newest Voice over IP technology.
</para>
-<para>openSUSE includes Mozilla Firefox, one of the best Web browsers
-in the world. Firefox includes all the features you need to enjoy
+<para>openSUSE &suse-version; includes Mozilla Firefox, one of the best Web
+browsers in the world. Firefox includes all the features you need to enjoy
the Web, including the newest HTML5 technologies. Firefox also boasts
lightning-fast performance, and a number of improvements designed to
protect your privacy and prevent phishing attacks.</para>
-<para>Also included with openSUSE are Evolution and Kontact,
+<para>Also included with openSUSE &suse-version; are Evolution and Kontact,
complete e-mail and contact management applications. For instant
messaging, openSUSE features easy to use IM clients that support all
of the popular protocols: AIM, Facebook, Google Talk, Jabber, MSN,
@@ -81,7 +81,7 @@
music library. Listen to your playlist online. Burn CDs or DVDs. Copy
your files to an iPod or media player and take your music anywhere. Manage
and edit digital pictures with powerful graphics editors. It's all easy
-with openSUSE.</para>
+with openSUSE &suse-version;.</para>
</section>
@@ -102,12 +102,11 @@
<title>Graphics, Graphics, Graphics</title>
<para>
-Using the tools in openSUSE, you can create or edit almost any type of
-graphic. For advanced image manipulation and graphics creation, use The
-GIMP a powerful tool for image retouching, composition, and
-authoring.</para>
+Using the tools in openSUSE &suse-version;, you can create or edit almost any
+type of graphic. For advanced image manipulation and graphics creation, use The
+GIMP a powerful tool for image retouching, composition, and authoring.</para>
-<para>For vector graphics, openSUSE includes Inkscape—a versatile
+<para>For vector graphics, openSUSE &suse-version; includes Inkscape — a versatile
graphics solution delivers support for transparent layers, bitmap tracing,
text paths and much more.
</para>
@@ -117,11 +116,10 @@
<section label="08_mobility">
<title>Computing On-the-Go</title>
- <para>openSUSE includes the most advanced mobility features. You
-can switch effortlessly between wireless and wired networks using
-NetworkManager from openSUSE. Connect with mobile devices like mobile
-phones and PDAs via Bluetooth, or use infrared ports to synchronize your
-data.</para>
+ <para>openSUSE &suse-version; includes the most advanced mobility features. You
+can switch effortlessly between wireless and wired networks using NetworkManager.
+Connect with mobile devices like mobile phones, tablets and PDAs via Bluetooth,
+or use infrared ports to synchronize your data.</para>
<para>The newest innovations in power management from openSUSE increase
your mobility and give you the freedom to take your work wherever you
@@ -135,15 +133,15 @@
<para>Help secure your system and data from Internet intruders with SUSE
Firewall. This security device is activated by default and easy to
-configure. But you can do even more to protect your system with openSUSE
-because it also includes AppArmor, the most effective and easy-to-use
-Linux application security system available today. AppArmor proactively
-protects your operating system and applications from internal or
+configure. But you can do even more to protect your system with openSUSE
+&suse-version; because it also includes AppArmor, the most effective and
+easy-to-use Linux application security system available today. AppArmor
+proactively protects your operating system and applications from internal or
external threats.</para>
<!-- for the online update feature, see bnc#793710 -->
-<para>In addition to SUSE Firewall and AppArmor, openSUSE also includes a
-special security patch update system. To ensure that the latest security
+<para>In addition to SUSE Firewall and AppArmor, openSUSE &suse-version; also
+includes a special security patch update system. To ensure that the latest security
patches are installed on your system, you can choose to perform an
online update at the end of this installation procedure (if you did not
choose the automatic installation modus at the beginning). And in the
@@ -156,10 +154,10 @@
<section label="10_devel">
<title>Virtualization Technology and Application Development Tools</title>
- <para>The Xen hypervisor is included with openSUSE. Xen is one of the most
-robust solutions for virtualization available. In addition, openSUSE provides
-tools for network file sharing (Samba, NFS, etc.), printing (CUPS) and Web
-hosting (Apache). For application development, openSUSE comes with a complete
+ <para>Both Xen and KVM hypervisors are included with openSUSE &suse-version;.
+Xen is one of the most robust solutions for virtualization available. In addition,
+openSUSE provides tools for network file sharing (Samba, NFS, etc.), printing (CUPS)
+and Web hosting (Apache). For application development, openSUSE comes with a complete
set of runtime environments plus extensive application development tools.
</para>
@@ -168,7 +166,7 @@
<section label="11_docs">
<title>Learn More</title>
<para>
-The openSUSE distribution provides extensive documentation for specific
+openSUSE &suse-version; provides extensive documentation for specific
openSUSE questions as well as general Linux-related questions. The Help
Center is accessible via the main menu. Manuals are also available in
PDF and can be downloaded and printed <!-- translator: check whether a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.12/package/yast2-slide-show.changes new/yast2-slide-show-3.1.13/package/yast2-slide-show.changes
--- old/yast2-slide-show-3.1.12/package/yast2-slide-show.changes 2014-09-23 17:46:16.000000000 +0200
+++ new/yast2-slide-show-3.1.13/package/yast2-slide-show.changes 2014-10-01 15:51:10.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Oct 1 13:41:47 UTC 2014 - ke(a)suse.de
+
+- 3.1.13
+- Update openSUSE slide show text by awafaa at opensuse org;
+ bnc#897929.
+
+-------------------------------------------------------------------
Tue Sep 23 15:33:42 UTC 2014 - ke(a)suse.de
- 3.1.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slide-show-3.1.12/package/yast2-slide-show.spec new/yast2-slide-show-3.1.13/package/yast2-slide-show.spec
--- old/yast2-slide-show-3.1.12/package/yast2-slide-show.spec 2014-09-23 17:46:16.000000000 +0200
+++ new/yast2-slide-show-3.1.13/package/yast2-slide-show.spec 2014-10-01 15:51:10.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-slide-show
-Version: 3.1.12
+Version: 3.1.13
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package california for openSUSE:Factory checked in at 2014-10-02 14:13:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/california (Old)
and /work/SRC/openSUSE:Factory/.california.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "california"
Changes:
--------
--- /work/SRC/openSUSE:Factory/california/california.changes 2014-08-25 11:05:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.california.new/california.changes 2014-10-02 14:14:22.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Oct 1 09:11:29 UTC 2014 - dimstar(a)opensuse.org
+
+- Update to version 0.2.0:
+ + F1 Help.
+ + Migrate to GTK+ 3.12.
+ + Quick Add improvements.
+ + Display recurring event information as plain language summary.
+ + Remove calendar from EDS.
+ + Various UI improvements.
+ + Updated translations.
+- Add yelp-tools BuildRequires: needed for the new help.
+
+-------------------------------------------------------------------
Old:
----
california-0.1.4.tar.xz
New:
----
california-0.2.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ california.spec ++++++
--- /var/tmp/diff_new_pack.tt4D0i/_old 2014-10-02 14:14:28.000000000 +0200
+++ /var/tmp/diff_new_pack.tt4D0i/_new 2014-10-02 14:14:28.000000000 +0200
@@ -17,21 +17,23 @@
Name: california
-Version: 0.1.4
+Version: 0.2.0
Release: 0
Summary: Calendar for GNOME 3
License: LGPL-2.1+
Group: Productivity/Office/Organizers
Url: https://wiki.gnome.org/Apps/California
-Source: http://download.gnome.org/sources/california/0.1/%{name}-%{version}.tar.xz
-BuildRequires: vala >= 0.22.1
-BuildRequires: intltool >= 0.35.0 desktop-file-utils
+Source: http://download.gnome.org/sources/california/0.2/%{name}-%{version}.tar.xz
+BuildRequires: desktop-file-utils
+BuildRequires: intltool >= 0.35.0
+BuildRequires: vala >= 0.24.0
+BuildRequires: yelp-tools
BuildRequires: pkgconfig(gee-0.8) >= 0.10.5
BuildRequires: pkgconfig(glib-2.0) >= 2.38.0
BuildRequires: pkgconfig(goa-1.0) >= 3.8.3
BuildRequires: pkgconfig(gobject-2.0) >= 2.38.0
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.38.0
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.7
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.2
BuildRequires: pkgconfig(libecal-1.2) >= 3.8.5
BuildRequires: pkgconfig(libgdata) >= 0.14.0
BuildRequires: pkgconfig(libsoup-2.4) >= 2.44
@@ -65,15 +67,16 @@
%desktop_database_postun
%glib2_gsettings_schema_postun
-
%files
%defattr(-,root,root)
%doc AUTHORS README COPYING NEWS
%{_bindir}/california
%dir %{_datadir}/appdata
+%{_datadir}/%{name}
%{_datadir}/appdata/california.appdata.xml
%{_datadir}/applications/california.desktop
%{_datadir}/glib-2.0/schemas/org.yorba.california.gschema.xml
%files lang -f %{name}.lang
+%changelog
++++++ california-0.1.4.tar.xz -> california-0.2.0.tar.xz ++++++
++++ 182877 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package codelite for openSUSE:Factory checked in at 2014-10-02 14:13:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/codelite (Old)
and /work/SRC/openSUSE:Factory/.codelite.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "codelite"
Changes:
--------
--- /work/SRC/openSUSE:Factory/codelite/codelite.changes 2014-03-20 07:04:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.codelite.new/codelite.changes 2014-10-02 14:14:18.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 23 16:26:01 UTC 2014 - sfalken(a)opensuse.org
+
+- Removed %wx_requires as it is no longer a valid macro
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ codelite.spec ++++++
--- /var/tmp/diff_new_pack.bOL0Oq/_old 2014-10-02 14:14:21.000000000 +0200
+++ /var/tmp/diff_new_pack.bOL0Oq/_new 2014-10-02 14:14:21.000000000 +0200
@@ -26,6 +26,7 @@
Url: http://codelite.org/
Source0: https://downloads.sourceforge.net/project/codelite/Mirrors/%{name}-%{versio…
Source1: %{name}.desktop
+Source2: %name-rpmlintrc
# PATCH-FIX-OPENSUSE codelite-date-time-usage-fix.patch fisiu(a)opensuse.org -- It removes usage of __DATE__ and __TIME__
Patch0: %{name}-date-time-usage-fix.patch
# PATCH-FEATURE-OPENSUSE codelite-disable-new-version-check.patch fisiu(a)opensuse.org -- Disable 'new version' check on startup
@@ -43,7 +44,6 @@
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libssh)
%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
Requires: xterm
Recommends: gcc
Recommends: wxWidgets-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lzip for openSUSE:Factory checked in at 2014-10-02 14:13:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lzip (Old)
and /work/SRC/openSUSE:Factory/.lzip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lzip"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lzip/lzip.changes 2013-10-11 15:33:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lzip.new/lzip.changes 2014-10-02 14:14:12.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Oct 1 11:07:33 UTC 2014 - jengelh(a)inai.de
+
+- Update to new upstream release 1.16
+* Compression ratio of option -9 has been slightly increased.
+* Compression time has been reduced by 4%.
+* `lzip -0` is now comparable in compression speed and ratio to
+ `gzip -6` (gzip's default compression level).
+* Copying of file dates, permissions, and ownership now behaves
+ like `cp -p`. (If the user ID or the group ID cannot be
+ duplicated, the file permission bits S_ISUID and S_ISGID are
+ cleared).
+* The license has been changed to GPL version 2 or later.
+
+-------------------------------------------------------------------
Old:
----
lzip-1.15.tar.gz
New:
----
lzip-1.16.tar.gz
lzip-1.16.tar.gz.sig
lzip.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lzip.spec ++++++
--- /var/tmp/diff_new_pack.CWMfV2/_old 2014-10-02 14:14:18.000000000 +0200
+++ /var/tmp/diff_new_pack.CWMfV2/_new 2014-10-02 14:14:18.000000000 +0200
@@ -2,7 +2,7 @@
#
# spec file for package lzip
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008-2013 Pascal Bleser <pascal.bleser(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -19,19 +19,18 @@
Name: lzip
-Version: 1.15
+Version: 1.16
Release: 0
Summary: Lossless Data Compressor based on the LZMA Algorithm
-License: GPL-3.0+
+License: GPL-2.0+
Group: Productivity/Archiving/Compression
Url: http://www.nongnu.org/lzip/lzip.html
-Source: http://mirrors.zerg.biz/nongnu/lzip/lzip-%{version}.tar.gz
+Source: http://download.savannah.gnu.org/releases/lzip/%name-%version.tar.gz
+Source2: http://download.savannah.gnu.org/releases/lzip/%name-%version.tar.gz.sig
+Source3: %name.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
-BuildRequires: glibc-devel
-BuildRequires: libstdc++-devel
-BuildRequires: make
PreReq: %install_info_prereq
%description
++++++ lzip-1.15.tar.gz -> lzip-1.16.tar.gz ++++++
++++ 8310 lines of diff (skipped)
++++++ lzip.keyring ++++++
pub 1024D/132D7742 2003-09-17
uid Antonio Diaz Diaz <antonio(a)gnu.org>
uid Antonio Diaz <ant_diaz(a)teleline.es>
sub 1024g/754578DA 2003-09-17
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mQGiBD9odIARBADkRI3Qc2qWpoxOFBlD8L5JaQlIEAaPI/19Y/z4ORHESY6s2Tfm
EtC51vlu8V/hXX8Sh4OZC3CrBIwhvSyIVIXbas+GR09B+8GRsfekRUS7jiwz/FsZ
Rnb0AjV1zNjJZazjyOUQjBou3Mo1MwiQXzeMQzqLC1xW+ABkAbQnAnZZIwCgvquq
rmQ1LKpBpYhb876T8x9TZIcD/2KTMvrvJVj+tKiRp6Wfiib8B4unllXAQ04hlul2
FP5oVIETdhQjsxj7/8F8yOONGgnL5Vn1+6sldd0LQ9il4MiZ36VFOec2xAeyYoB1
D3hup/zUTjzljj+JyKyGXahrwm0941QhYr+Kw/99dvE0pB8CsaQ5/e5R70uv7YnD
ZT9xA/wO4acdvGCLDw5ZPVKZW1rcgGL1Pr2nWCc92hv4SxdSWu3FU8aeGOVwJa2q
I/CwiEk2oEXI/WwTEf9mde3qlsc1SkRKgR0DDj+7Az5MUcilCUDv2BG2mLa+dEus
zwqLDPmjo2AWP1L2UIx7c46U9suvcGBwsI7NSnD9PLrvrUVGYrQjQW50b25pbyBE
aWF6IDxhbnRfZGlhekB0ZWxlbGluZS5lcz6IYQQTEQIAGQUCP2h0gAQLBwMCAxUC
AwMWAgECHgECF4AAEgkQj+mVAxMtd0IHZUdQRwABASgPAJ9FP48ts9GETKX1Kc6m
P6trpaMZdACfTNqHKHiG5qaFqp1dT93+iM4KMgu0I0FudG9uaW8gRGlheiBEaWF6
IDxhbnRvbmlvQGdudS5vcmc+iF4EExECAB4FAlGQyJkCGwMGCwkIBwMCAxUCAwMW
AgECHgECF4AACgkQj+mVAxMtd0IaIQCeM/BA/56UVtCPMlODGCuUiqQDluoAn2Sp
K4RybxL/e5aCNrnJg/kITt00uQENBD9odJIQBAC7Nr/BOCBOovFtIAnFufclBiUZ
1jC8kvNTC0i8vparh0WroyRCNfzYujc4H6zLbe/9hPhexSTR8GD0q3m2MxGnADpb
whHFrsMK+Tpk/dva7twlPWmwt4ZOl+wsmXRG9d6iDXdgVfThuXY009lY6TRUHlPW
CCe4zkjsRV0Sq9qy0wADBQQAh3FFwHKq2M9qfuykxlhMpDt2CbeiwnIeMpOHwXoV
cG8ahfxlaT1J9RnKIkzMJ9KSueyqWvjGrDfWAmoFbXgQ/rv82qmEMwKwmg75kzkt
elVlFMicqX1N1KT1Ttce0UAxuxd1Vi/SfMzJLbc0s4fHDdfnVZH7fgq+SM9F0DHc
qnuITgQYEQIABgUCP2h0kgASCRCP6ZUDEy13QgdlR1BHAAEBaHYAn1bocEx8GNyk
RG/RBe2octjFEFlNAKCMIurPIOzYo20sBAq7kIR9x8qvwQ==
=pg7M
-----END PGP PUBLIC KEY BLOCK-----
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2014-10-02 14:13:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rsyslog (Old)
and /work/SRC/openSUSE:Factory/.rsyslog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2014-09-30 19:42:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2014-10-02 14:14:09.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 1 08:44:57 UTC 2014 - mt(a)suse.de
+
+- Removed broken zpipe utility from diag-tools package (bnc#890228)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rsyslog.spec ++++++
--- /var/tmp/diff_new_pack.tSmiBh/_old 2014-10-02 14:14:12.000000000 +0200
+++ /var/tmp/diff_new_pack.tSmiBh/_new 2014-10-02 14:14:12.000000000 +0200
@@ -655,6 +655,8 @@
install -d -m0755 %{buildroot}/sbin
ln -sf %{_sbindir}/rsyslogd $RPM_BUILD_ROOT/sbin/rsyslogd
fi
+# it is simply broken (bnc#890228)
+rm -f $RPM_BUILD_ROOT%{_sbindir}/zpipe
#
%if %{with systemd} && ! %{with systemv}
install -m755 rsyslog-service-prepare %{buildroot}%{_sbindir}/
@@ -956,7 +958,6 @@
%defattr(-,root,root)
%{_sbindir}/msggen
%{_sbindir}/rsyslog_diag_hostname
-%{_sbindir}/zpipe
%{rsyslog_module_dir_nodeps}/imdiag.so
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package leptonica for openSUSE:Factory checked in at 2014-10-02 14:13:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/leptonica (Old)
and /work/SRC/openSUSE:Factory/.leptonica.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leptonica"
Changes:
--------
--- /work/SRC/openSUSE:Factory/leptonica/leptonica.changes 2014-01-30 11:28:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.leptonica.new/leptonica.changes 2014-10-02 14:14:05.000000000 +0200
@@ -1,0 +2,36 @@
+Sat Sep 27 06:01:17 UTC 2014 - lazy.kent(a)opensuse.org
+
+- Update to 1.71.
+ * This version supports tesseract 3.0.4. In particular, 3.0.4 has
+ automatic conversion of a set of scanned images, either in a
+ directory or coming directly from a scanner, into pdf with
+ injected text. This is something we've wanted to do for several
+ years!
+ * Improved jp2k header reading, including resolution.
+ * Removed src files: rotateorthlow.c, pdfio.c, pdfiostub.c.
+ * Renamed jp2kio.c, jp2kiostub.c ==> jp2kheader.c,
+ jp2kheaderstub.c. These header reading functions parse the jp2k
+ files, and don't require a jpeg2000 library.
+ * New jp2kio.c, jp2kiostub.c, that uses openjpeg-2.X to read and
+ write jp2k. We now support I/O from these formats: png, tiff,
+ jpeg, bmp, pnm, webp, gif and jp2k as well as writing to
+ PostScript and pdf.
+ * New pdfio1.c, pdfio1stub.c, pdfio2.c pdfio2stub.c, where we've
+ split functions into high and low level.
+ * Fixed memory bug in bilateral.c.
+ * Improved reading/write of binary data from file. For example,
+ l_binaryReadStream() can now be used to capture data piped in
+ via stdin.
+ * Font directory now arg passed in everywhere (not hardcoded).
+ * Don't write temporary files to /tmp; only to a small number of
+ subdirectories, to avoid spamming the /tmp directory. E.g., for
+ regression tests, the current output is now to /tmp/regout/.
+ * For jpeg reading modify pixReadJpeg() to take as a hint a bit
+ flag that allows extraction of only the luminance channel.
+ * Allow wrapping of pdf objects from png images without
+ transcoding.
+ * Better support for alpha on read/write with png, including 1
+ bpp with colormap, alpha (supported in png with transparency
+ array).
+
+-------------------------------------------------------------------
Old:
----
leptonica-1.70.tar.gz
New:
----
leptonica-1.71.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ leptonica.spec ++++++
--- /var/tmp/diff_new_pack.ftUBtM/_old 2014-10-02 14:14:09.000000000 +0200
+++ /var/tmp/diff_new_pack.ftUBtM/_new 2014-10-02 14:14:09.000000000 +0200
@@ -19,7 +19,7 @@
%define major 4
Name: leptonica
-Version: 1.70
+Version: 1.71
Release: 0
Summary: Leptonica Library
License: BSD-2-Clause
++++++ leptonica-1.70.tar.gz -> leptonica-1.71.tar.gz ++++++
/work/SRC/openSUSE:Factory/leptonica/leptonica-1.70.tar.gz /work/SRC/openSUSE:Factory/.leptonica.new/leptonica-1.71.tar.gz differ: char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2014-10-02 14:13:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2014-06-16 21:43:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2014-10-02 14:13:59.000000000 +0200
@@ -1,0 +2,87 @@
+Tue Sep 30 07:37:42 UTC 2014 - gber(a)opensuse.org
+
+- update to version 1.12.0
+ - Fix assumption that the display server is X when running scripts.
+ - Don't access .dmrc files until information from these files is
+ required.
+ - Don't check the logind CanGraphical seat property unless
+ login-check-graphical option is set to true. There are too many
+ cases of drivers that don't set the appropriate flags for this
+ feature to work.
+ - Make socket writing code used between greeter and daemon more
+ robust to errors.
+ - Fix small memory leaks.
+ - Improve logging messages.
+ - Test improvements.
+ - Rework logind code that gets session ID. The previous method
+ was racy and a change in lightdm 1.11.7 led to a lockup when
+ this race occurred.
+ - Handle CanGraphical property on logind seats
+ - Use logind to provide the list of seats to use. Deprecate the
+ old method of manually defining seats.
+ - Add --show-config option that shows combined configuration.
+ - Drop the surfaceflinger seat type. This was a temporary
+ solution while Ubuntu Phone was migrating to Mir.
+ - Add a seat option 'allow-user-switching' that can disable all
+ user switching for that seat
+ - Add a new session type 'mir-container' that allows the session
+ to run inside a custom system compositor
+ - Only seat0 takes VT from Plymouth
+ - Removed unused GAsyncResultIface.is_tagged as this attribute
+ was not available in earlier versions of Glib I/O.
+ - Abort autogen if yelp-tools not installed
+ - Return correct errors for D-Bus calls
+ - Make PAM services configurable
+ - Do timed autologin each time you are returned to the greeter
+ - Fix tests failing with Qt 5.3 due to it checking getuid/geteuid
+ which we are faking
+ - dm-tool: Warn if trying to switch to user without username
+ - Fix Mir sessions broken with unity-system-compositor 0.3.
+ - Add back Vala bindings for LightDM.Greeter.connect_sync - just
+ mark as deprecated.
+ - Put unity-system-compositor's mir_socket under /run rather than
+ /tmp.
+ - Fix building with clang (3.5) and -Werror.
+ - Correct section name in default users.conf file.
+ - Add liblightdm method to get user UID
+ - DBus-activate logind
+ - Check for libgcrypt at configure time
+ - Allow greeters to remain runing to reduce startup time when
+ switching to a greeter
+ - Add asynchronous methods to liblightdm
+ - When switching to an existing session refresh PAM credentials
+ and end session cleanly so no resources leak.
+ - Support new standard DesktopNames field in session files
+ - Set XDG_SESSION_TYPE and XDG_SESSION_DESKTOP as used by systemd
+ - Emit DBus PropertiesChanged when Sessions/Seats properties
+ change. Also add SessionAdded/SessionRemoved signals to Seat
+ interface
+
+-------------------------------------------------------------------
+Wed Sep 17 05:21:21 UTC 2014 - gber(a)opensuse.org
+
+- update to version 1.10.2
+ - Use logind to provide the list of seats to use
+ - Fix crash if running script hooks with non-X display servers
+ - Add a seat option 'allow-user-switching' that can disable all
+ user switching for that seat
+ - Make PAM services configurable
+ - Add liblightdm method to get user UID
+ - Add a new session type 'mir-container' that allows the session
+ to run inside a custom system compositor
+ - Add --show-config option that shows combined configuration
+ - Use XDG_SESSION_ID from PAM instead of using the logind D-Bus
+ API
+ - Make socket writing code used between greeter and daemon more
+ robust to errors
+ - Correct section name in default users.conf file
+ - Fix tests failing with Qt 5.3 due to it checking
+ getuid/geteuid which we are faking
+ - Fix small memory leaks
+ - Test improvements
+- fix users.conf section name
+- enable logind multiseat by default
+- configure lightdm to use the xdm PAM services directly instead of
+ symlinking them
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.10.1.tar.xz
New:
----
lightdm-1.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:03.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:03.000000000 +0200
@@ -27,13 +27,13 @@
%define rundir /run
Name: lightdm
-Version: 1.10.1
+Version: 1.12.0
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
Group: System/X11/Displaymanagers
Url: http://www.freedesktop.org/wiki/Software/LightDM
-Source0: https://launchpad.net/lightdm/1.10/%{version}/+download/%{name}-%{version}.…
+Source0: https://launchpad.net/lightdm/1.12/%{version}/+download/%{name}-%{version}.…
Source1: %{name}-greeter.pamd
Source2: X11-displaymanagers-%{name}
Source3: gdmflexiserver
@@ -200,8 +200,9 @@
# these are useless stubs for now
rm -rf %{buildroot}%{_datadir}/help/
-ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/lightdm
-ln -sf %{_sysconfdir}/pam.d/xdm-np %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
+# xdm and xdm-np are used instead
+rm %{buildroot}%{_sysconfdir}/pam.d/lightdm \
+ %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
ln data/lightdm.conf data/lightdm.conf.example
@@ -258,7 +259,7 @@
%dir %{_sysconfdir}/lightdm/
%config(noreplace) %{_sysconfdir}/lightdm/users.conf
%config(noreplace) %{_sysconfdir}/lightdm/keys.conf
-%config %{_sysconfdir}/pam.d/lightdm*
+%config %{_sysconfdir}/pam.d/lightdm-greeter
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%dir %{_libexecdir}/X11/displaymanagers/
%{_libexecdir}/X11/displaymanagers/lightdm
++++++ 50-suse-defaults.conf ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:03.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:03.000000000 +0200
@@ -1,7 +1,11 @@
[LightDM]
user-authority-in-system-dir=true
+logind-load-seats=true
[SeatDefaults]
+pam-service = xdm
+pam-autologin-service = xdm-np
+pam-greeter-service = lightdm-greeter
xserver-command=/usr/bin/X
session-wrapper=/etc/X11/xdm/Xsession
greeter-setup-script=/etc/X11/xdm/Xsetup
++++++ lightdm-1.10.1.tar.xz -> lightdm-1.12.0.tar.xz ++++++
++++ 22479 lines of diff (skipped)
++++++ lightdm-disable-utmp-handling.patch ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 6b8575b98c63d50bd0f8346222143586245430e0
+# Parent a952bffa87a4e7d533d0fa43396466b399c545bb
disable utmp handling since this is handled in the Xstartup/Xreset scripts
diff --git a/src/session-child.c b/src/session-child.c
@@ -25,7 +25,7 @@
static void
updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
@@ -219,6 +222,7 @@ updwtmpx (const gchar *wtmp_file, struct
-
+
updwtmp (wtmp_file, &u);
}
+#endif
@@ -48,7 +48,7 @@
}
/* Check account is valid */
-@@ -669,6 +675,7 @@ session_child_run (int argc, char **argv
+@@ -672,6 +678,7 @@ session_child_run (int argc, char **argv
/* Wait for the command to complete (blocks) */
if (child_pid > 0)
{
@@ -56,7 +56,7 @@
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -701,10 +708,10 @@ session_child_run (int argc, char **argv
+@@ -704,10 +711,10 @@ session_child_run (int argc, char **argv
endutxent ();
updwtmpx ("/var/log/wtmp", &ut);
}
@@ -69,7 +69,7 @@
/* Log to utmp */
if (g_strcmp0 (pam_getenv (pam_handle, "XDG_SESSION_CLASS"), "greeter") != 0)
{
-@@ -737,6 +744,7 @@ session_child_run (int argc, char **argv
+@@ -740,6 +747,7 @@ session_child_run (int argc, char **argv
endutxent ();
updwtmpx ("/var/log/wtmp", &ut);
}
++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -3,7 +3,7 @@
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -79,6 +79,7 @@ lightdm_CFLAGS = \
+@@ -75,6 +75,7 @@ lightdm_CFLAGS = \
$(WARN_CFLAGS) \
$(LIGHTDM_CFLAGS) \
-I"$(top_srcdir)/common" \
@@ -14,7 +14,7 @@
diff --git a/src/session-child.c b/src/session-child.c
--- a/src/session-child.c
+++ b/src/session-child.c
-@@ -610,6 +610,8 @@ session_child_run (int argc, char **argv
+@@ -613,6 +613,8 @@ session_child_run (int argc, char **argv
g_free (value);
}
++++++ lightdm-sysconfig-support.patch ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -39,7 +39,7 @@
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -71,7 +71,9 @@ lightdm_SOURCES = \
+@@ -67,7 +67,9 @@ lightdm_SOURCES = \
xdmcp-server.h \
xdmcp-session.c \
xdmcp-session.h \
@@ -61,9 +61,9 @@
#include "display-manager.h"
#include "xdmcp-server.h"
#include "vnc-server.h"
-@@ -63,6 +64,117 @@ typedef struct
+@@ -70,6 +71,117 @@ typedef struct
- #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager"
+ static gboolean update_login1_seat (Login1Seat *login1_seat);
+#define SYSCONFIG_DISPLAYMANAGER "/etc/sysconfig/displaymanager"
+#define SYSCONFIG_WINDOWMANAGER "/etc/sysconfig/windowmanager"
@@ -179,7 +179,7 @@
static void
log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data)
{
-@@ -1119,6 +1231,9 @@ main (int argc, char **argv)
+@@ -1378,6 +1490,9 @@ main (int argc, char **argv)
g_warning ("Failed to make cache directory %s: %s", dir, strerror (errno));
g_free (dir);
@@ -632,27 +632,33 @@
diff --git a/src/seat.c b/src/seat.c
--- a/src/seat.c
+++ b/src/seat.c
-@@ -1154,7 +1154,10 @@ create_greeter_session (Seat *seat)
+@@ -1235,9 +1235,14 @@ create_greeter_session (Seat *seat)
session_set_argv (SESSION (greeter_session), argv);
g_strfreev (argv);
-- greeter_set_pam_services (greeter_session, USER_SERVICE, AUTOLOGIN_SERVICE);
+- greeter_set_pam_services (greeter_session,
+- seat_get_string_property (seat, "pam-service"),
+- seat_get_string_property (seat, "pam-autologin-service"));
+ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login"))
-+ greeter_set_pam_services (greeter_session, AUTOLOGIN_SERVICE, AUTOLOGIN_SERVICE);
++ greeter_set_pam_services (greeter_session,
++ seat_get_string_property (seat, "pam-autologin-service"),
++ seat_get_string_property (seat, "pam-autologin-service"));
+ else
-+ greeter_set_pam_services (greeter_session, USER_SERVICE, AUTOLOGIN_SERVICE);
++ greeter_set_pam_services (greeter_session,
++ seat_get_string_property (seat, "pam-service"),
++ seat_get_string_property (seat, "pam-autologin-service"));
g_signal_connect (greeter_session, "create-session", G_CALLBACK (greeter_create_session_cb), seat);
g_signal_connect (greeter_session, "start-session", G_CALLBACK (greeter_start_session_cb), seat);
-@@ -1370,7 +1373,10 @@ seat_switch_to_user (Seat *seat, const g
+@@ -1468,7 +1473,10 @@ seat_switch_to_user (Seat *seat, const g
/* Attempt to authenticate them */
session = create_user_session (seat, username, FALSE);
g_signal_connect (session, "authentication-complete", G_CALLBACK (switch_authentication_complete_cb), seat);
-- session_set_pam_service (session, USER_SERVICE);
+- session_set_pam_service (session, seat_get_string_property (seat, "pam-service"));
+ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login"))
-+ session_set_pam_service (session, AUTOLOGIN_SERVICE);
++ session_set_pam_service (session, seat_get_string_property (seat, "pam-autologin-service"));
+ else
-+ session_set_pam_service (session, USER_SERVICE);
- session_start (session);
++ session_set_pam_service (session, seat_get_string_property (seat, "pam-service"));
- return FALSE;
+ return session_start (session);
+ }
++++++ lightdm-use-run-dir.patch ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 7809b3dab31692d7d1eeb9de16aa2f58cc0872b1
+# Parent b89fc72d8538bc8c27fbbec89408015d7095dc3b
Use /run instead of localstatedir/run/lightdm
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -83,7 +83,7 @@ lightdm_CFLAGS = \
+@@ -79,7 +79,7 @@ lightdm_CFLAGS = \
-DSBIN_DIR=\"$(sbindir)\" \
-DUSERS_DIR=\"$(localstatedir)/lib/lightdm-data\" \
-DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
++++++ lightdm-xauthlocalhostname-support.patch ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -3,18 +3,18 @@
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
-@@ -290,6 +290,7 @@ seat_xlocal_run_script (Seat *seat, Disp
- path = x_server_local_get_authority_file_path (x_server);
- process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));
- process_set_env (script, "XAUTHORITY", path);
-+ process_set_env (script, "XAUTHLOCALHOSTNAME", g_get_host_name ());
+@@ -350,6 +350,7 @@ seat_xlocal_run_script (Seat *seat, Disp
+ path = x_server_local_get_authority_file_path (x_server);
+ process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));
+ process_set_env (script, "XAUTHORITY", path);
++ process_set_env (script, "XAUTHLOCALHOSTNAME", g_get_host_name ());
+ }
SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display_server, script);
- }
diff --git a/src/x-server-local.c b/src/x-server-local.c
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
-@@ -147,14 +147,15 @@ XServerLocal *
+@@ -150,14 +150,15 @@ XServerLocal *
x_server_local_new (void)
{
XServerLocal *self;
@@ -42,8 +42,8 @@
+#include "x-server-local.h"
struct XServerPrivate
- {
-@@ -167,6 +168,8 @@ x_server_connect_session (DisplayServer
+ {
+@@ -169,6 +170,8 @@ x_server_connect_session (DisplayServer
else
l_debug (session, "Not setting XDG_VTNR");
++++++ users.conf ++++++
--- /var/tmp/diff_new_pack.q12DEg/_old 2014-10-02 14:14:04.000000000 +0200
+++ /var/tmp/diff_new_pack.q12DEg/_new 2014-10-02 14:14:04.000000000 +0200
@@ -8,7 +8,7 @@
# hidden-users = Users that are not shown to the user
# hidden-shells = Shells that indicate a user cannot login
#
-[UserAccounts]
+[UserList]
minimum-uid=1000
hidden-users=nobody
hidden-shells=/bin/false /sbin/nologin
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2014-10-02 14:13:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2014-09-28 19:58:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2014-10-02 14:13:46.000000000 +0200
@@ -1,0 +2,84 @@
+Thu Oct 2 09:39:19 CEST 2014 - ms(a)suse.de
+
+- v7.01.5 released
+
+-------------------------------------------------------------------
+Wed Oct 1 17:27:42 CEST 2014 - ms(a)suse.de
+
+- Fixed use of zypper package cache
+
+ For unknown reasons zypper removes the pkg-cache-dir when
+ calling the addrepo command. Because this is unwanted kiwi
+ temporarly moves the current cache dir and moves it back
+ after the addrepo call is done
+
+-------------------------------------------------------------------
+Wed Oct 1 16:03:00 CEST 2014 - ms(a)suse.de
+
+- DB: rebuild documentation
+
+-------------------------------------------------------------------
+Wed Oct 1 12:27:54 CEST 2014 - ms(a)suse.de
+
+- DB: update documentation
+
+ first review by the documentation department
+
+-------------------------------------------------------------------
+Tue Sep 30 17:28:48 CEST 2014 - ms(a)suse.de
+
+- v7.01.4 released
+
+-------------------------------------------------------------------
+Tue Sep 30 16:56:20 CEST 2014 - ms(a)suse.de
+
+- Added support for custom boxname for vagrant images (bnc #896205)
+
+ By default the name set to the vagrant .json file is the name
+ of the image as specified in the kiwi XML description. However,
+ in the world of https://vagrantcloud.com/, the convention for
+ "fully-qualified" box names is "ORGANIZATION/BOXNAME" which does
+ not apply to a standard kiwi image name. With the new boxname
+ attribute people can now specify the name of the box to be
+ vagrantcloud conform. e.g
+
+ <vagrantconfig ... boxname="opensuse/minimal-13.1"/>
+
+-------------------------------------------------------------------
+Tue Sep 30 16:17:28 CEST 2014 - ms(a)suse.de
+
+- v7.01.3 released
+
+-------------------------------------------------------------------
+Tue Sep 30 11:38:58 CEST 2014 - ms(a)suse.de
+
+- Add error message to log file if downloadFile failed
+
+-------------------------------------------------------------------
+Tue Sep 30 11:38:18 CEST 2014 - ms(a)suse.de
+
+- Fixed uninstall make target
+
+ Delete /dev/shm/lwp-download created by kiwi
+
+-------------------------------------------------------------------
+Tue Sep 30 10:12:43 CEST 2014 - ms(a)suse.de
+
+- v7.01.2 released
+
+-------------------------------------------------------------------
+Tue Sep 30 10:06:49 CEST 2014 - ms(a)suse.de
+
+- DB: rebuild documentation for version 7
+
+-------------------------------------------------------------------
+Tue Sep 30 09:59:59 CEST 2014 - ms(a)suse.de
+
+- Branch created for SLE12, master open for development at version 7
+
+-------------------------------------------------------------------
+Mon Sep 29 22:13:44 CEST 2014 - ms(a)suse.de
+
+- Fixed use of uninitialized value $time
+
+-------------------------------------------------------------------
@@ -185,0 +270,5 @@
+
+-------------------------------------------------------------------
+Tue Sep 16 01:20:31 CEST 2014 - schwab(a)suse.de
+
+- linuxefi only exists in grub2 on x86
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.lCOdPX/_old 2014-10-02 14:13:50.000000000 +0200
+++ /var/tmp/diff_new_pack.lCOdPX/_new 2014-10-02 14:13:50.000000000 +0200
@@ -26,7 +26,7 @@
Group: System/Management
Url: http://github.com/openSUSE/kiwi
Name: kiwi
-Version: 5.06.165
+Version: 7.01.5
Release: 0
Provides: kiwi-image:lxc
Provides: kiwi-image:tbz
++++++ kiwi-docu.tar.bz2 ++++++
++++ 39950 lines of diff (skipped)
++++++ kiwi-repo.tar.bz2 ++++++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2014-09-17 16:25:06.000000000 +0200
+++ new/kiwi/.revision 2014-09-16 14:54:54.000000000 +0200
@@ -1 +1 @@
-6a1c9d1ec096f8734d3408625513abf1607a8615
+a7498fcf3652f7de59df10d349b2b501f069d379
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/Makefile new/kiwi/Makefile
--- old/kiwi/Makefile 2014-08-29 22:30:35.000000000 +0200
+++ new/kiwi/Makefile 2014-09-30 11:33:37.000000000 +0200
@@ -281,6 +281,7 @@
rm -f /usr/sbin/kiwi
rm -f /usr/share/emacs/site-lisp/suse-start-kiwi-mode.el
rm -f /etc/bash_completion.d/kiwi.sh
+ rm -f /dev/shm/lwp-download
build:
./.doit -p --local
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2014-09-26 10:22:22.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2014-10-02 09:39:15.000000000 +0200
@@ -1130,6 +1130,7 @@
my $this = shift;
my $url = shift;
my $dest = shift;
+ my $kiwi = $this->{kiwi};
my $dirname;
my $basename;
my $proxy;
@@ -1211,6 +1212,7 @@
}
my $LWP = FileHandle -> new();
if (! $LWP -> open (">$lwp")) {
+ $kiwi->loginfo("downloadFile::Failed to create $lwp: $!");
return;
}
if ($proxy) {
@@ -1224,6 +1226,7 @@
my $locator = KIWILocator -> instance();
my $lwpload = $locator -> getExecPath ('lwp-download');
if (! $lwpload) {
+ $kiwi->loginfo("downloadFile::Can't find lwp-download");
return;
}
print $LWP $lwpload.' "$1" "$2"'."\n";
@@ -1235,6 +1238,7 @@
# the download
# ----
KIWIQX::qxx ("chmod a+x $lwp 2>&1");
+ KIWIQX::qxx ("chmod a+w $lwp 2>&1");
$dest = $dirname."/".$basename;
my $data = KIWIQX::qxx ("$lwp $url $dest 2>&1");
my $code = $? >> 8;
@@ -1831,7 +1835,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.06.165";
+ $data{Version} = "7.01.5";
$data{Publisher} = "SUSE LINUX GmbH";
$data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm
--- old/kiwi/modules/KIWIImageFormat.pm 2014-09-09 13:19:25.000000000 +0200
+++ new/kiwi/modules/KIWIImageFormat.pm 2014-09-30 16:55:41.000000000 +0200
@@ -533,6 +533,10 @@
foreach my $vgc (@{$vgclist}) {
my $box = $this->{image};
my $provider = $vgc -> getProvider();
+ my $boxname = $vgc -> getBoxName();
+ if (! $boxname) {
+ $boxname = $xml -> getImageName();
+ }
$kiwi -> info ("Creating vagrant box for $provider provider\n");
#==========================================
# create vagrant image
@@ -603,7 +607,7 @@
$providers->[0]->{url} = basename $box;
$versions->[0]->{version} = $pref -> getVersion();
$versions->[0]->{providers} = $providers;
- $json_data{name} = $xml -> getImageName();
+ $json_data{name} = $boxname;
$json_data{description} = $desc -> getSpecificationDescript();
$json_data{description} =~ s/[\n\t]+//g;
$json_data{versions} = $versions;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2014-09-26 10:22:22.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2014-09-30 09:22:59.000000000 +0200
@@ -2874,8 +2874,12 @@
# activate secure boot if required
#--------------------------------------
if [ "$kiwi_firmware" = "uefi" ];then
- echo "GRUB_USE_LINUXEFI=true" >> $inst_default_grub
- echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub
+ case $arch in
+ i?86|x86_64)
+ echo "GRUB_USE_LINUXEFI=true" >> $inst_default_grub
+ echo "GRUB_USE_INITRDEFI=true" >> $inst_default_grub
+ ;;
+ esac
fi
#======================================
# write vesa vga setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManagerZypper.pm new/kiwi/modules/KIWIManagerZypper.pm
--- old/kiwi/modules/KIWIManagerZypper.pm 2014-09-26 10:22:22.000000000 +0200
+++ new/kiwi/modules/KIWIManagerZypper.pm 2014-10-01 17:25:20.000000000 +0200
@@ -369,8 +369,14 @@
if (! $chroot) {
if (! $repo_exists) {
$kiwi -> info ("Adding bootstrap zypper service: $alias");
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packages /var/cache/kiwi/packs"
+ );
$data = KIWIQX::qxx ("@zypper --root \"$root\" $sadd 2>&1");
$code = $? >> 8;
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packs /var/cache/kiwi/packages"
+ );
} else {
$kiwi -> info ("Updating bootstrap zypper service: $alias");
$data = KIWIQX::qxx (
@@ -395,8 +401,14 @@
my @zypper= @{$this->{zypper_chroot}};
if (! $repo_exists) {
$kiwi -> info ("Adding chroot zypper service: $alias");
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packages /var/cache/kiwi/packs"
+ );
$data = KIWIQX::qxx ("@kchroot @zypper $sadd 2>&1");
$code = $? >> 8;
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packs /var/cache/kiwi/packages"
+ );
} else {
$kiwi -> info ("Updating chroot zypper service: $alias");
$data = KIWIQX::qxx (
@@ -417,9 +429,15 @@
$kiwi -> done ();
if (($source{$alias}{imgincl}) && (! -f $imgRepo)) {
$kiwi -> info ("Adding $alias repo to image");
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packages /var/cache/kiwi/packs"
+ );
$sadd =~ s/--keep-packages//;
$data = KIWIQX::qxx ("@kchroot zypper $sadd 2>&1");
$code = $? >> 8;
+ KIWIQX::qxx(
+ "mv /var/cache/kiwi/packs /var/cache/kiwi/packages"
+ );
if ($code != 0) {
$kiwi -> failed ();
$kiwi -> error ("zypper: $data");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc 2014-09-12 12:41:26.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rnc 2014-09-30 16:44:22.000000000 +0200
@@ -2563,9 +2563,20 @@
]
]
attribute virtualsize { xsd:nonNegativeInteger }
+ k.vagrantconfig.boxname.attribute =
+ ## The boxname as it's written into the json file
+ ## If not specified the image name is used
+ [
+ db:para [
+ "The boxname as it's written into the json file."
+ "If not specified the image name is used."
+ ]
+ ]
+ attribute boxname { text }
k.vagrantconfig.attlist =
k.vagrantconfig.provider.attribute &
- k.vagrantconfig.virtualsize.attribute
+ k.vagrantconfig.virtualsize.attribute &
+ k.vagrantconfig.boxname.attribute?
k.vagrantconfig =
## Specifies the Vagrant configuration section
[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng 2014-09-12 12:41:26.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rng 2014-09-30 16:44:29.000000000 +0200
@@ -3659,10 +3659,20 @@
<data type="nonNegativeInteger"/>
</attribute>
</define>
+ <define name="k.vagrantconfig.boxname.attribute">
+ <attribute name="boxname">
+ <a:documentation>The boxname as it's written into the json file
+If not specified the image name is used</a:documentation>
+ <db:para>The boxname as it's written into the json file.If not specified the image name is used.</db:para>
+ </attribute>
+ </define>
<define name="k.vagrantconfig.attlist">
<interleave>
<ref name="k.vagrantconfig.provider.attribute"/>
<ref name="k.vagrantconfig.virtualsize.attribute"/>
+ <optional>
+ <ref name="k.vagrantconfig.boxname.attribute"/>
+ </optional>
</interleave>
</define>
<define name="k.vagrantconfig">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm
--- old/kiwi/modules/KIWIXML.pm 2014-09-17 16:25:06.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2014-09-30 16:49:06.000000000 +0200
@@ -2962,6 +2962,8 @@
my @vagrantConfigData;
for my $vagrantConfig (@vagrantConfigNodes) {
my %vagrantConfigSet;
+ $vagrantConfigSet{boxname} =
+ $vagrantConfig -> getAttribute('boxname');
$vagrantConfigSet{provider} =
$vagrantConfig -> getAttribute('provider');
$vagrantConfigSet{virtual_size} =
@@ -5876,7 +5878,7 @@
my $TFD = FileHandle -> new();
if ($TFD -> open ("$index.timestamp")) {
my $curstamp = <$TFD>; chomp $curstamp; $TFD -> close();
- if ($curstamp eq $time) {
+ if (($time) && ($curstamp eq $time)) {
$kiwi -> done();
unlink $repoMD;
return $index;
@@ -5915,9 +5917,9 @@
#==========================================
# Store new time stamp
#------------------------------------------
- if (! open ($RXML, '>', "$index.timestamp")) {
+ if ((! $time) || (! open ($RXML, '>', "$index.timestamp"))) {
$kiwi -> failed ();
- $kiwi -> error ("--> Failed to create timestamp: $!");
+ $kiwi -> error ("--> Failed to create timestamp: $index.timestamp");
$kiwi -> failed ();
unlink $repoMD;
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLVagrantConfigData.pm new/kiwi/modules/KIWIXMLVagrantConfigData.pm
--- old/kiwi/modules/KIWIXMLVagrantConfigData.pm 2014-08-29 22:30:36.000000000 +0200
+++ new/kiwi/modules/KIWIXMLVagrantConfigData.pm 2014-09-30 16:49:46.000000000 +0200
@@ -46,6 +46,7 @@
# this = {
# provider = ''
# virtual_size = ''
+ # boxname = ''
# }
# ---
#==========================================
@@ -63,6 +64,7 @@
my %keywords = map { ($_ => 1) } qw(
provider
virtual_size
+ boxname
);
$this->{supportedKeywords} = \%keywords;
if (! $this -> p_isInitHashRef($init) ) {
@@ -73,6 +75,7 @@
}
$this->{provider} = $init->{provider};
$this->{virtual_size} = $init->{virtual_size};
+ $this->{boxname} = $init->{boxname};
return $this;
}
@@ -119,6 +122,37 @@
}
#==========================================
+# getBoxName
+#------------------------------------------
+sub getBoxName {
+ # ...
+ # Return the setting for the boxname configuration
+ # ---
+ my $this = shift;
+ return $this->{boxname};
+}
+
+#==========================================
+# setBoxName
+#------------------------------------------
+sub setBoxName {
+ # ...
+ # Set the boxname attribute, if called with no argument the
+ # attribute is erased
+ # ---
+ my $this = shift;
+ my $val = shift;
+ if (! $val) {
+ if ($this->{boxname}) {
+ delete $this->{boxname};
+ }
+ } else {
+ $this->{boxname} = $val;
+ }
+ return $this;
+}
+
+#==========================================
# setVirtualSize
#------------------------------------------
sub setVirtualSize {
@@ -149,6 +183,10 @@
my $element = XML::LibXML::Element -> new('vagrantconfig');
my $provider = $this -> getProvider();
my $vsize = $this -> getVirtualSize();
+ my $boxname = $this -> getBoxName();
+ if ($boxname) {
+ $element -> setAttribute('boxname', $provider);
+ }
if ($provider) {
$element -> setAttribute('provider', $provider);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm new/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm
--- old/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm 2014-08-29 22:30:36.000000000 +0200
+++ new/kiwi/tests/unit/lib/Test/kiwiXMLVagrantConfigData.pm 2014-09-30 16:52:49.000000000 +0200
@@ -26,7 +26,6 @@
use KIWIXMLVagrantConfigData;
-
#==========================================
# Constructor
#------------------------------------------
@@ -139,6 +138,36 @@
}
#==========================================
+# test_getBoxName
+#------------------------------------------
+sub test_getBoxName {
+ # ...
+ # Test the getBoxName method
+ # ---
+ my $this = shift;
+ my $kiwi = $this->{kiwi};
+ my $init = $this -> __getBaseInitHash();
+ my $confDataObj = KIWIXMLVagrantConfigData -> new($init);
+ my $msg = $kiwi -> getMessage();
+ $this -> assert_str_equals('No messages set', $msg);
+ my $msgT = $kiwi -> getMessageType();
+ $this -> assert_str_equals('none', $msgT);
+ my $state = $kiwi -> getState();
+ $this -> assert_str_equals('No state set', $state);
+ # Test this condition last to get potential error messages
+ $this -> assert_not_null($confDataObj);
+ my $scan = $confDataObj -> getBoxName();
+ $msg = $kiwi -> getMessage();
+ $this -> assert_str_equals('No messages set', $msg);
+ $msgT = $kiwi -> getMessageType();
+ $this -> assert_str_equals('none', $msgT);
+ $state = $kiwi -> getState();
+ $this -> assert_str_equals('No state set', $state);
+ $this -> assert_str_equals('foo', $scan);
+ return;
+}
+
+#==========================================
# test_getVirtualSize
#------------------------------------------
sub test_getVirtualSize {
@@ -182,6 +211,7 @@
# ---
my $this = shift;
my %init = (
+ boxname => 'foo',
provider => 'libvirt',
virtual_size => '42'
);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at 2014-10-02 14:13:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/patterns-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.patterns-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-openSUSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/patterns-openSUSE/patterns-openSUSE.changes 2014-09-17 21:24:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.patterns-openSUSE.new/patterns-openSUSE.changes 2014-10-02 14:13:41.000000000 +0200
@@ -1,0 +2,28 @@
+Thu Oct 2 03:11:46 UTC 2014 - badshah400(a)gmail.com
+
+- Pattern gnome_yast: Replace libyui-gtk-pkg and
+ yast2-control-center-gnome in gnome_yast pattern with its qt
+ version; the gtk bindings have critical bugs (see bnc#897910,
+ bnc#891183, bnc#852730) but seem unmaintained for now.
+
+-------------------------------------------------------------------
+Sat Sep 27 10:03:45 UTC 2014 - trcs(a)gmx.com
+
+- package lxde
+ * do not recommend imaging pattern:
+ + it triggers the installation of GIMP that is redundant
+ because mtPaint is in the pattern, has the same goal and is
+ lighter
+ + it recommends the installation of the pattern imaging_opt
+ which in turn suggests calibre that is a heavyweight
+ application that doesn't really fit in LXDE
+ * do not recommend neither lxshortcut nor lxsession-edit:
+ + lxshortcut is deprecated by LibFM 1.2.0
+ + lxsession-edit is now provided by LXSession
+ * recommend uGet instead of transmission-gtk and do not suggests
+ aria2:
+ + uGet can manage both BitTorrent and Metalink protocols (in
+ addition to HTTP, HTTPS and FTP)
+ + aria2 is required by uGet
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.5S7T6n/_old 2014-10-02 14:13:45.000000000 +0200
+++ /var/tmp/diff_new_pack.5S7T6n/_new 2014-10-02 14:13:45.000000000 +0200
@@ -2545,8 +2545,9 @@
Provides: pattern-order() = 1260
Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-yast2_basis)
# from data/GNOME-YaST
-Requires: libyui-gtk-pkg
-Requires: yast2-control-center-gnome
+# Use libyui-qt-pkg since libyui-gtk-pkg seems to be unmaintained
+Requires: libyui-qt-pkg
+Requires: yast2-control-center-qt
# yast modules for the desktop
Recommends: yast2-scanner
Recommends: yast2-tv
@@ -3530,7 +3531,7 @@
Requires: pattern() = x11
Recommends: pattern() = lxde_office
Recommends: pattern() = multimedia
-Recommends: pattern() = imaging
+
Recommends: pattern() = remote_desktop
# from data/LXDE
Recommends: lxappearance
@@ -3544,8 +3545,6 @@
Recommends: lxpanel
Recommends: lxrandr
Recommends: lxsession
-Recommends: lxsession-edit
-Recommends: lxshortcut
Recommends: lxtask
Recommends: lxterminal
Recommends: lxcc
@@ -3565,7 +3564,7 @@
Recommends: empathy
Recommends: xchat
Recommends: claws-mail
-Recommends: transmission-gtk
+Recommends: uget
Recommends: xdg-user-dirs-gtk
Recommends: xfce4-power-manager
Recommends: xfce4-screenshooter
@@ -3618,8 +3617,6 @@
Recommends: xdg-user-dirs
# bnc#598884
Suggests: moonlight-plugin
-# metalink downloader
-Suggests: aria2
# from data/COMMON-DESKTOP-OPT
# packages a GTK application
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-10-02 14:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-09-26 10:51:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-10-02 14:13:38.000000000 +0200
@@ -1,0 +2,22 @@
+Tue Sep 30 10:15:38 UTC 2014 - ancor(a)suse.com
+
+- The "change hostname via DHCP" setting is now configurable via
+ control file (bnc#870896).
+- 3.1.104
+
+-------------------------------------------------------------------
+Mon Sep 29 22:14:49 UTC 2014 - mfilka(a)suse.com
+
+- bnc#898620
+ - do not write LLADDR="00:00:00:00:00:00" into ifcfg in z/VM
+- 3.1.103
+
+-------------------------------------------------------------------
+Thu Sep 25 15:51:37 UTC 2014 - mfilka(a)suse.com
+
+- bnc#897394, bnc#866250
+ - device specific routes configuration (ifroute-<devname>) is
+ supported
+- 3.1.102
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.1.101.tar.bz2
New:
----
yast2-network-3.1.104.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.7UtTnh/_old 2014-10-02 14:13:41.000000000 +0200
+++ /var/tmp/diff_new_pack.7UtTnh/_new 2014-10-02 14:13:41.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.101
+Version: 3.1.104
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.101.tar.bz2 -> yast2-network-3.1.104.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/package/yast2-network.changes new/yast2-network-3.1.104/package/yast2-network.changes
--- old/yast2-network-3.1.101/package/yast2-network.changes 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/package/yast2-network.changes 2014-10-01 17:02:11.000000000 +0200
@@ -1,4 +1,26 @@
-------------------------------------------------------------------
+Tue Sep 30 10:15:38 UTC 2014 - ancor(a)suse.com
+
+- The "change hostname via DHCP" setting is now configurable via
+ control file (bnc#870896).
+- 3.1.104
+
+-------------------------------------------------------------------
+Mon Sep 29 22:14:49 UTC 2014 - mfilka(a)suse.com
+
+- bnc#898620
+ - do not write LLADDR="00:00:00:00:00:00" into ifcfg in z/VM
+- 3.1.103
+
+-------------------------------------------------------------------
+Thu Sep 25 15:51:37 UTC 2014 - mfilka(a)suse.com
+
+- bnc#897394, bnc#866250
+ - device specific routes configuration (ifroute-<devname>) is
+ supported
+- 3.1.102
+
+-------------------------------------------------------------------
Tue Sep 23 15:03:15 UTC 2014 - mfilka(a)suse.com
- bnc#892958
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/package/yast2-network.spec new/yast2-network-3.1.104/package/yast2-network.spec
--- old/yast2-network-3.1.101/package/yast2-network.spec 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/package/yast2-network.spec 2014-10-01 17:02:11.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.101
+Version: 3.1.104
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/src/include/network/lan/s390.rb new/yast2-network-3.1.104/src/include/network/lan/s390.rb
--- old/yast2-network-3.1.101/src/include/network/lan/s390.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/src/include/network/lan/s390.rb 2014-10-01 17:02:12.000000000 +0200
@@ -8,23 +8,18 @@
# Functions for accessing and handling s390 specific needs.
module Yast
module NetworkLanS390Include
- def initialize_network_lan_s390(include_target)
- Yast.import "UI"
+ SYS_DIR = "/sys/class/net"
+ def initialize_network_lan_s390(include_target)
Yast.import "FileUtils"
-
- Yast.include include_target, "network/routines.rb"
-
- @sys_dir = "/sys/class/net"
end
# Checks if driver was successfully loaded for particular device.
def s390_DriverLoaded(devname)
return false if !Arch.s390
+ return false if devname.empty?
- return false if IsEmpty(devname)
-
- FileUtils.IsDirectory(Builtins.sformat("%1/%2", @sys_dir, devname)) == true
+ FileUtils.IsDirectory("#{SYS_DIR}/#{devname}") == true
end
# Reads particular qeth attribute and returns its value as a string.
@@ -37,7 +32,7 @@
result = Convert.to_string(
SCR.Read(
path(".target.string"),
- Builtins.sformat("%1/%2/device/%3", @sys_dir, devname, attrib)
+ Builtins.sformat("%1/%2/device/%3", SYS_DIR, devname, attrib)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.104/src/lib/network/network_autoconfiguration.rb
--- old/yast2-network-3.1.101/src/lib/network/network_autoconfiguration.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/src/lib/network/network_autoconfiguration.rb 2014-10-01 17:02:12.000000000 +0200
@@ -83,8 +83,10 @@
DNS.Read # handles NetworkConfig too
DNS.ProposeHostname # generate random hostname, if none known so far
- # propose settings
- DNS.dhcp_hostname = !Arch.is_laptop
+ # FIXME after SLE12: DNS.default_dhcp_hostname should be private (setting
+ # default values is not something for an API), but that would need some
+ # refactoring of this part.
+ DNS.dhcp_hostname = DNS.default_dhcp_hostname
# get default value, from control.xml
DNS.write_hostname = DNS.DefaultWriteHostname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/src/modules/DNS.rb new/yast2-network-3.1.104/src/modules/DNS.rb
--- old/yast2-network-3.1.101/src/modules/DNS.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/src/modules/DNS.rb 2014-10-01 17:02:12.000000000 +0200
@@ -43,6 +43,7 @@
Yast.import "UI"
textdomain "network"
+ Yast.import "Arch"
Yast.import "NetHwDetection"
Yast.import "Hostname"
Yast.import "IP"
@@ -228,6 +229,24 @@
whth
end
+ # Default value for #dhcp_hostname based on ProductFeatures and Arch
+ #
+ # @return [Boolean] value set in features or, if none is set, false just
+ # for laptops
+ def default_dhcp_hostname
+ # ProductFeatures.GetBooleanFeature returns false either if the value is
+ # false or if it's missing, so let's discard the later case calling
+ # ProductFeatures.GetFeature first
+ feature_index = ["globals", "dhclient_set_hostname"]
+ feature = ProductFeatures.GetFeature(*feature_index)
+ # No value for the feature
+ if feature.nil? || (feature.respond_to?(:empty?) && feature.empty?)
+ !Arch.is_laptop
+ else
+ ProductFeatures.GetBooleanFeature(*feature_index)
+ end
+ end
+
def ReadHostname
fqhostname = ""
# In installation (standard, or AutoYaST one), prefer /etc/install.inf
@@ -445,7 +464,7 @@
# @return true if success
def Import(settings)
settings = deep_copy(settings)
- @dhcp_hostname = Ops.get_boolean(settings, "dhcp_hostname", false)
+ @dhcp_hostname = settings.fetch("dhcp_hostname") { default_dhcp_hostname }
#if not defined, set to 'auto'
@resolv_conf_policy = Ops.get_string(
settings,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/src/modules/LanItems.rb new/yast2-network-3.1.104/src/modules/LanItems.rb
--- old/yast2-network-3.1.101/src/modules/LanItems.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/src/modules/LanItems.rb 2014-10-01 17:02:12.000000000 +0200
@@ -82,9 +82,6 @@
@description = ""
- #unique - only for backward compatibility
- #global string unique = "";
-
@type = ""
# ifcfg name for the @current device
@device = ""
@@ -204,7 +201,6 @@
# NetworkModules:: name
@nm_name = ""
- @nm_name_old = nil
#this is the map of kernel modules vs. requested firmware
#non-empty keys are firmware packages shipped by SUSE
@@ -246,7 +242,6 @@
"REMOTE_IPADDR" => "",
"NETMASK" => "",
"MTU" => "",
- "LLADDR" => "00:00:00:00:00:00",
"ETHTOOL_OPTIONS" => "",
"NAME" => "",
"STARTMODE" => "manual",
@@ -301,7 +296,8 @@
"QETH_LAYER2" => "no",
"QETH_CHANIDS" => "",
"IPA_TAKEOVER" => "no",
- "IUCV_USER" => ""
+ "IUCV_USER" => "",
+ "LLADDR" => "00:00:00:00:00:00"
}
# ifplugd sometimes does not work for wifi
@@ -1728,10 +1724,6 @@
@wl_power = d["WIRELESS_POWER"] == "yes"
@wl_ap_scanmode = d["WIRELESS_AP_SCANMODE"]
- # s/390 options
- # We always have to set the MAC Address for qeth Layer2 support
- @qeth_macaddress = d["LLADDR"]
-
@ipoib_mode = d["IPOIB_MODE"]
@aliases = Ops.get_map(devmap, "_aliases", {})
@@ -1752,6 +1744,14 @@
@qeth_layer2 = d["QETH_LAYER2"] == "yes"
@qeth_chanids = d["QETH_CHANIDS"]
+ # s/390 options
+ # We always have to set the MAC Address for qeth Layer2 support.
+ # It is used mainly as a hint for user that MAC is expected in case
+ # of Layer2 devices. Other devices do not need it. Simply
+ # because such devices do not emulate Layer2
+ @qeth_macaddress = d["LLADDR"] if @qeth_layer2
+
+
# qeth attribute. FIXME: currently not read from system.
@ipa_takeover = Ops.get_string(defaults, "IPA_TAKEOVER", "") == "yes"
@@ -1860,11 +1860,6 @@
end
Builtins.y2debug("type=%1", @type)
- # We always have to set the MAC Address for qeth Layer2 support
- if @qeth_layer2
- @qeth_macaddress = Ops.get_string(devmap, "LLADDR", "00:00:00:00:00:00")
- end
-
true
end
@@ -1918,13 +1913,14 @@
Ops.set(newdev, "REMOTE_IPADDR", @remoteip)
# set LLADDR to sysconfig only for device on layer2 and only these which needs it
- if @qeth_layer2
+ # do not write incorrect LLADDR.
+ if @qeth_layer2 && s390_correct_lladdr(@qeth_macaddress)
busid = Ops.get_string(@Items, [@current, "hwinfo", "busid"], "")
# sysfs id has changed from css0...
- sysfs_id = Ops.add("/devices/qeth/", busid)
- Builtins.y2milestone("busid %1", busid)
+ sysfs_id = "/devices/qeth/#{busid}"
+ log.info("busid #{busid}")
if s390_device_needs_persistent_mac(sysfs_id, @Hardware)
- Ops.set(newdev, "LLADDR", @qeth_macaddress)
+ newdev["LLADDR"] = @qeth_macaddress
end
end
@@ -2527,6 +2523,20 @@
publish :variable => name, :type => type
end
+ # Checks if given lladdr can be written into ifcfg
+ #
+ # @param lladdr [String] logical link address, usually MAC address in case
+ # of qeth device
+ # @return [true, false] check result
+ def s390_correct_lladdr(lladdr)
+ return false if !Arch.s390
+ return false if lladdr.nil?
+ return false if lladdr.empty?
+ return false if lladdr.strip == "00:00:00:00:00:00"
+
+ return true
+ end
+
public
# @attribute Items
@@ -2607,7 +2617,6 @@
publish_variable :proposal_valid , "boolean"
publish_variable :nm_proposal_valid , "boolean"
publish_variable :nm_name , "string"
- publish_variable :nm_name_old , "string"
# @attribute SysconfigDefaults
publish_variable :SysconfigDefaults , "map <string, string>"
publish :function => :GetLanItem, :type => "map (integer)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/src/modules/Routing.rb new/yast2-network-3.1.104/src/modules/Routing.rb
--- old/yast2-network-3.1.101/src/modules/Routing.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/src/modules/Routing.rb 2014-10-01 17:02:12.000000000 +0200
@@ -33,6 +33,10 @@
module Yast
class RoutingClass < Module
+ # @return [Array<String>] names of devices with sysconfig configuration
+ attr_reader :devices
+
+ include Logger
# @Orig_Routes [Array] array of hashes. Caches known routes
#
@@ -41,12 +45,19 @@
#
# @modified [Boolean] modified by AY (bnc#649494)
+ # "routes" and ifroute-DEV file directory
+ ROUTES_DIR = "/etc/sysconfig/network"
# "routes" file location
ROUTES_FILE = "/etc/sysconfig/network/routes"
SYSCTL_IPV4_PATH = ".etc.sysctl_conf.\"net.ipv4.ip_forward\""
SYSCTL_IPV6_PATH = ".etc.sysctl_conf.\"net.ipv6.conf.all.forwarding\""
+ # see man routes - difference on implicit device param (aka "-") in
+ # case of /etc/sysconfig/network/routes and /etc/sysconfig/network/
+ # /ifroute-<device>
+ ANY_DEVICE = "-"
+
def main
Yast.import "UI"
textdomain "network"
@@ -54,6 +65,7 @@
Yast.import "NetHwDetection"
Yast.import "NetworkInterfaces"
Yast.import "Map"
+ Yast.import "Mode"
Yast.import "SuSEFirewall"
Yast.include self, "network/runtime.rb"
@@ -103,7 +115,7 @@
"destination" => "default",
"gateway" => gw,
"netmask" => "-",
- "device" => "-"
+ "device" => ANY_DEVICE
}
]
true
@@ -135,6 +147,9 @@
@Forward_v6 = SCR.Read(path(SYSCTL_IPV6_PATH)) == "1"
end
+ log.info("Forward_v4=#{@Forward_v4}")
+ log.info("Forward_v6=#{@Forward_v6}")
+
nil
end
@@ -174,34 +189,42 @@
# If no routes, sets a default gateway from Detection
# @return true if success
def Read
- # read route.conf
- if Ops.greater_than(SCR.Read(path(".target.size"), ROUTES_FILE), 0)
- @Routes = Convert.convert(
- SCR.Read(path(".routes")),
- :from => "any",
- :to => "list <map>"
- )
- else
- @Routes = []
+ # read available devices
+ NetworkInterfaces.Read
+ @devices = NetworkInterfaces.List("")
+
+ # read routes
+ @Routes = SCR.Read(path(".routes")) || []
+
+ @devices.each do |device|
+ # Mode.test required for old testsuite. Dynamic agent registration break
+ # stubing there
+ register_ifroute_agent_for_device(device) unless Mode.test
+
+ dev_routes = SCR.Read(path(".ifroute-#{device}")) || []
+
+ next if dev_routes.nil? || dev_routes.empty?
+
+ dev_routes.map! do |route|
+ route["device"] = device if route["device"] == ANY_DEVICE
+ route
+ end
+
+ @Routes.concat dev_routes
end
- ReadIPForwarding()
+ @Routes.uniq!
+ log.info("Routes=#{@Routes}")
- Builtins.y2debug("Routes=#{@Routes}")
- Builtins.y2debug("Forward_v4=#{@Forward_v4}")
- Builtins.y2debug("Forward_v6=#{@Forward_v6}")
+ ReadIPForwarding()
# save routes to check for changes later
@Orig_Routes = deep_copy(@Routes)
- @Orig_Forward_v4 = deep_copy(@Forward_v4)
- @Orig_Forward_v6 = deep_copy(@Forward_v6)
+ @Orig_Forward_v4 = @Forward_v4
+ @Orig_Forward_v6 = @Forward_v6
- # read available devices
- NetworkInterfaces.Read
- @devices = NetworkInterfaces.List("")
-
- if @Routes == []
- ReadFromGateway(Ops.get_string(NetHwDetection.result, "GATEWAY", ""))
+ if @Routes.empty?
+ ReadFromGateway(NetHwDetection.result["GATEWAY"] || "")
end
true
@@ -224,7 +247,6 @@
]
caption = _("Saving Routing Configuration")
- sl = 0 #100; //for testing
Progress.New(caption, " ", Builtins.size(steps), steps, [], "")
@@ -232,7 +254,6 @@
ProgressNextStage(_("Writing IP forwarding settings..."))
WriteIPForwarding()
- Builtins.sleep(sl)
# at first stop the running routes
# FIXME SCR::Execute(.target.bash, "/etc/init.d/route stop");
@@ -242,31 +263,70 @@
#Progress stage 2/2
ProgressNextStage(_("Writing routing settings..."))
- # create if not exists, otherwise backup
- if Ops.less_than(SCR.Read(path(".target.size"), ROUTES_FILE), 0)
- SCR.Write(path(".target.string"), ROUTES_FILE, "")
+ ret = write_routes(@Routes)
+
+ Progress.NextStage
+
+ ret
+ end
+
+ # From *routes*, select those belonging to *device* and write
+ # an appropriate config file.
+ # @param device device name, or "-" for global routes
+ # @param routes [Array<Hash>] defines route; even unrelated to *device*
+ # @return [true, false] if it succeedes
+ def write_route_file(device, routes)
+ routes = routes.select { |r| r["device"] == device }
+
+ if routes.empty?
+ # work around bnc#19476
+ if device == ANY_DEVICE
+ filename = ROUTES_FILE
+ return SCR.Write(path(".target.string"), filename, "")
+ else
+ filename = "#{ROUTES_DIR}/ifroute-#{device}"
+ return SCR.Execute(path(".target.remove"), filename)
+ end
else
+ if device == ANY_DEVICE
+ scr_path = path(".routes")
+ else
+ scr_path = register_ifroute_agent_for_device(device)
+ end
+ return SCR.Write(scr_path, routes)
+ end
+ end
+
+ # Updates routing configuration files
+ #
+ # It means /etc/sysconfig/network/routes and
+ # /etc/sysconfig/network/ifroute-*
+ #
+ # @param routes [Array] of hashes which defines route
+ # @return [true, false] if it succeedes
+ def write_routes(routes)
+ # create if not exists, otherwise backup
+ if SCR.Read(path(".target.size"), ROUTES_FILE) > 0
SCR.Execute(
path(".target.bash"),
"/bin/cp #{ROUTES_FILE} #{ROUTES_FILE}.YaST2save"
)
+ else
+ SCR.Write(path(".target.string"), ROUTES_FILE, "")
end
- ret = false
- if @Routes == []
- # workaround bug [#4476]
- ret = SCR.Write(path(".target.string"), ROUTES_FILE, "")
- else
- # update the routes config
- ret = SCR.Write(path(".routes"), @Routes)
+ ret = true
+
+ # update the routes config
+ Routing.devices.each do |device|
+ written = write_route_file(device, routes)
+ ret &&= written
end
- Builtins.sleep(sl)
- Progress.NextStage
- # and finally set up the new routes
- # FIXME SCR::Execute(.target.bash, "/etc/init.d/route start");
+ written = write_route_file(ANY_DEVICE, routes)
+ ret &&= written
- ret == true
+ return ret
end
@@ -379,6 +439,68 @@
publish :function => :GetGateway, :type => "string ()"
publish :function => :SetDevices, :type => "boolean (list)"
publish :function => :Summary, :type => "string ()"
+
+ private
+ def ifroute_term(device)
+ raise ArgumentError if device.nil? || device.empty?
+
+ non_empty_str_term = term(:String, "^ \t\n")
+ whitespace_term = term(:Whitespace)
+ optional_whitespace_term = term(:Optional, whitespace_term)
+ routes_content_term = term(
+ :List,
+ term(
+ :Tuple,
+ term(
+ :destination,
+ non_empty_str_term
+ ),
+ whitespace_term,
+ term(:gateway, non_empty_str_term),
+ whitespace_term,
+ term(:netmask, non_empty_str_term),
+ optional_whitespace_term,
+ term(
+ :Optional,
+ term(:device, non_empty_str_term)
+ ),
+ optional_whitespace_term,
+ term(
+ :Optional,
+ term(
+ :extrapara,
+ term(:String, "^\n")
+ )
+ )
+ ),
+ "\n"
+ )
+
+ term(
+ :ag_anyagent,
+ term(
+ :Description,
+ term(:File, "#{ROUTES_DIR}/ifroute-#{device}"),
+ "#\n",
+ false,
+ routes_content_term
+ )
+ )
+ end
+
+ # Registers SCR agent which is used for accessing particular ifroute-device
+ # file
+ #
+ # @param device [String] device name (e.g. eth0, enp0s3, ...)
+ # @return [Path] SCR path of the agent
+ # @raise [RuntimeError] if it fails
+ def register_ifroute_agent_for_device(device)
+ scr_path = path(".ifroute-#{device}")
+ SCR.RegisterAgent(scr_path, ifroute_term(device)) or
+ raise "Cannot SCR.RegisterAgent(#{scr_path}, ...)"
+ scr_path
+ end
+
end
Routing = RoutingClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/Makefile.am new/yast2-network-3.1.104/test/Makefile.am
--- old/yast2-network-3.1.101/test/Makefile.am 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/test/Makefile.am 2014-10-01 17:02:12.000000000 +0200
@@ -17,6 +17,8 @@
complex_test.rb \
read_hardware_test.rb \
udev_test.rb \
+ ifroute_test.rb \
+ s390_helpers_test.rb \
remote_test.rb
TEST_EXTENSIONS = .rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/data/dhcp_hostname_false.xml new/yast2-network-3.1.104/test/data/dhcp_hostname_false.xml
--- old/yast2-network-3.1.101/test/data/dhcp_hostname_false.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/data/dhcp_hostname_false.xml 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
+<!--
+Work around for the text domain
+textdomain="control"
+-->
+
+ <textdomain>control</textdomain>
+
+ <globals>
+ <additional_kernel_parameters/>
+ <enable_autologin config:type="boolean">false</enable_autologin>
+ <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts>
+ <dhclient_set_hostname config:type="boolean">false</dhclient_set_hostname>
+ </globals>
+
+ <software>
+ <delete_old_packages config:type="boolean">true</delete_old_packages>
+ </software>
+
+ <partitioning>
+ <try_separate_home config:type="boolean">true</try_separate_home>
+ </partitioning>
+
+ <network>
+ <force_static_ip config:type="boolean">false</force_static_ip>
+ <network_manager>always</network_manager>
+ <startmode>auto</startmode>
+ </network>
+
+ <texts>
+ <dummy_desktop><label/></dummy_desktop>
+ </texts>
+
+</productDefines>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/data/dhcp_hostname_nil.xml new/yast2-network-3.1.104/test/data/dhcp_hostname_nil.xml
--- old/yast2-network-3.1.101/test/data/dhcp_hostname_nil.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/data/dhcp_hostname_nil.xml 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
+<!--
+Work around for the text domain
+textdomain="control"
+-->
+
+ <textdomain>control</textdomain>
+
+ <globals>
+ <additional_kernel_parameters/>
+ <enable_autologin config:type="boolean">false</enable_autologin>
+ <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts>
+ </globals>
+
+ <software>
+ <delete_old_packages config:type="boolean">true</delete_old_packages>
+ </software>
+
+ <partitioning>
+ <try_separate_home config:type="boolean">true</try_separate_home>
+ </partitioning>
+
+ <network>
+ <force_static_ip config:type="boolean">false</force_static_ip>
+ <network_manager>always</network_manager>
+ <startmode>auto</startmode>
+ </network>
+
+ <texts>
+ <dummy_desktop><label/></dummy_desktop>
+ </texts>
+
+</productDefines>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/data/dhcp_hostname_true.xml new/yast2-network-3.1.104/test/data/dhcp_hostname_true.xml
--- old/yast2-network-3.1.101/test/data/dhcp_hostname_true.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/data/dhcp_hostname_true.xml 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
+<!--
+Work around for the text domain
+textdomain="control"
+-->
+
+ <textdomain>control</textdomain>
+
+ <globals>
+ <additional_kernel_parameters/>
+ <enable_autologin config:type="boolean">false</enable_autologin>
+ <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts>
+ <dhclient_set_hostname config:type="boolean">true</dhclient_set_hostname>
+ </globals>
+
+ <software>
+ <delete_old_packages config:type="boolean">true</delete_old_packages>
+ </software>
+
+ <partitioning>
+ <try_separate_home config:type="boolean">true</try_separate_home>
+ </partitioning>
+
+ <network>
+ <force_static_ip config:type="boolean">false</force_static_ip>
+ <network_manager>always</network_manager>
+ <startmode>auto</startmode>
+ </network>
+
+ <texts>
+ <dummy_desktop><label/></dummy_desktop>
+ </texts>
+
+</productDefines>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/dns_test.rb new/yast2-network-3.1.104/test/dns_test.rb
--- old/yast2-network-3.1.101/test/dns_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/dns_test.rb 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,111 @@
+#!/usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+require_relative "SCRStub"
+
+module Yast
+ RSpec.configure do |c|
+ c.include SCRStub
+ end
+
+ import "Arch"
+ import "DNS"
+ import "ProductControl"
+
+ describe DNS do
+ describe ".default_dhcp_hostname" do
+ before do
+ allow(Arch).to receive(:is_laptop).and_return laptop
+ ProductControl.ReadControlFile(File.join(SCRStub::DATA_PATH, control_file))
+ end
+
+ context "with dhcp_hostname=true in control file" do
+ let(:control_file) { "dhcp_hostname_true.xml" }
+
+ context "in a laptop" do
+ let(:laptop) { true }
+
+ it "returns the value from product features" do
+ expect(DNS.default_dhcp_hostname).to eql(true)
+ end
+ end
+
+ context "in a workstation" do
+ let(:laptop) { false }
+
+ it "returns the value from product features" do
+ expect(DNS.default_dhcp_hostname).to eql(true)
+ end
+ end
+ end
+
+ context "with dhcp_hostname=false in control file" do
+ let(:control_file) { "dhcp_hostname_false.xml" }
+
+ context "in a laptop" do
+ let(:laptop) { true }
+
+ it "returns the value from product features" do
+ expect(DNS.default_dhcp_hostname).to eql(false)
+ end
+ end
+
+ context "in a workstation" do
+ let(:laptop) { false }
+
+ it "returns the value from product features" do
+ expect(DNS.default_dhcp_hostname).to eql(false)
+ end
+ end
+ end
+
+ context "without dhcp_hostname in control file" do
+ let(:control_file) { "dhcp_hostname_nil.xml" }
+
+ context "in a laptop" do
+ let(:laptop) { true }
+
+ it "returns false" do
+ expect(DNS.default_dhcp_hostname).to eql(false)
+ end
+ end
+
+ context "in a workstation" do
+ let(:laptop) { false }
+
+ it "returns true" do
+ expect(DNS.default_dhcp_hostname).to eql(true)
+ end
+ end
+ end
+ end
+
+ describe ".Import" do
+ context "with present dhcp_hostname and write_hostname" do
+ let(:settings) { {"hostname" => "host", "dhcp_hostname" => true, "write_hostname" => true} }
+
+ it "honors the provided values" do
+ expect(DNS).to_not receive(:DefaultWriteHostname)
+ expect(DNS).to_not receive(:default_dhcp_hostname)
+ DNS.Import(settings)
+ expect(DNS.write_hostname).to eql(true)
+ expect(DNS.dhcp_hostname).to eql(true)
+ end
+ end
+
+ context "with missing dhcp_hostname and write_hostname" do
+ let(:settings) { {"hostname" => "host"} }
+
+ it "relies on proper methods to get default values" do
+ expect(DNS).to receive(:DefaultWriteHostname).and_return false
+ expect(DNS).to receive(:default_dhcp_hostname).and_return false
+ DNS.Import(settings)
+ expect(DNS.write_hostname).to eql(false)
+ expect(DNS.dhcp_hostname).to eql(false)
+ end
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/ifroute_test.rb new/yast2-network-3.1.104/test/ifroute_test.rb
--- old/yast2-network-3.1.101/test/ifroute_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/ifroute_test.rb 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,130 @@
+#! /usr/bin/env rspec
+
+require_relative "test_helper"
+
+require "yast"
+
+include Yast
+
+Yast.import "NetworkInterfaces"
+Yast.import "Routing"
+
+describe "Routing#Read" do
+ ROUTES_FILE = [
+ {
+ "destination" => "default",
+ "device" => "eth0",
+ "gateway" => "1.1.1.1",
+ "netmask" => "-"
+ }
+ ]
+ IFROUTE_FILE = [
+ {
+ "destination" => "default",
+ "device" => "-",
+ "gateway" => "1.1.1.1",
+ "netmask" => "-"
+ }
+ ]
+
+ before(:each) do
+ allow(NetworkInterfaces)
+ .to receive(:Read)
+ .and_return(true)
+ allow(NetworkInterfaces)
+ .to receive(:List)
+ .and_return(["eth0"])
+ allow(SCR)
+ .to receive(:Read)
+ .and_return(nil)
+ end
+
+ it "loades ifroute-* files" do
+ allow(SCR)
+ .to receive(:Read)
+ .with(path(".routes"))
+ .and_return([])
+
+ expect(SCR)
+ .to receive(:Read)
+ .with(path(".ifroute-eth0"))
+ .and_return(IFROUTE_FILE)
+ expect(Routing.Read).to be true
+ expect(Routing.Routes).not_to be_empty
+ end
+
+ it "replace implicit device name using explicit one" do
+ expect(SCR)
+ .to receive(:Read)
+ .with(path(".ifroute-eth0"))
+ .and_return(IFROUTE_FILE)
+ expect(Routing.Read).to be true
+ # check if implicit device name "-" is rewritten according device name
+ # which ifroute belongs to
+ expect(Routing.Routes.first["device"])
+ .to eql "eth0"
+ end
+
+ it "removes duplicit routes" do
+ expect(SCR)
+ .to receive(:Read)
+ .with(path(".routes"))
+ .and_return(ROUTES_FILE)
+ expect(SCR)
+ .to receive(:Read)
+ .with(path(".ifroute-eth0"))
+ .and_return(IFROUTE_FILE)
+ expect(Routing.Read).to be true
+ expect(Routing.Routes.size).to eql 1
+ end
+
+end
+
+describe "Routing#write_routes" do
+ ROUTES_WITH_DEV = [
+ {
+ "destination" => "default",
+ "device" => "eth0",
+ "gateway" => "1.1.1.1",
+ "netmask" => "-"
+ },
+ {
+ "destination" => "default",
+ "device" => "eth1",
+ "gateway" => "2.2.2.2",
+ "netmask" => "-"
+ }
+ ]
+
+ it "writes device assigned routes into correct ifroute file" do
+ allow(SCR)
+ .to receive(:Read)
+ .with(path(".target.size"), RoutingClass::ROUTES_FILE)
+ .and_return(1)
+ allow(Routing)
+ .to receive(:devices)
+ .and_return(["eth0", "eth1", "eth2"])
+ expect(SCR)
+ .to receive(:Execute)
+ .with(path(".target.bash"), /^\/bin\/cp/)
+ .and_return(0)
+
+ expect(SCR)
+ .to receive(:Write)
+ .with(path(".ifroute-eth0"), anything())
+ .and_return(true)
+ expect(SCR)
+ .to receive(:Write)
+ .with(path(".ifroute-eth1"), anything())
+ .and_return(true)
+ expect(SCR)
+ .to receive(:Execute)
+ .with(path(".target.remove"), "/etc/sysconfig/network/ifroute-eth2")
+ .and_return(true)
+ expect(SCR)
+ .to receive(:Write)
+ .with(path(".target.string"), "/etc/sysconfig/network/routes", "")
+ .and_return(true)
+ expect(Routing.write_routes(ROUTES_WITH_DEV)).to be true
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/lan_items_helpers_test.rb new/yast2-network-3.1.104/test/lan_items_helpers_test.rb
--- old/yast2-network-3.1.101/test/lan_items_helpers_test.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/test/lan_items_helpers_test.rb 2014-10-01 17:02:12.000000000 +0200
@@ -103,3 +103,29 @@
expect(Yast::LanItems.getNetworkInterfaces).to match_array(EXPECTED_INTERFACES)
end
end
+
+describe "LanItemsClass#s390_correct_lladdr" do
+ Yast.import "Arch"
+
+ before(:each) do
+ allow(Yast::Arch)
+ .to receive(:s390)
+ .and_return(true)
+ end
+
+ it "fails if given lladdr is nil" do
+ expect(Yast::LanItems.send(:s390_correct_lladdr, nil)).to be false
+ end
+
+ it "fails if given lladdr is empty" do
+ expect(Yast::LanItems.send(:s390_correct_lladdr, "")).to be false
+ end
+
+ it "fails if given lladdr contains zeroes only" do
+ expect(Yast::LanItems.send(:s390_correct_lladdr, "00:00:00:00:00:00")).to be false
+ end
+
+ it "succeeds if given lladdr contains valid MAC" do
+ expect(Yast::LanItems.send(:s390_correct_lladdr, "0a:00:27:00:00:00")).to be true
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/routing_test.rb new/yast2-network-3.1.104/test/routing_test.rb
--- old/yast2-network-3.1.101/test/routing_test.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/test/routing_test.rb 2014-10-01 17:02:12.000000000 +0200
@@ -277,9 +277,6 @@
.with(path(".routes")) { MOCKED_ROUTES }
expect(SCR)
.to receive(:Read)
- .with(path(".target.size"), "#{RoutingClass::ROUTES_FILE}") { 1 }
- expect(SCR)
- .to receive(:Read)
.with(SYSCTL_IPV4_PATH) { ipv4 }
expect(SCR)
.to receive(:Read)
@@ -300,6 +297,7 @@
expect(Routing.Read).to be true
end
+
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/test/s390_helpers_test.rb new/yast2-network-3.1.104/test/s390_helpers_test.rb
--- old/yast2-network-3.1.101/test/s390_helpers_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.104/test/s390_helpers_test.rb 2014-10-01 17:02:12.000000000 +0200
@@ -0,0 +1,52 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+require "yast"
+
+# creating a wrapper for Yast's 'header' file
+$LOAD_PATH.unshift File.expand_path('../../src', __FILE__)
+require "include/network/lan/s390"
+
+class NetworkLanS390Include < Yast::Client
+ include Singleton
+
+ def initialize
+ Yast.include self, "network/lan/s390.rb"
+ end
+end
+
+Yast.import "Arch"
+Yast.import "FileUtils"
+
+describe "NetworkLanS390Include::s390_DriverLoaded" do
+ DEVNAME = "devname"
+
+ before(:each) do
+ allow(Yast::Arch)
+ .to receive(:s390)
+ .and_return(true)
+ end
+
+ # it checks if a driver which emulates common linux device
+ # on top of s390 one is loaded already
+ it "succeeds when driver is already loaded" do
+ expect(Yast::FileUtils)
+ .to receive(:IsDirectory)
+ .with("#{Yast::NetworkLanS390Include::SYS_DIR}/#{DEVNAME}")
+ .and_return(true)
+
+ expect(NetworkLanS390Include.instance.s390_DriverLoaded(DEVNAME))
+ .to be true
+ end
+
+ it "fails when driver is not loaded" do
+ expect(Yast::FileUtils)
+ .to receive(:IsDirectory)
+ .with("#{Yast::NetworkLanS390Include::SYS_DIR}/#{DEVNAME}")
+ .and_return(false)
+
+ expect(NetworkLanS390Include.instance.s390_DriverLoaded(DEVNAME))
+ .to be false
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/testsuite/tests/Lan.out new/yast2-network-3.1.104/testsuite/tests/Lan.out
--- old/yast2-network-3.1.101/testsuite/tests/Lan.out 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/testsuite/tests/Lan.out 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Dump Disabled
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/testsuite/tests/Lan.rb new/yast2-network-3.1.104/testsuite/tests/Lan.rb
--- old/yast2-network-3.1.101/testsuite/tests/Lan.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/testsuite/tests/Lan.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-# encoding: utf-8
-
-#***************************************************************************
-#
-# Copyright (c) 2012 Novell, Inc.
-# All Rights Reserved.
-#
-# 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 Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail,
-# you may find current contact information at www.novell.com
-#
-#**************************************************************************
-module Yast
- class LanClient < Client
- def main
- Yast.include self, "testsuite.rb"
-
- DUMP("Disabled")
- return
-
- @READ = {
- "target" => { "size" => 1, "tmpdir" => "/tmp", "string" => "Blah\n" },
- "init" => { "scripts" => { "exists" => true } },
- "etc" => {
- "resolv_conf" => {
- "nameserver" => ["1.2.3.4", "5.6.7.8"],
- "search" => ["suse.cz", "suse.de"],
- "domain" => "blah"
- }
- },
- "probe" => { "system" => [] },
- "product" => {
- "features" => {
- "USE_DESKTOP_SCHEDULER" => "0",
- "ENABLE_AUTOLOGIN" => "0",
- "EVMS_CONFIG" => "0",
- "IO_SCHEDULER" => "cfg",
- "UI_MODE" => "expert"
- }
- },
- "sysconfig" => {
- "language" => {
- "RC_LANG" => "",
- "DEFAULT_LANGUAGE" => "",
- "ROOT_USES_LANG" => "no"
- },
- "console" => { "CONSOLE_ENCODING" => "UTF-8" }
- }
- }
-
- @EXEC = { "target" => { "bash_output" => {} } }
-
- TESTSUITE_INIT([@READ, {}, @EXEC], nil)
-
- Yast.import "Lan"
- Yast.import "Progress"
- Progress.off
-
- DUMP("Read")
- #TEST(``(Lan::Read()), [READ], nil);
-
- DUMP("Write")
- #TEST(``(Lan::Write()), [], nil);
-
- @lan_settings = {
- "dns" => {
- "dhcp_hostname" => false,
- "domain" => "suse.com",
- "hostname" => "nashif",
- "nameservers" => ["10.0.0.1"],
- "searchlist" => ["suse.com"]
- },
- "interfaces" => [
- {
- "STARTMODE" => "onboot",
- "BOOTPROTO" => "static",
- "BROADCAST" => "10.10.1.255",
- "IPADDR" => "10.10.1.1",
- "NETMASK" => "255.255.255.0",
- "NETWORK" => "10.10.1.0",
- "UNIQUE" => "",
- "device" => "eth0",
- "module" => "",
- "options" => ""
- }
- ],
- "routing" => {
- "routes" => [
- {
- "destination" => "default",
- "device" => "",
- "gateway" => "10.10.0.8",
- "netmask" => "0.0.0.0"
- }
- ],
- "ip_forwarding" => false
- }
- }
-
- DUMP("Import")
- #TEST(``(Lan::Import(lan_settings)), [], nil);
-
- DUMP("Export")
- #TEST(``(Lan::Export()), [], nil);
- end
- end
-end
-
-Yast::LanClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/testsuite/tests/NetworkStorage.rb new/yast2-network-3.1.104/testsuite/tests/NetworkStorage.rb
--- old/yast2-network-3.1.101/testsuite/tests/NetworkStorage.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/testsuite/tests/NetworkStorage.rb 2014-10-01 17:02:12.000000000 +0200
@@ -56,16 +56,6 @@
@EXECUTE
], nil)
- # FIXME polish it to really test it
- #
- # TEST(``(
- # Assert::Equal(`nfs, NetworkStorage::isDiskOnNetwork("server:/export"))
- # ), [READ, WRITE, EXECUTE], nil);
- #
- # TEST(``(
- # Assert::Equal(`nfs, NetworkStorage::isDiskOnNetwork("server-v4:/"))
- # ), [READ, WRITE, EXECUTE], nil);
-
nil
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/testsuite/tests/Network_YaPI.out new/yast2-network-3.1.104/testsuite/tests/Network_YaPI.out
--- old/yast2-network-3.1.101/testsuite/tests/Network_YaPI.out 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/testsuite/tests/Network_YaPI.out 2014-10-01 17:02:12.000000000 +0200
@@ -8,13 +8,6 @@
Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST "suse.cz suse.de"
Read .target.stat "/etc/hostname" $["exists":true]
Read .target.string "/etc/hostname" "laptop.suse.cz"
-Read .target.size "/etc/sysconfig/network/routes" 27
-Read .routes [$["destination":"default", "gateway":"10.20.30.40"]]
-Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0
-Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
-Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
-Read .etc.sysctl_conf."net.ipv4.ip_forward" nil
-Read .etc.sysctl_conf."net.ipv6.conf.all.forwarding" nil
Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"]
Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"]
Read .network.value."eth0".BOOTPROTO "dhcp4"
@@ -60,6 +53,19 @@
Read .network.value."eth5.23".IPADDR "1.2.3.8/24"
Read .network.value."eth5.23".STARTMODE "auto"
Read .network.value."eth5.23".VLAN_ID "23"
+Read .routes [$["destination":"default", "gateway":"10.20.30.40"]]
+Read .ifroute-eth0 []
+Read .ifroute-eth1 []
+Read .ifroute-eth2 []
+Read .ifroute-eth3 []
+Read .ifroute-eth4 []
+Read .ifroute-eth5 []
+Read .ifroute-eth5.23 []
+Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0
+Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
+Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
+Read .etc.sysctl_conf."net.ipv4.ip_forward" nil
+Read .etc.sysctl_conf."net.ipv6.conf.all.forwarding" nil
Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"]
Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"]
Read .network.value."eth0".BOOTPROTO "dhcp4"
@@ -275,8 +281,14 @@
Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password restart network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
-Read .target.size "/etc/sysconfig/network/routes" 27
Read .routes [$["destination":"default", "gateway":"10.20.30.40"]]
+Read .ifroute-eth0 []
+Read .ifroute-eth1 []
+Read .ifroute-eth2 []
+Read .ifroute-eth3 []
+Read .ifroute-eth4 []
+Read .ifroute-eth5 []
+Read .ifroute-eth5.23 []
Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"]
Read .etc.sysctl_conf."net.ipv4.ip_forward" nil
@@ -290,6 +302,13 @@
Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0
Read .target.size "/etc/sysconfig/network/routes" 27
Execute .target.bash "/bin/cp /etc/sysconfig/network/routes /etc/sysconfig/network/routes.YaST2save" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth0" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth1" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth2" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth3" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth4" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth5" 0
+Execute .target.remove "/etc/sysconfig/network/ifroute-eth5.23" 0
Write .routes [$["destination":"default", "device":"-", "gateway":"10.20.30.40", "netmask":"-"]] true
Log assertion failure, expected '$["error":"A valid IP address consists of four integers\nin the range 0-255 separated by dots.", "exit":"-1"]', got '$["error":"A valid IPv4 address consists of four integers\nin the range 0-255 separated by dots.", "exit":"-1"]'
Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.101/testsuite/tests/Network_YaPI.rb new/yast2-network-3.1.104/testsuite/tests/Network_YaPI.rb
--- old/yast2-network-3.1.101/testsuite/tests/Network_YaPI.rb 2014-09-24 15:22:13.000000000 +0200
+++ new/yast2-network-3.1.104/testsuite/tests/Network_YaPI.rb 2014-10-01 17:02:12.000000000 +0200
@@ -110,6 +110,15 @@
}
}
+ # mock /etc/sysconfig/network/ifroute-* files. It was not supported
+ # at time of writing the testsuite and if not mocked causes false
+ # positives
+ ifroutes = {}
+ @READ["network"]["section"].keys.each do |devname|
+ ifroutes["ifroute-#{devname}"] = []
+ end
+ @READ.merge!(ifroutes)
+
Testsuite.Init([@READ, {}, @EXEC], nil)
Yast.import "YaPI::NETWORK"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0