openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
November 2012
- 1 participants
- 1324 discussions
Hello community,
here is the log from the commit of package calligra for openSUSE:Factory checked in at 2012-11-02 17:31:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calligra (Old)
and /work/SRC/openSUSE:Factory/.calligra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/calligra/calligra-doc.changes 2012-10-03 07:05:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.calligra.new/calligra-doc.changes 2012-11-02 17:32:00.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Oct 30 22:01:12 UTC 2012 - asterios.dramis(a)gmail.com
+
+- Update to 2.5.3:
+ * Bugfix release.
+- Replaced Mesa-devel build requirement with pkgconfig(gl).
+- Removed dcmtk-devel build requirement (not needed anymore).
+- Added new build requirements java-devel and libwps-devel.
+
+-------------------------------------------------------------------
calligra.changes: same change
Old:
----
calligra-2.5.2.tar.bz2
New:
----
calligra-2.5.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calligra-doc.spec ++++++
--- /var/tmp/diff_new_pack.1kD1zs/_old 2012-11-02 17:32:04.000000000 +0100
+++ /var/tmp/diff_new_pack.1kD1zs/_new 2012-11-02 17:32:04.000000000 +0100
@@ -17,19 +17,17 @@
Name: calligra-doc
-Version: 2.5.2
+Version: 2.5.3
Release: 0
Summary: Documentation of the Calligra Suite
License: GFDL-1.2
Group: Documentation/HTML
Url: http://www.calligra.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-%{version}.ta…
-BuildRequires: Mesa-devel
BuildRequires: OpenEXR-devel
%if 0%{?suse_version} > 1210
BuildRequires: OpenGTL-devel
BuildRequires: create-resources
-BuildRequires: dcmtk-devel
%endif
BuildRequires: fdupes
BuildRequires: fftw3-devel
@@ -38,6 +36,7 @@
%endif
BuildRequires: glew-devel
BuildRequires: gsl-devel
+BuildRequires: java-devel
%if 0%{?suse_version} > 1210
BuildRequires: libQtGTL-devel
%endif
@@ -49,9 +48,7 @@
BuildRequires: libkdcraw-devel
BuildRequires: libkdepimlibs4-devel
BuildRequires: liblcms-devel
-%if 0%{?suse_version} > 1130
BuildRequires: liblcms2-devel
-%endif
BuildRequires: libmysqld-devel
BuildRequires: libpoppler-qt4-devel
BuildRequires: libpqxx-devel
@@ -63,6 +60,7 @@
%endif
BuildRequires: libwpd-devel
BuildRequires: libwpg-devel
+BuildRequires: libwps-devel
BuildRequires: marble-devel
BuildRequires: mysql-devel
BuildRequires: okular-devel
@@ -75,6 +73,8 @@
BuildRequires: pstoedit
BuildRequires: sqlite-devel
BuildRequires: xbase-devel
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(glu)
Requires: calligra = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ calligra.spec ++++++
--- /var/tmp/diff_new_pack.1kD1zs/_old 2012-11-02 17:32:04.000000000 +0100
+++ /var/tmp/diff_new_pack.1kD1zs/_new 2012-11-02 17:32:04.000000000 +0100
@@ -17,14 +17,13 @@
Name: calligra
-Version: 2.5.2
+Version: 2.5.3
Release: 0
Summary: Libraries and Base Files for the Calligra Suite
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Office/Suite
Url: http://www.calligra.org/
-Source0: %{name}-%{version}.tar.bz2
-#Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}-%{version}/%{name}-%{version}.tar.…
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}-%{version}/%{name}-%{version}.tar.…
Source1: hi16-app-kexi.png
Source2: hi22-app-kexi.png
Source3: hi32-app-kexi.png
@@ -32,12 +31,10 @@
Source5: hisc-app-kexi.svgz
# PATCH-FIX-OPENSUSE remove_python_shebangs.patch asterios.dramis(a)gmail.com -- Remove python shebangs from various scripts (fixes rpmlint warning "non-executable-script")
Patch0: remove_python_shebangs.patch
-BuildRequires: Mesa-devel
BuildRequires: OpenEXR-devel
%if 0%{?suse_version} > 1210
BuildRequires: OpenGTL-devel
BuildRequires: create-resources
-BuildRequires: dcmtk-devel
%endif
BuildRequires: fdupes
BuildRequires: fftw3-devel
@@ -46,6 +43,7 @@
%endif
BuildRequires: glew-devel
BuildRequires: gsl-devel
+BuildRequires: java-devel
%if 0%{?suse_version} > 1210
BuildRequires: libQtGTL-devel
%endif
@@ -69,6 +67,7 @@
%endif
BuildRequires: libwpd-devel
BuildRequires: libwpg-devel
+BuildRequires: libwps-devel
BuildRequires: marble-devel
BuildRequires: mysql-devel
BuildRequires: okular-devel
@@ -81,6 +80,7 @@
BuildRequires: pstoedit
BuildRequires: sqlite-devel
BuildRequires: xbase-devel
+BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
Recommends: %{name}-doc = %{version}
Recommends: kdepim4-runtime
@@ -685,6 +685,10 @@
%{_kde4_appsdir}/planwork/
%dir %{_kde4_iconsdir}/hicolor/45x45
%dir %{_kde4_iconsdir}/hicolor/45x45/mimetypes
+%{_kde4_modulesdir}/planconvert/
+%{_kde4_modulesdir}/planmpxjimport.so
+%{_kde4_servicesdir}/plan_msproject_import.desktop
+%{_kde4_servicesdir}/plan_planner_import.desktop
%files stage -f filelists/stage
%defattr(-,root,root,-)
++++++ calligra-2.5.2.tar.bz2 -> calligra-2.5.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/calligra/calligra-2.5.2.tar.bz2 /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.5.3.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2012-11-02 17:31:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old)
and /work/SRC/openSUSE:Factory/.roundcubemail.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "roundcubemail", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2012-09-27 10:28:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.roundcubemail.new/roundcubemail.changes 2012-11-02 17:31:30.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Oct 29 07:00:08 UTC 2012 - wr(a)rosenauer.org
+
+- Update to version 0.8.2
+ * bugfix release (detailed changes in CHANGELOG)
+
+-------------------------------------------------------------------
Old:
----
roundcubemail-0.8.1.tar.gz
New:
----
roundcubemail-0.8.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ roundcubemail.spec ++++++
--- /var/tmp/diff_new_pack.uzLD2a/_old 2012-11-02 17:31:32.000000000 +0100
+++ /var/tmp/diff_new_pack.uzLD2a/_new 2012-11-02 17:31:32.000000000 +0100
@@ -18,10 +18,10 @@
Name: roundcubemail
Summary: A modern browser-based multilingual IMAP client
-License: GPL-3.0+ ; GPL-2.0 ; BSD-3-Clause
+License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause
Group: Productivity/Networking/Email/Clients
Url: http://www.roundcube.net/
-Version: 0.8.1
+Version: 0.8.2
Release: 0
BuildRequires: apache2-devel
BuildRequires: fdupes
++++++ roundcubemail-0.8.1.tar.gz -> roundcubemail-0.8.2.tar.gz ++++++
++++ 8238 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package R-base for openSUSE:Factory checked in at 2012-11-02 17:31:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/R-base (Old)
and /work/SRC/openSUSE:Factory/.R-base.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "R-base", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/R-base/R-base.changes 2012-07-12 10:51:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.R-base.new/R-base.changes 2012-11-02 17:31:14.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Oct 26 12:35:44 UTC 2012 - detlef.steuer(a)gmx.de
+
+- Upstream release 2.15.2
+- see, as usual, /usr/lib/R/doc/NEWS.html
+- most relevant change for rpm are some added translation files
+
+-------------------------------------------------------------------
Old:
----
R-2.15.1.tar.bz2
New:
----
R-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ R-base.spec ++++++
--- /var/tmp/diff_new_pack.pmafJi/_old 2012-11-02 17:31:17.000000000 +0100
+++ /var/tmp/diff_new_pack.pmafJi/_new 2012-11-02 17:31:17.000000000 +0100
@@ -18,7 +18,7 @@
Name: R-base
%define release 1
-Version: 2.15.1
+Version: 2.15.2
Release: %release
Source: R-%{version}.tar.bz2
#Source: http://cran.r-project.org/src/base/R-2/R-%%{version}.tar.gz
@@ -71,33 +71,34 @@
Requires: cairo >= 1.2
Requires: fontconfig
Requires: freetype2
+Requires: glibc-locale
Requires: readline
Requires: xdg-utils
Requires: xorg-x11-fonts-100dpi
Requires: xorg-x11-fonts-75dpi
Provides: R = %{version}
-Provides: R-KernSmooth = 2.23.7
-Provides: R-MASS = 7.3.18
-Provides: R-Matrix = 1.0.6
-Obsoletes: R-Matrix < 1.0.6
-Provides: R-boot = 1.3.4
-Provides: R-class = 7.3.3
-Provides: R-cluster = 1.14.2
+Provides: R-KernSmooth = 2.23.8
+Provides: R-MASS = 7.3.22
+Provides: R-Matrix = 1.0.9
+Obsoletes: R-Matrix < 1.0.9
+Provides: R-boot = 1.3.7
+Provides: R-class = 7.3.5
+Provides: R-cluster = 1.14.3
Provides: R-codetools = 0.2.8
Provides: R-compiler = %{version}
Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.50
+Provides: R-foreign = 0.8.51
Provides: R-grDevices = %{version}
Provides: R-graphics = %{version}
Provides: R-grid = %{version}
-Provides: R-lattice = 0.20.6
+Provides: R-lattice = 0.20.10
Provides: R-methods = %{version}
-Provides: R-mgcv = 1.7.18
-Provides: R-nlme = 3.1.104
-Provides: R-nnet = 7.3.1
-Provides: R-rpart = 3.1.53
-Provides: R-spatial = 7.3.3
+Provides: R-mgcv = 1.7.22
+Provides: R-nlme = 3.1.105
+Provides: R-nnet = 7.3.5
+Provides: R-rpart = 3.1.55
+Provides: R-spatial = 7.3.5
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
@@ -113,10 +114,10 @@
%package -n R-base-devel
Summary: Libraries and includefiles for developing with R-base
Group: Development/Libraries/Other
-Provides: R-Matrix-devel = 1.0.6
+Provides: R-Matrix-devel = 1.0.9
Provides: R-devel = %{version}
Requires: R-base
-Obsoletes: R-Matrix-devel < 1.0.6
+Obsoletes: R-Matrix-devel < 1.0.9
%description -n R-base-devel
This package provides the necessary development headers and
@@ -213,6 +214,7 @@
%lang(it) %{_libdir}/R/library/base/po/it/
%lang(ja) %{_libdir}/R/library/base/po/ja/
%lang(ko) %{_libdir}/R/library/base/po/ko/
+%lang(nn) %{_libdir}/R/library/base/po/nn/
%lang(pl) %{_libdir}/R/library/base/po/pl/
%lang(pt) %{_libdir}/R/library/base/po/pt*/
%lang(ru) %{_libdir}/R/library/base/po/ru/
@@ -233,6 +235,7 @@
%lang(de) %{_libdir}/R/library/boot/po/de/
%lang(en) %{_libdir}/R/library/boot/po/en*/
%lang(fr) %{_libdir}/R/library/boot/po/fr/
+%lang(pl) %{_libdir}/R/library/boot/po/pl/
%lang(ru) %{_libdir}/R/library/boot/po/ru/
%{_libdir}/R/library/boot/R/
# class
@@ -251,6 +254,7 @@
%lang(de) %{_libdir}/R/library/class/po/de/
%lang(en) %{_libdir}/R/library/class/po/en*/
%lang(fr) %{_libdir}/R/library/class/po/fr/
+%lang(pl) %{_libdir}/R/library/class/po/pl/
%{_libdir}/R/library/class/R/
# cluster
%dir %{_libdir}/R/library/cluster/
@@ -267,6 +271,7 @@
%dir %{_libdir}/R/library/cluster/po/
%lang(de) %{_libdir}/R/library/cluster/po/de/
%lang(en) %{_libdir}/R/library/cluster/po/en*/
+%lang(pl) %{_libdir}/R/library/cluster/po/pl/
# codetools
%dir %{_libdir}/R/library/codetools/
%{_libdir}/R/library/codetools/DESCRIPTION
@@ -291,6 +296,7 @@
%lang(en) %{_libdir}/R/library/compiler/po/en*/
%lang(fr) %{_libdir}/R/library/compiler/po/fr/
%lang(ja) %{_libdir}/R/library/compiler/po/ja/
+%lang(ko) %{_libdir}/R/library/compiler/po/ko/
%lang(pl) %{_libdir}/R/library/compiler/po/pl/
%lang(pt) %{_libdir}/R/library/compiler/po/pt_BR/
%lang(ru) %{_libdir}/R/library/compiler/po/ru/
@@ -319,6 +325,7 @@
%lang(de) %{_libdir}/R/library/foreign/po/de/
%lang(en) %{_libdir}/R/library/foreign/po/en*/
%lang(fr) %{_libdir}/R/library/foreign/po/fr/
+%lang(pl) %{_libdir}/R/library/foreign/po/pl/
%{_libdir}/R/library/foreign/R/
# graphics
%dir %{_libdir}/R/library/graphics/
@@ -403,6 +410,7 @@
%dir %{_libdir}/R/library/KernSmooth/po/
%lang(de) %{_libdir}/R/library/KernSmooth/po/de/
%lang(en) %{_libdir}/R/library/KernSmooth/po/en*/
+%lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/
%{_libdir}/R/library/KernSmooth/R/
# lattice
%dir %{_libdir}/R/library/lattice/
@@ -440,6 +448,7 @@
%lang(de) %{_libdir}/R/library/MASS/po/de/
%lang(en) %{_libdir}/R/library/MASS/po/en*/
%lang(fr) %{_libdir}/R/library/MASS/po/fr/
+%lang(pl) %{_libdir}/R/library/MASS/po/pl/
%{_libdir}/R/library/MASS/R/
%{_libdir}/R/library/MASS/scripts/
# Matrix
@@ -459,6 +468,7 @@
%dir %{_libdir}/R/library/Matrix/po/
%lang(de) %{_libdir}/R/library/Matrix/po/de/
%lang(en) %{_libdir}/R/library/Matrix/po/en*/
+%lang(pl) %{_libdir}/R/library/Matrix/po/pl/
%{_libdir}/R/library/Matrix/R/
%{_libdir}/R/library/Matrix/test-tools.R
%{_libdir}/R/library/Matrix/test-tools-1.R
@@ -513,6 +523,7 @@
%lang(de) %{_libdir}/R/library/nlme/po/de/
%lang(en) %{_libdir}/R/library/nlme/po/en*/
%lang(fr) %{_libdir}/R/library/nlme/po/fr/
+%lang(pl) %{_libdir}/R/library/nlme/po/pl/
%{_libdir}/R/library/nlme/R/
%{_libdir}/R/library/nlme/scripts/
# nnet
@@ -531,24 +542,29 @@
%lang(de) %{_libdir}/R/library/nnet/po/de/
%lang(en) %{_libdir}/R/library/nnet/po/en*/
%lang(fr) %{_libdir}/R/library/nnet/po/fr/
+%lang(pl) %{_libdir}/R/library/nnet/po/pl/
%{_libdir}/R/library/nnet/R/
# parallel
%dir %{_libdir}/R/library/parallel/
%{_libdir}/R/library/parallel/DESCRIPTION
%{_libdir}/R/library/parallel/INDEX
+%dir %{_libdir}/R/library/parallel/doc
+%{_libdir}/R/library/parallel/doc/index.html
+%{_libdir}/R/library/parallel/doc/parallel.pdf
+%{_libdir}/R/library/parallel/doc/parallel.R
+%{_libdir}/R/library/parallel/doc/parallel.Rnw
%dir %{_libdir}/R/library/parallel/Meta
%{_libdir}/R/library/parallel/Meta/Rd.rds
%{_libdir}/R/library/parallel/Meta/hsearch.rds
%{_libdir}/R/library/parallel/Meta/links.rds
%{_libdir}/R/library/parallel/Meta/nsInfo.rds
%{_libdir}/R/library/parallel/Meta/package.rds
+%{_libdir}/R/library/parallel/Meta/vignette.rds
%{_libdir}/R/library/parallel/NAMESPACE
%dir %{_libdir}/R/library/parallel/R
%{_libdir}/R/library/parallel/R/parallel
%{_libdir}/R/library/parallel/R/parallel.rdb
%{_libdir}/R/library/parallel/R/parallel.rdx
-%dir %{_libdir}/R/library/parallel/doc
-%{_libdir}/R/library/parallel/doc/parallel.pdf
%dir %{_libdir}/R/library/parallel/help
%{_libdir}/R/library/parallel/help/AnIndex
%{_libdir}/R/library/parallel/help/aliases.rds
@@ -565,6 +581,7 @@
%lang(de) %{_libdir}/R/library/parallel/po/de/
%lang(en) %{_libdir}/R/library/parallel/po/en*/
%lang(fr) %{_libdir}/R/library/parallel/po/fr/
+%lang(ko) %{_libdir}/R/library/parallel/po/ko/
%lang(pl) %{_libdir}/R/library/parallel/po/pl/
%lang(ru) %{_libdir}/R/library/parallel/po/ru/
%lang(zh_CN) %{_libdir}/R/library/parallel/po/zh_CN/
@@ -582,6 +599,7 @@
%lang(de) %{_libdir}/R/library/rpart/po/de/
%lang(en) %{_libdir}/R/library/rpart/po/en*/
%lang(fr) %{_libdir}/R/library/rpart/po/fr/
+%lang(pl) %{_libdir}/R/library/rpart/po/pl/
%lang(ru) %{_libdir}/R/library/rpart/po/ru/
%{_libdir}/R/library/rpart/R/
# spatial
@@ -600,6 +618,7 @@
%lang(de) %{_libdir}/R/library/spatial/po/de/
%lang(en) %{_libdir}/R/library/spatial/po/en*/
%lang(fr) %{_libdir}/R/library/spatial/po/fr/
+%lang(pl) %{_libdir}/R/library/spatial/po/pl/
%{_libdir}/R/library/spatial/ppdata/
%{_libdir}/R/library/spatial/PP.files
%{_libdir}/R/library/spatial/R/
@@ -780,40 +799,40 @@
%{_libdir}/R/share/encodings/
%{_libdir}/R/share/java/
%dir %{_libdir}/R/share/locale/
-%{_libdir}/R/share/locale/da
-%{_libdir}/R/share/locale/da/LC_MESSAGES
-%{_libdir}/R/share/locale/de
-%{_libdir}/R/share/locale/de/LC_MESSAGES
-%{_libdir}/R/share/locale/en
-%{_libdir}/R/share/locale/en/LC_MESSAGES
-%{_libdir}/R/share/locale/en@quot
-%{_libdir}/R/share/locale/en@quot/LC_MESSAGES
-%{_libdir}/R/share/locale/en_GB
-%{_libdir}/R/share/locale/en_GB/LC_MESSAGES
-%{_libdir}/R/share/locale/es
-%{_libdir}/R/share/locale/es/LC_MESSAGES
-%{_libdir}/R/share/locale/fr
-%{_libdir}/R/share/locale/fr/LC_MESSAGES
-%{_libdir}/R/share/locale/it
-%{_libdir}/R/share/locale/it/LC_MESSAGES
-%{_libdir}/R/share/locale/ja
-%{_libdir}/R/share/locale/ja/LC_MESSAGES
-%{_libdir}/R/share/locale/ko
-%{_libdir}/R/share/locale/ko/LC_MESSAGES
-%{_libdir}/R/share/locale/nn
-%{_libdir}/R/share/locale/nn/LC_MESSAGES
-%{_libdir}/R/share/locale/pl
-%{_libdir}/R/share/locale/pl/LC_MESSAGES
-%{_libdir}/R/share/locale/pt_BR
-%{_libdir}/R/share/locale/pt_BR/LC_MESSAGES
-%{_libdir}/R/share/locale/ru
-%{_libdir}/R/share/locale/ru/LC_MESSAGES
-%{_libdir}/R/share/locale/tr
-%{_libdir}/R/share/locale/tr/LC_MESSAGES
-%{_libdir}/R/share/locale/zh_CN
-%{_libdir}/R/share/locale/zh_CN/LC_MESSAGES
-%{_libdir}/R/share/locale/zh_TW
-%{_libdir}/R/share/locale/zh_TW/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/da
+%dir %{_libdir}/R/share/locale/da/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/de
+%dir %{_libdir}/R/share/locale/de/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/en
+%dir %{_libdir}/R/share/locale/en/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/en@quot
+%dir %{_libdir}/R/share/locale/en@quot/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/en_GB
+%dir %{_libdir}/R/share/locale/en_GB/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/es
+%dir %{_libdir}/R/share/locale/es/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/fr
+%dir %{_libdir}/R/share/locale/fr/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/it
+%dir %{_libdir}/R/share/locale/it/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/ja
+%dir %{_libdir}/R/share/locale/ja/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/ko
+%dir %{_libdir}/R/share/locale/ko/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/nn
+%dir %{_libdir}/R/share/locale/nn/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/pl
+%dir %{_libdir}/R/share/locale/pl/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/pt_BR
+%dir %{_libdir}/R/share/locale/pt_BR/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/ru
+%dir %{_libdir}/R/share/locale/ru/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/tr
+%dir %{_libdir}/R/share/locale/tr/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/zh_CN
+%dir %{_libdir}/R/share/locale/zh_CN/LC_MESSAGES
+%dir %{_libdir}/R/share/locale/zh_TW
+%dir %{_libdir}/R/share/locale/zh_TW/LC_MESSAGES
%{_libdir}/R/share/licenses/
%{_libdir}/R/share/make/
@@ -821,7 +840,7 @@
%{_libdir}/R/share/sh/
%{_libdir}/R/share/texmf/
# ld.so.conf
-/etc/ld.so.conf.d/R.conf
+%config /etc/ld.so.conf.d/R.conf
%files -n R-base-devel
%defattr(-, root, root)
++++++ R-2.15.1.tar.bz2 -> R-2.15.2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/R-base/R-2.15.1.tar.bz2 /work/SRC/openSUSE:Factory/.R-base.new/R-2.15.2.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mcpp for openSUSE:Factory checked in at 2012-11-02 17:30:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mcpp (Old)
and /work/SRC/openSUSE:Factory/.mcpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mcpp", Maintainer is "DMueller(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mcpp/mcpp.changes 2011-09-23 02:12:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mcpp.new/mcpp.changes 2012-11-02 17:30:41.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Oct 18 16:49:49 UTC 2012 - mrueckert(a)suse.de
+
+- enable building of the shared library
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mcpp.spec ++++++
--- /var/tmp/diff_new_pack.ByEo47/_old 2012-11-02 17:30:42.000000000 +0100
+++ /var/tmp/diff_new_pack.ByEo47/_new 2012-11-02 17:30:42.000000000 +0100
@@ -39,26 +39,63 @@
--------
Kiyoshi Matsui <kmatsui(a)t3.rim.or.jp>
+%define _libname libmcpp0
+%package -n %{_libname}
+#
+Summary: The shared library of Matsui's C Preprocessor
+Group: Development/Libraries/C and C++
+
+%description -n %{_libname}
+mcpp is a small and portable C/C++ preprocessor implementing all of
+C90, C99 and C++98.
+
+This package holds the shared libraries of libev.
+
+%package devel
+#
+Summary: Development files for mcpp
+Group: Development/Libraries/C and C++
+Requires: %{_libname} = %{version}
+Requires: %{name} = %{version}
+%description devel
+mcpp is a small and portable C/C++ preprocessor implementing all of
+C90, C99 and C++98.
+
+This package holds the development files for libev.
+
%prep
%setup -q
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -D_BSD_SOURCE"
-%configure
+%configure --enable-mcpplib
make %{?jobs:-j %jobs}
%install
%makeinstall
rm -rf $RPM_BUILD_ROOT/usr/share/doc/mcpp
+rm -rf %{buildroot}%{_libdir}/libmcpp.*a
%clean
rm -rf $RPM_BUILD_ROOT
+%post -n %{_libname} -p /sbin/ldconfig
+%postun -n %{_libname} -p /sbin/ldconfig
+
%files
%defattr(-, root, root)
%doc doc/mcpp-manual.html LICENSE NEWS README
%{_prefix}/bin/*
%{_mandir}/man1/mcpp.1.gz
+%files -n %{_libname}
+%defattr(-,root,root,-)
+%{_libdir}/libmcpp.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/mcpp_*.h
+%{_libdir}/libmcpp.so
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-11-02 17:30:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2012-11-02 17:30:35.000000000 +0100
@@ -0,0 +1,2347 @@
+-------------------------------------------------------------------
+Fri Nov 2 14:07:15 UTC 2012 - coolo(a)suse.com
+
+- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824)
+
+-------------------------------------------------------------------
+Mon Oct 29 13:01:20 UTC 2012 - fcrozat(a)suse.com
+
+- Add var-run-lock.patch: make sure /var/run and /var/lock are
+ handled as bind mount if they aren't symlinks.
+- Update storage-after-cryptsetup.patch with new systemctl path.
+- Migrate broken symlinks in /etc/systemd/system due to new systemd
+ location.
+
+-------------------------------------------------------------------
+Fri Oct 26 13:37:52 UTC 2012 - fcrozat(a)suse.com
+
+- Update to release 195:
+ + journalctl agained --since and --until, as well as filtering
+ for units with --unit=/-u.
+ + allow ExecReload properly for Type=oneshot (needed for
+ iptables.service, rpc-nfsd.service).
+ + journal daemon supports time-based rotation and vaccuming.
+ + journalctl -F allow to list all values of a certain field in
+ journal database.
+ + new commandline clients for timedated, locald and hostnamed
+ + new tool systemd-coredumpctl to list and extract coredumps from
+ journal.
+ + improve gatewayd: follow mode, filtering, support for
+ HTML5/JSON Server-Sent-Events.
+ + reload support in SysV initscripts is now detected when file is
+ parted.
+ + "systemctl status --follow" as been removed, use "journalctl -fu
+ instead"
+ + journald.conf RuntimeMinSize and PersistentMinSize settings
+ have been removed.
+- Add compatibility symlink for systemd-ask-password and systemctl
+ in /bin.
+
+-------------------------------------------------------------------
+Thu Oct 18 12:27:07 UTC 2012 - fcrozat(a)suse.com
+
+- Create and own more systemd drop-in directories.
+
+-------------------------------------------------------------------
+Tue Oct 16 13:18:13 UTC 2012 - fcrozat(a)suse.com
+
+- Improve mini packages for bootstrapping.
+- do not mount /tmp as tmpfs by default.
+
+-------------------------------------------------------------------
+Tue Oct 16 07:40:23 UTC 2012 - fcrozat(a)suse.com
+
+- Fix install script when there is no inittab
+
+-------------------------------------------------------------------
+Mon Oct 15 14:48:47 UTC 2012 - fcrozat(a)suse.com
+
+- Create a systemd-mini specfile to prevent cycle in bootstrapping
+
+-------------------------------------------------------------------
+Thu Oct 4 11:23:42 UTC 2012 - fcrozat(a)suse.com
+
+- udev and its subpackages are now generated by systemd source
+ package.
+- migrate udev and systemd to /usr
+- Update to version 194:
+ + if /etc/vconsole.conf is non-existent or empty and if
+ /etc/sysconfig/console:CONSOLE_FONT (resp
+ /etc/sysconfig/keyboard:KEYTABLE) set, console font (resp
+ keymap) is not modified.
+- Changes from version 44 to 193:
+ + journalctl gained --cursor= to show entries starting from a
+ specified location in journal.
+ + Size limit enforced to 4K for fields exported with "-o json" in
+ journalctl. Use --all to disable this behavior.
+ + Optional journal gateway daemon
+ (systemd-journal-gatewayd.service) to access journal via HTTP
+ and JSON. Use "wget http://localhost:19531/entries" to get
+ /var/log/messages compatible format and
+ 'curl -H"Accept: application/json"
+ http://localhost:19531/entries' for JSON formatted content.
+ HTML5 static page is also available as explained on
+ http://0pointer.de/public/journal-gatewayd
+ + do not mount cpuset controler, doesn't work well by default
+ ATM.
+ + improved nspawn behaviour with /etc/localtime
+ + journald logs its maximize size on disk
+ + multi-seat X wrapper (partially merged in upstream X server).
+ + HandleSleepKey has been splitted into HandleSuspendKey and
+ HandleHibernateKey.
+ + systemd and logind now handle system sleep states, in
+ particular suspending and hibernating.
+ + new cgroups are mounted by default (cpu, cpuacct,
+ net_cls, net_pri)
+ + sync at shutdown is now handled by kernel
+ + imported journalctl output (colors, filtering, pager, bash
+ completion).
+ + suffix ".service" may now be ommited on most systemctl command
+ involving service unit names.
+ + much improved nspawn containers support.
+ + new conditions added : ConditionFileNotEmpty, ConditionHost,
+ ConditionPathIsReadWrite
+ + tmpfiles "w" supports file globbing
+ + logind handles lid switch, power and sleep keys all the time,
+ unless systemd-inhibit
+ --what=handle-power-key:handle-sleep-key:handle-lid-switch is
+ run by Desktop Environments.
+ + support for reading structured kernel message is used by
+ default (need kernel >= 3.5). /proc/kmsg is now used only by
+ classic syslog daemons.
+ + Forward Secure Sealing is now support for Journal files.
+ + RestartPrevenExitStatus and SuccessExitStatus allow configure
+ of exit status (exit code or signal).
+ + handles keyfile-size and keyfile-offset in /etc/crypttab.
+ + TimeoutSec settings has been splitted into TimeoutStartSec and
+ TimeoutStopSec.
+ + add SystemCallFilters option to add blacklist/whitelist to
+ system calls, using SECCOMP mode 2 of kernel >= 3.5.
+ + systemctl udevadm info now takes a /dev or /sys path as argument:
+ - udevadm info /dev/sda
+ + XDG_RUNTIME_DIR now uses numeric UIDs instead of usernames.
+ + systemd-loginctl and systemd-journalctl have been renamed
+ to loginctl and journalctl to match systemctl.
+ + udev: RUN+="socket:..." and udev_monitor_new_from_socket() is
+ no longer supported. udev_monitor_new_from_netlink() needs to
+ be used to subscribe to events.
+ + udev: when udevd is started by systemd, processes which are left
+ behind by forking them off of udev rules, are unconditionally
+ cleaned up and killed now after the event handling has finished.
+ Services or daemons must be started as systemd services.
+ Services can be pulled-in by udev to get started, but they can
+ no longer be directly forked by udev rules.
+ + For almost all files, license is now LGPL2.1+ (from previous
+ GPL2.0+). Exception are some minor stuff in udev (will be
+ changed to LGPL2.1 eventually) and MIT license sd-daemon.[ch]
+ library.
+ + var-run.mount and var-lock.mount are no longer provided
+ (should be converted to symlinks).
+ + A new service type Type=idle to avoid ugly interleaving of
+ getty output and boot status messages.
+ + systemd-delta has been added, a tool to explore differences
+ between user/admin configuration and vendor defaults.
+ + /tmp mouted as tmpfs by default.
+ + /media is now longer mounted as tmpfs
+ + GTK tool has been split off to systemd-ui package.
+ + much improved documentation.
+- Merge BuildRequires from udev package:
+ gobject-introspection-devel, gtk-doc, libsepol-devel,
+ libusb-devel, pkgconfig(blkid), pkgconfig-glib-2.0),
+ pjgconfig(libcryptsetup), pkgconfig(libpci),
+ pkgconfig(libqrencode), pkgconfig(libselinux),
+ pkgconfig(usbutils).
+- Add pkgconfig(libqrencode) and pkgconfig(libmicrohttpd)
+- Merge sources from udev package: boot.udev, write_dev_root.rules,
+ udev-root-symlink.systemd.
+- Merge patches from udev package: numbered started from 1000):
+ 0001-Reinstate-TIMEOUT-handling.patch,
+ 0013-re-enable-by_path-links-for-ata-devices.patch,
+ 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch,
+ 0026-udev-netlink-null-rules.patch,
+ 0027-udev-fix-sg-autoload-regression.patch.
+- Remove following patches, merged upstream:
+ 0001-util-never-follow-symlinks-in-rm_rf_children.patch,
+ fixppc.patch, logind-logout.patch, fix-getty-isolate.patch,
+ fix-swap-priority.patch, improve-restart-behaviour.patch,
+ fix-dir-noatime-tmpfiles.patch, journal-bugfixes.patch,
+ ulimit-support.patch, change-terminal.patch,
+ fix-tty-startup.patch, fix-write-user-state-file.patch,
+ fix-analyze-exception.patch, use_localtime.patch,
+ journalctl-pager-improvement.patch,
+ avoid-random-seed-cycle.patch,
+ 0001-add-sparse-support-to-detect-endianness-bug.patch,
+ drop-timezone.patch.
+- Rebase the following patches:
+ 0001-Add-bootsplash-handling-for-password-dialogs.patch,
+ 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch,
+ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch,
+ 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch,
+ crypt-loop-file.patch,
+ delay-fsck-cryptsetup-after-md-lvm-dmraid.patch,
+ dm-lvm-after-local-fs-pre-target.patch, fastboot-forcefsck.patch,
+ fix-enable-disable-boot-initscript.patch, modules_on_boot.patch,
+ new-lsb-headers.patch, storage-after-cryptsetup.patch,
+ support-suse-clock-sysconfig.patch, support-sysvinit.patch,
+ sysctl-modules.patch, systemd-numlock-suse.patch, tty1.patch.
+
+-------------------------------------------------------------------
+Thu Aug 23 11:11:25 CEST 2012 - fcrozat(a)suse.com
+
+- Add use_localtime.patch: use /etc/localtime instead of
+ /etc/timezone (bnc#773491)
+- Add support-suse-clock-sysconfig.patch: read SUSE
+ /etc/sysconfig/clock file.
+- Add drop-timezone.patch: drop support for /etc/timezone, never
+ supported on openSUSE.
+- Add journalctl-pager-improvement.patch: better handle output when
++++ 2150 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2012-08-26 11:35:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2012-11-02 17:30:35.000000000 +0100
@@ -1,0 +2,187 @@
+Fri Nov 2 14:07:15 UTC 2012 - coolo(a)suse.com
+
+- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824)
+
+-------------------------------------------------------------------
+Mon Oct 29 13:01:20 UTC 2012 - fcrozat(a)suse.com
+
+- Add var-run-lock.patch: make sure /var/run and /var/lock are
+ handled as bind mount if they aren't symlinks.
+- Update storage-after-cryptsetup.patch with new systemctl path.
+- Migrate broken symlinks in /etc/systemd/system due to new systemd
+ location.
+
+-------------------------------------------------------------------
+Fri Oct 26 13:37:52 UTC 2012 - fcrozat(a)suse.com
+
+- Update to release 195:
+ + journalctl agained --since and --until, as well as filtering
+ for units with --unit=/-u.
+ + allow ExecReload properly for Type=oneshot (needed for
+ iptables.service, rpc-nfsd.service).
+ + journal daemon supports time-based rotation and vaccuming.
+ + journalctl -F allow to list all values of a certain field in
+ journal database.
+ + new commandline clients for timedated, locald and hostnamed
+ + new tool systemd-coredumpctl to list and extract coredumps from
+ journal.
+ + improve gatewayd: follow mode, filtering, support for
+ HTML5/JSON Server-Sent-Events.
+ + reload support in SysV initscripts is now detected when file is
+ parted.
+ + "systemctl status --follow" as been removed, use "journalctl -fu
+ instead"
+ + journald.conf RuntimeMinSize and PersistentMinSize settings
+ have been removed.
+- Add compatibility symlink for systemd-ask-password and systemctl
+ in /bin.
+
+-------------------------------------------------------------------
+Thu Oct 18 12:27:07 UTC 2012 - fcrozat(a)suse.com
+
+- Create and own more systemd drop-in directories.
+
+-------------------------------------------------------------------
+Tue Oct 16 13:18:13 UTC 2012 - fcrozat(a)suse.com
+
+- Improve mini packages for bootstrapping.
+- do not mount /tmp as tmpfs by default.
+
+-------------------------------------------------------------------
+Tue Oct 16 07:40:23 UTC 2012 - fcrozat(a)suse.com
+
+- Fix install script when there is no inittab
+
+-------------------------------------------------------------------
+Mon Oct 15 14:48:47 UTC 2012 - fcrozat(a)suse.com
+
+- Create a systemd-mini specfile to prevent cycle in bootstrapping
+
+-------------------------------------------------------------------
+Thu Oct 4 11:23:42 UTC 2012 - fcrozat(a)suse.com
+
+- udev and its subpackages are now generated by systemd source
+ package.
+- migrate udev and systemd to /usr
+- Update to version 194:
+ + if /etc/vconsole.conf is non-existent or empty and if
+ /etc/sysconfig/console:CONSOLE_FONT (resp
+ /etc/sysconfig/keyboard:KEYTABLE) set, console font (resp
+ keymap) is not modified.
+- Changes from version 44 to 193:
+ + journalctl gained --cursor= to show entries starting from a
+ specified location in journal.
+ + Size limit enforced to 4K for fields exported with "-o json" in
+ journalctl. Use --all to disable this behavior.
+ + Optional journal gateway daemon
+ (systemd-journal-gatewayd.service) to access journal via HTTP
+ and JSON. Use "wget http://localhost:19531/entries" to get
+ /var/log/messages compatible format and
+ 'curl -H"Accept: application/json"
+ http://localhost:19531/entries' for JSON formatted content.
+ HTML5 static page is also available as explained on
+ http://0pointer.de/public/journal-gatewayd
+ + do not mount cpuset controler, doesn't work well by default
+ ATM.
+ + improved nspawn behaviour with /etc/localtime
+ + journald logs its maximize size on disk
+ + multi-seat X wrapper (partially merged in upstream X server).
+ + HandleSleepKey has been splitted into HandleSuspendKey and
+ HandleHibernateKey.
+ + systemd and logind now handle system sleep states, in
+ particular suspending and hibernating.
+ + new cgroups are mounted by default (cpu, cpuacct,
+ net_cls, net_pri)
+ + sync at shutdown is now handled by kernel
+ + imported journalctl output (colors, filtering, pager, bash
+ completion).
+ + suffix ".service" may now be ommited on most systemctl command
+ involving service unit names.
+ + much improved nspawn containers support.
+ + new conditions added : ConditionFileNotEmpty, ConditionHost,
+ ConditionPathIsReadWrite
+ + tmpfiles "w" supports file globbing
+ + logind handles lid switch, power and sleep keys all the time,
+ unless systemd-inhibit
+ --what=handle-power-key:handle-sleep-key:handle-lid-switch is
+ run by Desktop Environments.
+ + support for reading structured kernel message is used by
+ default (need kernel >= 3.5). /proc/kmsg is now used only by
+ classic syslog daemons.
+ + Forward Secure Sealing is now support for Journal files.
+ + RestartPrevenExitStatus and SuccessExitStatus allow configure
+ of exit status (exit code or signal).
+ + handles keyfile-size and keyfile-offset in /etc/crypttab.
+ + TimeoutSec settings has been splitted into TimeoutStartSec and
+ TimeoutStopSec.
+ + add SystemCallFilters option to add blacklist/whitelist to
+ system calls, using SECCOMP mode 2 of kernel >= 3.5.
+ + systemctl udevadm info now takes a /dev or /sys path as argument:
+ - udevadm info /dev/sda
+ + XDG_RUNTIME_DIR now uses numeric UIDs instead of usernames.
+ + systemd-loginctl and systemd-journalctl have been renamed
+ to loginctl and journalctl to match systemctl.
+ + udev: RUN+="socket:..." and udev_monitor_new_from_socket() is
+ no longer supported. udev_monitor_new_from_netlink() needs to
+ be used to subscribe to events.
+ + udev: when udevd is started by systemd, processes which are left
+ behind by forking them off of udev rules, are unconditionally
+ cleaned up and killed now after the event handling has finished.
+ Services or daemons must be started as systemd services.
+ Services can be pulled-in by udev to get started, but they can
+ no longer be directly forked by udev rules.
+ + For almost all files, license is now LGPL2.1+ (from previous
+ GPL2.0+). Exception are some minor stuff in udev (will be
+ changed to LGPL2.1 eventually) and MIT license sd-daemon.[ch]
+ library.
+ + var-run.mount and var-lock.mount are no longer provided
+ (should be converted to symlinks).
+ + A new service type Type=idle to avoid ugly interleaving of
+ getty output and boot status messages.
+ + systemd-delta has been added, a tool to explore differences
+ between user/admin configuration and vendor defaults.
+ + /tmp mouted as tmpfs by default.
+ + /media is now longer mounted as tmpfs
+ + GTK tool has been split off to systemd-ui package.
+ + much improved documentation.
+- Merge BuildRequires from udev package:
+ gobject-introspection-devel, gtk-doc, libsepol-devel,
+ libusb-devel, pkgconfig(blkid), pkgconfig-glib-2.0),
+ pjgconfig(libcryptsetup), pkgconfig(libpci),
+ pkgconfig(libqrencode), pkgconfig(libselinux),
+ pkgconfig(usbutils).
+- Add pkgconfig(libqrencode) and pkgconfig(libmicrohttpd)
+- Merge sources from udev package: boot.udev, write_dev_root.rules,
+ udev-root-symlink.systemd.
+- Merge patches from udev package: numbered started from 1000):
+ 0001-Reinstate-TIMEOUT-handling.patch,
+ 0013-re-enable-by_path-links-for-ata-devices.patch,
+ 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch,
+ 0026-udev-netlink-null-rules.patch,
+ 0027-udev-fix-sg-autoload-regression.patch.
+- Remove following patches, merged upstream:
+ 0001-util-never-follow-symlinks-in-rm_rf_children.patch,
+ fixppc.patch, logind-logout.patch, fix-getty-isolate.patch,
+ fix-swap-priority.patch, improve-restart-behaviour.patch,
+ fix-dir-noatime-tmpfiles.patch, journal-bugfixes.patch,
+ ulimit-support.patch, change-terminal.patch,
+ fix-tty-startup.patch, fix-write-user-state-file.patch,
+ fix-analyze-exception.patch, use_localtime.patch,
+ journalctl-pager-improvement.patch,
+ avoid-random-seed-cycle.patch,
+ 0001-add-sparse-support-to-detect-endianness-bug.patch,
+ drop-timezone.patch.
+- Rebase the following patches:
+ 0001-Add-bootsplash-handling-for-password-dialogs.patch,
+ 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch,
+ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch,
+ 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch,
+ crypt-loop-file.patch,
+ delay-fsck-cryptsetup-after-md-lvm-dmraid.patch,
+ dm-lvm-after-local-fs-pre-target.patch, fastboot-forcefsck.patch,
+ fix-enable-disable-boot-initscript.patch, modules_on_boot.patch,
+ new-lsb-headers.patch, storage-after-cryptsetup.patch,
+ support-suse-clock-sysconfig.patch, support-sysvinit.patch,
+ sysctl-modules.patch, systemd-numlock-suse.patch, tty1.patch.
+
+-------------------------------------------------------------------
Old:
----
0001-add-sparse-support-to-detect-endianness-bug.patch
0001-util-never-follow-symlinks-in-rm_rf_children.patch
avoid-random-seed-cycle.patch
change-terminal.patch
drop-timezone.patch
fix-analyze-exception.patch
fix-dir-noatime-tmpfiles.patch
fix-getty-isolate.patch
fix-swap-priority.patch
fix-tty-startup.patch
fix-write-user-state-file.patch
fixppc.patch
improve-restart-behaviour.patch
journal-bugfixes.patch
journalctl-pager-improvement.patch
logind-logout.patch
systemd-44.tar.xz
systemd-gtk.changes
systemd-gtk.spec
ulimit-support.patch
use_localtime.patch
New:
----
0001-Reinstate-TIMEOUT-handling.patch
0013-re-enable-by_path-links-for-ata-devices.patch
0014-rules-create-by-id-scsi-links-for-ATA-devices.patch
0026-udev-netlink-null-rules.patch
0027-udev-fix-sg-autoload-regression.patch
boot.udev
systemd-195.tar.xz
systemd-mini-rpmlintrc
systemd-mini.changes
systemd-mini.spec
udev-root-symlink.systemd
var-run-lock.patch
write_dev_root_rule
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
++++ 834 lines (skipped)
++++++ systemd.spec ++++++
++++ 913 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/systemd/systemd.spec
++++ and /work/SRC/openSUSE:Factory/.systemd.new/systemd.spec
++++++ 0001-Add-bootsplash-handling-for-password-dialogs.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -8,8 +8,8 @@
---
diff --git a/src/ask-password-api.c b/src/ask-password-api.c
index da967ab..b89bcea 100644
---- a/src/ask-password-api.c
-+++ b/src/ask-password-api.c
+--- a/src/shared/ask-password-api.c
++++ b/src/shared/ask-password-api.c
@@ -62,6 +62,9 @@ int ask_password_tty(
bool reset_tty = false;
bool silent_mode = false;
++++++ 0001-Reinstate-TIMEOUT-handling.patch ++++++
Without treating events with timeouts specially some drivers would
cause a 30 seconds stall on boot: .
I also received reports of some drivers not working at all, even
after the timeout.
We will remove this patch when more drivers have been fixed in
the kernel (3.4?).
This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
57c6f8ae5f52a6e8ffc66a54966346f733dded39.
---
Note: this is mostly a FYI, and whether or not it makes sense
to apply this upstream depends on how big problems other report
regarding this issue.
src/libudev-device.c | 19 +++++++++++++++++++
src/libudev-private.h | 1 +
src/udevd.c | 13 ++++++++++---
4 files changed, 32 insertions(+), 3 deletions(-)
Index: systemd-190/src/libudev/libudev-device.c
===================================================================
--- systemd-190.orig/src/libudev/libudev-device.c
+++ systemd-190/src/libudev/libudev-device.c
@@ -68,6 +68,7 @@ struct udev_device {
struct udev_list tags_list;
unsigned long long int seqnum;
unsigned long long int usec_initialized;
+ int timeout;
int devlink_priority;
int refcount;
dev_t devnum;
@@ -162,6 +163,21 @@ static int udev_device_set_devnum(struct
return 0;
}
+int udev_device_get_timeout(struct udev_device *udev_device)
+{
+ return udev_device->timeout;
+}
+
+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
+{
+ char num[32];
+
+ udev_device->timeout = timeout;
+ snprintf(num, sizeof(num), "%u", timeout);
+ udev_device_add_property(udev_device, "TIMEOUT", num);
+ return 0;
+}
+
const char *udev_device_get_devpath_old(struct udev_device *udev_device)
{
return udev_device->devpath_old;
@@ -418,6 +434,8 @@ void udev_device_add_property_from_strin
udev_device_set_devpath_old(udev_device, &property[12]);
} else if (startswith(property, "SEQNUM=")) {
udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
+ } else if (startswith(property, "TIMEOUT=")) {
+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
} else if (startswith(property, "IFINDEX=")) {
udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
} else if (startswith(property, "DEVMODE=")) {
@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(stru
udev_list_init(udev, &udev_device->sysattr_value_list, true);
udev_list_init(udev, &udev_device->sysattr_list, false);
udev_list_init(udev, &udev_device->tags_list, true);
+ udev_device->timeout = -1;
udev_device->watch_handle = -1;
/* copy global properties */
udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
Index: systemd-190/src/libudev/libudev-private.h
===================================================================
--- systemd-190.orig/src/libudev/libudev-private.h
+++ systemd-190/src/libudev/libudev-private.h
@@ -65,6 +65,7 @@ const char *udev_device_get_id_filename(
void udev_device_set_is_initialized(struct udev_device *udev_device);
int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
void udev_device_cleanup_tags_list(struct udev_device *udev_device);
+int udev_device_get_timeout(struct udev_device *udev_device);
unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
int udev_device_get_devlink_priority(struct udev_device *udev_device);
Index: systemd-190/src/udev/udevd.c
===================================================================
--- systemd-190.orig/src/udev/udevd.c
+++ systemd-190/src/udev/udevd.c
@@ -387,7 +387,7 @@ out:
}
}
-static void event_run(struct event *event)
+static void event_run(struct event *event, bool force)
{
struct udev_list_node *loop;
@@ -413,7 +413,7 @@ static void event_run(struct event *even
return;
}
- if (children >= children_max) {
+ if (!force && children >= children_max) {
if (children_max > 1)
log_debug("maximum number (%i) of children reached\n", children);
return;
@@ -447,6 +447,13 @@ static int event_queue_insert(struct ude
event->state = EVENT_QUEUED;
udev_list_node_append(&event->node, &event_list);
+
+ /* run all events with a timeout set immediately */
+ if (udev_device_get_timeout(dev) > 0) {
+ event_run(event, true);
+ return 0;
+ }
+
return 0;
}
@@ -552,7 +559,7 @@ static void event_queue_start(struct ude
if (is_devpath_busy(event))
continue;
- event_run(event);
+ event_run(event, false);
}
}
++++++ 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -7,10 +7,10 @@
src/vconsole-setup.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 insertions(+), 3 deletions(-)
-Index: systemd-37/src/vconsole-setup.c
+Index: systemd-189/src/vconsole/vconsole-setup.c
===================================================================
---- systemd-37.orig/src/vconsole/vconsole-setup.c
-+++ systemd-37/src/vconsole/vconsole-setup.c
+--- systemd-189.orig/src/vconsole/vconsole-setup.c
++++ systemd-189/src/vconsole/vconsole-setup.c
@@ -40,6 +40,7 @@
#include "log.h"
#include "macro.h"
@@ -19,7 +19,7 @@
static bool is_vconsole(int fd) {
unsigned char data[1];
-@@ -79,8 +80,8 @@
+@@ -99,8 +100,8 @@ static int enable_utf8(int fd) {
return r;
}
@@ -30,7 +30,7 @@
int i = 0;
pid_t pid;
-@@ -99,6 +100,8 @@
+@@ -119,6 +120,8 @@ static int load_keymap(const char *vc, c
args[i++] = map;
if (map_toggle)
args[i++] = map_toggle;
@@ -38,8 +38,8 @@
+ args[i++] = "disable.capslock";
args[i++] = NULL;
- if ((pid = fork()) < 0) {
-@@ -150,6 +153,101 @@
+ pid = fork();
+@@ -172,6 +175,101 @@ static int load_font(const char *vc, con
return 0;
}
@@ -141,7 +141,7 @@
int main(int argc, char **argv) {
const char *vc;
char *vc_keymap = NULL;
-@@ -163,8 +261,16 @@
+@@ -185,8 +283,16 @@ int main(int argc, char **argv) {
#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
char *vc_keytable = NULL;
#endif
@@ -158,29 +158,26 @@
int r = EXIT_FAILURE;
pid_t font_pid = 0, keymap_pid = 0;
-@@ -265,6 +371,10 @@
- #elif defined(TARGET_SUSE)
- if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
- "KEYTABLE", &vc_keymap,
-+ "KBD_DELAY", &vc_kbd_delay,
-+ "KBD_RATE", &vc_kbd_rate,
-+ "KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock,
-+ "COMPOSETABLE", &vc_compose_table,
- NULL)) < 0) {
-
- if (r != -ENOENT)
-@@ -280,6 +390,7 @@
- if (r != -ENOENT)
- log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
+@@ -281,10 +387,15 @@ int main(int argc, char **argv) {
+ free(vc_keymap);
+ vc_keymap = t;
}
+ disable_capslock = vc_kbd_disable_caps_lock && strcasecmp(vc_kbd_disable_caps_lock, "YES") == 0;
- #elif defined(TARGET_ARCH)
- if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
-@@ -436,7 +547,11 @@
- if (!utf8)
+ #elif defined(TARGET_SUSE)
+ r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
+ "KEYTABLE", &vc_keymap,
++ "KBD_DELAY", &vc_kbd_delay,
++ "KBD_RATE", &vc_kbd_rate,
++ "KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock,
++ "COMPOSETABLE", &vc_compose_table,
+ NULL);
+ if (r < 0 && r != -ENOENT)
+ log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r));
+@@ -443,7 +554,11 @@ int main(int argc, char **argv) {
disable_utf8(fd);
+
- if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
+ if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock, &keymap_pid) >= 0 &&
+#ifdef TARGET_SUSE
@@ -190,7 +187,7 @@
load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
r = EXIT_SUCCESS;
-@@ -444,6 +559,14 @@
+@@ -451,6 +566,14 @@ finish:
if (keymap_pid > 0)
wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
@@ -205,7 +202,7 @@
if (font_pid > 0)
wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
-@@ -451,6 +574,12 @@
+@@ -458,6 +581,12 @@ finish:
free(vc_font);
free(vc_font_map);
free(vc_font_unimap);
@@ -218,4 +215,3 @@
if (fd >= 0)
close_nointr_nofail(fd);
-Only in new/src/vconsole: vconsole-setup.c.orig
++++++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -9,8 +9,8 @@
Index: systemd-41/src/service.c
===================================================================
---- systemd-41.orig/src/service.c
-+++ systemd-41/src/service.c
+--- systemd-41.orig/src/core/service.c
++++ systemd-41/src/core/service.c
@@ -3210,23 +3210,30 @@ static void sysv_facility_in_insserv_con
Unit *u;
if (sysv_translate_facility(parsed[0], NULL, &facility) < 0)
++++++ 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -14,8 +14,8 @@
Index: systemd-37/src/service.c
===================================================================
---- systemd-37.orig/src/service.c
-+++ systemd-37/src/service.c
+--- systemd-37.orig/src/core/service.c
++++ systemd-37/src/core/service.c
@@ -2014,8 +2014,13 @@ static void service_enter_running(Servic
cgroup_ok = cgroup_good(s);
++++++ 0013-re-enable-by_path-links-for-ata-devices.patch ++++++
Index: udev-182/src/udev-builtin-path_id.c
===================================================================
--- udev-182.orig/src/udev/udev-builtin-path_id.c
+++ udev-182/src/udev/udev-builtin-path_id.c
@@ -286,6 +286,85 @@ out:
return hostdev;
}
+static struct udev_device *handle_ata(struct udev_device *parent, char **path)
+{
+ struct udev_device *hostdev;
+ int host, bus, target, lun;
+ const char *name;
+ char *base;
+ char *pos;
+ DIR *dir;
+ struct dirent *dent;
+ int basenum, len;
+
+ hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
+ if (hostdev == NULL)
+ return NULL;
+
+ name = udev_device_get_sysname(parent);
+ if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4)
+ return NULL;
+
+ /* rebase ata offset to get the local relative number */
+ basenum = -1;
+ base = strdup(udev_device_get_syspath(hostdev));
+ if (base == NULL)
+ return NULL;
+ pos = strrchr(base, '/');
+ if (pos == NULL) {
+ parent = NULL;
+ goto out;
+ }
+ pos[0] = '\0';
+ len = strlen(base) - 5;
+ if (len <= 0) {
+ parent = NULL;
+ goto out;
+ }
+ base[len] = '\0';
+ dir = opendir(base);
+ if (dir == NULL) {
+ parent = NULL;
+ goto out;
+ }
+ for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+ char *rest;
+ int i;
+
+ if (dent->d_name[0] == '.')
+ continue;
+ if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
+ continue;
+ if (strncmp(dent->d_name, "ata", 3) != 0)
+ continue;
+ i = strtoul(&dent->d_name[3], &rest, 10);
+
+ /* ata devices start with 1, so decrease by 1 if i is bigger then 0 */
+ if (i > 0)
+ i--;
+ if (rest[0] != '\0')
+ continue;
+ /*
+ * find the smallest number; the host really needs to export its
+ * own instance number per parent device; relying on the global host
+ * enumeration and plainly rebasing the numbers sounds unreliable
+ */
+ if (basenum == -1 || i < basenum)
+ basenum = i;
+ }
+ closedir(dir);
+ if (basenum == -1) {
+ parent = NULL;
+ goto out;
+ }
+ host -= basenum;
+
+ path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun);
+out:
+ free(base);
+ return hostdev;
+}
+
static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
{
const char *devtype;
@@ -322,16 +401,8 @@ static struct udev_device *handle_scsi(s
goto out;
}
- /*
- * We do not support the ATA transport class, it creates duplicated link
- * names as the fake SCSI host adapters are all separated, they are all
- * re-based as host == 0. ATA should just stop faking two duplicated
- * hierarchies for a single topology and leave the SCSI stuff alone;
- * until that happens, there are no by-path/ links for ATA devices behind
- * an ATA transport class.
- */
if (strstr(name, "/ata") != NULL) {
- parent = NULL;
+ parent = handle_ata(parent, path);
goto out;
}
++++++ 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch ++++++
Index: udev-182/rules/60-persistent-storage.rules
===================================================================
--- udev-182.orig/rules/60-persistent-storage.rules
+++ udev-182/rules/60-persistent-storage.rules
@@ -44,6 +44,10 @@ KERNEL=="cciss*", ENV{DEVTYPE}=="disk",
KERNEL=="sd*|sr*|cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
KERNEL=="sd*|cciss*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+# scsi compat links for ATA devices
+KERNEL=="sd*[!0-9]", ENV{ID_BUS}=="ata", PROGRAM="scsi_id --whitelisted --replace-whitespace -p0x80 -d $devnode", RESULT=="?*", ENV{ID_SCSI_COMPAT}="$result", SYMLINK+="disk/by-id/scsi-$env{ID_SCSI_COMPAT}"
+KERNEL=="sd*[0-9]", ENV{ID_SCSI_COMPAT}=="?*", SYMLINK+="disk/by-id/scsi-$env{ID_SCSI_COMPAT}-part%n"
+
# firewire
KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$attr{ieee1394_id}"
KERNEL=="sd*[0-9]", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$attr{ieee1394_id}-part%n"
++++++ 0026-udev-netlink-null-rules.patch ++++++
Index: udev-182/src/udevd.c
===================================================================
--- udev-182.orig/src/udev/udevd.c
+++ udev-182/src/udev/udevd.c
@@ -1683,6 +1683,8 @@ int main(int argc, char *argv[])
dev = udev_monitor_receive_device(monitor);
if (dev != NULL) {
udev_device_set_usec_initialized(dev, now_usec());
+ if (rules == NULL)
+ rules = udev_rules_new(udev, resolve_names);
if (event_queue_insert(dev) < 0)
udev_device_unref(dev);
}
++++++ 0027-udev-fix-sg-autoload-regression.patch ++++++
Index: systemd-190/rules/80-drivers.rules
===================================================================
--- systemd-190.orig/rules/80-drivers.rules
+++ systemd-190/rules/80-drivers.rules
@@ -7,6 +7,7 @@ SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}==
SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", IMPORT{builtin}="kmod load tifm_ms"
SUBSYSTEM=="memstick", IMPORT{builtin}="kmod load ms_block mspro_block"
SUBSYSTEM=="i2o", IMPORT{builtin}="kmod load i2o_block"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", IMPORT{builtin}="kmod load sg"
SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev"
LABEL="drivers_end"
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -1,3 +1,6 @@
systemd
supplements "packageand(systemd:pam-<targettype>)"
-/lib/systemd/system/
+libudev0
+libgudev-1_0-0
+
++++++ boot.udev ++++++
#!/bin/sh
#
### BEGIN INIT INFO
# Provides: boot.udev
# Required-Start:
# Required-Stop:
# Should-Start:
# Should-Stop:
# Default-Start: B
# Default-Stop:
# Short-Description: manage /dev and kernel device-events
# Description: udevd daemon to manage /dev and kernel device events
### END INIT INFO
. /etc/rc.status
PATH="/sbin:/bin"
udev_timeout=180
case "$1" in
start)
# create /dev/root symlink with dynamic rule
if [ -x /lib/udev/write_dev_root_rule ]; then
/lib/udev/write_dev_root_rule
fi
# start udevd
echo -n "Starting udevd: "
/sbin/udevd --daemon
if [ $? -ne 0 ]; then
rc_status -v
rc_exit
fi
rc_status -v
# trigger events for all devices
echo -n "Loading drivers, configuring devices: "
/sbin/udevadm trigger --type=subsystems --action=add
/sbin/udevadm trigger --type=devices --action=add
# wait for events to finish
/sbin/udevadm settle --timeout=$udev_timeout
rc_status -v
;;
stop)
echo -n "Stopping udevd: "
killproc /sbin/udevd
rc_status -v
;;
restart)
echo -n "Restarting udevd: "
killproc /sbin/udevd
/sbin/udevd --daemon
rc_status -v
;;
status)
echo -n "Checking for udevd: "
checkproc /sbin/udevd
rc_status -v
;;
reload)
echo -n "Reloading udev rules: "
/sbin/udevadm control --reload-rules
rc_status -v
;;
force-reload)
echo -n "Restarting udev and reconfiguring all devices: "
killproc /sbin/udevd
rm -rf /dev/.udev /dev/disk
root_symlink_rule
/sbin/udevd --daemon
/sbin/udevadm trigger --action=add
/sbin/udevadm settle --timeout=$udev_timeout
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|restart|status|reload|force-reload}"
exit 1
;;
esac
rc_exit
++++++ crypt-loop-file.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -1,8 +1,8 @@
-Index: systemd-37/src/cryptsetup/cryptsetup-generator.c
+Index: systemd-190/src/cryptsetup/cryptsetup-generator.c
===================================================================
---- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c
-+++ systemd-37/src/cryptsetup/cryptsetup-generator.c
-@@ -138,7 +138,7 @@ static int create_disk(
+--- systemd-190.orig/src/cryptsetup/cryptsetup-generator.c
++++ systemd-190/src/cryptsetup/cryptsetup-generator.c
+@@ -136,7 +136,7 @@ static int create_disk(
const char *password,
const char *options) {
@@ -11,62 +11,64 @@
int r;
FILE *f = NULL;
bool noauto, nofail;
-@@ -167,10 +167,50 @@ static int create_disk(
+@@ -168,11 +168,51 @@ static int create_disk(
goto fail;
}
-- if (!(d = unit_name_from_path(u, ".device"))) {
+- d = unit_name_from_path(u, ".device");
+- if (!d) {
- r = -ENOMEM;
- log_error("Failed to allocate device name.");
- goto fail;
+ if (!startswith(device,"/dev/")) {
++ d = unit_name_from_path_instance("cryptsetup", name, ".path");
++ if (!d) {
++ r = -ENOMEM;
++ log_error("Failed to allocate path name.");
++ goto fail;
++ }
++
++ if (asprintf(&path_file, "%s/%s", arg_dest, d) < 0) {
++ r = -ENOMEM;
++ log_error("Failed to allocate unit file name.");
++ goto fail;
++ }
++
++ f = fopen(path_file, "wxe");
++ if (!f) {
++ r = -errno;
++ log_error("Failed to create unit file: %m");
++ goto fail;
++ }
++
++ fprintf(f,
++ "[Unit]\n"
++ "Description=Cryptography Setup for %s\n"
++ "DefaultDependencies=no\n"
++ "[Path]\n"
++ "PathExists=%s\n",
++ device, device);
++
++ fflush(f);
++
++ if (ferror(f)) {
++ r = -errno;
++ log_error("Failed to write file: %m");
++ goto fail;
++ }
+
-+ if (!(d = unit_name_build_escape("cryptsetup", name, ".path"))) {
-+ r = -ENOMEM;
-+ log_error("Failed to allocate path name.");
-+ goto fail;
-+ }
-+
-+ if (asprintf(&path_file, "%s/%s", arg_dest, d) < 0) {
-+ r = -ENOMEM;
-+ log_error("Failed to allocate unit file name.");
-+ goto fail;
-+ }
-+
-+ if (!(f = fopen(path_file, "wxe"))) {
-+ r = -errno;
-+ log_error("Failed to create unit file: %m");
-+ goto fail;
-+ }
-+
-+ fprintf(f,
-+ "[Unit]\n"
-+ "Description=Cryptography Setup for %s\n"
-+ "DefaultDependencies=no\n"
-+ "[Path]\n"
-+ "PathExists=%s\n",
-+ device, device);
-+
-+ fflush(f);
-+
-+ if (ferror(f)) {
-+ r = -errno;
-+ log_error("Failed to write file: %m");
-+ goto fail;
-+ }
-+
-+ f = NULL;
++ f = NULL;
+ } else {
-+
-+ if (!(d = unit_name_from_path(u, ".device"))) {
-+ r = -ENOMEM;
-+ log_error("Failed to allocate device name.");
-+ goto fail;
-+ }
++ d = unit_name_from_path(u, ".device");
++ if (!d) {
++ r = -ENOMEM;
++ log_error("Failed to allocate device name.");
++ goto fail;
++ }
}
- if (!(f = fopen(p, "wxe"))) {
-@@ -300,6 +340,7 @@ fail:
+ f = fopen(p, "wxe");
+@@ -298,6 +338,7 @@ fail:
free(n);
free(d);
free(e);
++++++ delay-fsck-cryptsetup-after-md-lvm-dmraid.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -8,26 +8,26 @@
units/fsck@.service.in | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
-Index: systemd-37/src/cryptsetup/cryptsetup-generator.c
+Index: systemd-189/src/cryptsetup/cryptsetup-generator.c
===================================================================
---- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c
-+++ systemd-37/src/cryptsetup/cryptsetup-generator.c
-@@ -112,6 +112,7 @@ static int create_disk(
+--- systemd-189.orig/src/cryptsetup/cryptsetup-generator.c
++++ systemd-189/src/cryptsetup/cryptsetup-generator.c
+@@ -192,6 +192,7 @@ static int create_disk(
"DefaultDependencies=no\n"
- "BindTo=%s dev-mapper-%%i.device\n"
+ "BindsTo=%s dev-mapper-%%i.device\n"
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
+ "After=md.service dmraid.service lvm.service\n"
"Before=umount.target\n",
d, d);
-Index: systemd-37/units/fsck@.service.in
+Index: systemd-189/units/systemd-fsck@.service.in
===================================================================
---- systemd-37.orig/units/fsck@.service.in
-+++ systemd-37/units/fsck@.service.in
-@@ -9,7 +9,7 @@
- Description=File System Check on %f
+--- systemd-189.orig/units/systemd-fsck@.service.in
++++ systemd-189/units/systemd-fsck@.service.in
+@@ -10,7 +10,7 @@ Description=File System Check on %f
+ Documentation=man:systemd-fsck@.service(8)
DefaultDependencies=no
- BindTo=%i.device
+ BindsTo=%i.device
-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device lvm.service md.service dmraid.service
Before=shutdown.target
++++++ dm-lvm-after-local-fs-pre-target.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -1,9 +1,9 @@
-Index: systemd-37/units/local-fs-pre.target
+Index: systemd-189/units/local-fs-pre.target
===================================================================
---- systemd-37.orig/units/local-fs-pre.target
-+++ systemd-37/units/local-fs-pre.target
-@@ -9,3 +9,4 @@
-
+--- systemd-189.orig/units/local-fs-pre.target
++++ systemd-189/units/local-fs-pre.target
+@@ -8,3 +8,4 @@
[Unit]
Description=Local File Systems (Pre)
+ Documentation=man:systemd.special(7)
+After=md.service lvm.service dmraid.service
++++++ fastboot-forcefsck.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -1,11 +1,11 @@
-Index: systemd-44/src/fsck.c
+Index: systemd-189/src/fsck/fsck.c
===================================================================
---- systemd-44.orig/src/fsck.c
-+++ systemd-44/src/fsck.c
-@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
+--- systemd-189.orig/src/fsck/fsck.c
++++ systemd-189/src/fsck/fsck.c
+@@ -128,7 +128,7 @@ static int parse_proc_cmdline(void) {
arg_skip = true;
- else if (startswith(w, "fsck.mode"))
- log_warning("Invalid fsck.mode= parameter. Ignoring.");
+ else if (startswith(w, "fsck"))
+ log_warning("Invalid fsck parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_SUSE)
else if (strneq(w, "fastboot", l))
++++++ fix-enable-disable-boot-initscript.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -7,11 +7,11 @@
src/systemctl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
-diff --git a/src/systemctl.c b/src/systemctl.c
-index e94e024..1a98599 100644
---- a/src/systemctl.c
-+++ b/src/systemctl.c
-@@ -3669,7 +3669,27 @@ static int enable_sysv_units(char **args) {
+Index: systemd-195/src/systemctl/systemctl.c
+===================================================================
+--- systemd-195.orig/src/systemctl/systemctl.c
++++ systemd-195/src/systemctl/systemctl.c
+@@ -3453,7 +3453,27 @@ static int enable_sysv_units(char **args
if (!found_sysv) {
free(p);
@@ -39,6 +39,3 @@
}
/* Mark this entry, so that we don't try enabling it as native unit */
---
-1.7.10.4
-
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -20,14 +20,14 @@
#
###
-# This is for /bin/systemctl
+# This is for systemctl
%systemd_requires \
Requires(pre): systemd \
Requires(post): systemd \
Requires(preun): systemd \
Requires(postun): systemd \
-%_unitdir /lib/systemd/system
+%_unitdir /usr/lib/systemd/system
%service_add_pre() \
test -n "$FIRST_ARG" || FIRST_ARG=$1 \
@@ -62,11 +62,11 @@
touch "/var/lib/systemd/migrated/$sysv_service" || : \
fi \
done \
-/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
+/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
if [ -n "$services_to_migrate" ]; then \
/usr/sbin/systemd-sysv-convert --apply $services_to_migrate >/dev/null 2>&1 || : \
elif [ $FIRST_ARG -eq 1 ]; then \
- /bin/systemctl preset %{?*} >/dev/null 2>&1 || : \
+ /usr/bin/systemctl preset %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
@@ -75,8 +75,8 @@
test -n "$FIRST_ARG" || FIRST_ARG=$1 \
if [ $FIRST_ARG -eq 0 ]; then \
# Package removal, not upgrade \
- /bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
- /bin/systemctl stop %{?*} > /dev/null 2>&1 || : \
+ /usr/bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
+ /usr/bin/systemctl stop %{?*} > /dev/null 2>&1 || : \
fi \
%{nil}
@@ -85,13 +85,13 @@
test -n "$FIRST_ARG" || FIRST_ARG=$1 \
if [ $FIRST_ARG -ge 1 ]; then \
# Package upgrade, not uninstall \
- /bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
+ /usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
else # package uninstall \
for service in %{?*} ; do \
sysv_service=${service%.*} \
rm -f "/var/lib/systemd/migrated/$sysv_service" 2> /dev/null || : \
done \
- /bin/systemctl daemon-reload >/dev/null 2>&1 || : \
+ /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
fi \
%{nil}
++++++ modules_on_boot.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:38.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:38.000000000 +0100
@@ -7,24 +7,25 @@
src/modules-load.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
-Index: systemd-44/src/modules-load.c
+Index: systemd-191/src/modules-load/modules-load.c
===================================================================
---- systemd-44.orig/src/modules-load.c
-+++ systemd-44/src/modules-load.c
-@@ -44,6 +44,9 @@ static void systemd_kmod_log(void *data,
- int main(int argc, char *argv[]) {
- int r = EXIT_FAILURE;
- char **files, **fn;
+--- systemd-191.orig/src/modules-load/modules-load.c
++++ systemd-191/src/modules-load/modules-load.c
+@@ -173,6 +173,9 @@ int main(int argc, char *argv[]) {
+ int r = EXIT_FAILURE, k;
+ char **files = NULL, **fn, **i;
+ struct kmod_ctx *ctx;
+#if defined(TARGET_SUSE)
+ char *modules_on_boot = NULL;
+#endif
- struct kmod_ctx *ctx;
- const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
-@@ -141,9 +144,59 @@ int main(int argc, char *argv[]) {
+ if (argc > 1) {
+ log_error("This program takes no argument.");
+@@ -256,9 +259,34 @@ int main(int argc, char *argv[]) {
fclose(f);
}
+-
+#if defined(TARGET_SUSE)
+ log_debug("apply: /etc/sysconfig/kernel MODULES_LOADED_ON_BOOT");
+ if ((r = parse_env_file("/etc/sysconfig/kernel", NEWLINE,
@@ -37,37 +38,12 @@
+ if (modules_on_boot) {
+ char **modules = strv_split(modules_on_boot,WHITESPACE);
+ char **module;
-+ struct kmod_list *itr, *modlist = NULL;
-+ int err;
+
+ if (modules) {
+ STRV_FOREACH(module, modules) {
-+ err = kmod_module_new_from_lookup(ctx, *module, &modlist);
-+ if (err < 0) {
-+ log_error("Failed to lookup alias '%s'", *module);
++ k = load_module(ctx, *module);
++ if (k < 0)
+ r = EXIT_FAILURE;
-+ continue;
-+ }
-+ kmod_list_foreach(itr, modlist) {
-+ struct kmod_module *mod = kmod_module_get_module(itr);
-+ err = kmod_module_probe_insert_module(mod, probe_flags,
-+ NULL, NULL, NULL, NULL);
-+
-+ if (err == 0)
-+ log_info("Inserted module '%s'", kmod_module_get_name(mod));
-+ else if (err == KMOD_PROBE_APPLY_BLACKLIST)
-+ log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
-+ else {
-+ log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
-+ strerror(-err));
-+ r = EXIT_FAILURE;
-+ }
-+
-+ kmod_module_unref(mod);
-+ }
-
-+ kmod_module_unref_list(modlist);
-+ modlist = NULL;
+ }
+ }
+ strv_free(modules);
@@ -79,16 +55,16 @@
+ free(modules_on_boot);
+#endif
kmod_unref(ctx);
+ strv_free(arg_proc_cmdline_modules);
- return r;
-Index: systemd-44/units/systemd-modules-load.service.in
+Index: systemd-191/units/systemd-modules-load.service.in
===================================================================
---- systemd-44.orig/units/systemd-modules-load.service.in
-+++ systemd-44/units/systemd-modules-load.service.in
-@@ -11,6 +11,7 @@ DefaultDependencies=no
- Conflicts=shutdown.target
+--- systemd-191.orig/units/systemd-modules-load.service.in
++++ systemd-191/units/systemd-modules-load.service.in
+@@ -13,6 +13,7 @@ Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=sysinit.target shutdown.target
+ ConditionCapability=CAP_SYS_MODULE
+ConditionPathExists=|/etc/sysconfig/kernel
ConditionDirectoryNotEmpty=|/lib/modules-load.d
ConditionDirectoryNotEmpty=|/usr/lib/modules-load.d
++++++ new-lsb-headers.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,8 +1,8 @@
-Index: systemd-44/src/service.c
+Index: systemd-189/src/core/service.c
===================================================================
---- systemd-44.orig/src/service.c
-+++ systemd-44/src/service.c
-@@ -122,6 +122,7 @@ static void service_init(Unit *u) {
+--- systemd-189.orig/src/core/service.c
++++ systemd-189/src/core/service.c
+@@ -145,6 +145,7 @@ static void service_init(Unit *u) {
#ifdef HAVE_SYSV_COMPAT
s->sysv_start_priority = -1;
s->sysv_start_priority_from_rcnd = -1;
@@ -10,7 +10,7 @@
#endif
s->socket_fd = -1;
s->guess_main_pid = true;
-@@ -840,6 +841,34 @@ static int service_load_sysv_path(Servic
+@@ -877,6 +878,34 @@ static int service_load_sysv_path(Servic
free(short_description);
short_description = d;
@@ -45,7 +45,7 @@
} else if (state == LSB_DESCRIPTION) {
if (startswith(l, "#\t") || startswith(l, "# ")) {
-@@ -894,7 +923,8 @@ static int service_load_sysv_path(Servic
+@@ -935,7 +964,8 @@ static int service_load_sysv_path(Servic
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
@@ -55,7 +55,7 @@
s->guess_main_pid = false;
s->restart = SERVICE_RESTART_NO;
s->exec_context.ignore_sigpipe = false;
-@@ -2036,7 +2066,7 @@ static void service_enter_running(Servic
+@@ -2107,7 +2137,7 @@ static void service_enter_running(Servic
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS)) {
#ifdef HAVE_SYSV_COMPAT
@@ -64,12 +64,12 @@
s->remain_after_exit = false;
#endif
service_set_state(s, SERVICE_RUNNING);
-Index: systemd-44/src/service.h
+Index: systemd-189/src/core/service.h
===================================================================
---- systemd-44.orig/src/service.h
-+++ systemd-44/src/service.h
-@@ -166,6 +166,7 @@ struct Service {
- #ifdef HAVE_SYSV_COMPAT
+--- systemd-189.orig/src/core/service.h
++++ systemd-189/src/core/service.h
+@@ -176,6 +176,7 @@ struct Service {
+ bool is_sysv:1;
bool sysv_has_lsb:1;
bool sysv_enabled:1;
+ bool sysv_remain_after_exit_heuristic:1;
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,6 +1,16 @@
#!/bin/sh
-VERSION=`sed -e '/^Version:/!d' -e 's/Version: *//' systemd.spec`
-RELEASE=`sed -e '/^Release:/!d' -e 's/Release: *//' systemd.spec`
-sed -i -e "s,^\(Version:[ tab]*\).*,\1$VERSION," -e "s,^\(Release:[ tab]*\).*,\1$RELEASE," systemd-gtk.spec
-cp systemd.changes systemd-gtk.changes
+# This script is based on libcdio_spec-prepare.sh (thanks to sbrabec(a)suse.cz)
+# create a -mini spec for systemd for bootstrapping
+
+ORIG_SPEC=systemd
+EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n"
+sed "s/^%define bootstrap.*$/${EDIT_WARNING}%define bootstrap 1/;
+ s/^%define udevpkgname.*$/${EDIT_WARNING}%define udevpkgname udev-mini/;
+ s/^\(Name:.*\)$/\1-mini/;
+ s/^BuildRoot.*/&\n\nProvides: %{real} = %{version}-%{release}\n/
+ " < ${ORIG_SPEC}.spec > ${ORIG_SPEC}-mini.spec
+cp ${ORIG_SPEC}.changes ${ORIG_SPEC}-mini.changes
+cp ${ORIG_SPEC}-rpmlintrc ${ORIG_SPEC}-mini-rpmlintrc
+
+osc service localrun format_spec_file
++++++ storage-after-cryptsetup.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -7,10 +7,10 @@
src/cryptsetup-generator.c | 80 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
-Index: systemd-37/src/cryptsetup/cryptsetup-generator.c
+Index: systemd-194/src/cryptsetup/cryptsetup-generator.c
===================================================================
---- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c
-+++ systemd-37/src/cryptsetup/cryptsetup-generator.c
+--- systemd-194.orig/src/cryptsetup/cryptsetup-generator.c
++++ systemd-194/src/cryptsetup/cryptsetup-generator.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <errno.h>
@@ -19,7 +19,7 @@
#include "log.h"
#include "util.h"
-@@ -58,6 +59,71 @@ static bool has_option(const char *hayst
+@@ -64,6 +65,71 @@ static bool has_option(const char *hayst
return false;
}
@@ -54,7 +54,7 @@
+ "RemainAfterExit=true\n"
+ "Type=oneshot\n"
+ "TimeoutSec=0\n"
-+ "ExecStart=/bin/systemctl restart lvm.service\n");
++ "ExecStart=/usr/bin/systemctl restart lvm.service\n");
+
+ fflush(f);
+
@@ -91,13 +91,13 @@
static int create_disk(
const char *name,
const char *device,
-@@ -291,6 +357,9 @@ int main(int argc, char *argv[]) {
+@@ -439,6 +505,9 @@ int main(int argc, char *argv[]) {
free(options);
}
-+ if (create_storage_after_cryptsetup () < 0)
++ if ((r == EXIT_SUCCESS) && (create_storage_after_cryptsetup () < 0))
+ r = EXIT_FAILURE;
+
finish:
- return r;
- }
+ if (f)
+ fclose(f);
++++++ support-suse-clock-sysconfig.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -8,25 +8,21 @@
src/timedate/timedated.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 6a7d980..fbebc1d 100644
---- a/src/timedate/timedated.c
-+++ b/src/timedate/timedated.c
-@@ -180,9 +180,13 @@ static int read_data(void) {
- if (r != -ENOENT)
- log_warning("Failed to read /etc/timezone: %s", strerror(-r));
-
--#ifdef TARGET_FEDORA
-+#if defined(TARGET_FEDORA) || defined(TARGET_SUSE)
- r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
-+#ifdef TARGET_FEDORA
- "ZONE", &tz.zone,
-+#else /* TARGET_SUSE */
-+ "TIMEZONE", &tz.zone,
+Index: systemd-190/src/timedate/timedated.c
+===================================================================
+--- systemd-190.orig/src/timedate/timedated.c
++++ systemd-190/src/timedate/timedated.c
+@@ -175,6 +175,13 @@ static int read_data(void) {
+ goto have_timezone;
+ }
+ }
++#ifdef TARGET_SUSE
++ r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
++ "TIMEZONE", &tz.zone,
++ NULL);
++ if (r < 0 && r != -ENOENT)
++ log_warning("Failed to read /etc/sysconfig/clock: %s", strerror(-r));
+#endif
- NULL);
- if (r < 0 && r != -ENOENT)
---
-1.7.10.4
-
+ #ifdef HAVE_DEBIAN
+ r = read_one_line_file("/etc/timezone", &tz.zone);
++++++ support-sysvinit.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,7 +1,7 @@
Index: systemd-36/src/systemctl.c
===================================================================
---- systemd-36.orig/src/systemctl.c
-+++ systemd-36/src/systemctl.c
+--- systemd-36.orig/src/systemctl/systemctl.c
++++ systemd-36/src/systemctl/systemctl.c
@@ -4672,10 +4672,13 @@ static int parse_argv(int argc, char *ar
/* Hmm, so some other init system is
* running, we need to forward this
++++++ sysctl-modules.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,12 +1,12 @@
-Index: systemd-37/units/systemd-sysctl.service.in
+Index: systemd-189/units/systemd-sysctl.service.in
===================================================================
---- systemd-37.orig/units/systemd-sysctl.service.in
-+++ systemd-37/units/systemd-sysctl.service.in
-@@ -10,6 +10,7 @@ Description=Apply Kernel Variables
+--- systemd-189.orig/units/systemd-sysctl.service.in
++++ systemd-189/units/systemd-sysctl.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-sysctl.service
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
+After=systemd-modules-load.service
Before=sysinit.target shutdown.target
+ ConditionPathIsReadWrite=/proc/sys/
ConditionPathExists=|/etc/sysctl.conf
- ConditionDirectoryNotEmpty=|/lib/sysctl.d
++++++ systemd-mini-rpmlintrc ++++++
addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*")
addFilter(".*dangling-symlink .* /dev/null.*")
addFilter(".*files-duplicate .*/reboot.8.*")
addFilter(".*files-duplicate .*/sd_is_socket.3.*")
addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion.sh")
addFilter("non-conffile-in-etc /etc/rpm/macros.systemd")
addFilter(".*dbus-policy-allow-receive")
addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*")
addFilter(".*dangling-symlink /lib/udev/devices/core.*")
addFilter(".*dangling-symlink /lib/udev/devices/fd.*")
addFilter(".*incoherent-init-script-name boot.udev.*")
addFilter(".init-script-without-%stop_on_removal-preun /etc/init.d/boot.udev")
addFilter(".init-script-without-%restart_on_update-postun /etc/init.d/boot.udev")
addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
addFilter(".*libgudev-.*shlib-fixed-dependency.*")
addFilter(".*suse-filelist-forbidden-systemd-userdirs.*")
addFilter("libudev-mini.*shlib-policy-name-error.*")
++++++ systemd-numlock-suse.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,8 +1,8 @@
-Index: systemd-44/src/vconsole/vconsole-setup.c
+Index: systemd-190/src/vconsole/vconsole-setup.c
===================================================================
---- systemd-44.orig/src/vconsole/vconsole-setup.c
-+++ systemd-44/src/vconsole/vconsole-setup.c
-@@ -265,12 +265,14 @@ int main(int argc, char **argv) {
+--- systemd-190.orig/src/vconsole/vconsole-setup.c
++++ systemd-190/src/vconsole/vconsole-setup.c
+@@ -287,12 +287,14 @@ int main(int argc, char **argv) {
char *vc_kbd_delay = NULL;
char *vc_kbd_rate = NULL;
char *vc_kbd_disable_caps_lock = NULL;
@@ -17,16 +17,8 @@
int r = EXIT_FAILURE;
pid_t font_pid = 0, keymap_pid = 0;
-@@ -374,6 +376,7 @@ int main(int argc, char **argv) {
- "KBD_DELAY", &vc_kbd_delay,
- "KBD_RATE", &vc_kbd_rate,
- "KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock,
-+ "KBD_NUMLOCK", &vc_kbd_numlock,
- "COMPOSETABLE", &vc_compose_table,
- NULL)) < 0) {
-
-@@ -391,6 +394,37 @@ int main(int argc, char **argv) {
- log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
+@@ -388,6 +390,37 @@ int main(int argc, char **argv) {
+ vc_keymap = t;
}
disable_capslock = vc_kbd_disable_caps_lock && strcasecmp(vc_kbd_disable_caps_lock, "YES") == 0;
+ if (vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "BIOS") == 0) {
@@ -61,9 +53,17 @@
+ } else
+ numlock = vc_kbd_numlock && strcasecmp(vc_kbd_numlock, "YES") == 0;
- #elif defined(TARGET_ARCH)
- if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
-@@ -558,6 +592,10 @@ int main(int argc, char **argv) {
+ #elif defined(TARGET_SUSE)
+ r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
+@@ -395,6 +428,7 @@ int main(int argc, char **argv) {
+ "KBD_DELAY", &vc_kbd_delay,
+ "KBD_RATE", &vc_kbd_rate,
+ "KBD_DISABLE_CAPS_LOCK", &vc_kbd_disable_caps_lock,
++ "KBD_NUMLOCK", &vc_kbd_numlock,
+ "COMPOSETABLE", &vc_compose_table,
+ NULL);
+ if (r < 0 && r != -ENOENT)
+@@ -565,6 +599,10 @@ int main(int argc, char **argv) {
finish:
if (keymap_pid > 0)
wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
@@ -74,56 +74,35 @@
#ifdef TARGET_SUSE
if (compose_table_pid > 0)
-Index: systemd-44/Makefile.am
+Index: systemd-190/Makefile.am
===================================================================
---- systemd-44.orig/Makefile.am
-+++ systemd-44/Makefile.am
-@@ -42,6 +42,7 @@ dbussessionservicedir=@dbussessionservic
- dbussystemservicedir=@dbussystemservicedir@
- dbusinterfacedir=@dbusinterfacedir@
- udevrulesdir=@udevrulesdir@
-+udevhelperdir=@udevhelperdir@
- pamlibdir=@pamlibdir@
- pkgconfigdatadir=$(datadir)/pkgconfig
- pkgconfiglibdir=$(libdir)/pkgconfig
-@@ -202,6 +203,9 @@ rootlibexec_PROGRAMS = \
- systemgenerator_PROGRAMS = \
- systemd-getty-generator
-
-+udevhelper_PROGRAMS = \
-+ numlock-on
-+
- noinst_PROGRAMS = \
- test-engine \
- test-job-type \
-@@ -2033,6 +2037,12 @@ systemd_uaccess_LDADD = \
- $(UDEV_LIBS) \
- $(ACL_LIBS)
+--- systemd-190.orig/Makefile.am
++++ systemd-190/Makefile.am
+@@ -1989,6 +1989,19 @@ dist_udevrules_DATA += \
+ rules/61-accelerometer.rules
+ # ------------------------------------------------------------------------------
+numlock_on_SOURCES = \
+ src/login/numlock-on.c
+
+numlock_on_CFLAGS = \
+ $(AM_CFLAGS)
+
- rootlibexec_PROGRAMS += \
- systemd-uaccess
-
-@@ -2040,7 +2050,8 @@ dist_udevrules_DATA += \
- src/login/70-uaccess.rules
-
- dist_udevrules_DATA += \
-- src/login/71-seat.rules
-+ src/login/71-seat.rules \
-+ src/login/73-seat-numlock.rules
-
- nodist_udevrules_DATA += \
- src/login/73-seat-late.rules
-Index: systemd-44/configure.ac
-===================================================================
---- systemd-44.orig/configure.ac
-+++ systemd-44/configure.ac
-@@ -410,6 +410,13 @@ fi
++udevlibexec_PROGRAMS += \
++ numlock-on
++
++dist_udevrules_DATA += \
++ rules/73-seat-numlock.rules
++
++# ------------------------------------------------------------------------------
+ if ENABLE_GUDEV
+ if ENABLE_GTK_DOC
+ SUBDIRS += \
+Index: systemd-190/configure.ac
+===================================================================
+--- systemd-190.orig/configure.ac
++++ systemd-190/configure.ac
+@@ -598,6 +598,13 @@ fi
with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
AC_DEFINE_UNQUOTED(DISTRIBUTION, ["${with_distro}"], [Target Distribution])
@@ -137,38 +116,10 @@
# Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d
-@@ -579,6 +586,11 @@ AC_ARG_WITH([udevrulesdir],
- [],
- [with_udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d])
-
-+AC_ARG_WITH([udevhelperdir],
-+ AS_HELP_STRING([--with-udevhelperdir=DIR], [Directory for udev helpers]),
-+ [],
-+ [with_udevhelperdir=`pkg-config --variable=udevdir udev`])
-+
- AC_ARG_WITH([rootprefix],
- AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
- [], [with_rootprefix=${ac_default_prefix}])
-@@ -611,6 +623,7 @@ AC_SUBST([dbussessionservicedir], [$with
- AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
- AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
- AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+AC_SUBST([udevhelperdir], [$with_udevhelperdir])
- AC_SUBST([pamlibdir], [$with_pamlibdir])
- AC_SUBST([rootprefix], [$with_rootprefix])
- AC_SUBST([rootlibdir], [$with_rootlibdir])
-@@ -650,6 +663,7 @@ AC_MSG_RESULT([
- rootlib dir: ${with_rootlibdir}
- PAM modules dir: ${with_pamlibdir}
- udev rules dir: ${with_udevrulesdir}
-+ udev hepler dir: ${with_udevhelperdir}
- D-Bus policy dir: ${with_dbuspolicydir}
- D-Bus session dir: ${with_dbussessionservicedir}
- D-Bus system dir: ${with_dbussystemservicedir}
-Index: systemd-44/src/login/73-seat-numlock.rules
+Index: systemd-190/rules/73-seat-numlock.rules
===================================================================
--- /dev/null
-+++ systemd-44/src/login/73-seat-numlock.rules
++++ systemd-190/rules/73-seat-numlock.rules
@@ -0,0 +1,8 @@
+# This file is part of systemd.
+#
@@ -178,10 +129,10 @@
+# (at your option) any later version.
+
+SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}"
-Index: systemd-44/src/login/numlock-on.c
+Index: systemd-190/src/login/numlock-on.c
===================================================================
--- /dev/null
-+++ systemd-44/src/login/numlock-on.c
++++ systemd-190/src/login/numlock-on.c
@@ -0,0 +1,36 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
@@ -219,16 +170,16 @@
+ return EX_IOERR;
+ return execv(args[0], args);
+}
-Index: systemd-44/units/systemd-vconsole-setup.service.in
+Index: systemd-190/units/systemd-vconsole-setup.service.in
===================================================================
---- systemd-44.orig/units/systemd-vconsole-setup.service.in
-+++ systemd-44/units/systemd-vconsole-setup.service.in
-@@ -10,7 +10,7 @@ Description=Setup Virtual Console
+--- systemd-190.orig/units/systemd-vconsole-setup.service.in
++++ systemd-190/units/systemd-vconsole-setup.service.in
+@@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=sysinit.target shutdown.target
+Before=sysinit.target shutdown.target udev-trigger.service
+ ConditionPathExists=/dev/tty0
[Service]
- Type=oneshot
++++++ systemd-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -2,9 +2,16 @@
addFilter(".*dangling-symlink .* /dev/null.*")
addFilter(".*files-duplicate .*/reboot.8.*")
addFilter(".*files-duplicate .*/sd_is_socket.3.*")
-addFilter("non-conffile-in-etc /etc/bash_completion.d/systemctl-bash-completion.sh")
+addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion.sh")
+addFilter("non-conffile-in-etc /etc/rpm/macros.systemd")
addFilter(".*dbus-policy-allow-receive")
-# Do not enable for submission into openSUSE:Factory,
-# just for testing while polkit-default-privs is not checked in
-# setBadness('polkit-unauthorized-privilege', 1)
-
+addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*")
+addFilter(".*dangling-symlink /lib/udev/devices/core.*")
+addFilter(".*dangling-symlink /lib/udev/devices/fd.*")
+addFilter(".*incoherent-init-script-name boot.udev.*")
+addFilter(".init-script-without-%stop_on_removal-preun /etc/init.d/boot.udev")
+addFilter(".init-script-without-%restart_on_update-postun /etc/init.d/boot.udev")
+addFilter(".*devel-file-in-non-devel-package.*udev.pc.*")
+addFilter(".*libgudev-.*shlib-fixed-dependency.*")
+addFilter(".*suse-filelist-forbidden-systemd-userdirs.*")
+addFilter("libudev-mini.*shlib-policy-name-error.*")
++++++ tty1.patch ++++++
--- /var/tmp/diff_new_pack.PewQ3x/_old 2012-11-02 17:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.PewQ3x/_new 2012-11-02 17:30:39.000000000 +0100
@@ -1,13 +1,13 @@
-Index: systemd-29/units/systemd-ask-password-wall.service.in
+Index: systemd-189/units/systemd-ask-password-wall.service.in
===================================================================
---- systemd-29.orig/units/systemd-ask-password-wall.service.in
-+++ systemd-29/units/systemd-ask-password-wall.service.in
-@@ -7,7 +7,7 @@
-
+--- systemd-189.orig/units/systemd-ask-password-wall.service.in
++++ systemd-189/units/systemd-ask-password-wall.service.in
+@@ -8,7 +8,7 @@
[Unit]
Description=Forward Password Requests to Wall
+ Documentation=man:systemd-ask-password-console.service(8)
-After=systemd-user-sessions.service
+After=systemd-user-sessions.service getty(a)tty1.service
[Service]
- ExecStartPre=-@rootbindir@/systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service
+ ExecStartPre=-@SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
++++++ udev-root-symlink.systemd ++++++
[Unit]
Description=create /dev/root symlink with dynamic rule
Before=udev.service
DefaultDependencies=no
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/lib/udev/write_dev_root_rule
++++++ var-run-lock.patch ++++++
Index: systemd-195/Makefile.am
===================================================================
--- systemd-195.orig/Makefile.am
+++ systemd-195/Makefile.am
@@ -294,6 +294,7 @@ dist_systemunit_DATA = \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
units/sys-fs-fuse-connections.mount \
+ units/var-run.mount \
units/tmp.mount \
units/printer.target \
units/sound.target \
@@ -308,6 +309,11 @@ dist_systemunit_DATA = \
units/systemd-udevd-kernel.socket \
units/system-update.target
+if HAVE_SYSV_COMPAT
+dist_systemunit_DATA += \
+ units/var-lock.mount
+endif
+
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
@@ -3864,9 +3870,11 @@ systemd-install-data-hook:
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
rm -f systemd-remount-fs.service \
systemd-fsck-root.service \
+ var-run.mount \
tmp.mount && \
$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
$(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
+ $(LN_S) ../var-run.mount var-run.mount && \
$(LN_S) ../tmp.mount tmp.mount )
( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3954,6 +3962,12 @@ if TARGET_MAGEIA
rm -f display-manager.service )
endif
+if HAVE_SYSV_COMPAT
+ ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+ rm -f var-lock.mount && \
+ $(LN_S) ../var-lock.mount var-lock.mount )
+endif
+
install-exec-hook: $(INSTALL_EXEC_HOOKS)
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
Index: systemd-195/units/var-lock.mount
===================================================================
--- /dev/null
+++ systemd-195/units/var-lock.mount
@@ -0,0 +1,19 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Lock Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/lock
+ConditionPathIsSymbolicLink=!/var/lock
+
+[Mount]
+What=/run/lock
+Where=/var/lock
+Type=bind
+Options=bind
Index: systemd-195/units/var-run.mount
===================================================================
--- /dev/null
+++ systemd-195/units/var-run.mount
@@ -0,0 +1,19 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Runtime Directory
+Before=local-fs.target
+# skip mounting if the directory does not exist or is a symlink
+ConditionPathIsDirectory=/var/run
+ConditionPathIsSymbolicLink=!/var/run
+
+[Mount]
+What=/run
+Where=/var/run
+Type=bind
+Options=bind
++++++ write_dev_root_rule ++++++
#!/bin/sh
eval $(/sbin/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/)
[ "$ROOT_MAJOR" -gt 0 ] || return
mkdir -m 0755 -p /run/udev/rules.d >/dev/null 2>&1
ln -sf /run/udev /dev/.udev 2>/dev/null || :
echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", \
ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", \
SYMLINK+=\"root\"" > /run/udev/rules.d/10-root-symlink.rules
exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package librime for openSUSE:Factory checked in at 2012-11-02 16:42:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/librime (Old)
and /work/SRC/openSUSE:Factory/.librime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librime", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/librime/brise.changes 2012-08-26 11:32:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.librime.new/brise.changes 2012-11-02 16:43:01.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Oct 11 14:36:24 UTC 2012 - i(a)marguerite.su
+
+- update version 0.13
+ * install data files from a separate package.
+ * update: luna_pinyin, terra_pinyin, jyutping tables.
+ * update: essay database.
+ * new schema: emoji.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/librime/librime.changes 2012-08-26 11:32:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.librime.new/librime.changes 2012-11-02 16:43:01.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Oct 11 14:40:51 UTC 2012 - i(a)marguerite.su
+
+- update version 0.9.4
+ * document new dependency 'google-glog'.
+ * fix x64 build.
+
+-------------------------------------------------------------------
Old:
----
librime-0.9.2.tar.gz
New:
----
brise-0.13.tar.gz
librime-0.9.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brise.spec ++++++
--- /var/tmp/diff_new_pack.2J0OeW/_old 2012-11-02 16:43:03.000000000 +0100
+++ /var/tmp/diff_new_pack.2J0OeW/_new 2012-11-02 16:43:03.000000000 +0100
@@ -16,14 +16,15 @@
#
Name: brise
-Version: 0.9.2
+Version: 0.13
Release: 0
License: GPL-3.0+
Summary: Rime Input Schemas Collection
Url: http://code.google.com/p/rimeime
Group: System/I18n/Chinese
-Source: librime-%{version}.tar.gz
+Source: brise-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: librime-devel
BuildArch: noarch
%description
@@ -37,14 +38,13 @@
%setup -q -n %{name}
%build
-# no need to build
+make %{?_smp_mflags}
%install
-install -d -m 755 %{buildroot}%{_datadir}/%{name}/
-cp -r * %{buildroot}%{_datadir}/%{name}/
+make DESTDIR=%{buildroot} install
%files
%defattr(-,root,root)
-%{_datadir}/%{name}/
+%{_datadir}/rime-data/
%changelog
++++++ librime.spec ++++++
--- /var/tmp/diff_new_pack.2J0OeW/_old 2012-11-02 16:43:03.000000000 +0100
+++ /var/tmp/diff_new_pack.2J0OeW/_new 2012-11-02 16:43:03.000000000 +0100
@@ -17,7 +17,7 @@
Name: librime
-Version: 0.9.2
+Version: 0.9.4
Release: 0
Summary: Rime Input Method Engine
License: GPL-3.0+
@@ -27,6 +27,7 @@
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: gcc-c++
+BuildRequires: glog-devel
BuildRequires: googletest-devel
%if 0%{?suse_version} >= 1220
BuildRequires: libboost_filesystem1_49_0
@@ -72,24 +73,12 @@
%package -n rime
Summary: Rime Input Method Engine
Group: System/I18n/Chinese
-Requires: rime-data = %{version}
%description -n rime
Rime is an Traditional Chinese input method engine.
Its idea comes from ancient Chinese brush and carving art.
Mainly it's about to express your thinking with your keystrokes.
-%package -n rime-data
-Summary: Schemas of Rime
-Group: System/I18n/Chinese
-
-%description -n rime-data
-Rime is an Traditional Chinese input method engine.
-Its idea comes from ancient Chinese brush and carving art.
-Mainly it's about to express your thinking with your keystrokes.
-
-This package is the resources and schemas of Rime.
-
%package -n librime0
Summary: Rime Input Method Engine
Group: System/Libraries
@@ -138,14 +127,10 @@
%{_bindir}/rime_deployer
%{_bindir}/rime_dict_manager
-%files -n rime-data
-%defattr(-,root,root)
-%{_datadir}/rime-data/
-
%files -n librime0
%defattr(-,root,root)
%{_libdir}/%{name}.so.0
-%{_libdir}/%{name}.so.0.9.2
+%{_libdir}/%{name}.so.0.9.4
%files devel
%defattr(-,root,root)
++++++ librime-0.9.2.tar.gz -> librime-0.9.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/librime/librime-0.9.2.tar.gz /work/SRC/openSUSE:Factory/.librime.new/librime-0.9.4.tar.gz differ: char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-11-02 16:40:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksh", Maintainer is "werner(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-10-26 17:11:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-11-02 16:40:44.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Oct 26 15:05:09 UTC 2012 - coolo(a)suse.com
+
+- add explicit buildrequire on grof for man pages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.Z4wJGr/_old 2012-11-02 16:40:48.000000000 +0100
+++ /var/tmp/diff_new_pack.Z4wJGr/_new 2012-11-02 16:40:48.000000000 +0100
@@ -35,6 +35,7 @@
BuildRequires: flex
BuildRequires: gdbm-devel
BuildRequires: glibc-devel
+BuildRequires: groff
BuildRequires: ncurses-devel
BuildRequires: procps
BuildRequires: psmisc
@@ -65,7 +66,7 @@
Version: 93u
Release: 0
Summary: Korn Shell
-License: CPL-1.0 ; EPL-1.0
+License: CPL-1.0 and EPL-1.0
Group: System/Shells
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.%{date}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2012-11-02 16:15:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source", Maintainer is "kernel-maintainers(a)forge.provo.novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2012-10-11 11:01:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2012-11-02 16:15:19.000000000 +0100
@@ -1,0 +2,124 @@
+Mon Oct 22 01:11:29 CEST 2012 - agraf(a)suse.de
+
+- ARM: Update config files: Exynos: Enable gfx and highmem
+- commit e8b3bd9
+
+-------------------------------------------------------------------
+Sun Oct 21 23:17:25 CEST 2012 - jslaby(a)suse.cz
+
+- Linux 3.6.3.
+- Refresh patches.xen/xen3-fixup-xen.
+- Refresh patches.xen/xen3-patch-2.6.23.
+- Refresh patches.xen/xen3-patch-3.2.
+- Refresh patches.xen/xen3-patch-3.6.
+- Delete patches.fixes/hv-storvsc-reset-wait.patch.
+- Delete
+ patches.rpmify/x86-kbuild-archscripts-depends-on-scripts_basic.
+- commit cfee26b
+
+-------------------------------------------------------------------
+Thu Oct 18 21:25:25 CEST 2012 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Use a macro instead of /etc/IGNORE-KABI-BADNESS
+- commit 19e7e54
+
+-------------------------------------------------------------------
+Thu Oct 18 19:21:35 CEST 2012 - agraf(a)suse.de
+
+- ARM: Update config files: Fix exynos uart
+- commit 1b4b5c5
+
+-------------------------------------------------------------------
+Thu Oct 18 16:26:57 CEST 2012 - trenn(a)suse.de
+
+- Cleanup ACPI table override patches with latest x86-tip commits
+ and proper git-xy: meta tags:
+- lib: Add early cpio decoder.
+- x86, acpi: Introduce x86 arch specific arch_reserve_mem_area()
+ for e820 handling.
+- ACPI: Store valid ACPI tables passed via early initrd in
+ reserved memblock areas.
+- ACPI: Implement physical address table override.
+- ACPI: Create acpi_table_taint() function to avoid code
+ duplication.
+- ACPI: Document ACPI table overriding via initrd.
+- ACPI: Fix build when disabled.
+- X86 ACPI: Use #ifdef not #if for CONFIG_X86 check.
+- ACPI: Overriding ACPI tables via initrd only works with
+ an initrd.
+- ACPI: Cleanup acpi_initrd_override declaration and remove
+ ifdefs.
+- Delete patches.arch/acpi_fix_custom_method_acc.patch.
+- Delete patches.arch/acpi_override_2_2.patch.
+- Delete patches.arch/acpi_override_documentation.
+- Delete patches.arch/acpi_override_introduce_taint_func.patch.
+- Delete patches.arch/acpi_physical_override.patch.
+- Delete patches.arch/lib_earlycpio.patch.
+- Delete patches.arch/x86_introduce_reserve_mem_area.patch.
+- commit c45da8f
+
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+ This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
+-------------------------------------------------------------------
+Sat Oct 13 11:47:44 CEST 2012 - jslaby(a)suse.cz
+
+- x86/kbuild: archscripts depends on scripts_basic.
+- commit 007718d
+
+-------------------------------------------------------------------
+Sat Oct 13 00:30:32 CEST 2012 - jslaby(a)suse.cz
+
+- Linux 3.6.2.
+- commit 798d597
+
+-------------------------------------------------------------------
+Thu Oct 11 17:17:11 CEST 2012 - guillaume.gardet(a)oliseo.fr
+
+- ARM (omap2plus) : re-enable OMAP DRM module
+- commit 379798d
+
+-------------------------------------------------------------------
+Wed Oct 10 21:28:30 CEST 2012 - jslaby(a)suse.cz
+
+- Delete
+ patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch.
+- Delete
+ patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch.
+- Delete
+ patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch.
+ These are in 3.6.1.
+- commit 2a321c4
+
+-------------------------------------------------------------------
+Mon Oct 8 07:36:36 CEST 2012 - agraf(a)suse.de
+
+- ARM: Update config files: Exynos: Enable serial console
+- commit a8d41ec
+
+-------------------------------------------------------------------
+Sun Oct 7 20:55:39 CEST 2012 - jslaby(a)suse.cz
+
+- Linux 3.6.1.
+- commit 1f7626a
+
+-------------------------------------------------------------------
+Thu Oct 4 15:55:59 CEST 2012 - ohering(a)suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+ apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct 4 15:51:44 CEST 2012 - ohering(a)suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+ to make sure the daemon is in sync with the kernel
+ (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-exynos.changes: same change
kernel-highbank.changes: same change
kernel-imx51.changes: same change
kernel-omap2plus.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-tegra.changes: same change
kernel-trace.changes: same change
kernel-u8500.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
IGNORE-KABI-BADNESS
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-cubox.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:27.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 3.6
-%define patchversion 3.6.0
+%define patchversion 3.6.3
%define variant %{nil}
%define vanilla_only 0
@@ -57,7 +57,7 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
-Version: 3.6.0
+Version: 3.6.3
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -123,13 +123,13 @@
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
-%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts: hyper-v < 4
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -667,7 +667,10 @@
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
- if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+ # %ignore_kabi_badness is defined in the Kernel:* projects in the
+ # OBS to be able to build the KOTD in spite of kabi errors
+ if [ 0%{?ignore_kabi_badness} -eq 0 -a \
+ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
kernel-debug.spec: same change
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -17,14 +17,14 @@
# norootforbuild
-%define patchversion 3.6.0
+%define patchversion 3.6.3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
Summary: Kernel Documentation
-Version: 3.6.0
+Version: 3.6.3
Release: 0
BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel
BuildRequires: kernel-source%variant
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 3.6
-%define patchversion 3.6.0
+%define patchversion 3.6.3
%define variant %{nil}
%define vanilla_only 0
@@ -57,7 +57,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.6.0
+Version: 3.6.3
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -123,13 +123,13 @@
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
-%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts: hyper-v < 4
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -669,7 +669,10 @@
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
- if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+ # %ignore_kabi_badness is defined in the Kernel:* projects in the
+ # OBS to be able to build the KOTD in spite of kabi errors
+ if [ 0%{?ignore_kabi_badness} -eq 0 -a \
+ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
kernel-exynos.spec: same change
kernel-highbank.spec: same change
kernel-imx51.spec: same change
kernel-omap2plus.spec: same change
kernel-pae.spec: same change
kernel-ppc64.spec: same change
kernel-s390.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -19,7 +19,7 @@
# icecream 0
%define srcversion 3.6
-%define patchversion 3.6.0
+%define patchversion 3.6.3
%define variant %{nil}
%define vanilla_only 0
@@ -29,7 +29,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.6.0
+Version: 3.6.3
Release: 0
License: GPL-2.0
Group: Development/Sources
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -23,7 +23,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 3.6.0
+Version: 3.6.3
%if %using_buildservice
Release: 0
%else
++++++ kernel-tegra.spec ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -18,7 +18,7 @@
# norootforbuild
%define srcversion 3.6
-%define patchversion 3.6.0
+%define patchversion 3.6.3
%define variant %{nil}
%define vanilla_only 0
@@ -57,7 +57,7 @@
Name: kernel-tegra
Summary: Kernel for Nvidia's Tegra SoC
-Version: 3.6.0
+Version: 3.6.3
Release: 0
License: GPL-2.0
Group: System/Kernel
@@ -123,13 +123,13 @@
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
-%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts: hyper-v < 4
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -667,7 +667,10 @@
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
- if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+ # %ignore_kabi_badness is defined in the Kernel:* projects in the
+ # OBS to be able to build the KOTD in spite of kabi errors
+ if [ 0%{?ignore_kabi_badness} -eq 0 -a \
+ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
kernel-trace.spec: same change
kernel-u8500.spec: same change
kernel-vanilla.spec: same change
kernel-xen.spec: same change
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/exynos new/config/armv7hl/exynos
--- old/config/armv7hl/exynos 2012-10-04 15:44:56.000000000 +0200
+++ new/config/armv7hl/exynos 2012-10-22 01:11:42.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.0 Kernel Configuration
+# Linux/arm 3.6.3 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -343,12 +343,13 @@
#
# CONFIG_S3C_BOOT_ERROR_RESET is not set
CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=0
+CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_SAMSUNG_CLOCK=y
CONFIG_SAMSUNG_CLKSRC=y
CONFIG_S5P_CLOCK=y
CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
CONFIG_S5P_IRQ=y
+CONFIG_S5P_GPIO_INT=y
CONFIG_SAMSUNG_GPIOLIB_4BIT=y
CONFIG_S5P_GPIO_DRVSTR=y
CONFIG_SAMSUNG_GPIO_EXTRA=0
@@ -361,13 +362,17 @@
CONFIG_S3C_DEV_HSMMC3=y
CONFIG_S3C_DEV_I2C1=y
CONFIG_S3C_DEV_I2C3=y
+CONFIG_S3C_DEV_I2C5=y
+CONFIG_S3C_DEV_I2C6=y
CONFIG_S3C_DEV_I2C7=y
CONFIG_S3C_DEV_USB_HSOTG=y
CONFIG_S3C_DEV_WDT=y
CONFIG_S3C_DEV_RTC=y
+CONFIG_SAMSUNG_DEV_ADC=y
CONFIG_SAMSUNG_DEV_KEYPAD=y
CONFIG_SAMSUNG_DEV_PWM=y
CONFIG_SAMSUNG_DEV_BACKLIGHT=y
+CONFIG_S5P_DEV_CSIS0=y
CONFIG_S5P_DEV_FIMC0=y
CONFIG_S5P_DEV_FIMC1=y
CONFIG_S5P_DEV_FIMC2=y
@@ -380,6 +385,7 @@
CONFIG_S5P_DEV_TV=y
CONFIG_S5P_DEV_USB_EHCI=y
# CONFIG_S3C24XX_PWM is not set
+CONFIG_S5P_SETUP_MIPIPHY=y
CONFIG_SAMSUNG_DMADEV=y
#
@@ -389,7 +395,7 @@
# CONFIG_SAMSUNG_PM_CHECK is not set
CONFIG_S5P_PM=y
CONFIG_S5P_SLEEP=y
-CONFIG_DEBUG_S3C_UART=0
+CONFIG_DEBUG_S3C_UART=2
#
# SAMSUNG EXYNOS SoCs Support
@@ -413,10 +419,13 @@
CONFIG_EXYNOS4_DEV_USB_OHCI=y
CONFIG_EXYNOS4_SETUP_I2C1=y
CONFIG_EXYNOS4_SETUP_I2C3=y
+CONFIG_EXYNOS4_SETUP_I2C5=y
+CONFIG_EXYNOS4_SETUP_I2C6=y
CONFIG_EXYNOS4_SETUP_I2C7=y
CONFIG_EXYNOS4_SETUP_KEYPAD=y
CONFIG_EXYNOS4_SETUP_SDHCI=y
CONFIG_EXYNOS4_SETUP_SDHCI_GPIO=y
+CONFIG_EXYNOS4_SETUP_FIMC=y
CONFIG_EXYNOS4_SETUP_USB_PHY=y
#
@@ -426,7 +435,7 @@
CONFIG_MACH_SMDKV310=y
CONFIG_MACH_ARMLEX4210=y
# CONFIG_MACH_UNIVERSAL_C210 is not set
-# CONFIG_MACH_NURI is not set
+CONFIG_MACH_NURI=y
CONFIG_MACH_ORIGEN=y
#
@@ -442,14 +451,14 @@
#
# Flattened Device Tree based board for EXYNOS SoCs
#
-# CONFIG_MACH_EXYNOS4_DT is not set
-# CONFIG_MACH_EXYNOS5_DT is not set
+CONFIG_MACH_EXYNOS4_DT=y
+CONFIG_MACH_EXYNOS5_DT=y
#
# Configuration for HSMMC 8-bit bus width
#
-# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
-# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
+CONFIG_EXYNOS4_SDHCI_CH0_8BIT=y
+CONFIG_EXYNOS4_SDHCI_CH2_8BIT=y
#
# Processor Type
@@ -504,6 +513,7 @@
# CONFIG_ARM_ERRATA_754327 is not set
# CONFIG_ARM_ERRATA_764369 is not set
# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
CONFIG_ARM_GIC=y
CONFIG_GIC_NON_BANKED=y
@@ -542,23 +552,24 @@
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
CONFIG_HAVE_ARCH_PFN_VALID=y
-# CONFIG_HIGHMEM is not set
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
CONFIG_HW_PERF_EVENTS=y
CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
@@ -2295,13 +2306,15 @@
#
# CONFIG_SERIAL_AMBA_PL010 is not set
# CONFIG_SERIAL_AMBA_PL011 is not set
-CONFIG_SERIAL_SAMSUNG=m
+CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX3107 is not set
-CONFIG_SERIAL_CORE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
@@ -2904,12 +2917,22 @@
CONFIG_SOC_CAMERA_OV9740=m
CONFIG_VIDEO_SH_MOBILE_CSI2=m
CONFIG_VIDEO_SH_MOBILE_CEU=m
-# CONFIG_VIDEO_SAMSUNG_S5P_FIMC is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
+CONFIG_VIDEO_SAMSUNG_S5P_FIMC=y
+CONFIG_VIDEO_S5P_FIMC=m
+CONFIG_VIDEO_S5P_MIPI_CSIS=m
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
+CONFIG_VIDEO_SAMSUNG_S5P_TV=y
+CONFIG_VIDEO_SAMSUNG_S5P_HDMI=m
+# CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_HDMIPHY=m
+CONFIG_VIDEO_SAMSUNG_S5P_SII9234=m
+CONFIG_VIDEO_SAMSUNG_S5P_SDO=m
+CONFIG_VIDEO_SAMSUNG_S5P_MIXER=m
+# CONFIG_VIDEO_SAMSUNG_S5P_MIXER_DEBUG is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y
@@ -3118,7 +3141,6 @@
CONFIG_DRM_EXYNOS=m
CONFIG_DRM_EXYNOS_DMABUF=y
CONFIG_DRM_EXYNOS_FIMD=y
-CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_DRM_EXYNOS_VIDI=y
CONFIG_DRM_EXYNOS_G2D=y
CONFIG_DRM_UDL=m
@@ -3161,7 +3183,10 @@
CONFIG_FB_METRONOME=m
CONFIG_FB_BROADSHEET=m
# CONFIG_FB_AUO_K190X is not set
-# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_EXYNOS_VIDEO=y
+CONFIG_EXYNOS_MIPI_DSI=y
+CONFIG_EXYNOS_LCD_S6E8AX0=y
+CONFIG_EXYNOS_DP=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_L4F00242T03 is not set
@@ -3363,14 +3388,14 @@
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHCI_S5P is not set
+CONFIG_USB_EHCI_S5P=y
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_EXYNOS is not set
+CONFIG_USB_OHCI_EXYNOS=y
CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -3591,7 +3616,6 @@
# CONFIG_MMC_SDHCI_S3C is not set
CONFIG_MMC_SDHCI_PXAV3=m
CONFIG_MMC_SDHCI_PXAV2=m
-CONFIG_MMC_SPI=m
CONFIG_MMC_TMIO_CORE=m
CONFIG_MMC_TMIO=m
# CONFIG_MMC_DW is not set
@@ -4204,6 +4228,7 @@
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_INFO_REDUCED is not set
@@ -4272,9 +4297,9 @@
# CONFIG_ARM_UNWIND is not set
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_S3C_UART0=y
+# CONFIG_DEBUG_S3C_UART0 is not set
# CONFIG_DEBUG_S3C_UART1 is not set
-# CONFIG_DEBUG_S3C_UART2 is not set
+CONFIG_DEBUG_S3C_UART2=y
# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_SEMIHOSTING is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/omap2plus new/config/armv7hl/omap2plus
--- old/config/armv7hl/omap2plus 2012-10-04 15:44:56.000000000 +0200
+++ new/config/armv7hl/omap2plus 2012-10-22 01:11:42.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.0 Kernel Configuration
+# Linux/arm 3.6.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2833,6 +2833,14 @@
# Graphics support
#
CONFIG_DRM=m
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
# CONFIG_DRM_UDL is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -3519,7 +3527,8 @@
# CONFIG_DVB_AS102 is not set
# CONFIG_EASYCAP is not set
# CONFIG_LIRC_STAGING is not set
-# CONFIG_DRM_OMAP is not set
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=2
#
# Android
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:28.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:28.000000000 +0100
@@ -123,13 +123,13 @@
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
-%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts: hyper-v < 4
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -591,7 +591,10 @@
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
- if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+ # %ignore_kabi_badness is defined in the Kernel:* projects in the
+ # OBS to be able to build the KOTD in spite of kabi errors
+ if [ 0%{?ignore_kabi_badness} -eq 0 -a \
+ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
++++++ patches.arch.tar.bz2 ++++++
++++ 1784 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/hv-storvsc-reset-wait.patch new/patches.fixes/hv-storvsc-reset-wait.patch
--- old/patches.fixes/hv-storvsc-reset-wait.patch 2012-08-17 15:00:01.000000000 +0200
+++ new/patches.fixes/hv-storvsc-reset-wait.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-From: K. Y. Srinivasan <kys(a)microsoft.com>
-Subject: Drivers: scsi: storvsc: Account for in-transit packets in the RESET path
-Patch-mainline: not yet
-
-Properly account for I/O in transit before returning from the RESET call.
-In the absense of this patch we could have a situation where the host may
-respond to a command that was issued prior to the issuance of the RESET
-command at some arbitrary time after responding to the RESET command.
-Currently, the host does not do anything with the RESET command and so
-it is ok to wait for the in-transit I/O to be accounted for. If the host
-side sematics changes, we will have to revisit this.
-
-Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
-Acked-by: jbeulich(a)suse.com (in lieu of ohering(a)suse.com)
-
----
- drivers/scsi/storvsc_drv.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
---- a/drivers/scsi/storvsc_drv.c
-+++ b/drivers/scsi/storvsc_drv.c
-@@ -1223,7 +1223,12 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
- /*
- * At this point, all outstanding requests in the adapter
- * should have been flushed out and return to us
-+ * There is a potential race here where the host may be in
-+ * the process of responding when we return from here.
-+ * Just wait for all in-transit packets to be accounted for
-+ * before we return from here.
- */
-+ storvsc_wait_to_drain(stor_device);
-
- return SUCCESS;
- }
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 10168 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch new/patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch
--- old/patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch 2012-10-04 13:52:15.000000000 +0200
+++ new/patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-From: <ohering(a)suse.de>
-Date: Wed, 5 Sep 2012 14:37:35 -0700
-Patch-mainline: 3.7-rc1
-Subject: [PATCH] tools/hv: Fix file handle leak
-Git-commit: d5ab482799e7c4c4b7c0aa67e8710dce28115d03
-
-Match up each fopen() with an fclose().
-
-Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
-Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
-Cc: stable(a)vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
----
- tools/hv/hv_kvp_daemon.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
-index c8e1013..4514fb4 100644
---- a/tools/hv/hv_kvp_daemon.c
-+++ b/tools/hv/hv_kvp_daemon.c
-@@ -160,7 +160,7 @@ static void kvp_update_file(int pool)
- sizeof(struct kvp_record),
- kvp_file_info[pool].num_records, filep);
-
-- fflush(filep);
-+ fclose(filep);
- kvp_release_lock(pool);
- }
-
-@@ -207,6 +207,7 @@ static void kvp_update_mem_state(int pool)
- kvp_file_info[pool].records = record;
- kvp_file_info[pool].num_records = records_read;
-
-+ fclose(filep);
- kvp_release_lock(pool);
- }
- static int kvp_file_init(void)
---
-1.7.12.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch new/patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch
--- old/patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch 2012-10-04 13:52:15.000000000 +0200
+++ new/patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-From: <ohering(a)suse.de>
-Date: Wed, 5 Sep 2012 14:37:36 -0700
-Patch-mainline: 3.7-rc1
-Subject: [PATCH] tools/hv: Fix exit() error code
-Git-commit: 6bb22fea25624ab593eee376fa5fb82d1b13f45a
-
-Linux native exit codes are 8-bit unsigned values. exit(-1) results
-in an exit code of 255, which is usually reserved for shells reporting
-'command not found'. Use the portable value EXIT_FAILURE. (Not that
-this matters much for a daemon.)
-
-Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
-Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
-Cc: stable(a)vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
----
- tools/hv/hv_kvp_daemon.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
-index 4514fb4..01b3ca5 100644
---- a/tools/hv/hv_kvp_daemon.c
-+++ b/tools/hv/hv_kvp_daemon.c
-@@ -122,7 +122,7 @@ static void kvp_acquire_lock(int pool)
-
- if (fcntl(kvp_file_info[pool].fd, F_SETLKW, &fl) == -1) {
- syslog(LOG_ERR, "Failed to acquire the lock pool: %d", pool);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- }
-
-@@ -134,7 +134,7 @@ static void kvp_release_lock(int pool)
- if (fcntl(kvp_file_info[pool].fd, F_SETLK, &fl) == -1) {
- perror("fcntl");
- syslog(LOG_ERR, "Failed to release the lock pool: %d", pool);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- }
-
-@@ -153,7 +153,7 @@ static void kvp_update_file(int pool)
- if (!filep) {
- kvp_release_lock(pool);
- syslog(LOG_ERR, "Failed to open file, pool: %d", pool);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
-
- bytes_written = fwrite(kvp_file_info[pool].records,
-@@ -179,7 +179,7 @@ static void kvp_update_mem_state(int pool)
- if (!filep) {
- kvp_release_lock(pool);
- syslog(LOG_ERR, "Failed to open file, pool: %d", pool);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- while (!feof(filep)) {
- readp = &record[records_read];
-@@ -196,7 +196,7 @@ static void kvp_update_mem_state(int pool)
-
- if (record == NULL) {
- syslog(LOG_ERR, "malloc failed");
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- continue;
- }
-@@ -225,7 +225,7 @@ static int kvp_file_init(void)
- if (access("/var/opt/hyperv", F_OK)) {
- if (mkdir("/var/opt/hyperv", S_IRUSR | S_IWUSR | S_IROTH)) {
- syslog(LOG_ERR, " Failed to create /var/opt/hyperv");
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- }
-
-@@ -1358,13 +1358,13 @@ int main(void)
-
- if (kvp_file_init()) {
- syslog(LOG_ERR, "Failed to initialize the pools");
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
-
- fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
- if (fd < 0) {
- syslog(LOG_ERR, "netlink socket creation failed; error:%d", fd);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- addr.nl_family = AF_NETLINK;
- addr.nl_pad = 0;
-@@ -1376,7 +1376,7 @@ int main(void)
- if (error < 0) {
- syslog(LOG_ERR, "bind failed; error:%d", error);
- close(fd);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- sock_opt = addr.nl_groups;
- setsockopt(fd, 270, 1, &sock_opt, sizeof(sock_opt));
-@@ -1396,7 +1396,7 @@ int main(void)
- if (len < 0) {
- syslog(LOG_ERR, "netlink_send failed; error:%d", len);
- close(fd);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
-
- pfd.fd = fd;
-@@ -1608,7 +1608,7 @@ kvp_done:
- len = netlink_send(fd, incoming_cn_msg);
- if (len < 0) {
- syslog(LOG_ERR, "net_link send failed; error:%d", len);
-- exit(-1);
-+ exit(EXIT_FAILURE);
- }
- }
-
---
-1.7.12.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch new/patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch
--- old/patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch 2012-10-04 13:52:15.000000000 +0200
+++ new/patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-From: <ohering(a)suse.de>
-Date: Wed, 5 Sep 2012 14:37:37 -0700
-Patch-mainline: 3.7-rc1
-Subject: [PATCH] tools/hv: Check for read/write errors
-Git-commit: 436473bc2173499ae274d0f50111d1e355006caf
-
-hv_kvp_daemon currently does not check whether fread() or fwrite()
-succeed. Add the necessary checks. Also, remove the incorrect use of
-feof() before fread().
-
-Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
-Signed-off-by: K. Y. Srinivasan <kys(a)microsoft.com>
-Cc: stable(a)vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
----
- tools/hv/hv_kvp_daemon.c | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
-index 01b3ca5..3922abc 100644
---- a/tools/hv/hv_kvp_daemon.c
-+++ b/tools/hv/hv_kvp_daemon.c
-@@ -160,7 +160,12 @@ static void kvp_update_file(int pool)
- sizeof(struct kvp_record),
- kvp_file_info[pool].num_records, filep);
-
-- fclose(filep);
-+ if (ferror(filep) || fclose(filep)) {
-+ kvp_release_lock(pool);
-+ syslog(LOG_ERR, "Failed to write file, pool: %d", pool);
-+ exit(EXIT_FAILURE);
-+ }
-+
- kvp_release_lock(pool);
- }
-
-@@ -181,12 +186,17 @@ static void kvp_update_mem_state(int pool)
- syslog(LOG_ERR, "Failed to open file, pool: %d", pool);
- exit(EXIT_FAILURE);
- }
-- while (!feof(filep)) {
-+ for (;;) {
- readp = &record[records_read];
- records_read += fread(readp, sizeof(struct kvp_record),
- ENTRIES_PER_BLOCK * num_blocks,
- filep);
-
-+ if (ferror(filep)) {
-+ syslog(LOG_ERR, "Failed to read file, pool: %d", pool);
-+ exit(EXIT_FAILURE);
-+ }
-+
- if (!feof(filep)) {
- /*
- * We have more data to read.
-@@ -249,12 +259,18 @@ static int kvp_file_init(void)
- fclose(filep);
- return 1;
- }
-- while (!feof(filep)) {
-+ for (;;) {
- readp = &record[records_read];
- records_read += fread(readp, sizeof(struct kvp_record),
- ENTRIES_PER_BLOCK,
- filep);
-
-+ if (ferror(filep)) {
-+ syslog(LOG_ERR, "Failed to read file, pool: %d",
-+ i);
-+ exit(EXIT_FAILURE);
-+ }
-+
- if (!feof(filep)) {
- /*
- * We have more data to read.
---
-1.7.12.1
-
++++++ patches.xen.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-fixup-xen new/patches.xen/xen3-fixup-xen
--- old/patches.xen/xen3-fixup-xen 2012-10-04 15:44:56.000000000 +0200
+++ new/patches.xen/xen3-fixup-xen 2012-10-21 23:17:25.000000000 +0200
@@ -2657,12 +2657,13 @@
+EXPORT_SYMBOL_GPL(xenbus_for_each_backend);
--- head.orig/drivers/xen/xenbus/xenbus_xs.c 2012-10-04 11:30:42.000000000 +0200
+++ head/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:18:49.000000000 +0100
-@@ -45,9 +45,16 @@
+@@ -45,10 +45,17 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <xen/xenbus.h>
-#include <xen/xen.h>
#include "xenbus_comms.h"
+ #include <asm/xen/hypervisor.h>
+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
+#include <xen/platform-compat.h>
@@ -2760,8 +2761,8 @@
return ret;
}
-@@ -620,19 +629,19 @@ static struct xenbus_watch *find_watch(c
-
+@@ -620,22 +629,22 @@ static struct xenbus_watch *find_watch(c
+ }
static void xs_reset_watches(void)
{
+#ifndef CONFIG_XEN
@@ -2770,6 +2771,9 @@
- if (!xen_hvm_domain())
- return;
-
+ if (xen_strict_xenbus_quirk())
+ return;
+
err = xenbus_scanf(XBT_NIL, "control",
- "platform-feature-xs_reset_watches", "%d", &supported);
+ "platform-feature-xs_reset_watches", "%d",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-2.6.23 new/patches.xen/xen3-patch-2.6.23
--- old/patches.xen/xen3-patch-2.6.23 2012-10-04 15:44:56.000000000 +0200
+++ new/patches.xen/xen3-patch-2.6.23 2012-10-21 23:17:25.000000000 +0200
@@ -4039,14 +4039,14 @@
--- head.orig/drivers/xen/xenbus/xenbus_xs.c 2011-06-30 16:06:45.000000000 +0200
+++ head/drivers/xen/xenbus/xenbus_xs.c 2012-01-20 14:47:34.000000000 +0100
@@ -626,7 +626,7 @@ static struct xenbus_watch *find_watch(c
-
+ }
static void xs_reset_watches(void)
{
-#ifndef CONFIG_XEN
+#ifdef MODULE
int err, supported = 0;
- err = xenbus_scanf(XBT_NIL, "control",
+ if (xen_strict_xenbus_quirk())
@@ -677,7 +677,9 @@ void unregister_xenbus_watch(struct xenb
char token[sizeof(watch) * 2 + 1];
int err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-3.2 new/patches.xen/xen3-patch-3.2
--- old/patches.xen/xen3-patch-3.2 2012-10-04 15:44:56.000000000 +0200
+++ new/patches.xen/xen3-patch-3.2 2012-10-21 23:17:25.000000000 +0200
@@ -4011,8 +4011,8 @@
#include <xen/xenbus.h>
+#include <xen/xen.h>
#include "xenbus_comms.h"
+ #include <asm/xen/hypervisor.h>
- #ifdef HAVE_XEN_PLATFORM_COMPAT_H
--- head.orig/include/xen/balloon.h 2012-02-03 13:34:56.000000000 +0100
+++ head/include/xen/balloon.h 2012-02-03 13:44:44.000000000 +0100
@@ -82,8 +82,9 @@ extern struct balloon_stats balloon_stat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-3.6 new/patches.xen/xen3-patch-3.6
--- old/patches.xen/xen3-patch-3.6 2012-10-04 15:44:56.000000000 +0200
+++ new/patches.xen/xen3-patch-3.6 2012-10-21 23:17:25.000000000 +0200
@@ -1649,7 +1649,7 @@
--- head.orig/drivers/xen/xenbus/xenbus_xs.c 2012-03-12 16:18:49.000000000 +0100
+++ head/drivers/xen/xenbus/xenbus_xs.c 2012-08-20 14:37:06.000000000 +0200
@@ -631,9 +631,14 @@ static struct xenbus_watch *find_watch(c
-
+ }
static void xs_reset_watches(void)
{
-#ifdef MODULE
@@ -1661,9 +1661,9 @@
+ return;
+#endif
+
- err = xenbus_scanf(XBT_NIL, "control",
- "platform-feature-xs_reset_watches", "%d",
- &supported);
+ if (xen_strict_xenbus_quirk())
+ return;
+
--- head.orig/include/xen/interface/platform.h 2012-10-04 13:09:12.000000000 +0200
+++ head/include/xen/interface/platform.h 2012-08-20 14:37:06.000000000 +0200
@@ -482,6 +482,7 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_pcpu_versi
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:29.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:29.000000000 +0100
@@ -27,6 +27,9 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
+ patches.kernel.org/patch-3.6.1
+ patches.kernel.org/patch-3.6.1-2
+ patches.kernel.org/patch-3.6.2-3
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -198,13 +201,16 @@
# Queued for 2.6.36 -> just revert after some time
patches.fixes/acpi_ec_sys_access_user_space_with_get_user.patch
- patches.arch/lib_earlycpio.patch
- patches.arch/x86_introduce_reserve_mem_area.patch
- patches.arch/acpi_override_2_2.patch
- patches.arch/acpi_physical_override.patch
- patches.arch/acpi_override_introduce_taint_func.patch
- patches.arch/acpi_override_documentation
- patches.arch/acpi_fix_custom_method_acc.patch
+ patches.arch/001-acpi_initrd_override_tables.patch
+ patches.arch/002-acpi_initrd_override_tables.patch
+ patches.arch/003-acpi_initrd_override_tables.patch
+ patches.arch/004-acpi_initrd_override_tables.patch
+ patches.arch/005-acpi_initrd_override_tables.patch
+ patches.arch/006-acpi_initrd_override_tables.patch
+ patches.arch/007-acpi_initrd_override_tables.patch
+ patches.arch/008-acpi_initrd_override_tables.patch
+ patches.arch/009-acpi_initrd_override_tables.patch
+ patches.arch/010-acpi_initrd_override_tables.patch
########################################################
# CPUFREQ
@@ -249,9 +255,6 @@
patches.suse/msft-hv-0391-Tools-hv-Implement-the-KVP-verb-KVP_OP_SET_IP_INFO.patch
patches.suse/msft-hv-0392-Tools-hv-Rename-the-function-kvp_get_ip_address.patch
patches.suse/msft-hv-0393-Tools-hv-Implement-the-KVP-verb-KVP_OP_GET_IP_INFO.patch
- patches.suse/msft-hv-0394-tools-hv-Fix-file-handle-leak.patch
- patches.suse/msft-hv-0395-tools-hv-Fix-exit-error-code.patch
- patches.suse/msft-hv-0396-tools-hv-Check-for-read-write-errors.patch
patches.suse/msft-hv-0397-tools-hv-Parse-etc-os-release.patch
patches.suse/msft-hv-0398-hyperv-Fix-the-max_xfer_size-in-RNDIS-initialization.patch
patches.suse/msft-hv-0399-hyperv-Fix-the-missing-return-value-in-rndis_filter_.patch
@@ -260,7 +263,6 @@
patches.suse/msft-hv-0402-hyperv-Report-actual-status-in-receive-completion-pa.patch
patches.suse/msft-hv-0403-hyperv-Add-buffer-for-extended-info-after-the-RNDIS-.patch
patches.suse/suse-hv-identify-virtual-pc-in-ata_piix.patch
- patches.fixes/hv-storvsc-reset-wait.patch
########################################################
# Networking, IPv6
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.fCAOPu/_old 2012-11-02 16:15:29.000000000 +0100
+++ /var/tmp/diff_new_pack.fCAOPu/_new 2012-11-02 16:15:29.000000000 +0100
@@ -1,3 +1,3 @@
-2012-10-04 15:44:56 +0200
-GIT Revision: 338be2caaad5a616f8f9e9c1108abb60cfa8b9b0
+2012-10-22 01:11:42 +0200
+GIT Revision: e8b3bd988d91394bef4d1d674333ee150f636a3e
GIT Branch: master
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package hxtools for openSUSE:Factory checked in at 2012-11-02 16:14:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hxtools (Old)
and /work/SRC/openSUSE:Factory/.hxtools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hxtools", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/hxtools/hxtools.changes 2012-08-04 09:15:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hxtools.new/hxtools.changes 2012-11-02 16:14:35.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Oct 22 07:17:53 UTC 2012 - cfarrell(a)suse.com
+
+- license update: GPL-2.0+ and SUSE-WTFPL-2.0
+ Use tags from the list linked at license.opensuse.org
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hxtools.spec ++++++
--- /var/tmp/diff_new_pack.WLNbtP/_old 2012-11-02 16:14:36.000000000 +0100
+++ /var/tmp/diff_new_pack.WLNbtP/_new 2012-11-02 16:14:36.000000000 +0100
@@ -21,7 +21,7 @@
Release: 0
Url: http://inai.de/projects/hxtools/
Summary: Collection of day-to-day tools (binaries)
-License: GPL-2.0+ ; WTFPL-2.0+
+License: GPL-2.0+ and SUSE-WTFPL-2.0
Group: System/Base
Source: %name-%version.tar.xz
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gtkmm3 for openSUSE:Factory checked in at 2012-11-02 16:13:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gtkmm3 (Old)
and /work/SRC/openSUSE:Factory/.gtkmm3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkmm3", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/gtkmm3/gtkmm3.changes 2012-10-03 15:08:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gtkmm3.new/gtkmm3.changes 2012-11-02 16:13:56.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Oct 22 15:15:41 UTC 2012 - dimstar(a)opensuse.org
+
+- Update to version 3.6.0:
+ + Gtk:
+ + ComboBox: Add set_active_id(), deprecating
+ get_active_id(string) (bgo#685801).
+ + TargetList: Add some add_*_targets() methods.
+ + WindowGroup: Add list_windows() and get_current_grab().
+
+-------------------------------------------------------------------
Old:
----
gtkmm-3.5.13.tar.xz
New:
----
gtkmm-3.6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkmm3.spec ++++++
--- /var/tmp/diff_new_pack.ITwD7o/_old 2012-11-02 16:13:57.000000000 +0100
+++ /var/tmp/diff_new_pack.ITwD7o/_new 2012-11-02 16:13:57.000000000 +0100
@@ -21,13 +21,13 @@
Name: gtkmm3
%define _name gtkmm
-Version: 3.5.13
+Version: 3.6.0
Release: 0
Summary: C++ Interface for GTK3 (a GUI Library for X)
License: LGPL-2.1+
Group: System/Libraries
Url: http://www.gtkmm.org/
-Source: http://download.gnome.org/sources/gtkmm/3.5/%{_name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gtkmm/3.6/%{_name}-%{version}.tar.xz
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -35,7 +35,7 @@
BuildRequires: pkgconfig(atkmm-1.6)
BuildRequires: pkgconfig(cairomm-1.0) >= 1.9.2
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.22.1
-BuildRequires: pkgconfig(giomm-2.4) >= 2.33.13
+BuildRequires: pkgconfig(giomm-2.4) >= 2.34.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0
BuildRequires: pkgconfig(pangomm-1.4) >= 2.27.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -71,7 +71,7 @@
%package doc
Summary: C++ Interface for GTK3 (a GUI Library for X)
-License: GPL-2.0+ ; LGPL-2.1+
+License: GPL-2.0+ and LGPL-2.1+
Group: Documentation/HTML
Requires: glibmm2-doc
BuildArch: noarch
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0