openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
January 2016
- 1 participants
- 1523 discussions
Hello community,
here is the log from the commit of package docky for openSUSE:Factory checked in at 2016-01-20 09:54:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docky (Old)
and /work/SRC/openSUSE:Factory/.docky.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docky"
Changes:
--------
--- /work/SRC/openSUSE:Factory/docky/docky.changes 2014-12-25 23:20:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.docky.new/docky.changes 2016-01-20 09:54:24.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Jan 13 19:20:00 UTC 2016 - dimstar(a)opensuse.org
+
+- Update to version 2.2.1.1:
+ + Bug-fix and Maintenance Release.
+ + SessionManager docklet:
+ - Use logind for suspend and hibernate.
+ - Drop support for deprecated DeviceKit and PowerManager.
+ + Updated translations.
+- Update BuildRequires to match what configure needs:
+ + Remove pkgconfig(dbus-sharp-1.0), pkgconfig(rsvg2-sharp-2.0),
+ pkgconfig(gnome-desktop-sharp-2.0), pkgconfig(wnck-sharp-1.0)
+ and pkgconfig)dbus-sharp-glib-1.0).
+ + Add gtk-sharp2-gapi, pkgconfig(dbus-sharp-2.0),
+ pkgconfig(dbus-sharp-glib-2.0), pkgconfig(gdk-pixbuf-2.0),
+ pkgconfig(gkeyfile-sharp), pkgconfig(libwnck-1.0).
+
+-------------------------------------------------------------------
Old:
----
docky-2.2.0.tar.xz
New:
----
docky-2.2.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docky.spec ++++++
--- /var/tmp/diff_new_pack.4QDZqL/_old 2016-01-20 09:54:26.000000000 +0100
+++ /var/tmp/diff_new_pack.4QDZqL/_new 2016-01-20 09:54:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package docky
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: docky
-Version: 2.2.0
+Version: 2.2.1.1
Release: 0
Summary: A Dock Application
License: GPL-3.0+
@@ -27,26 +27,27 @@
# PATCH-HACK-OPENSUSE docky-mono-3.10.0.patch dimstar(a)opensuse.org -- Work around build issues with mono 3.10.0; no idea why it would not like the original code
Patch0: docky-mono-3.10.0.patch
BuildRequires: fdupes
+BuildRequires: gtk-sharp2-gapi
BuildRequires: intltool
BuildRequires: mono
BuildRequires: mono-devel
-BuildRequires: pkgconfig(dbus-sharp-1.0) >= 0.7
-BuildRequires: pkgconfig(dbus-sharp-glib-1.0) >= 0.5
+BuildRequires: pkgconfig(dbus-sharp-2.0) >= 0.7
+BuildRequires: pkgconfig(dbus-sharp-glib-2.0) >= 0.5
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gconf-sharp-2.0)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.14.3
BuildRequires: pkgconfig(gio-sharp-2.0)
+BuildRequires: pkgconfig(gkeyfile-sharp)
BuildRequires: pkgconfig(glib-sharp-2.0)
-BuildRequires: pkgconfig(gnome-desktop-sharp-2.0)
BuildRequires: pkgconfig(gnome-keyring-sharp-1.0)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.14.3
BuildRequires: pkgconfig(gtk-sharp-2.0)
+BuildRequires: pkgconfig(libwnck-1.0) >= 2.20
BuildRequires: pkgconfig(mono-addins)
BuildRequires: pkgconfig(mono-addins-gui)
BuildRequires: pkgconfig(mono-addins-setup)
BuildRequires: pkgconfig(mono-cairo)
BuildRequires: pkgconfig(notify-sharp)
-BuildRequires: pkgconfig(rsvg2-sharp-2.0)
-BuildRequires: pkgconfig(wnck-sharp-1.0)
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%else
++++++ docky-2.2.0.tar.xz -> docky-2.2.1.1.tar.xz ++++++
++++ 49554 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-dulwich for openSUSE:Factory checked in at 2016-01-20 09:54:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-dulwich (Old)
and /work/SRC/openSUSE:Factory/.python-dulwich.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-dulwich"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-dulwich/python-dulwich.changes 2016-01-01 19:47:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-dulwich.new/python-dulwich.changes 2016-01-20 09:54:23.000000000 +0100
@@ -1,0 +2,23 @@
+Thu Jan 14 10:19:50 UTC 2016 - toddrme2178(a)gmail.com
+
+- Update to 0.12.0
+ + IMPROVEMENTS
+ * Add a `dulwich.archive` module that can create tarballs.
+ Based on code from Jonas Haag in klaus.
+ * Add a `dulwich.reflog` module for reading and writing reflogs.
+ (Jelmer Vernooij)
+ * Fix handling of ambiguous refs in `parse_ref` to make
+ it match the behaviour described in https://git-scm.com/docs/gitrevisions.
+ (Chris Bunney)
+ * Support Python3 in C modules. (Lele Gaifax)
+ + BUG FIXES
+ * Simplify handling of SSH command invocation.
+ Fixes quoting of paths. Thanks, Thomas Liebetraut. (#384)
+ * Fix inconsistent handling of trailing slashes for DictRefsContainer. (#383)
+ * Add hack to support thin packs duing fetch(), albeit while requiring the
+ entire pack file to be loaded into memory. (jsbain)
+ + CHANGES
+ * This will be the last release to support Python 2.6.
+- Implement update-alternatives
+
+-------------------------------------------------------------------
Old:
----
dulwich-0.11.2.tar.gz
New:
----
dulwich-0.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-dulwich.spec ++++++
--- /var/tmp/diff_new_pack.3PyHah/_old 2016-01-20 09:54:24.000000000 +0100
+++ /var/tmp/diff_new_pack.3PyHah/_new 2016-01-20 09:54:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-dulwich
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python-dulwich
-Version: 0.11.2
+Version: 0.12.0
Release: 0
Url: https://www.dulwich.io
Summary: Pure-Python Git Library
@@ -28,6 +28,8 @@
BuildRequires: fdupes
BuildRequires: python-Sphinx
BuildRequires: python-devel
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%endif
@@ -45,14 +47,42 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+
+# Prepare for update-alternatives usage
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+for p in dulwich dul-receive-pack dul-upload-pack ; do
+ mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{py_ver}
+ ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p
+ # create a dummy target for /etc/alternatives/$p
+ touch %{buildroot}%{_sysconfdir}/alternatives/$p
+done
+
%fdupes %{buildroot}
+%post
+"%_sbindir/update-alternatives" \
+ --install %{_bindir}/dulwich dulwich %{_bindir}/dulwich-%{py_ver} 30 \
+ --slave %{_bindir}/dul-receive-pack dul-receive-pack %{_bindir}/dul-receive-pack-%{py_ver} \
+ --slave %{_bindir}/dul-upload-pack dul-upload-pack %{_bindir}/dul-upload-pack-%{py_ver}
+
+%postun
+if [ $1 -eq 0 ] ; then
+ "%_sbindir/update-alternatives" --remove dulwich %{_bindir}/dulwich-%{py_ver}
+fi
+
%files
%defattr(-,root,root,-)
-%doc COPYING NEWS README.md build/sphinx/html
+%doc COPYING NEWS README.md
+%doc build/sphinx/html
+%{_bindir}/dulwich
%{_bindir}/dul-receive-pack
%{_bindir}/dul-upload-pack
-%{_bindir}/dulwich
+%{_bindir}/dulwich-%{py_ver}
+%{_bindir}/dul-receive-pack-%{py_ver}
+%{_bindir}/dul-upload-pack-%{py_ver}
+%ghost %{_sysconfdir}/alternatives/dulwich
+%ghost %{_sysconfdir}/alternatives/dul-receive-pack
+%ghost %{_sysconfdir}/alternatives/dul-upload-pack
%{python_sitearch}/*
%changelog
++++++ dulwich-0.11.2.tar.gz -> dulwich-0.12.0.tar.gz ++++++
++++ 1698 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package samba for openSUSE:Factory checked in at 2016-01-20 09:54:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/samba (Old)
and /work/SRC/openSUSE:Factory/.samba.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba"
Changes:
--------
--- /work/SRC/openSUSE:Factory/samba/samba.changes 2015-12-18 21:51:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2016-01-20 09:54:19.000000000 +0100
@@ -1,0 +2,38 @@
+Fri Jan 15 21:58:31 UTC 2016 - lmuelle(a)suse.com
+
+- Add quotes around path of update-apparmor-samba-profile; (bnc#962177).
+
+-------------------------------------------------------------------
+Wed Jan 13 21:25:05 UTC 2016 - lmuelle(a)suse.com
+
+- Remove autoconf build-time requirement.
+
+-------------------------------------------------------------------
+Wed Jan 13 10:23:56 UTC 2016 - lmuelle(a)suse.com
+
+- Update to 4.3.4.
+ + vfs_fruit: Enable POSIX directory rename semantics; (bso#11065).
+ + Crash: Bad talloc magic value - access after free; (bso#11394).
+ + Copying files with vfs_fruit fails when using vfs_streams_xattr without
+ stream prefix and type suffix; (bso#11466).
+ + samba-tool: Fix uncaught exception if no fSMORoleOwner attribute is given;
+ (bso#11613).
+ + Fix a typo in the smb.conf manpage, explanation of idmap config;
+ (bso#11619).
+ + Correctly initialize the list head when keeping a list of primary followed
+ by DFS connections; (bso#11624).
+ + Reduce the memory footprint of empty string options; (bso#11625).
+ + lib/async_req: Do not install async_connect_send_test; (bso#11639).
+ + Fix typos in man vfs_gpfs; (bso#11641).
+ + Make "hide dot files" option work with "store dos attributes = yes";
+ (bso#11645).
+ + Fix a corner case of the symlink verification; (bso#11647); (bnc#960249).
+ + Do not disable "store dos attributes" on-the-fly; (bso#11649).
+ + Update lastLogon and lastLogonTimestamp; (bso#11659).
+
+-------------------------------------------------------------------
+Mon Jan 11 19:16:46 UTC 2016 - lmuelle(a)suse.com
+
+- Prevent access denied if the share path is "/"; (bso#11647); (bnc#960249).
+
+-------------------------------------------------------------------
Old:
----
samba-4.3.3.tar.asc
samba-4.3.3.tar.gz
New:
----
samba-4.3.4.tar.asc
samba-4.3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.QfEHcw/_old 2016-01-20 09:54:22.000000000 +0100
+++ /var/tmp/diff_new_pack.QfEHcw/_new 2016-01-20 09:54:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package samba
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,16 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
Name: samba
-%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
-BuildRequires: autoconf
-%endif
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
@@ -122,7 +119,7 @@
BuildRequires: systemd
BuildRequires: systemd-devel
%endif
-%define samba_ver 4.3.3
+%define samba_ver 4.3.4
%define samba_ver_suffix %nil
%if "%{samba_ver_suffix}" == ""
%define samba_source_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -144,11 +141,11 @@
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
-%define SOURCE_TIMESTAMP 3552
+%define SOURCE_TIMESTAMP 3565
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
-Version: 4.3.3
+Version: 4.3.4
Release: 0
Url: https://www.samba.org/
Provides: samba-gplv3 = %{version}
@@ -1224,7 +1221,6 @@
rm \
%{buildroot}/%{_libdir}/samba/ldb/ildap.so \
%{buildroot}/%{_libdir}/samba/ldb/ldbsamba_extensions.so \
- %{buildroot}/%{_bindir}/async_connect_send_test \
%endif
# utility scripts
++++++ patches.tar.bz2 ++++++
++++ 2708 lines of diff (skipped)
++++++ samba-4.3.3.tar.gz -> samba-4.3.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/samba/samba-4.3.3.tar.gz /work/SRC/openSUSE:Factory/.samba.new/samba-4.3.4.tar.gz differ: char 5, line 1
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2015-12-16 17:42:05.000000000 +0100
+++ new/vendor-files/tools/package-data 2016-01-16 19:05:58.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="3552"
+SAMBA_PACKAGE_SVN_VERSION="3565"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/update-apparmor-samba-profile new/vendor-files/tools/update-apparmor-samba-profile
--- old/vendor-files/tools/update-apparmor-samba-profile 2015-05-13 21:10:11.000000000 +0200
+++ new/vendor-files/tools/update-apparmor-samba-profile 2016-01-16 18:59:56.000000000 +0100
@@ -8,7 +8,7 @@
# - "/" - if someone is insane enough to share his complete filesystem, he'll have
# to modify the apparmor profile himself
-# (c) Christian Boltz 2011
+# (c) Christian Boltz 2011-2016
# This script is licensed under the GPL v2 or, at your choice, any later version.
@@ -24,8 +24,8 @@
exit 1
}
-
-versionstring="${0##*/} 1.0"
+# if you change this script, _always_ update the version to force an update of the profile sniplet
+versionstring="${0##*/} 1.1"
aastatus="/usr/sbin/aa-status"
aaparser="/sbin/apparmor_parser"
@@ -41,7 +41,6 @@
test -e "$loadedprofiles" || silentexit "apparmor not loaded"
test -e "$profilesniplet" || silentexit "apparmor profile snippet not available"
test -r "$loadedprofiles" || verboseexit "no read permissions for $loadedprofiles - not running as root?"
-grep -q '^/usr/sbin/smbd (' /sys/kernel/security/apparmor/profiles || silentexit "smbd profile not loaded"
widelinks=$(testparm -s --parameter-name "wide links" 2>/dev/null)
test "$widelinks" == "Yes" && {
@@ -56,7 +55,7 @@
{
echo "# autogenerated by $versionstring at samba start - do not edit!"
echo ""
- testparm -s 2>/dev/null |sed -n '/^[ \t]*path[ \t]*=[ \t]*[^% \t]\{2,\}/ s�^[ \t]*path[ \t]*=[ \t]*\(.*\)$�\1/ rk,\n\1/** rwkl,�p'
+ testparm -s 2>/dev/null |sed -n '/^[ \t]*path[ \t]*=[ \t]*[^% \t]\{2,\}/ s�^[ \t]*path[ \t]*=[ \t]*\(.*\)$�"\1/" rk,\n"\1/**" rwkl,�p'
} > "$tmp_profilesniplet"
diff "$profilesniplet" "$tmp_profilesniplet" >/dev/null && {
@@ -65,10 +64,12 @@
silentexit "profile sniplet unchanged"
}
-echo "Updating AppArmor profile for Samba..."
-
mv -f "$tmp_profilesniplet" "$profilesniplet"
+grep -q '^/usr/sbin/smbd (' /sys/kernel/security/apparmor/profiles || silentexit "smbd profile not loaded"
+
+echo "Reloading updated AppArmor profile for Samba..."
+
# reload profile
"$aaparser" -r "$smbd_profile"
1
0
Hello community,
here is the log from the commit of package pinentry for openSUSE:Factory checked in at 2016-01-20 09:54:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pinentry (Old)
and /work/SRC/openSUSE:Factory/.pinentry.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pinentry"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2015-12-18 21:52:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2016-01-20 09:54:13.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 13 10:07:36 UTC 2016 - tchvatal(a)suse.com
+
+- Use qt5 instead of qt4 in pinentry-qt
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pinentry.spec ++++++
--- /var/tmp/diff_new_pack.UUQMoj/_old 2016-01-20 09:54:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UUQMoj/_new 2016-01-20 09:54:15.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pinentry
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-#%define nmajor %(xxx="`grep NCURSES_VERSION_MAJOR /usr/include/ncurses.h`"; test -z "$xxx" && xxx=leer; echo $xxx)
-#%define nmajor %(xxx="leer"; xxx="`grep NCURSES_VERSION_MAJOR /usr/include/ncurses.h 2> /dev/null`"; echo $xxx)
%define ncurses %(xxx="`readlink -f %{_includedir}/ncurses.h`"; echo $xxx)
%define nmajor %(grep NCURSES_VERSION_MAJOR < %{_includedir}/ncurses.h)
Name: pinentry
@@ -36,9 +34,11 @@
Patch7: pinentry-ncurses6.diff
BuildRequires: libassuan-devel >= 2.1.0
BuildRequires: libgpg-error-devel >= 1.16
-BuildRequires: libqt4-devel
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gcr-base-3)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0
@@ -51,17 +51,18 @@
This is a collection of simple PIN or passphrase entry dialogs which
utilize the Assuan protocol as described by the Aegypten project.
-%package qt4
+%package qt5
Summary: Collection of Simple PIN or Passphrase Entry Dialogs
Group: Productivity/Other
Requires: pinentry
Provides: pinentry-dialog
Provides: pinentry-gui
Provides: pinentry-qt = %{version}
-Provides: pinentry:%{_bindir}/pinentry-qt4
Obsoletes: pinentry-qt <= 0.8.3
+Provides: pinentry-qt4 = %{version}
+Obsoletes: pinentry-qt4 <= 0.9.7
-%description qt4
+%description qt5
This is a collection of simple PIN or passphrase entry dialogs which
utilize the Assuan protocol as described by the Aegypten project.
@@ -109,8 +110,8 @@
%build
# Regenerate moc's
-moc qt/pinentrydialog.h > qt/pinentrydialog.moc
-moc qt/pinentryconfirm.h > qt/pinentryconfirm.moc
+moc-qt5 qt/pinentrydialog.h > qt/pinentrydialog.moc
+moc-qt5 qt/pinentryconfirm.h > qt/pinentryconfirm.moc
nmajor=$(sed -rn 's/^#define\s+NCURSES_VERSION_MAJOR\s+([0-9]+)/\1/p' %{_includedir}/ncurses.h)
CFLAGS="%{optflags} $(ncursesw${nmajor}-config --cflags)"
CXXFLAGS="%{optflags} -std=gnu++11 $(ncursesw${nmajor}-config --cflags)"
@@ -173,7 +174,7 @@
%attr(755,root,root) %{_bindir}/pinentry-tty
%attr(755,root,root) %{_bindir}/pinentry-curses
-%files qt4
+%files qt5
%defattr(-,root,root)
%attr(755,root,root) %{_bindir}/pinentry-qt4
%attr(755,root,root) %{_bindir}/pinentry-qt
1
0
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2016-01-20 09:54:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysvinit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2014-08-25 11:03:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2016-01-20 09:54:08.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_f_a(a)gmx.de
+
+- cleanup package
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2015-12-13 09:33:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-01-20 09:54:08.000000000 +0100
@@ -1,0 +2,25 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_f_a(a)gmx.de
+
+- cleanup package:
+ * don't build binaries which are not installed
+ * remove unused sources
+ * remove patches (or parts of patches) which modify unused files
+ * remove old build conditions (sysvinit, util-linux, mkinitrd)
+ * remove unused dependencies
+- this cleanup does not change the resulting binaries (except some
+ package dependencies)
+- list of removed patches:
+ * sysvinit-2.82-startstop.patch
+ * sysvinit-2.88+dsf-blowfish.dif
+ * sysvinit-2.88+dsf-crypt.patch
+ * sysvinit-2.88+dsf-env.patch
+ * sysvinit-2.88dsf-multiple-sulogin.patch
+ * sysvinit-2.88+dsf-run.diff
+ * sysvinit-2.88+dsf-xen.patch
+- list of modified patches:
+ * notify-pam-dead.patch
+ * sysvinit-2.88+dsf.dif
+ * sysvinit-2.88+dsf-sulogin.diff
+ * sysvinit-2.88dsf-suse.patch
+
+-------------------------------------------------------------------
Old:
----
mkinitrd-boot.sh
mkinitrd-kill1.sh
mkinitrd-kill2.sh
rc.powerd
sysvinit-2.82-startstop.patch
sysvinit-2.88+dsf-blowfish.dif
sysvinit-2.88+dsf-crypt.patch
sysvinit-2.88+dsf-env.patch
sysvinit-2.88+dsf-run.diff
sysvinit-2.88+dsf-xen.patch
sysvinit-2.88dsf-multiple-sulogin.patch
sysvinit-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerd.spec ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -16,11 +16,6 @@
#
-%if %{undefined systemd_requires}
-%global with_sysvinit 1
-%endif
-%bcond_with sysvinit
-
Name: powerd
Version: 2.0.2
Release: 0
@@ -28,25 +23,15 @@
License: GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1140
-%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: pkg-config
-BuildRequires: systemd-devel
-%endif
-%endif
Url: https://power.sourceforge.net/
Source0: powerd-%{version}.tar.bz2
-Source1: rc.powerd
Source2: powerd.service
Patch0: powerd-%{version}.dif
Patch1: powerd-%{version}-getaddrinfo.patch
-%if %{without sysvinit}
%if %{undefined _unitdir}
%{expand: %%global %_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
%endif
-%endif
%description -n powerd
powerd monitors the serial port connected to an UPS device and will perform
@@ -82,28 +67,17 @@
echo '# read manual page of detectups(8) and powerd(8) its self.' >> %{buildroot}/etc/powerd.conf
echo '# ' >> %{buildroot}/etc/powerd.conf
echo '# to enable powerd service run the command' >> %{buildroot}/etc/powerd.conf
-%if %{with sysvinit}
- echo '# insserv powerd' >> %{buildroot}/etc/powerd.conf
- echo '# rcpowerd start' >> %{buildroot}/etc/powerd.conf
- mkdir -p %{buildroot}/etc/init.d
- install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
- ln -sf /etc/init.d/powerd %{buildroot}%{_sbindir}/rcpowerd
-%else
echo '# systemctl enable powerd.service' >> %{buildroot}/etc/powerd.conf
echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/%{_unitdir}
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
-%endif
%preun
%stop_on_removal powerd
%postun
%restart_on_update powerd
-%if %{with sysvinit}
-%insserv_cleanup
-%endif
%files -n powerd
%defattr (-,root,root,755)
@@ -112,11 +86,7 @@
/sbin/detectups
%{_sbindir}/rcpowerd
%config /etc/powerd.conf
-%if %{with sysvinit}
-%config /etc/init.d/powerd
-%else
%attr(0644,root,root) %{_unitdir}/powerd.service
-%endif
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
++++++ sysvinit.spec ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -16,22 +16,6 @@
#
-%if 0%{suse_version} < 1300
-%global with_util_linux 1
-%endif
-%bcond_with util_linux
-%if %{undefined systemd_requires}
-%bcond_without sysvinit
-%else
-%bcond_with sysvinit
-%endif
-
-%if 0%{?suse_version} > 1310
-%define have_mkinitrd 0
-%else
-%define have_mkinitrd 1
-%endif
-
Name: sysvinit
%define KPVER 2.21
%define SCVER 1.16
@@ -43,57 +27,26 @@
License: GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: audit-devel
-BuildRequires: libselinux-devel
-BuildRequires: libsepol-devel
-BuildRequires: pam-devel
-%if 0%{?suse_version} > 1140
-%if 0%{?suse_version} > 1230
-BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: pkg-config
-BuildRequires: systemd-devel
-%endif
-%endif
#!BuildIgnore: sysvinit-tools
-Requires(post): coreutils grep
-%if %have_mkinitrd
-Requires(post): mkinitrd
-Requires(postun): mkinitrd
-%endif
Url: http://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}dsf.tar.bz2
Source2: killproc-%{KPVER}.tar.bz2
Source4: showconsole-%{SCVER}.tar.bz2
Source5: startpar-%{START}.tar.bz2
-Source7: %{name}-rpmlintrc
-Source8: mkinitrd-boot.sh
-Source9: mkinitrd-kill1.sh
-Source10: mkinitrd-kill2.sh
Patch: %{name}-%{version}dsf.dif
-Patch1: %{name}-2.82-startstop.patch
Patch2: %{name}-2.88dsf-suse.patch
Patch3: %{name}-2.88dsf-scripts2.patch
Patch4: notify-pam-dead.patch
-Patch5: %{name}-2.88dsf-multiple-sulogin.patch
-Patch6: %{name}-%{version}dsf-run.diff
-Patch7: %{name}-%{version}dsf-crypt.patch
-Patch8: %{name}-%{version}dsf-blowfish.dif
Patch9: %{name}-2.88dsf-no-kill.patch
-Patch10: %{name}-%{version}dsf-env.patch
Patch11: %{name}-%{version}dsf-dostat.patch
# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
Patch12: %{name}-%{version}dsf-sulogin.diff
-# PATCH-FIX-SUSE -- sulogin: find suitable console device even if first is not usable
-Patch13: %{name}-%{version}dsf-xen.patch
Patch30: killproc-%{KPVER}.dif
Patch31: killproc-2.18-open_flags.dif
Patch40: showconsole-%{SCVER}.dif
Patch41: showconsole-1.16-deadlock.diff
Patch42: showconsole-1.16-glibc.dif
Patch50: startpar-%{START}.dif
-Requires: mingetty
-Requires: sysvinit-tools
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -108,46 +61,20 @@
%package tools
Summary: Tools for basic booting
Group: System/Base
-%if 0%{suse_version} > 1120
-Requires(preun): coreutils %insserv_prereq
-Requires(postun): coreutils %insserv_prereq
-%else
-PreReq: coreutils %insserv_prereq
-%endif
%description tools
Helper tools from sysvinit that support booting, including but not exclusive
to startpar, killproc and pidof. System V init specific programs are in the
sysvinit package.
-%package init
-Summary: Provides /sbin/init for sysvinit
-Group: System/Base
-Provides: sbin_init
-Conflicts: otherproviders(sbin_init)
-Requires: %{name}
-%ifnarch s390 s390x
-Requires: powerd
-%endif
-
-%description init
-Just some symlinks and manual page for sysvinit
-
%prep
%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 4 -b 5
-%patch1 -p0 -b .startstop
%patch2 -p0 -b .suse
%patch3 -p0 -b .scripts2
%patch4 -p0 -b .pam
-%patch5 -p0 -b .sulogin
-%patch6 -p0 -b .run
-%patch7 -p0 -b .crypt
-%patch8 -p0 -b .blowfish
%patch9 -p0 -b .no-kill
-%patch10 -p0 -b .env
%patch11 -p0 -b .dostat
%patch12 -p0 -b .ka5
-%patch13 -p0 -b .xen
%patch
pushd doc
mkdir killproc showconsole
@@ -186,30 +113,7 @@
popd
%install
- rm -rf %{buildroot}
- mkdir %{buildroot}
- mkdir -m 755 -p %{buildroot}/bin
- mkdir -m 755 -p %{buildroot}/dev
- mkdir -m 755 -p %{buildroot}/etc
- mkdir -m 755 -p %{buildroot}/sbin
- mkdir -m 755 -p %{buildroot}/usr/bin
- mkdir -m 755 -p %{buildroot}/usr/include
- mkdir -m 755 -p %{buildroot}%{_mandir}/man1
- mkdir -m 755 -p %{buildroot}%{_mandir}/man5
- mkdir -m 755 -p %{buildroot}%{_mandir}/man8
- make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} WITH_SELINUX=yes DISTRO=SuSE
- mv %{buildroot}/sbin/init %{buildroot}/sbin/sysvinit
- mv %{buildroot}%{_mandir}/man8/init.8 %{buildroot}/%{_mandir}/man8/sysvinit.8
- ln -s /sbin/sysvinit %{buildroot}/sbin/init
- ln -s sysvinit.8 %{buildroot}%{_mandir}/man8/init.8
- mkdir -p %{buildroot}/lib/sysvinit
- ln -sf /sbin/sysvinit %{buildroot}/lib/sysvinit/telinit
- ln -sf /sbin/sysvinit %{buildroot}/sbin/telinit
- test -p %{buildroot}/dev/initctl || {
- rm -f %{buildroot}/dev/initctl
- mknod %{buildroot}/dev/initctl p
- chmod 600 %{buildroot}/dev/initctl
- }
+ make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} DISTRO=SuSE
pushd ../showconsole-%{SCVER}
make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0700" DESTDIR=%{buildroot}
popd
@@ -220,124 +124,17 @@
make install DESTDIR=%{buildroot}
popd
#
-# Install mkinitrd scriptlets
-#
-%if %have_mkinitrd
- install -d %{buildroot}/lib/mkinitrd/scripts
- install -m 0755 %{SOURCE8} %{buildroot}/lib/mkinitrd/scripts/boot-blogd.sh
- install -m 0755 %{SOURCE9} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd.sh
- install -m 0755 %{SOURCE10} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd2.sh
-%endif
-#
# Remove files not packed:
#
- rm -f %{buildroot}/usr/include/{initreq.h,libblogger.h}
- rm -f %{buildroot}/usr/lib/libblogger.a
- rm -f %{buildroot}%{_mandir}/man1/mesg.1*
+ rm %{buildroot}/usr/include/{initreq.h,libblogger.h}
+ rm %{buildroot}/usr/lib/libblogger.a
chmod 444 %{buildroot}%{_mandir}/man?/*
-%if ! %{with util_linux}
- rm -vf %{buildroot}/bin/mountpoint
- rm -vf %{buildroot}/usr/bin/utmpdump
- rm -vf %{buildroot}/sbin/sulogin
- rm -vf %{buildroot}%{_mandir}/man1/mountpoint.1*
- rm -vf %{buildroot}%{_mandir}/man1/utmpdump.1*
- rm -vf %{buildroot}%{_mandir}/man8/sulogin.8*
-%endif
-%if !%{with sysvinit}
- rm -vf %{buildroot}/sbin/sysvinit
- rm -vfr %{buildroot}/lib/sysvinit
- rm -vf %{buildroot}/sbin/halt
- rm -vf %{buildroot}/sbin/init
- rm -vf %{buildroot}/sbin/poweroff
- rm -vf %{buildroot}/sbin/reboot
- rm -vf %{buildroot}/sbin/runlevel
- rm -vf %{buildroot}/sbin/shutdown
- rm -vf %{buildroot}/sbin/telinit
- rm -vf %{buildroot}%{_mandir}/man8/halt.8
- rm -vf %{buildroot}%{_mandir}/man5/initscript.5
- rm -vf %{buildroot}%{_mandir}/man5/inittab.5
- rm -vf %{buildroot}%{_mandir}/man8/init.8
- rm -vf %{buildroot}%{_mandir}/man8/sysvinit.8
- rm -vf %{buildroot}%{_mandir}/man8/poweroff.8
- rm -vf %{buildroot}%{_mandir}/man8/reboot.8
- rm -vf %{buildroot}%{_mandir}/man8/runlevel.8
- rm -vf %{buildroot}%{_mandir}/man8/shutdown.8
- rm -vf %{buildroot}%{_mandir}/man8/telinit.8
- rm -vfr %{buildroot}/lib/mkinitrd
-%endif
-
-%if %{with sysvinit}
-%post
-ret=0
-if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build -a -x /sbin/init; then
- icount=$(grep -cE '^[[:alnum:]]+:[[:alnum:]]*:' /etc/inittab 2>/dev/null || echo 0)
- if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) -a $icount -gt 6 ; then
- if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i' /sbin/sysvinit); then
- /sbin/telinit u
- fi
- elif test $icount -le 6 ; then
- echo 'Broken /etc/inittab found, installing and using %{name} make no sense!' 1>&2
- ret=1
- fi
-fi
-%if %have_mkinitrd
-if test -x /sbin/mkinitrd_setup; then
- mkinitrd_setup
-fi
-%endif
-exit $ret
-
-%if %have_mkinitrd
-%postun
-if test -x /sbin/mkinitrd_setup; then
- mkinitrd_setup
-fi
-%endif
-
-%files
-%defattr (-,root,root,755)
-/sbin/sysvinit
-%dir /lib/sysvinit
-/lib/sysvinit/telinit
-
-%files init
-%defattr (-,root,root,755)
-/sbin/halt
-/sbin/init
-/sbin/poweroff
-/sbin/reboot
-/sbin/runlevel
-/sbin/shutdown
-/sbin/telinit
-%doc %{_mandir}/man8/halt.8.gz
-%doc %{_mandir}/man5/initscript.5.gz
-%doc %{_mandir}/man5/inittab.5.gz
-%doc %{_mandir}/man8/init.8.gz
-%doc %{_mandir}/man8/sysvinit.8.gz
-%doc %{_mandir}/man8/poweroff.8.gz
-%doc %{_mandir}/man8/reboot.8.gz
-%doc %{_mandir}/man8/runlevel.8.gz
-%doc %{_mandir}/man8/shutdown.8.gz
-%doc %{_mandir}/man8/telinit.8.gz
-%if %have_mkinitrd
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/boot-blogd.sh
-/lib/mkinitrd/scripts/boot-killblogd.sh
-/lib/mkinitrd/scripts/boot-killblogd2.sh
-%endif
-%endif
%files tools
%defattr (-,root,root,755)
%doc COPYING COPYRIGHT doc/Propaganda
%doc doc/Changelog doc/killproc doc/showconsole
%config /etc/pam.d/init
-%if %{with util_linux}
-/sbin/sulogin
-/bin/mountpoint
-/usr/bin/utmpdump
-%endif
/bin/pidof
/bin/usleep
/bin/fsync
@@ -358,11 +155,6 @@
/sbin/mkill
/sbin/startproc
/sbin/start_daemon
-%if %{with util_linux}
-%doc %{_mandir}/man1/mountpoint.1.gz
-%doc %{_mandir}/man1/utmpdump.1.gz
-%doc %{_mandir}/man8/sulogin.8.gz
-%endif
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
# /usr/include/libblogger.h
@@ -384,12 +176,5 @@
%doc %{_mandir}/man8/rvmtab.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
-%if 0
-%doc contrib/bootlogd.README
-/sbin/bootlogd
-/sbin/intr
-%doc %{_mandir}/man8/bootlogd.8.gz
-%doc %{_mandir}/man8/intr.8.gz
-%endif
%changelog
++++++ notify-pam-dead.patch ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -35,59 +35,6 @@
# $(INSTALL_DIR) $(ROOT)/etc/
# $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
ln -sf halt $(ROOT)/sbin/reboot
---- src/init.c
-+++ src/init.c 2010-04-13 00:00:00.000000000 +0000
-@@ -79,6 +79,10 @@
- #include "reboot.h"
- #include "set.h"
-
-+#ifdef USE_PAM
-+extern void notify_pam_dead_session(const char *id);
-+#endif
-+
- #ifndef SIGPWR
- # define SIGPWR SIGUSR2
- #endif
-@@ -1132,6 +1136,9 @@ pid_t spawn(CHILD *ch, int *res)
- }
- dup(f);
- dup(f);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- }
-
- /*
-@@ -1551,6 +1558,9 @@ void read_inittab(void)
- INITDBG(L_VB, "Updating utmp for pid %d [id %s]",
- ch->pid, ch->id);
- ch->flags &= ~RUNNING;
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
-@@ -2012,6 +2022,9 @@ void re_exec(void)
- if (ch->flags & ZOMBIE) {
- INITDBG(L_VB, "Child died, PID= %d", ch->pid);
- ch->flags &= ~(RUNNING|ZOMBIE|WAITING);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
-@@ -2465,6 +2478,9 @@ void process_signals()
- if (ch->flags & ZOMBIE) {
- INITDBG(L_VB, "Child died, PID= %d", ch->pid);
- ch->flags &= ~(RUNNING|ZOMBIE|WAITING);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
--- src/init.sample
+++ src/init.sample 2010-04-13 00:00:00.000000000 +0000
@@ -0,0 +1,8 @@
@@ -99,113 +46,4 @@
+auth sufficient pam_rootok.so
+account include common-account
+session requisite pam_lastlog.so silent
---- src/utmp.c
-+++ src/utmp.c 2010-04-13 00:00:00.000000000 +0000
-@@ -34,10 +34,18 @@
- #include <string.h>
- #include <utmp.h>
-
-+#if defined(USE_PAM) && defined(INIT_MAIN)
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif
-+
- #include "init.h"
- #include "initreq.h"
- #include "paths.h"
-
-+#ifndef _PATH_DEV
-+# define _PATH_DEV "/dev/"
-+#endif
-
- #if defined(__GLIBC__)
- # if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) && defined(__powerpc__)
-@@ -127,9 +135,9 @@ char *line) /* Which line is this */
- strncpy(utmp.ut_name, user, sizeof(utmp.ut_name));
- strncpy(utmp.ut_id , id , sizeof(utmp.ut_id ));
- strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
--
-- /* Put the OS version in place of the hostname */
-- if (uname(&uname_buf) == 0)
-+
-+ /* Put the OS version in place of the hostname */
-+ if (uname(&uname_buf) == 0)
- strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));
-
- #if HAVE_UPDWTMP
-@@ -262,3 +270,75 @@ char *line) /* LINE if used. */
- write_wtmp(user, id, pid, type, line && line[0] ? line : oldline);
- }
-
-+#if defined(USE_PAM) && defined(INIT_MAIN)
-+static pam_handle_t *pamh = NULL;
-+# ifdef __GNUC__
-+static int
-+null_conv(int num_msg, const struct pam_message **msgm,
-+ struct pam_response **response __attribute__((unused)),
-+ void *appdata_ptr __attribute__((unused)))
-+# else
-+static int
-+null_conv(int num_msg, const struct pam_message **msgm,
-+ struct pam_response **response, void *appdata_ptr)
-+# endif
-+{
-+ int i;
-+ for (i = 0; i < num_msg; i++) {
-+ const struct pam_message *msg = msgm[i];
-+ if (msg == (const struct pam_message*)0)
-+ continue;
-+ if (msg->msg == (char*)0)
-+ continue;
-+ switch (msg->msg_style) {
-+ case PAM_ERROR_MSG:
-+ case PAM_TEXT_INFO:
-+ initlog(L_VB, "pam_message %s", msg->msg);
-+ default:
-+ break;
-+ }
-+ }
-+ return 0;
-+}
-+static const struct pam_conv conv = { null_conv, NULL };
-+# define PAM_FAIL_CHECK(func, args...) \
-+ { \
-+ if ((pam_ret = (func)(args)) != PAM_SUCCESS) { \
-+ initlog(L_VB, "%s", pam_strerror(pamh, pam_ret)); \
-+ goto pam_error; \
-+ } \
-+ }
-+
-+void notify_pam_dead_session(const char *id)
-+{
-+ struct utmp *oldut, ut;
-+
-+ setutent();
-+
-+ memset(&ut, 0, sizeof(ut));
-+ ut.ut_type = DEAD_PROCESS;
-+ strncpy(ut.ut_id, id, sizeof(ut.ut_id));
-+
-+ if ((oldut = getutid(&ut)) && (oldut->ut_type == USER_PROCESS)) {
-+ int pam_ret;
-+ char tty[UT_LINESIZE+ strlen(_PATH_DEV) + 1];
-+
-+ if (strncmp(oldut->ut_line, _PATH_DEV, strlen(_PATH_DEV)))
-+ snprintf(tty, sizeof(tty), _PATH_DEV "%.*s",
-+ UT_LINESIZE, oldut->ut_line);
-+ else
-+ snprintf(tty, sizeof(tty), "%.*s",
-+ UT_LINESIZE, oldut->ut_line);
-+
-+ PAM_FAIL_CHECK(pam_start, "init", oldut->ut_user, &conv, &pamh);
-+ PAM_FAIL_CHECK(pam_set_item, pamh, PAM_TTY, tty);
-+ PAM_FAIL_CHECK(pam_set_item, pamh, PAM_RHOST, oldut->ut_host);
-+ PAM_FAIL_CHECK(pam_close_session, pamh, PAM_SILENT);
-+ pam_error:
-+ pam_end(pamh, pam_ret);
-+ }
-+
-+ endutent();
-+}
-+#endif /* USE_PAM && INIT_MAIN */
+
++++++ sysvinit-2.88+dsf-sulogin.diff ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -16,29 +16,3 @@
if (buf[0] == '\0') {
nsyslog(LOG_ERR,
"can't read from %s\n", path);
-Index: src/shutdown.c
-===================================================================
---- src/shutdown.c (revision 116)
-+++ src/shutdown.c (working copy)
-@@ -76,7 +76,7 @@
-
- char *clean_env[] = {
- "HOME=/",
-- "PATH=/bin:/usr/bin:/sbin:/usr/sbin",
-+ "PATH=" PATH_DEFAULT,
- "TERM=dumb",
- "SHELL=/bin/sh",
- NULL,
-Index: src/sulogin.c
-===================================================================
---- src/sulogin.c (revision 116)
-+++ src/sulogin.c (working copy)
-@@ -987,7 +998,7 @@
- }
- if (alarm_rised) {
- tcfinal(con);
-- printf("Timed out.\n\r");
-+ fprintf(stderr, "Timed out.\n\r");
- }
- /*
- * User may pressed Control-D.
++++++ sysvinit-2.88+dsf.dif ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -1,6 +1,6 @@
---- src/Makefile
-+++ src/Makefile 2010-03-23 15:11:12.000000000 +0000
-@@ -9,16 +9,16 @@
+--- src/Makefile.orig 2015-12-04 14:01:44.134651379 +0100
++++ src/Makefile 2015-12-04 14:01:50.735728998 +0100
+@@ -9,19 +9,19 @@
#
CPPFLAGS = -DUSE_PAM
@@ -11,19 +11,41 @@
# For some known distributions we do not build all programs, otherwise we do.
BIN =
- SBIN = init halt shutdown runlevel killall5 fstab-decode
+-SBIN = init halt shutdown runlevel killall5 fstab-decode
-USRBIN = last mesg
++SBIN = killall5 fstab-decode
+USRBIN =
-MAN1 = last.1 lastb.1 mesg.1
+-MAN5 = initscript.5 inittab.5
+-MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
+-MAN8 += shutdown.8 telinit.8 fstab-decode.8
+MAN1 =
- MAN5 = initscript.5 inittab.5
- MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
- MAN8 += shutdown.8 telinit.8 fstab-decode.8
-@@ -176,10 +176,8 @@ endif
- ln -sf halt $(ROOT)/sbin/reboot
- ln -sf halt $(ROOT)/sbin/poweroff
- ln -sf init $(ROOT)/sbin/telinit
++MAN5 =
++MAN8 = killall5.8 pidof.8
++MAN8 += fstab-decode.8
+
+ ifeq ($(DISTRO),)
+ BIN += mountpoint
+@@ -46,11 +46,6 @@
+
+ ifeq ($(DISTRO),SuSE)
+ CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
+-BIN += mountpoint
+-SBIN += sulogin
+-USRBIN += utmpdump
+-MAN1 += utmpdump.1 mountpoint.1
+-MAN8 += sulogin.8
+ endif
+
+ ID = $(shell id -u)
+@@ -173,13 +168,8 @@
+ endif
+ # $(INSTALL_DIR) $(ROOT)/etc/
+ # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
+- ln -sf halt $(ROOT)/sbin/reboot
+- ln -sf halt $(ROOT)/sbin/poweroff
+- ln -sf init $(ROOT)/sbin/telinit
- ln -sf /sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \
@@ -33,23 +55,3 @@
$(INSTALL_DIR) $(ROOT)/usr/include/
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
---- src/bootlogd.c
-+++ src/bootlogd.c 2011-03-15 14:58:54.000000000 +0000
-@@ -241,7 +241,7 @@
- int consolename(char *res, size_t rlen)
- {
- #ifdef TIOCGDEV
-- unsigned int kdev;
-+ kdev_t kdev;
- #endif
- struct stat st;
- int n;
-@@ -559,7 +559,7 @@
- }
-
- (void)ioctl(0, TIOCCONS, NULL);
--#if 1
-+#if 0
- /* Work around bug in 2.1/2.2 kernels. Fixed in 2.2.13 and 2.3.18 */
- if ((n = open("/dev/tty0", O_RDWR)) >= 0) {
- (void)ioctl(n, TIOCCONS, NULL);
++++++ sysvinit-2.88dsf-suse.patch ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -1,113 +1,3 @@
---- man/init.8
-+++ man/init.8 2010-03-19 14:44:16.000000000 +0000
-@@ -261,7 +261,7 @@ It activates the \fIkbrequest\fP action.
- .SH CONFORMING TO
- \fBInit\fP is compatible with the System V init. It works closely
- together with the scripts in the directories
--\fI/etc/init.d\fP and \fI/etc/rc{runlevel}.d\fP.
-+\fI/etc/init.d\fP and \fI/etc/init.d/rc{runlevel}.d\fP.
- If your system uses this convention, there should be a \fIREADME\fP
- file in the directory \fI/etc/init.d\fP explaining how these scripts work.
- .\"}}}
-@@ -301,6 +301,7 @@ page by Michael Haardt (u31b3hs(a)pool.inf
- .\"}}}
- .\"{{{ See also
- .SH "SEE ALSO"
-+.BR init.d (7),
- .BR getty (1),
- .BR login (1),
- .BR sh (1),
---- man/inittab.5
-+++ man/inittab.5 2004-03-12 12:33:05.000000000 +0000
-@@ -197,7 +197,7 @@ rc::bootwait:/etc/rc
- .fi
- .sp
- .RE
--This inittab file executes \fB/etc/rc\fP during boot and starts gettys
-+This inittab file executes \fB/etc/rc\fP during boot and starts mingettys
- on tty1\-tty4.
- .PP
- A more elaborate \fBinittab\fP with different runlevels (see the comments
-@@ -205,23 +205,20 @@ inside):
- .RS
- .sp
- .nf
--.ne 19
-+.ne 41
- # Level to run in
- id:2:initdefault:
-
- # Boot-time system configuration/initialization script.
--si::sysinit:/etc/init.d/rcS
-+si:I:bootwait:/etc/init.d/boot
-
--# What to do in single-user mode.
--~:S:wait:/sbin/sulogin
--
--# /etc/init.d executes the S and K scripts upon change
--# of runlevel.
--#
--# Runlevel 0 is halt.
--# Runlevel 1 is single-user.
--# Runlevels 2-5 are multi-user.
--# Runlevel 6 is reboot.
-+# Runlevel 0 is System halt (Never use this as initdefault!)
-+# Runlevel 1 is Single user mode
-+# Runlevel 2 is Local multiuser without remote network (e.g. NFS)
-+# Runlevel 3 is Full multiuser with network
-+# Runlevel 4 is Not used
-+# Runlevel 5 is Full multiuser with network and xdm
-+# Runlevel 6 is System reboot (Never use this as initdefault!)
-
- l0:0:wait:/etc/init.d/rc 0
- l1:1:wait:/etc/init.d/rc 1
-@@ -231,17 +228,27 @@ l4:4:wait:/etc/init.d/rc 4
- l5:5:wait:/etc/init.d/rc 5
- l6:6:wait:/etc/init.d/rc 6
-
-+# What to do in single-user mode
-+ls:S:wait:/etc/init.d/rc S
-+~~:S:respawn:/sbin/sulogin
-+
- # What to do at the "3 finger salute".
--ca::ctrlaltdel:/sbin/shutdown -t1 -h now
-+ca::ctrlaltdel:/sbin/shutdown -t5 -h now
-
--# Runlevel 2,3: getty on virtual consoles
--# Runlevel 3: getty on terminal (ttyS0) and modem (ttyS1)
--1:23:respawn:/sbin/getty tty1 VC linux
--2:23:respawn:/sbin/getty tty2 VC linux
--3:23:respawn:/sbin/getty tty3 VC linux
--4:23:respawn:/sbin/getty tty4 VC linux
--S0:3:respawn:/sbin/getty -L 9600 ttyS0 vt320
--S1:3:respawn:/sbin/mgetty -x0 -D ttyS1
-+# Runlevel 2 upto 5: mingetty on console.
-+# level 2, 3, and 5 also getty on serial port S0.
-+1:2345:respawn:/sbin/mingetty --noclear tty1
-+2:2345:respawn:/sbin/mingetty tty2
-+3:2345:respawn:/sbin/mingetty tty3
-+4:2345:respawn:/sbin/mingetty tty4
-+5:2345:respawn:/sbin/mingetty tty5
-+6:2345:respawn:/sbin/mingetty tty6
-+S0:235:respawn:/sbin/agetty -L 9600 ttyS0 vt102
-+
-+# modem getty(s),
-+# /dev/modem is a link to the modem device.
-+#mo:235:respawn:/usr/sbin/mgetty -s 38400 modem
-+mo:235:respawn:/sbin/uugetty modem M19200
-
- .fi
- .sp
-@@ -261,5 +268,8 @@ by Michael Haardt (u31b3hs(a)pool.informat
- .\"{{{ See also
- .SH "SEE ALSO"
- .BR init (8),
--.BR telinit (8)
-+.BR telinit (8),
-+.BR init.d (7),
-+.BR agetty (8),
-+.BR mgetty (8)
- .\"}}}
--- man/killall5.8
+++ man/killall5.8 2010-03-19 14:43:25.000000000 +0000
@@ -44,6 +44,7 @@ process were killed, and 1 if it was una
@@ -129,14 +19,3 @@
.BR shutdown (8),
.BR init (8),
.BR halt (8),
---- man/sulogin.8
-+++ man/sulogin.8 2004-03-12 12:26:35.000000000 +0000
-@@ -35,7 +35,7 @@ passes it the \fB\-b\fP option.
- .PP
- The user is prompted
- .IP "" .5i
--Give root password for system maintenance
-+Give root password for system login
- .br
- (or type Control\-D for normal startup):
- .PP
1
0
Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2016-01-20 09:54:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2015-12-18 21:52:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2016-01-20 09:54:02.000000000 +0100
@@ -1,0 +2,32 @@
+Mon Dec 28 14:48:48 UTC 2015 - dimstar(a)opensuse.org
+
+- Update to version 0.9.2:
+ + two-step: Add separate startup / shutdown animations.
+ + device-manager: try fb device if drm device failed.
+ + Port to GTK+ 3.0.
+ + script support system update events.
+ + Drop the obsolete log-viewer
+- Rebase patches:
+ + plymouth-fix-window-size
+ + stop-graphical.patch
+ + 0001-Some-greenish-openSUSE-colors.patch
+ + fix-serial-consoles.patch
+ + 0001-seats-guard-against-NULL-terminal.patch
+ + plymouth-ignore-cirrusdrm.patch
+ + plymouth-boot-vga-framebuffer.patch
+ + 0001-let-it-become-a-real-daemon.patch
+- Drop upstream fixed patches:
+ + 0001-device-manager-only-call-ply_terminal_free.patch
+ + 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
+ + 0001-splash-do-not-process-display-lists-if-it-is-empty.patch
+ + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
+ + 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
+ + 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
+- Replace pkgconfig(gtk+-2.0) BuildRequires with
+ pkgconfig(gtk+-3.0), following upstreams port to GTK+ 3.0.
+- Rename library subpackage from *2 to *4, followings upstreams
+ soname bump.
+- Drop utils subpackage: the log-viewer, which was the only tool
+ left, has been dropped.
+
+-------------------------------------------------------------------
Old:
----
0001-device-manager-only-call-ply_terminal_free.patch
0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
0001-splash-do-not-process-display-lists-if-it-is-empty.patch
0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
plymouth-0.9.0.tar.bz2
New:
----
plymouth-0.9.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -22,13 +22,13 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
-Version: 0.9.0
+Version: 0.9.2
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0+
Group: System/Base
Url: http://freedesktop.org/software/plymouth/releases
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.ta…
Source1: boot-duration
# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes
Patch3: plymouth-fix-window-size
@@ -42,24 +42,12 @@
# PATCH-FIX-UPSTREAM plymouth-manpages.patch idoenmez(a)suse.de -- Fix man page installation
Patch17: plymouth-manpages.patch
Patch18: fix-serial-consoles.patch
-# PATCH-FIX-UPSTREAM 0001-device-manager-only-call-ply_terminal_free.patch fcrozat(a)suse.com -- Fix crash
-Patch19: 0001-device-manager-only-call-ply_terminal_free.patch
# PATCH-FIX-OPENSUSE use-mkinitrd.patch fcrozat(a)suse.com -- call mkinitrd -B for now
Patch20: use-mkinitrd.patch
# PATCH-FIX-UPSTREAM 0001-seats-guard-against-NULL-terminal.patch fcrozat(a)suse.com -- guard against null terminal
Patch21: 0001-seats-guard-against-NULL-terminal.patch
-# PATCH-FIX-UPSTREAM 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch fcrozat(a)suse.com -- prevent crash if pixel display is removed
-Patch22: 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch
-# PATCH-FIX-UPSTREAM 0001-splash-do-not-process-display-lists-if-it-is-empty.patch fcrozat(a)suse.com -- do no crash when removing displays
-Patch23: 0001-splash-do-not-process-display-lists-if-it-is-empty.patch
-# PATCH-FIX-UPSTREAM 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch fcrozat(a)suse.com -- handle recent udev
-Patch24: 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch
-# PATCH-FIX-UPSTREAM 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch fcrozat(a)suse.com -- handle empty seat better
-Patch25: 0001-seat-be-a-little-more-forgiving-in-the-case-there-s-.patch
# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch fcrozat(a)suse.com -- ignore cirrusdrm, use fb instead
Patch26: plymouth-ignore-cirrusdrm.patch
-# PATCH-FIX-UPSTREAM 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch bnc#886148 fcrozat(a)suse.com -- fix UTF-8 code for square
-Patch27: 0001-text-step-bar-use-correct-utf-8-multibyte-sequence-f.patch
Patch28: plymouth-boot-vga-framebuffer.patch
Patch29: 0001-let-it-become-a-real-daemon.patch
@@ -73,6 +61,7 @@
BuildRequires: systemd >= 186
BuildRequires: update-desktop-files
BuildRequires: xz
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(systemd) >= 186
Requires(post): coreutils
@@ -94,36 +83,36 @@
messages are instead redirected to a log file for viewing
after boot.
-%package -n libply-boot-client2
+%package -n libply-boot-client4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-%description -n libply-boot-client2
+%description -n libply-boot-client4
This package contains the libply-boot-client library used by Plymouth.
-%package -n libply-splash-core2
+%package -n libply-splash-core4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-%description -n libply-splash-core2
+%description -n libply-splash-core4
This package contains the libply-splash-core library
used by graphical Plymouth splashes.
-%package -n libply-splash-graphics2
+%package -n libply-splash-graphics4
Summary: Plymouth graphics libraries
Group: Development/Libraries/C and C++
BuildRequires: libpng-devel
-%description -n libply-splash-graphics2
+%description -n libply-splash-graphics4
This package contains the libply-splash-graphics library
used by graphical Plymouth splashes.
-%package -n libply2
+%package -n libply4
Summary: Plymouth core library
Group: Development/Libraries/C and C++
-Requires: libply-boot-client2 = %{version}
+Requires: libply-boot-client4 = %{version}
-%description -n libply2
+%description -n libply4
This package contains the libply library used by Plymouth.
%package devel
@@ -131,26 +120,16 @@
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: %{name}-x11-renderer = %{version}
-Requires: libply-boot-client2 = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-boot-client4 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
Requires: pkgconfig
%description devel
This package contains the libply and libplybootsplash libraries
and headers needed to develop 3rd party splash plugins for Plymouth.
-%package utils
-Summary: Plymouth related utilities
-Group: System/Base
-BuildRequires: pkgconfig(gtk+-2.0)
-Requires: %{name} = %{version}
-
-%description utils
-This package contains utilities that integrate with Plymouth
-including a boot log viewing application.
-
%package dracut
Summary: Plymouth related utilities for dracut
Group: System/Base
@@ -187,7 +166,7 @@
Group: System/Base
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(pango) >= 1.21.0
-Requires: libply-splash-core2 = %{version}
+Requires: libply-splash-core4 = %{version}
%description plugin-label
This package contains the label control plugin for
@@ -197,9 +176,9 @@
%package plugin-fade-throbber
Summary: Plymouth "Fade-Throbber" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-fade-throbber
This package contains the "Fade-In" boot splash plugin for
@@ -210,9 +189,9 @@
Summary: Plymouth "Throbgress" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-throbgress
This package contains the "throbgress" boot splash plugin for
@@ -224,9 +203,9 @@
Summary: Plymouth "space-flares" plugin
Group: System/Base
Requires: %{name}-plugin-label = %{version}
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
@@ -235,9 +214,9 @@
%package plugin-two-step
Summary: Plymouth "two-step" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
Requires: plymouth-plugin-label = %{version}
%description plugin-two-step
@@ -249,9 +228,9 @@
%package plugin-script
Summary: Plymouth "script" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-script
This package contains the "script" boot splash plugin for
@@ -262,9 +241,9 @@
%package plugin-tribar
Summary: Plymouth "script" plugin
Group: System/Base
-Requires: libply-splash-core2 = %{version}
-Requires: libply-splash-graphics2 = %{version}
-Requires: libply2 = %{version}
+Requires: libply-splash-core4 = %{version}
+Requires: libply-splash-graphics4 = %{version}
+Requires: libply4 = %{version}
%description plugin-tribar
This package contains the "tribar" boot splash plugin for
@@ -352,15 +331,9 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
%patch26 -p1
-%patch27 -p1
%patch28 -p1
%patch29 -p1
@@ -385,7 +358,6 @@
--with-background-color=0x3391cd \
--disable-gdm-transition \
--without-system-root-install \
- --with-log-viewer \
--without-rhgb-compat-link \
--with-boot-tty=/dev/tty7 \
--with-shutdown-tty=/dev/tty1 \
@@ -438,21 +410,21 @@
%posttrans
%{?regenerate_initrd_posttrans}
-%post -n libply-boot-client2 -p /sbin/ldconfig
+%post -n libply-boot-client4 -p /sbin/ldconfig
-%postun -n libply-boot-client2 -p /sbin/ldconfig
+%postun -n libply-boot-client4 -p /sbin/ldconfig
-%post -n libply-splash-core2 -p /sbin/ldconfig
+%post -n libply-splash-core4 -p /sbin/ldconfig
-%postun -n libply-splash-core2 -p /sbin/ldconfig
+%postun -n libply-splash-core4 -p /sbin/ldconfig
-%post -n libply-splash-graphics2 -p /sbin/ldconfig
+%post -n libply-splash-graphics4 -p /sbin/ldconfig
-%postun -n libply-splash-graphics2 -p /sbin/ldconfig
+%postun -n libply-splash-graphics4 -p /sbin/ldconfig
-%post -n libply2 -p /sbin/ldconfig
+%post -n libply4 -p /sbin/ldconfig
-%postun -n libply2 -p /sbin/ldconfig
+%postun -n libply4 -p /sbin/ldconfig
%post theme-spinfinity
if [ $1 -eq 1 ]; then
@@ -568,21 +540,21 @@
%{_libdir}/pkgconfig/ply-boot-client.pc
%{_includedir}/plymouth-1
-%files -n libply-boot-client2
+%files -n libply-boot-client4
%defattr(-, root, root)
-%{_libdir}/libply-boot-client.so.2*
+%{_libdir}/libply-boot-client.so.4*
-%files -n libply-splash-core2
+%files -n libply-splash-core4
%defattr(-, root, root)
-%{plymouth_libdir}/libply-splash-core.so.2*
+%{plymouth_libdir}/libply-splash-core.so.4*
-%files -n libply-splash-graphics2
+%files -n libply-splash-graphics4
%defattr(-, root, root)
-%{_libdir}/libply-splash-graphics.so.2*
+%{_libdir}/libply-splash-graphics.so.4*
-%files -n libply2
+%files -n libply4
%defattr(-, root, root)
-%{plymouth_libdir}/libply.so.2*
+%{plymouth_libdir}/libply.so.4*
%files scripts
%defattr(-, root, root)
@@ -590,10 +562,6 @@
%{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd
-%files utils
-%defattr(-, root, root)
-%{_bindir}/plymouth-log-viewer
-
%files x11-renderer
%defattr(-,root,root,-)
%{_libdir}/plymouth/renderers/x11*
++++++ 0001-Some-greenish-openSUSE-colors.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -7,45 +7,41 @@
src/plugins/splash/text/plugin.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
-Index: plymouth-0.9.0/src/plugins/splash/text/plugin.c
+Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c
===================================================================
---- plymouth-0.9.0.orig/src/plugins/splash/text/plugin.c
-+++ plymouth-0.9.0/src/plugins/splash/text/plugin.c
-@@ -174,13 +174,13 @@ view_start_animation (view_t *view)
- 0x000000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
-- 0xffffff);
-+ 0x40ff00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
-- 0x3465a4);
-+ 0x20a000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x979a9b);
-+ 0x106000);
+--- plymouth-0.9.2.orig/src/plugins/splash/text/plugin.c
++++ plymouth-0.9.2/src/plugins/splash/text/plugin.c
+@@ -174,10 +174,10 @@ view_start_animation (view_t *view)
+ 0x2e3436);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_WHITE,
+- 0xffffff);
++ 0x40ff00);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x979a9b);
++ 0x106000);
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
-Index: plymouth-0.9.0/src/plugins/splash/tribar/plugin.c
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
+Index: plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
===================================================================
---- plymouth-0.9.0.orig/src/plugins/splash/tribar/plugin.c
-+++ plymouth-0.9.0/src/plugins/splash/tribar/plugin.c
+--- plymouth-0.9.2.orig/src/plugins/splash/tribar/plugin.c
++++ plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
@@ -177,13 +177,13 @@ view_start_animation (view_t *view)
- 0x000000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_WHITE,
-- 0xffffff);
-+ 0x40ff00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
-- 0x0073B3);
-+ 0x20a000);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x00457E);
-+ 0x106000);
+ 0x000000);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_WHITE,
+- 0xffffff);
++ 0x40ff00);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BLUE,
+- 0x0073B3);
++ 0x20a000);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x00457E);
++ 0x106000);
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
++++++ 0001-let-it-become-a-real-daemon.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -13,13 +13,13 @@
plymouth-0.9.0/src/main.c | 42 +++++++------
5 files changed, 43 insertions(+), 18 deletions(-)
-Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
===================================================================
---- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c
-+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
-@@ -933,3 +933,12 @@ ply_device_manager_deactivate_keyboards
- node = next_node;
- }
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+@@ -926,3 +926,12 @@ ply_device_manager_deactivate_keyboards
+ node = next_node;
+ }
}
+
+void
@@ -30,11 +30,11 @@
+ ply_terminal_close,
+ manager);
+}
-Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
===================================================================
---- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.h
-+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.h
-@@ -49,6 +49,7 @@ void ply_device_manager_deactivate_keybo
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.h
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
+@@ -52,6 +52,7 @@ void ply_device_manager_deactivate_keybo
void ply_device_manager_activate_renderers (ply_device_manager_t *manager);
void ply_device_manager_deactivate_renderers (ply_device_manager_t *manager);
ply_terminal_t *ply_device_manager_get_default_terminal (ply_device_manager_t *manager);
@@ -42,150 +42,147 @@
#endif
-Index: plymouth-0.9.0/src/libply/ply-utils.c
+Index: plymouth-0.9.2/src/libply/ply-utils.c
===================================================================
---- plymouth-0.9.0.orig/src/libply/ply-utils.c
-+++ plymouth-0.9.0/src/libply/ply-utils.c
+--- plymouth-0.9.2.orig/src/libply/ply-utils.c
++++ plymouth-0.9.2/src/libply/ply-utils.c
@@ -77,6 +77,7 @@
static int errno_stack[PLY_ERRNO_STACK_SIZE];
static int errno_stack_position = 0;
+static bool inChild = false;
- bool
+ bool
ply_open_unidirectional_pipe (int *sender_fd,
-@@ -797,6 +798,7 @@ ply_create_daemon (void)
- {
- int read_error = errno;
- int status;
-+ inChild = true;
-
- if (waitpid (pid, &status, WNOHANG) <= 0)
- {
-@@ -843,6 +845,9 @@ ply_detach_daemon (ply_daemon_handle_t *
- close (sender_fd);
- free (handle);
+@@ -771,6 +772,7 @@ ply_create_daemon (void)
+ if (!ply_read (receiver_fd, &byte, sizeof(uint8_t))) {
+ int read_error = errno;
+ int status;
++ inChild = true;
+
+ if (waitpid (pid, &status, WNOHANG) <= 0)
+ ply_error ("failed to read status from child immediately after starting to daemonize: %s", strerror (read_error));
+@@ -811,6 +813,9 @@ ply_detach_daemon (ply_daemon_handle_t *
+ close (sender_fd);
+ free (handle);
-+ if (inChild)
-+ setsid();
++ if (inChild)
++ setsid();
+
- return true;
+ return true;
}
-Index: plymouth-0.9.0/src/libply/ply-terminal-session.c
+Index: plymouth-0.9.2/src/libply/ply-terminal-session.c
===================================================================
---- plymouth-0.9.0.orig/src/libply/ply-terminal-session.c
-+++ plymouth-0.9.0/src/libply/ply-terminal-session.c
-@@ -187,6 +187,13 @@ ply_terminal_session_redirect_console (p
-
- assert (terminal_name != NULL);
-
-+ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
-+ if (fd >= 0)
-+ {
-+ ioctl (fd, TIOCCONS); /* Undo any current map if any */
-+ close (fd);
-+ }
+--- plymouth-0.9.2.orig/src/libply/ply-terminal-session.c
++++ plymouth-0.9.2/src/libply/ply-terminal-session.c
+@@ -187,6 +187,12 @@ ply_terminal_session_redirect_console (p
+
+ assert (terminal_name != NULL);
+
++ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
++ if (fd >= 0) {
++ ioctl (fd, TIOCCONS); /* Undo any current map if any */
++ close (fd);
++ }
+
- fd = open (terminal_name, O_RDWR | O_NOCTTY);
+ fd = open (terminal_name, O_RDWR | O_NOCTTY);
- if (fd < 0)
-Index: plymouth-0.9.0/src/main.c
+ if (fd < 0)
+Index: plymouth-0.9.2/src/main.c
===================================================================
---- plymouth-0.9.0.orig/src/main.c
-+++ plymouth-0.9.0/src/main.c
-@@ -1042,6 +1042,7 @@ on_seat_added (state_t *state,
-
+--- plymouth-0.9.2.orig/src/main.c
++++ plymouth-0.9.2/src/main.c
+@@ -1026,6 +1026,7 @@ on_seat_added (state_t *state,
+ on_enter, state);
}
+static ply_device_manager_t *manager;
static void
- load_devices (state_t *state,
- ply_device_manager_flags_t flags)
-@@ -1049,6 +1050,8 @@ load_devices (state_t
- state->device_manager = ply_device_manager_new (state->default_tty, flags);
- state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
+ load_devices (state_t *state,
+ ply_device_manager_flags_t flags)
+@@ -1033,6 +1034,8 @@ load_devices (state_t
+ state->device_manager = ply_device_manager_new (state->default_tty, flags);
+ state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
-+ manager = state->device_manager;
++ manager = state->device_manager;
+
- ply_device_manager_watch_seats (state->device_manager,
- (ply_seat_added_handler_t)
- on_seat_added,
-@@ -1077,6 +1080,7 @@ quit_splash (state_t *state)
- ply_trace ("Not retaining splash, so deallocating VT");
- ply_terminal_deactivate_vt (state->local_console_terminal);
- ply_terminal_close (state->local_console_terminal);
-+ ply_close_all_terminals (state->device_manager);
+ ply_device_manager_watch_seats (state->device_manager,
+ (ply_seat_added_handler_t)
+ on_seat_added,
+@@ -1058,6 +1061,7 @@ quit_splash (state_t *state)
+ ply_trace ("Not retaining splash, so deallocating VT");
+ ply_terminal_deactivate_vt (state->local_console_terminal);
+ ply_terminal_close (state->local_console_terminal);
++ ply_close_all_terminals (state->device_manager);
+ }
}
- }
-@@ -2075,25 +2079,22 @@ dump_debug_buffer_to_file (void)
- #include <termios.h>
- #include <unistd.h>
+@@ -1974,25 +1978,20 @@ dump_debug_buffer_to_file (void)
+ #include <termios.h>
+ #include <unistd.h>
static void
-on_crash (int signum)
+dosigaction (int signum)
{
-- struct termios term_attributes;
- int fd;
+- struct termios term_attributes;
+ int fd;
-- fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
-- if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY);
+- fd = open ("/dev/tty1", O_RDWR | O_NOCTTY);
+- if (fd < 0) fd = open ("/dev/hvc0", O_RDWR | O_NOCTTY);
-
-- ioctl (fd, KDSETMODE, KD_TEXT);
+- ioctl (fd, KDSETMODE, KD_TEXT);
-
-- tcgetattr (fd, &term_attributes);
+- tcgetattr (fd, &term_attributes);
-
-- term_attributes.c_iflag |= BRKINT | IGNPAR | ICRNL | IXON;
-- term_attributes.c_oflag |= OPOST;
-- term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN;
+- term_attributes.c_iflag |= BRKINT | IGNPAR | ICRNL | IXON;
+- term_attributes.c_oflag |= OPOST;
+- term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN;
-
-- tcsetattr (fd, TCSAFLUSH, &term_attributes);
-+ if (manager)
-+ {
-+ ply_device_manager_deactivate_keyboards (manager);
-+ ply_close_all_terminals (manager);
-+ }
-
-- close (fd);
-+ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
-+ if (fd >= 0)
-+ {
-+ ioctl (fd, TIOCCONS); /* Undo any current map if any */
-+ close (fd);
-+ }
-
- if (debug_buffer != NULL)
- {
-@@ -2108,7 +2109,6 @@ on_crash (int signum)
- pid_file = NULL;
- }
+- tcsetattr (fd, TCSAFLUSH, &term_attributes);
++ if (manager) {
++ ply_device_manager_deactivate_keyboards (manager);
++ ply_close_all_terminals (manager);
++ }
+
+- close (fd);
++ fd = open ("/dev/console", O_RDWR | O_NOCTTY);
++ if (fd >= 0) {
++ ioctl (fd, TIOCCONS); /* Undo any current map if any */
++ close (fd);
++ }
+
+ if (debug_buffer != NULL) {
+ dump_debug_buffer_to_file ();
+@@ -2005,7 +2004,6 @@ on_crash (int signum)
+ pid_file = NULL;
+ }
-- signal (signum, SIG_DFL);
- raise(signum);
+- signal (signum, SIG_DFL);
+ raise (signum);
}
-@@ -2145,6 +2145,7 @@ main (int argc,
- char *kernel_command_line = NULL;
- char *tty = NULL;
- ply_device_manager_flags_t device_manager_flags = PLY_DEVICE_MANAGER_FLAGS_NONE;
-+ struct sigaction sa;
-
- state.start_time = ply_get_timestamp ();
- state.command_parser = ply_command_parser_new ("plymouthd", "Splash server");
-@@ -2256,8 +2257,13 @@ main (int argc,
- if (debug)
- debug_buffer = ply_buffer_new ();
-
-- signal (SIGABRT, on_crash);
-- signal (SIGSEGV, on_crash);
-+ sigemptyset(&sa.sa_mask);
-+ sa.sa_flags = SA_RESETHAND;
-+ sa.sa_handler = dosigaction;
-+ sigaction (SIGHUP, &sa, NULL);
-+ sigaction (SIGTERM, &sa, NULL);
-+ sigaction (SIGABRT, &sa, NULL);
-+ sigaction (SIGSEGV, &sa, NULL);
+@@ -2039,6 +2037,7 @@ main (int argc,
+ char *kernel_command_line = NULL;
+ char *tty = NULL;
+ ply_device_manager_flags_t device_manager_flags = PLY_DEVICE_MANAGER_FLAGS_NONE;
++ struct sigaction sa;
+
+ state.start_time = ply_get_timestamp ();
+ state.command_parser = ply_command_parser_new ("plymouthd", "Splash server");
+@@ -2141,8 +2140,13 @@ main (int argc,
+ if (debug)
+ debug_buffer = ply_buffer_new ();
+
+- signal (SIGABRT, on_crash);
+- signal (SIGSEGV, on_crash);
++ sigemptyset(&sa.sa_mask);
++ sa.sa_flags = SA_RESETHAND;
++ sa.sa_handler = dosigaction;
++ sigaction (SIGHUP, &sa, NULL);
++ sigaction (SIGTERM, &sa, NULL);
++ sigaction (SIGABRT, &sa, NULL);
++ sigaction (SIGSEGV, &sa, NULL);
- /* before do anything we need to make sure we have a working
- * environment.
+ /* before do anything we need to make sure we have a working
+ * environment.
++++++ 0001-seats-guard-against-NULL-terminal.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -9,86 +9,56 @@
src/libply-splash-core/ply-terminal.c | 11 +++++++----
3 files changed, 15 insertions(+), 9 deletions(-)
-diff --git a/src/libply-splash-core/ply-keyboard.c b/src/libply-splash-core/ply-keyboard.c
-index 624f906..1bed19f 100644
---- a/src/libply-splash-core/ply-keyboard.c
-+++ b/src/libply-splash-core/ply-keyboard.c
-@@ -423,8 +423,11 @@ ply_keyboard_free (ply_keyboard_t *keyboard)
- }
- else
- {
-- ply_buffer_free (keyboard->provider.if_terminal->key_buffer);
-- free (keyboard->provider.if_terminal);
-+ if (keyboard->provider.if_terminal)
-+ {
-+ ply_buffer_free (keyboard->provider.if_terminal->key_buffer);
-+ free (keyboard->provider.if_terminal);
-+ }
- }
-
- free (keyboard);
-diff --git a/src/libply-splash-core/ply-seat.c b/src/libply-splash-core/ply-seat.c
-index 2ac8bf7..29e2dfa 100644
---- a/src/libply-splash-core/ply-seat.c
-+++ b/src/libply-splash-core/ply-seat.c
-@@ -102,12 +102,12 @@ add_text_displays (ply_seat_t *seat)
- {
- ply_text_display_t *display;
-
-- if (!ply_terminal_is_open (seat->terminal))
-+ if (!seat->terminal || !ply_terminal_is_open (seat->terminal))
- {
-- if (!ply_terminal_open (seat->terminal))
-+ if (!seat->terminal || !ply_terminal_open (seat->terminal))
- {
- ply_trace ("could not add terminal %s: %m",
-- ply_terminal_get_name (seat->terminal));
-+ seat->terminal ? ply_terminal_get_name (seat->terminal) : "none" );
- return;
+Index: plymouth-0.9.2/src/libply-splash-core/ply-seat.c
+===================================================================
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-seat.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-seat.c
+@@ -101,10 +101,10 @@ add_text_displays (ply_seat_t *seat)
+ {
+ ply_text_display_t *display;
+
+- if (!ply_terminal_is_open (seat->terminal)) {
+- if (!ply_terminal_open (seat->terminal)) {
++ if (!seat->terminal || !ply_terminal_is_open (seat->terminal)) {
++ if (!seat->terminal || !ply_terminal_open (seat->terminal)) {
+ ply_trace ("could not add terminal %s: %m",
+- ply_terminal_get_name (seat->terminal));
++ seat->terminal ? ply_terminal_get_name (seat->terminal) : "none");
+ return;
+ }
}
- }
-diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
-index 992dd3f..b52b108 100644
---- a/src/libply-splash-core/ply-terminal.c
-+++ b/src/libply-splash-core/ply-terminal.c
-@@ -654,30 +654,33 @@ ply_terminal_open (ply_terminal_t *terminal)
- int
- ply_terminal_get_fd (ply_terminal_t *terminal)
- {
-- return terminal->fd;
-+ return terminal ? terminal->fd : -1;
- }
-
+Index: plymouth-0.9.2/src/libply-splash-core/ply-terminal.c
+===================================================================
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-terminal.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-terminal.c
+@@ -639,24 +639,27 @@ ply_terminal_get_fd (ply_terminal_t *ter
bool
ply_terminal_is_vt (ply_terminal_t *terminal)
{
-- return terminal->vt_number > 0;
-+ return terminal ? terminal->vt_number > 0 : false;
+- return terminal->vt_number > 0;
++ return terminal ? terminal->vt_number > 0 : false;
}
bool
ply_terminal_is_open (ply_terminal_t *terminal)
{
-- return terminal->is_open;
-+ return terminal ? terminal->is_open : false;
+- return terminal->is_open;
++ return terminal ? terminal->is_open : false;
}
bool
ply_terminal_is_active (ply_terminal_t *terminal)
{
-- return terminal->is_active;
-+ return terminal ? terminal->is_active : false;
+- return terminal->is_active;
++ return terminal ? terminal->is_active : false;
}
void
ply_terminal_close (ply_terminal_t *terminal)
{
-+ if (!terminal)
-+ return;
++ if (!terminal)
++ return;
+
- if (!terminal->is_open)
- {
- ply_trace ("terminal %s is already closed", terminal->name);
---
-1.8.4.5
-
+ if (!terminal->is_open) {
+ ply_trace ("terminal %s is already closed", terminal->name);
+ return;
++++++ fix-serial-consoles.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:04.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:04.000000000 +0100
@@ -1,51 +1,47 @@
-Index: plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.c
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
===================================================================
---- plymouth-0.8.8_git20140327.orig/src/libply-splash-core/ply-device-manager.c
-+++ plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.c
-@@ -58,6 +58,8 @@ struct _ply_device_manager
- int udev_queue_fd;
- ply_fd_watch_t *udev_queue_fd_watch;
- struct udev_monitor *udev_monitor;
-+ bool has_serial_consoles;
-+
-
- ply_seat_added_handler_t seat_added_handler;
- ply_seat_removed_handler_t seat_removed_handler;
-@@ -501,6 +503,7 @@ ply_device_manager_new (const char
- manager->loop = NULL;
- manager->terminals = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare);
- manager->local_console_terminal = ply_terminal_new (default_tty);
-+ manager->has_serial_consoles = false;
- ply_hashtable_insert (manager->terminals,
- (void *) ply_terminal_get_name (manager->local_console_terminal),
- manager->local_console_terminal);
-@@ -670,21 +673,19 @@ create_seat_for_terminal (const char
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+@@ -62,6 +62,7 @@ struct _ply_device_manager
+ ply_seat_added_handler_t seat_added_handler;
+ ply_seat_removed_handler_t seat_removed_handler;
+ void *seat_event_handler_data;
++ bool has_serial_consoles;
+ };
+
+ static void
+@@ -501,6 +502,7 @@ ply_device_manager_new (const char
+ manager->loop = NULL;
+ manager->terminals = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare);
+ manager->local_console_terminal = ply_terminal_new (default_tty);
++ manager->has_serial_consoles = false;
+ ply_hashtable_insert (manager->terminals,
+ (void *) ply_terminal_get_name (manager->local_console_terminal),
+ manager->local_console_terminal);
+@@ -663,18 +665,16 @@ create_seat_for_terminal (const char
static bool
create_seats_from_terminals (ply_device_manager_t *manager)
{
-- bool has_serial_consoles;
+- bool has_serial_consoles;
-
- ply_trace ("checking for consoles");
+ ply_trace ("checking for consoles");
- if (manager->flags & PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES)
- {
-- has_serial_consoles = false;
-+ manager->has_serial_consoles = false;
- ply_trace ("ignoring all consoles but default console because explicitly told to.");
- }
- else
- {
-- has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active");
-+ manager->has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active");
- }
-
-- if (has_serial_consoles)
-+ if (manager->has_serial_consoles)
- {
- ply_trace ("serial consoles detected, managing them with details forced");
- ply_hashtable_foreach (manager->terminals,
-@@ -838,6 +839,15 @@ ply_device_manager_has_open_seats (ply_d
- return false;
+ if (manager->flags & PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES) {
+- has_serial_consoles = false;
++ manager->has_serial_consoles = false;
+ ply_trace ("ignoring all consoles but default console because explicitly told to.");
+ } else {
+- has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active");
++ manager->has_serial_consoles = add_consoles_from_file (manager, "/sys/class/tty/console/active");
+ }
+
+- if (has_serial_consoles) {
++ if (manager->has_serial_consoles) {
+ ply_trace ("serial consoles detected, managing them with details forced");
+ ply_hashtable_foreach (manager->terminals,
+ (ply_hashtable_foreach_func_t *)
+@@ -821,6 +821,15 @@ ply_device_manager_has_open_seats (ply_d
+ return false;
}
+bool
@@ -60,26 +56,26 @@
ply_list_t *
ply_device_manager_get_seats (ply_device_manager_t *manager)
{
-Index: plymouth-0.8.8_git20140327/src/main.c
+Index: plymouth-0.9.2/src/main.c
===================================================================
---- plymouth-0.8.8_git20140327.orig/src/main.c
-+++ plymouth-0.8.8_git20140327/src/main.c
-@@ -848,7 +848,7 @@ plymouth_should_show_default_splash (sta
- };
- int i;
-
-- if (state->should_force_details)
-+ if (ply_device_manager_has_serial_consoles(state->device_manager) || state->should_force_details)
- return false;
+--- plymouth-0.9.2.orig/src/main.c
++++ plymouth-0.9.2/src/main.c
+@@ -854,7 +854,7 @@ plymouth_should_show_default_splash (sta
+ };
+ int i;
+
+- if (state->should_force_details)
++ if (ply_device_manager_has_serial_consoles(state->device_manager) || state->should_force_details)
+ return false;
- for (i = 0; strings[i] != NULL; i++)
-Index: plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.h
+ for (i = 0; strings[i] != NULL; i++) {
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
===================================================================
---- plymouth-0.8.8_git20140327.orig/src/libply-splash-core/ply-device-manager.h
-+++ plymouth-0.8.8_git20140327/src/libply-splash-core/ply-device-manager.h
-@@ -42,6 +42,7 @@ void ply_device_manager_watch_seats (ply
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.h
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.h
+@@ -44,6 +44,7 @@ void ply_device_manager_watch_seats (ply
ply_seat_removed_handler_t seat_removed_handler,
- void *data);
+ void *data);
bool ply_device_manager_has_open_seats (ply_device_manager_t *manager);
+bool ply_device_manager_has_serial_consoles (ply_device_manager_t *manager);
ply_list_t *ply_device_manager_get_seats (ply_device_manager_t *manager);
++++++ plymouth-0.9.0.tar.bz2 -> plymouth-0.9.2.tar.bz2 ++++++
++++ 65976 lines of diff (skipped)
++++++ plymouth-boot-vga-framebuffer.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:05.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:05.000000000 +0100
@@ -1,19 +1,19 @@
-Index: plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
===================================================================
---- plymouth-0.9.0.orig/src/libply-splash-core/ply-device-manager.c
-+++ plymouth-0.9.0/src/libply-splash-core/ply-device-manager.c
-@@ -101,12 +101,13 @@ device_is_for_local_console (ply_device_
- * card the kernel is using for its console. */
- device_path = udev_device_get_syspath (device);
- asprintf (&bus_device_path, "%s/device", device_path);
-+ ply_trace ("Testing device path %s\n", bus_device_path);
- bus_device = udev_device_new_from_syspath (manager->udev_context, bus_device_path);
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+@@ -102,12 +102,13 @@ device_is_for_local_console (ply_device_
+ * card the kernel is using for its console. */
+ device_path = udev_device_get_syspath (device);
+ asprintf (&bus_device_path, "%s/device", device_path);
++ ply_trace ("Testing device path %s\n", bus_device_path);
+ bus_device = udev_device_new_from_syspath (manager->udev_context, bus_device_path);
- boot_vga = udev_device_get_sysattr_value (bus_device, "boot_vga");
- free (bus_device_path);
+ boot_vga = udev_device_get_sysattr_value (bus_device, "boot_vga");
+ free (bus_device_path);
-- if (boot_vga != NULL && strcmp (boot_vga, "1") == 0)
-+ if (boot_vga == NULL /* framebuffer case */ || strcmp (boot_vga, "1") == 0)
- for_local_console = true;
- else
- for_local_console = false;
+- if (boot_vga != NULL && strcmp (boot_vga, "1") == 0)
++ if (boot_vga == NULL /* framebuffer case */ || strcmp (boot_vga, "1") == 0)
+ for_local_console = true;
+ else
+ for_local_console = false;
++++++ plymouth-fix-window-size ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:05.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:05.000000000 +0100
@@ -14,23 +14,25 @@
src/plugins/splash/script/script-lib-sprite.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- a/src/plugins/splash/script/script-lib-sprite.c
-+++ b/src/plugins/splash/script/script-lib-sprite.c
-@@ -233,7 +233,7 @@ static script_return_t sprite_window_get
- if (width == 0)
- width = ply_pixel_display_get_width (display->pixel_display);
- else
-- width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
-+ width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
- }
- return script_return_obj (script_obj_new_number (width));
+Index: plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
+===================================================================
+--- plymouth-0.9.2.orig/src/plugins/splash/script/script-lib-sprite.c
++++ plymouth-0.9.2/src/plugins/splash/script/script-lib-sprite.c
+@@ -231,7 +231,7 @@ static script_return_t sprite_window_get
+ if (width == 0)
+ width = ply_pixel_display_get_width (display->pixel_display);
+ else
+- width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
++ width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
+ }
+ return script_return_obj (script_obj_new_number (width));
}
-@@ -273,7 +273,7 @@ static script_return_t sprite_window_get
- if (height == 0)
- height = ply_pixel_display_get_height (display->pixel_display);
- else
-- height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
-+ height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
- }
- return script_return_obj (script_obj_new_number (height));
+@@ -269,7 +269,7 @@ static script_return_t sprite_window_get
+ if (height == 0)
+ height = ply_pixel_display_get_height (display->pixel_display);
+ else
+- height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
++ height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
+ }
+ return script_return_obj (script_obj_new_number (height));
}
++++++ plymouth-ignore-cirrusdrm.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:05.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:05.000000000 +0100
@@ -1,15 +1,15 @@
-diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
-index a5aa59d..0be2117 100644
---- a/src/libply-splash-core/ply-device-manager.c
-+++ b/src/libply-splash-core/ply-device-manager.c
-@@ -125,6 +125,10 @@ fb_device_has_drm_device (ply_device_manager_t *manager,
- const char *id_path;
- bool has_drm_device = false;
-
-+ const char *card_name = udev_device_get_sysattr_value (fb_device, "name");
-+ if (card_name && strcmp ("cirrusdrmfb", card_name) == 0)
-+ return false;
-+
- /* We want to see if the framebuffer is associated with a DRM-capable
- * graphics card, if it is, we'll use the DRM device */
- card_matches = udev_enumerate_new (manager->udev_context);
+Index: plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+===================================================================
+--- plymouth-0.9.2.orig/src/libply-splash-core/ply-device-manager.c
++++ plymouth-0.9.2/src/libply-splash-core/ply-device-manager.c
+@@ -157,6 +157,10 @@ fb_device_has_drm_device (ply_device_man
+ const char *id_path;
+ bool has_drm_device = false;
+
++ const char *card_name = udev_device_get_sysattr_value (fb_device, "name");
++ if (card_name && strcmp ("cirrusdrmfb", card_name) == 0)
++ return false;
++
+ /* We want to see if the framebuffer is associated with a DRM-capable
+ * graphics card, if it is, we'll use the DRM device */
+ card_matches = udev_enumerate_new (manager->udev_context);
++++++ stop-graphical.patch ++++++
--- /var/tmp/diff_new_pack.csg8ge/_old 2016-01-20 09:54:05.000000000 +0100
+++ /var/tmp/diff_new_pack.csg8ge/_new 2016-01-20 09:54:05.000000000 +0100
@@ -1,19 +1,19 @@
-Index: plymouth-0.9.0/systemd-units/plymouth-quit-wait.service.in
+Index: plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
===================================================================
---- plymouth-0.9.0.orig/systemd-units/plymouth-quit-wait.service.in
-+++ plymouth-0.9.0/systemd-units/plymouth-quit-wait.service.in
+--- plymouth-0.9.2.orig/systemd-units/plymouth-quit-wait.service.in
++++ plymouth-0.9.2/systemd-units/plymouth-quit-wait.service.in
@@ -1,6 +1,7 @@
[Unit]
- Description=Wait for Plymouth Boot Screen to Quit
+ Description=Hold until boot process finishes up
After=rc-local.service plymouth-start.service systemd-user-sessions.service
+Conflicts=graphical.target
[Service]
ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait
-Index: plymouth-0.9.0/systemd-units/plymouth-quit.service.in
+Index: plymouth-0.9.2/systemd-units/plymouth-quit.service.in
===================================================================
---- plymouth-0.9.0.orig/systemd-units/plymouth-quit.service.in
-+++ plymouth-0.9.0/systemd-units/plymouth-quit.service.in
+--- plymouth-0.9.2.orig/systemd-units/plymouth-quit.service.in
++++ plymouth-0.9.2/systemd-units/plymouth-quit.service.in
@@ -1,6 +1,7 @@
[Unit]
Description=Terminate Plymouth Boot Screen
1
0
Hello community,
here is the log from the commit of package python-Sphinx for openSUSE:Factory checked in at 2016-01-20 09:53:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old)
and /work/SRC/openSUSE:Factory/.python-Sphinx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Sphinx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes 2015-12-21 12:03:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python-Sphinx.changes 2016-01-20 09:53:57.000000000 +0100
@@ -1,0 +2,69 @@
+Tue Jan 12 16:35:16 UTC 2016 - michael(a)stroeder.com
+
+- Update to 1.3.4
+
+Release 1.3.4 (released Jan 12, 2016)[51]
+ * #2134: Fix figure caption with reference causes latex build error
+ * #2094: Fix rubric with reference not working in Latex
+ * #2147: Fix litralinclude code in latex does not break in pages
+ * #1833: Fix email addresses is showed again if latex_show_urls is
+ not None
+ * #2176: sphinx.ext.graphviz: use <object> instead of <img> to embed
+ svg
+ * #967: Fix SVG inheritance diagram is not hyperlinked (clickable)
+ * #1237: Fix footnotes not working in definition list in LaTeX
+ * #2168: Fix raw directive does not work for text writer
+ * #2171: Fix cannot linkcheck url with unicode
+ * #2182: LaTeX: support image file names with more than 1 dots
+ * #2189: Fix previous sibling link for first file in subdirectory
+ uses last file, not intended previous from root toctree
+ * #2003: Fix decode error under python2 (only) when make linkcheck is
+ run
+ * #2186: Fix LaTeX output of mathbb in math
+ * #1480, #2188: LaTeX: Support math in section titles
+ * #2071: Fix same footnote in more than two section titles =>
+ LaTeX/PDF Bug
+ * #2040: Fix UnicodeDecodeError in sphinx-apidoc when author contains
+ non-ascii characters
+ * #2193: Fix shutil.SameFileError if source directory and destination
+ directory are same
+ * #2178: Fix unparseable C++ cross-reference when referencing a
+ function with :cpp:any:
+ * #2206: Fix Sphinx latex doc build failed due to a footnotes
+ * #2201: Fix wrong table caption for tables with over 30 rows
+ * #2213: Set <blockquote> in the classic theme to fit with <p>
+ * #1815: Fix linkcheck does not raise an exception if warniserror set
+ to true and link is broken
+ * #2197: Fix slightly cryptic error message for missing index.rst
+ file
+ * #1894: Unlisted phony targets in quickstart Makefile
+ * #2125: Fix unifies behavior of collapsed fields (GroupedField and
+ TypedField)
+ * #1408: Check latex_logo validity before copying
+ * #771: Fix latex output doesn’t set tocdepth
+ * #1820: On Windows, console coloring is broken with colorama version
+ 0.3.3. Now sphinx use colorama>=0.3.5 to avoid this problem.
+ * #2072: Fix footnotes in chapter-titles do not appear in PDF output
+ * #1580: Fix paragraphs in longtable don’t work in Latex output
+ * #1366: Fix centered image not centered in latex
+ * #1860: Fix man page using :samp: with braces - font doesn’t reset
+ * #1610: Sphinx crashes in japanese indexing in some systems
+ * Fix Sphinx crashes if mecab initialization failed
+ * #2160: Fix broken TOC of PDFs if section includes an image
+ * #2172: Fix dysfunctional admonition [53]py@lightbox in sphinx.sty.
+ Thanks to jfbu.
+ * #2198,#2205: make gettext generate broken msgid for definition
+ lists.
+ * #2062: Escape characters in doctests are treated incorrectly with
+ Python 2.
+ * #2225: Fix if the option does not begin with dash, linking is not
+ performed
+ * #2226: Fix math is not HTML-encoded when :nowrap: is given (jsmath,
+ mathjax)
+ * #1601, #2220: ‘any’ role breaks extended domains behavior. Affected
+ extensions doesn’t support resolve_any_xref and resolve_xref
+ returns problematic node instead of None. sphinxcontrib-httpdomain
+ is one of them.
+ * #2229: Fix no warning is given for unknown options
+
+-------------------------------------------------------------------
Old:
----
Sphinx-1.3.3.tar.gz
New:
----
Sphinx-1.3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Sphinx.spec ++++++
--- /var/tmp/diff_new_pack.D5MOIg/_old 2016-01-20 09:53:59.000000000 +0100
+++ /var/tmp/diff_new_pack.D5MOIg/_new 2016-01-20 09:53:59.000000000 +0100
@@ -17,7 +17,7 @@
Name: python-Sphinx
-Version: 1.3.3
+Version: 1.3.4
Release: 0
Url: http://sphinx-doc.org
Summary: Python documentation generator
++++++ Sphinx-1.3.3.tar.gz -> Sphinx-1.3.4.tar.gz ++++++
++++ 3848 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2016-01-20 09:53:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint (Old)
and /work/SRC/openSUSE:Factory/.rpmlint.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2015-12-13 09:37:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2016-01-20 09:53:52.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 13 14:36:27 UTC 2016 - krahmer(a)suse.com
+
+- whitelist drbdmanage DBUS (bsc#956811)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint-tests.spec ++++++
--- /var/tmp/diff_new_pack.MTlA9L/_old 2016-01-20 09:53:55.000000000 +0100
+++ /var/tmp/diff_new_pack.MTlA9L/_new 2016-01-20 09:53:55.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpmlint-tests
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
rpmlint.spec: same change
++++++ config ++++++
--- /var/tmp/diff_new_pack.MTlA9L/_old 2016-01-20 09:53:55.000000000 +0100
+++ /var/tmp/diff_new_pack.MTlA9L/_new 2016-01-20 09:53:55.000000000 +0100
@@ -686,7 +686,10 @@
"org.cinnamon.SettingsDaemon.DateTimeMechanism.service",
# thermald (bsc#954771)
"org.freedesktop.thermald.conf",
- "org.freedesktop.thermald.service"
+ "org.freedesktop.thermald.service",
+ # drbdmanage (bsc#956811)
+ "org.drbd.drbdmanaged.conf",
+ "org.drbd.drbdmanaged.service"
))
setOption("PAMModules.WhiteList", (
1
0
Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2016-01-20 09:53:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2015-11-23 07:29:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2016-01-20 09:53:46.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Nov 27 14:46:57 CET 2015 - snwint(a)suse.de
+
+- updated boot doc for prep partitions
+- 3.1.162
+
+-------------------------------------------------------------------
+Fri Nov 20 07:19:26 UTC 2015 - igonzalezsosa(a)suse.com
+
+- Fix AutoYaST schema to allow specification of 'vgamode',
+ 'xen_kernel_append' and 'failsafe_disabled' in globals section
+ (bsc#954412)
+
+-------------------------------------------------------------------
+Wed Nov 18 12:10:10 UTC 2015 - mvidner(a)suse.com
+
+- Fix validation of AutoYaST profiles (bsc#954412)
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-3.1.161.tar.bz2
New:
----
yast2-bootloader-3.1.162.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.4cSwo1/_old 2016-01-20 09:53:47.000000000 +0100
+++ /var/tmp/diff_new_pack.4cSwo1/_new 2016-01-20 09:53:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-bootloader
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.161
+Version: 3.1.162
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-bootloader-3.1.161.tar.bz2 -> yast2-bootloader-3.1.162.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.161/SUPPORTED_SCENARIOS.md new/yast2-bootloader-3.1.162/SUPPORTED_SCENARIOS.md
--- old/yast2-bootloader-3.1.161/SUPPORTED_SCENARIOS.md 2015-11-17 14:42:14.000000000 +0100
+++ new/yast2-bootloader-3.1.162/SUPPORTED_SCENARIOS.md 2016-01-13 14:22:12.000000000 +0100
@@ -41,6 +41,10 @@
* ppc64(le and be)
* only GRUB2
* there must be at least one [PReP partition](http://en.wikipedia.org/wiki/Partition_type#List_of_partition_ID… which size must not exceed 8MB (see [fate](https://fate.suse.com/317302))
+ * there's no requirement on the partition number
+ * good PReP disk layout overview [PowerLinux Boot howto](https://www.ibm.com/developerworks/community/wikis/home?lang=en#!/wi…
+ * boot code implemented in [SLOF - Slimline Open Firmware](https://github.com/aik/SLOF/blob/master/slof/fs/packages/disk-lab… - used e.g. by qemu
+ * full reference (quite ancient) [CHRP](https://stuff.mit.edu/afs/sipb/contrib/doc/specs/protocol/chrp/)
* s390x
* /boot/zipl must be on ext fs ( unless upgraded from working zipl configuration )
* only GRUB2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.161/package/yast2-bootloader.changes new/yast2-bootloader-3.1.162/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.161/package/yast2-bootloader.changes 2015-11-17 14:42:14.000000000 +0100
+++ new/yast2-bootloader-3.1.162/package/yast2-bootloader.changes 2016-01-13 14:22:12.000000000 +0100
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Fri Nov 27 14:46:57 CET 2015 - snwint(a)suse.de
+
+- updated boot doc for prep partitions
+- 3.1.162
+
+-------------------------------------------------------------------
+Fri Nov 20 07:19:26 UTC 2015 - igonzalezsosa(a)suse.com
+
+- Fix AutoYaST schema to allow specification of 'vgamode',
+ 'xen_kernel_append' and 'failsafe_disabled' in globals section
+ (bsc#954412)
+
+-------------------------------------------------------------------
+Wed Nov 18 12:10:10 UTC 2015 - mvidner(a)suse.com
+
+- Fix validation of AutoYaST profiles (bsc#954412)
+
+-------------------------------------------------------------------
Tue Nov 17 13:59:40 CET 2015 - shundhammer(a)suse.de
- Fixed crash in bootloader proposal if previous installation was
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.161/package/yast2-bootloader.spec new/yast2-bootloader-3.1.162/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.161/package/yast2-bootloader.spec 2015-11-17 14:42:14.000000000 +0100
+++ new/yast2-bootloader-3.1.162/package/yast2-bootloader.spec 2016-01-13 14:22:12.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-bootloader
-Version: 3.1.161
+Version: 3.1.162
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.161/src/autoyast-rnc/bootloader.rnc new/yast2-bootloader-3.1.162/src/autoyast-rnc/bootloader.rnc
--- old/yast2-bootloader-3.1.161/src/autoyast-rnc/bootloader.rnc 2015-11-17 14:42:14.000000000 +0100
+++ new/yast2-bootloader-3.1.162/src/autoyast-rnc/bootloader.rnc 2016-01-13 14:22:13.000000000 +0100
@@ -41,6 +41,21 @@
bl_location = element location { text }
bl_global =
element global {
+ element append { text }? &
+ element append_failsafe { text }? &
+ element cryptodisk { INTEGER }? &
+ element distributor { text }? &
+ element gfxbackground { text }? &
+ element gfxmode { text }? &
+ element gfxtheme { text }? &
+ # really "true"|"false", without config:type=boolean
+ element failsafe_disabled { "true" | "false" }? &
+ element hiddenmenu { "true" | "false" }? &
+ element os_prober { "true" | "false" }? &
+ element suse_btrfs { "true" | "false" }? &
+ element xen_append { text }? &
+ element xen_kernel_append { text }? &
+
element boot_custom { text }? &
element generic_mbr { text }? &
element trusted_grub{ text }? &
@@ -55,7 +70,8 @@
boot_boot? &
boot_extended? &
boot_mbr? &
- stage1_dev?
+ stage1_dev? &
+ element vgamode { text }?
}
lines_cache_id = element lines_cache_id { text }
@@ -77,6 +93,8 @@
}
section =
element section {
+ element menuentry {text}? &
+ element usage {text}? &
element append {text}? &
element initial {text}? &
element console {text}? &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.161/src/lib/bootloader/auto_client.rb new/yast2-bootloader-3.1.162/src/lib/bootloader/auto_client.rb
--- old/yast2-bootloader-3.1.161/src/lib/bootloader/auto_client.rb 2015-11-17 14:42:14.000000000 +0100
+++ new/yast2-bootloader-3.1.162/src/lib/bootloader/auto_client.rb 2016-01-13 14:22:13.000000000 +0100
@@ -63,6 +63,15 @@
BootloaderAutoSequence()
end
+ # Return configuration data
+ #
+ # Some of the sections are useless as they're ignored during import.
+ # (for example, entries are generated by Grub2 itself).
+ #
+ # More details can be found in the original pull request at
+ # https://github.com/yast/yast-bootloader/pull/272
+ #
+ # return map or list
def export
Export2AI(Yast::Bootloader.Export)
end
1
0
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2016-01-20 09:53:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2015-10-12 10:00:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2016-01-20 09:53:41.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 13 10:47:09 UTC 2016 - sndirsch(a)suse.com
+
+- Corrected console keyboard mapping for French(Canada) and
+ Ukrainian (bsc#960307, bsc#942899)
+- 3.1.25
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.1.24.tar.bz2
New:
----
yast2-country-3.1.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.PWEIlN/_old 2016-01-20 09:53:43.000000000 +0100
+++ /var/tmp/diff_new_pack.PWEIlN/_new 2016-01-20 09:53:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-country
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.24
+Version: 3.1.25
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-country-3.1.24.tar.bz2 -> yast2-country-3.1.25.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.24/keyboard/src/data/keyboard_raw.ycp new/yast2-country-3.1.25/keyboard/src/data/keyboard_raw.ycp
--- old/yast2-country-3.1.24/keyboard/src/data/keyboard_raw.ycp 2015-10-01 16:14:15.000000000 +0200
+++ new/yast2-country-3.1.25/keyboard/src/data/keyboard_raw.ycp 2016-01-13 11:54:10.000000000 +0100
@@ -118,7 +118,7 @@
// keyboard layout
_("French (Canada)"),
$[
- "pc104" : $[ "ncurses": "ca-fr-legacy.map.gz"],
+ "pc104" : $[ "ncurses": "ca.map.gz"],
"macintosh" : $[ "ncurses": "mac-us.map.gz"],
"type4" : $[ "ncurses": "sunkeymap.map.gz" ],
"type5" : $[ "ncurses": "sunt5-fr-latin1.map.gz" ],
@@ -534,7 +534,7 @@
_("Ukrainian"),
$[
"pc104" : $[
- "ncurses" : "ua.map.gz",
+ "ncurses" : "ua-utf.map.gz",
],
"macintosh" : $[
"ncurses" : "mac-us.map.gz"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.24/package/yast2-country.changes new/yast2-country-3.1.25/package/yast2-country.changes
--- old/yast2-country-3.1.24/package/yast2-country.changes 2015-10-01 16:14:15.000000000 +0200
+++ new/yast2-country-3.1.25/package/yast2-country.changes 2016-01-13 11:54:10.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Jan 13 10:47:09 UTC 2016 - sndirsch(a)suse.com
+
+- Corrected console keyboard mapping for French(Canada) and
+ Ukrainian (bsc#960307, bsc#942899)
+- 3.1.25
+
+-------------------------------------------------------------------
Thu Oct 1 14:59:57 CEST 2015 - locilka(a)suse.com
- Allocate space for "Other Settings" button proportionally to its
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.24/package/yast2-country.spec new/yast2-country-3.1.25/package/yast2-country.spec
--- old/yast2-country-3.1.24/package/yast2-country.spec 2015-10-01 16:14:15.000000000 +0200
+++ new/yast2-country-3.1.25/package/yast2-country.spec 2016-01-13 11:54:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.24
+Version: 3.1.25
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
1
0