commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2020-10-07 14:16:09
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.4249 (New)
Package is "sysvinit"
Wed Oct 7 14:16:09 2020 rev:172 rq:834509 version:2.97
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2019-09-27
14:43:03.589605494 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.4249/sysvinit.changes
2020-10-07 14:16:13.945378132 +0200
@@ -1,0 +2,30 @@
+Wed Aug 26 12:42:23 UTC 2020 - Dominique Leuenberger
+
+- Drop /bin/pidof and /sbin/pidof, including corresponding man
+ page: let's switch to pidof as provided by procps-ng.
+
+---
+Tue Aug 25 14:45:33 UTC 2020 - Dominique Leuenberger
+
+- Update to sysvinit 2.97:
+ * Check $(ROOT) filesystem for libcrypt instead of a hardcoded
+path to /usr.
+ * Code clean-up and making sure we avoid freeing unused memory.
+ * Added shell script which converts systemd unit files into
+init.d style scripts.
+ * Allow init to load configuration data from files stored in
+/etc/inittab.d/
+ * Allow shutdown time to be specified in the format +hh:mm. This
+is in addition to the existing formats such as hh:mm, +m, and
+"now".
+ * Fixed typos in manual pages.
+- Update startpar to 0.65:
+ + Make sure startpar testsuite can find insserv executable in
+/usr/sbin or /sbin.
+ + Added PREFIX variable to Makefile and testsuite to make
+location of startpar and insserv more flexible.
+- Rebase sysvinit-2.90.dif.
+- Drop SCVER defines: not used in any place.
+- Drop startpar-sysmacros.patch: fixed upstream.
+
+---
Old:
startpar-0.63.tar.xz
startpar-sysmacros.patch
sysvinit-2.96.tar.xz
New:
startpar-0.65.tar.xz
sysvinit-2.97.tar.xz
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.qgvf8h/_old 2020-10-07 14:16:15.161379099 +0200
+++ /var/tmp/diff_new_pack.qgvf8h/_new 2020-10-07 14:16:15.165379102 +0200
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: systemd-rpm-macros
-Url:https://power.sourceforge.net/
+URL:https://power.sourceforge.net/
Source0:powerd-%{version}.tar.bz2
Source2:powerd.service
Patch0: powerd-%{version}.dif
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.qgvf8h/_old 2020-10-07 14:16:15.205379134 +0200
+++ /var/tmp/diff_new_pack.qgvf8h/_new 2020-10-07 14:16:15.209379137 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,8 @@
Name: sysvinit
%define KPVER 2.23
-%define SCVER 1.20
-%define SIVER 2.96
-%define START 0.63
+%define SIVER 2.97
+%define START 0.65
Version:%{SIVER}
Release:0
Summary:SysV-Style init
@@ -29,15 +28,14 @@
BuildRequires: blog-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: sysvinit-tools
-Url:https://savannah.nongnu.org/projects/sysvinit/
-Source: sysvinit-%{SIVER}.tar.xz
+URL:https://savannah.nongnu.org/projects/sysvinit/
+Source:
http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-%{SIVER}.tar.xz
Source1:
https://github.com/bitstreamout/killproc/archive/v%{KPVER}.tar.gz#/killproc-%{KPVER}.tar.gz
-Source2:startpar-%{START}.tar.xz
+Source2:
http://download.savannah.nongnu.org/releases/sysvinit/startpar-%{START}.tar.xz
Patch: %{name}-2.90.dif
Patch2: %{name}-2.88dsf-suse.patch
Patch9: %{name}-2.90-no-kill.patch
Patch50:startpar-0.58.dif
-Patch51:startpar-sysmacros.patch
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -56,7 +54,7 @@
%description tools
Helper tools from sysvinit that support booting, including but not exclusive
-to startpar, killproc and pidof. System V init specific programs are in the
+to startpar and killproc. System V init specific programs are in the
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2019-09-27 14:43:02
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.2352 (New)
Package is "sysvinit"
Fri Sep 27 14:43:02 2019 rev:171 rq:731661 version:2.96
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2019-06-25
22:16:50.772664400 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.2352/sysvinit.changes
2019-09-27 14:43:03.589605494 +0200
@@ -1,0 +2,24 @@
+Wed Sep 18 07:45:38 UTC 2019 - Dr. Werner Fink
+
+- Update to sysvinit 2.96
+ * Added -z command line paramter to pidof which tells pidof to
+try to find processes in uninterruptable (D) or zombie (Z) states.
+This can cause pidof to hang, but produces a more complete process
+list.
+ * Reformatted init code to make if/while logic more clear.
+ * Make sure src/Makefile cleans up all executable files
+when parent Makefile calls "make clean".
+
+---
+Thu Aug 29 13:25:34 UTC 2019 - Dr. Werner Fink
+
+- Update to killproc 2.23
+ * killproc has its upstream at https://github.com/bitstreamout/killproc
+ * Use new system call statx(2) to replace old stat(2)/lstat(2)
+- Remove patches now upstream:
+ * killproc-2.18-open_flags.dif
+ * killproc-2.21.dif
+ * killproc-sysmacros.patch
+ * killproc-mntinf-optional.patch
+
+---
Old:
killproc-2.18-open_flags.dif
killproc-2.21.dif
killproc-2.21.tar.bz2
killproc-mntinf-optional.patch
killproc-sysmacros.patch
sysvinit-2.95.tar.xz
New:
killproc-2.23.tar.gz
sysvinit-2.96.tar.xz
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.i3fHIp/_old 2019-09-27 14:43:04.493603143 +0200
+++ /var/tmp/diff_new_pack.i3fHIp/_new 2019-09-27 14:43:04.493603143 +0200
@@ -17,9 +17,9 @@
Name: sysvinit
-%define KPVER 2.21
+%define KPVER 2.23
%define SCVER 1.20
-%define SIVER 2.95
+%define SIVER 2.96
%define START 0.63
Version:%{SIVER}
Release:0
@@ -31,15 +31,11 @@
#!BuildIgnore: sysvinit-tools
Url:https://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}.tar.xz
-Source1:killproc-%{KPVER}.tar.bz2
+Source1:
https://github.com/bitstreamout/killproc/archive/v%{KPVER}.tar.gz#/killproc-%{KPVER}.tar.gz
Source2:startpar-%{START}.tar.xz
Patch: %{name}-2.90.dif
Patch2: %{name}-2.88dsf-suse.patch
Patch9: %{name}-2.90-no-kill.patch
-Patch30:killproc-%{KPVER}.dif
-Patch31:killproc-2.18-open_flags.dif
-Patch32:killproc-sysmacros.patch
-Patch33:killproc-mntinf-optional.patch
Patch50:startpar-0.58.dif
Patch51:startpar-sysmacros.patch
@@ -76,11 +72,7 @@
mkdir killproc
popd
pushd ../killproc-%{KPVER}
-%patch30
-%patch31 -p0 -b .dialog
-%patch32 -p1
-%patch33 -p0
-ln -t../%{name}-%{SIVER}/doc/killproc README
+ln -t../%{name}-%{SIVER}/doc/killproc README.md
popd
pushd ../startpar-%{START}
%patch50
++ sysvinit-2.88dsf-suse.patch ++
--- /var/tmp/diff_new_pack.i3fHIp/_old 2019-09-27 14:43:04.533603039 +0200
+++ /var/tmp/diff_new_pack.i3fHIp/_new 2019-09-27 14:43:04.533603039 +0200
@@ -4,7 +4,7 @@
2 files changed, 3 insertions(+), 1 deletion(-)
--- man/killall5.8
-+++ man/killall5.8 2019-06-17 12:05:21.101622374 +
man/killall5.8 2019-09-18 07:39:31.188377719 +
@@ -44,6 +44,7 @@ process were killed, and 1 if it was una
.SH SEE ALSO
.BR halt (8),
@@ -15,9 +15,9 @@
.SH AUTHOR
Miquel van Smoorenburg, miqu...@cistron.nl
--- man/pidof.8
-+++ man/pidof.82019-06-17 12:06:25.816419988 +
-@@ -94,6 +94,7 @@ Zombie processes or processes in disk sl
- are ignored, as attempts to access the stats of these will sometimes fail.
man/pidof.82019-09-18 07:40:18.859489726 +
+@@ -101,6 +101,7 @@ The \-z flag (see above) tells pidof to
+ processes, at the risk of failing or hanging.
.SH SEE ALSO
+.BR pidofproc (8),
++ sysvinit-2.90-no-kill.patch ++
--- /var/tmp/diff_new_pack.i3fHIp/_old 2019-09-27 14:43:04.541603018 +0200
+++ /var/tmp/diff_new_pack.i3fHIp/_new 2019-09-27 14:43:04.545603008 +0200
@@ -3,8 +3,8 @@
1 file changed, 52 insertions(+)
--- src/killall5.c
-+++ src/killall5.c 2018-08-06 12:45:03.832836347 +
-@@ -470,6 +470,38 @@ int readarg(FILE *fp, char *buf, int sz)
src/killall5.c 2019-09-18 07:41:29.094181373 +
+@@ -478,6 +478,38 @@ int readarg(FILE *fp, char *buf, int sz)
}
/*
@@ -43,7 +43,7 @@
*Read the proc
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2019-06-25 22:16:49
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.4615 (New)
Package is "sysvinit"
Tue Jun 25 22:16:49 2019 rev:170 rq:711279 version:2.95
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2019-03-05
12:16:13.361008758 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.4615/powerd.changes
2019-06-25 22:16:50.636664190 +0200
@@ -1,0 +2,5 @@
+Tue Jun 18 10:25:28 UTC 2019 - Dr. Werner Fink
+
+- Find newer architectures even with vendor string
+
+---
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2019-04-12
09:11:31.805595519 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.4615/sysvinit.changes
2019-06-25 22:16:50.772664400 +0200
@@ -1,0 +2,19 @@
+Fri Jun 21 07:20:38 UTC 2019 - Dr. Werner Fink
+
+- Remove logsave as well as the manual page as those as part of
+ package e2fsprogs already
+
+---
+Mon Jun 17 13:54:35 UTC 2019 - Dr. Werner Fink
+
+- Update to sysvinit 2.95
+ * new logsave helper
+- Update to startpar-0.63
+ * move startpar from /sbin to /bin
+- Port our patches
+ * startpar-0.58.dif
+ * sysvinit-2.88dsf-suse.patch
+ * sysvinit-2.90-no-kill.patch
+ * sysvinit-2.90.dif
+
+---
Old:
startpar-0.58.tar.bz2
sysvinit-2.90.tar.xz
New:
startpar-0.63.tar.xz
sysvinit-2.95.tar.xz
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.OG3Rbj/_old 2019-06-25 22:16:51.744665897 +0200
+++ /var/tmp/diff_new_pack.OG3Rbj/_new 2019-06-25 22:16:51.744665897 +0200
@@ -18,9 +18,9 @@
Name: sysvinit
%define KPVER 2.21
-%define SCVER 1.16
-%define SIVER 2.90
-%define START 0.58
+%define SCVER 1.20
+%define SIVER 2.95
+%define START 0.63
Version:%{SIVER}
Release:0
Summary:SysV-Style init
@@ -29,18 +29,18 @@
BuildRequires: blog-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: sysvinit-tools
-Url:http://savannah.nongnu.org/projects/sysvinit/
+Url:https://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}.tar.xz
Source1:killproc-%{KPVER}.tar.bz2
-Source2:startpar-%{START}.tar.bz2
-Patch: %{name}-%{SIVER}.dif
+Source2:startpar-%{START}.tar.xz
+Patch: %{name}-2.90.dif
Patch2: %{name}-2.88dsf-suse.patch
-Patch9: %{name}-%{SIVER}-no-kill.patch
+Patch9: %{name}-2.90-no-kill.patch
Patch30:killproc-%{KPVER}.dif
Patch31:killproc-2.18-open_flags.dif
Patch32:killproc-sysmacros.patch
Patch33:killproc-mntinf-optional.patch
-Patch50:startpar-%{START}.dif
+Patch50:startpar-0.58.dif
Patch51:startpar-sysmacros.patch
%description
@@ -64,6 +64,10 @@
sysvinit package.
%prep
+ls -l
+rm -rf killproc-%{KPVER}
+rm -rf startpar-%{START} startpar
+ln -sf startpar startpar-%{START}
%setup -n %{name}-%{SIVER} -q -b 1 -b 2
%patch2 -p0 -b .suse
%patch9 -p0 -b .no-kill
@@ -118,20 +122,21 @@
/bin/pidof
/bin/usleep
/bin/fsync
+/bin/startpar
/sbin/fstab-decode
/sbin/checkproc
/sbin/pidofproc
/sbin/killproc
/sbin/killall5
/sbin/pidof
-/sbin/startpar
+/sbin/startproc
/sbin/rvmtab
/sbin/vhangup
/sbin/mkill
-/sbin/startproc
/sbin/start_daemon
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
+%doc %{_mandir}/man1/startpar.1.gz
%doc %{_mandir}/man8/fstab-decode.8.gz
%doc %{_mandir}/man8/checkproc.8.gz
%doc %{_mandir}/man8/pidofproc.8.gz
@@ -140,7 +145,6 @@
%doc %{_mandir}/man8/pidof.8.gz
%doc %{_mandir}/man8/startproc.8.gz
%doc %{_mandir}/man8/start_daemon.8.gz
-%doc %{_mandir}/man8/startpar.8.gz
%doc %{_mandir}/man8/rvmtab.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
++ powerd-2.0.2.dif ++
--- /var/tmp/diff_new_pack.OG3Rbj/_old 2019-06-25 22:16:51.776665946 +0200
+++ /var/tmp/diff_new_pack.OG3Rbj/_new 2019-06-25 22:16:51.776665946 +0200
@@ -411,3 +411,18 @@
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-*
\
+@@ -216,12 +216,12 @@ case $basic_machine in
+ | alphaev6[78]-* \
+ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ | clipper-* | orion-* \
+-| sparclite-* | pdp11-* |
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2019-04-12 09:11:30
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.27019 (New)
Package is "sysvinit"
Fri Apr 12 09:11:30 2019 rev:169 rq:692609 version:2.90
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2018-08-15
10:29:40.911344181 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.27019/sysvinit.changes
2019-04-12 09:11:31.805595519 +0200
@@ -1,0 +2,7 @@
+Tue Apr 9 13:13:42 UTC 2019 - Dr. Werner Fink
+
+- Add patch killproc-mntinf-optional.patch to handle various optional
+ fields of /proc//mountinfo on the entry/ies before the hypen
+ (bsc#1131982)
+
+---
New:
killproc-mntinf-optional.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.clBdEH/_old 2019-04-12 09:11:33.013595906 +0200
+++ /var/tmp/diff_new_pack.clBdEH/_new 2019-04-12 09:11:33.021595909 +0200
@@ -39,6 +39,7 @@
Patch30:killproc-%{KPVER}.dif
Patch31:killproc-2.18-open_flags.dif
Patch32:killproc-sysmacros.patch
+Patch33:killproc-mntinf-optional.patch
Patch50:startpar-%{START}.dif
Patch51:startpar-sysmacros.patch
@@ -74,6 +75,7 @@
%patch30
%patch31 -p0 -b .dialog
%patch32 -p1
+%patch33 -p0
ln -t../%{name}-%{SIVER}/doc/killproc README
popd
pushd ../startpar-%{START}
++ killproc-mntinf-optional.patch ++
On newer kernels there are more optional parameter fields
before the hyphen
---
libinit.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- libinit.c
+++ libinit.c 2019-04-09 12:47:35.913748799 +
@@ -281,7 +281,7 @@ static void init_mounts(void)
if ((mnt = fopen("/proc/self/mountinfo", "re")) == (FILE*)0)
return;
-while (fscanf(mnt, "%i %i %u:%u %*s %s %*s - %s %*s %*[^\n]", ,
, , , [0], [0]) == 6) {
+while (fscanf(mnt, "%i %i %u:%u %*s %s %*[^-] - %s %*s %*[^\n]", ,
, , , [0], [0]) == 6) {
const size_t nlen = strlen(point);
MNTINFO *restrict p;
if (posix_memalign((void*), sizeof(void*), alignof(MNTINFO)+(nlen+1))
!= 0) {
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2019-03-05 12:16:07
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.28833 (New)
Package is "sysvinit"
Tue Mar 5 12:16:07 2019 rev:168 rq:679450 version:2.90
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2018-05-30
12:41:04.944893823 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.28833/powerd.changes
2019-03-05 12:16:13.361008758 +0100
@@ -1,0 +2,6 @@
+Mon Jan 14 13:28:31 UTC 2019 - Dr. Werner Fink
+
+- Modify patch powerd-2.0.2.dif that is add x86_64-* to match e.g.
+ basic mchine type x86_64-suse
+
+---
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.aveiFF/_old 2019-03-05 12:16:15.197008187 +0100
+++ /var/tmp/diff_new_pack.aveiFF/_new 2019-03-05 12:16:15.205008185 +0100
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -73,11 +73,17 @@
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
+%pre
+%service_add_post powerd.service
+
%preun
-%stop_on_removal powerd
+%service_del_preun powerd.service
+
+%post
+%service_add_post powerd.service
%postun
-%restart_on_update powerd
+%service_del_postun powerd.service
%files -n powerd
%defattr (-,root,root,755)
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.aveiFF/_old 2019-03-05 12:16:15.221008179 +0100
+++ /var/tmp/diff_new_pack.aveiFF/_new 2019-03-05 12:16:15.233008176 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ powerd-2.0.2.dif ++
--- /var/tmp/diff_new_pack.aveiFF/_old 2019-03-05 12:16:15.285008160 +0100
+++ /var/tmp/diff_new_pack.aveiFF/_new 2019-03-05 12:16:15.285008160 +0100
@@ -385,3 +385,29 @@
+};
+
+#endif
+--- config.guess
config.guess 2019-01-09 15:01:32.155857875 +
+@@ -818,10 +818,10 @@ EOF
+
+ case "${UNAME_MACHINE}" in
+ i?86)
+- VENDOR=pc;
++ VENDOR=suse;
+ ;;
+ *)
+- VENDOR=unknown;
++ VENDOR=suse;
+ ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+--- config.sub
config.sub 2019-01-09 15:01:32.155857875 +
+@@ -204,7 +204,7 @@ case $basic_machine in
+ ;;
+ # Recognize the basic CPU types with company name.
+ # FIXME: clean up the formatting here.
+- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* |
m68000-* \
++ vax-* | tahoe-* | i[34567]86-* | i860-* | x86_64-* | ia64-* | m32r-* |
m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-*
\
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2018-08-15 10:29:37
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Wed Aug 15 10:29:37 2018 rev:167 rq:627700 version:2.90
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2018-08-06
11:52:06.541018530 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2018-08-15
10:29:40.911344181 +0200
@@ -1,0 +2,13 @@
+Mon Aug 6 13:21:20 UTC 2018 - wer...@suse.de
+
+- Update to sysvinit 2.90
+- Remove now upstream patches
+ * sysvinit-2.88+dsf-dostat.patch
+ * sysvinit-2.88+dsf-sulogin.diff
+ * sysvinit-2.88+dsf.tar.bz2
+ * sysvinit-2.88dsf-scripts2.patch
+- Port our patches
+ sysvinit-2.88dsf-no-kill.patch becomes sysvinit-2.90-no-kill.patch
+ sysvinit-2.88+dsf.dif becomes sysvinit-2.90.dif
+
+---
Old:
sysvinit-2.88+dsf-dostat.patch
sysvinit-2.88+dsf-sulogin.diff
sysvinit-2.88+dsf.dif
sysvinit-2.88+dsf.tar.bz2
sysvinit-2.88dsf-no-kill.patch
sysvinit-2.88dsf-scripts2.patch
New:
sysvinit-2.90-no-kill.patch
sysvinit-2.90.dif
sysvinit-2.90.tar.xz
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.TKfMne/_old 2018-08-15 10:29:41.719345640 +0200
+++ /var/tmp/diff_new_pack.TKfMne/_new 2018-08-15 10:29:41.723345647 +0200
@@ -19,7 +19,7 @@
Name: sysvinit
%define KPVER 2.21
%define SCVER 1.16
-%define SIVER 2.88+
+%define SIVER 2.90
%define START 0.58
Version:%{SIVER}
Release:0
@@ -30,16 +30,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: sysvinit-tools
Url:http://savannah.nongnu.org/projects/sysvinit/
-Source: sysvinit-%{SIVER}dsf.tar.bz2
+Source: sysvinit-%{SIVER}.tar.xz
Source1:killproc-%{KPVER}.tar.bz2
Source2:startpar-%{START}.tar.bz2
-Patch: %{name}-%{version}dsf.dif
+Patch: %{name}-%{SIVER}.dif
Patch2: %{name}-2.88dsf-suse.patch
-Patch3: %{name}-2.88dsf-scripts2.patch
-Patch9: %{name}-2.88dsf-no-kill.patch
-Patch11:%{name}-%{version}dsf-dostat.patch
-# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
-Patch12:%{name}-%{version}dsf-sulogin.diff
+Patch9: %{name}-%{SIVER}-no-kill.patch
Patch30:killproc-%{KPVER}.dif
Patch31:killproc-2.18-open_flags.dif
Patch32:killproc-sysmacros.patch
@@ -67,12 +63,9 @@
sysvinit package.
%prep
-%setup -n %{name}-%{SIVER}dsf -q -b 1 -b 2
+%setup -n %{name}-%{SIVER} -q -b 1 -b 2
%patch2 -p0 -b .suse
-%patch3 -p0 -b .scripts2
%patch9 -p0 -b .no-kill
-%patch11 -p0 -b .dostat
-%patch12 -p0 -b .ka5
%patch
pushd doc
mkdir killproc
@@ -81,7 +74,7 @@
%patch30
%patch31 -p0 -b .dialog
%patch32 -p1
-ln -t../%{name}-%{SIVER}dsf/doc/killproc README
+ln -t../%{name}-%{SIVER}/doc/killproc README
popd
pushd ../startpar-%{START}
%patch50
++ sysvinit-2.88dsf-no-kill.patch -> sysvinit-2.90-no-kill.patch ++
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit-2.88dsf-no-kill.patch
2011-10-18 14:39:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit-2.90-no-kill.patch
2018-08-15 10:29:40.127342765 +0200
@@ -1,6 +1,10 @@
+---
+ src/killall5.c | 52
+ 1 file changed, 52 insertions(+)
+
--- src/killall5.c
-+++ src/killall5.c 2011-10-17 12:11:32.0 +
-@@ -454,6 +454,38 @@ int readarg(FILE *fp, char *buf, int sz)
src/killall5.c 2018-08-06 12:45:03.832836347 +
+@@ -468,6 +468,38 @@ int readarg(FILE *fp, char *buf, int sz)
}
/*
@@ -39,7 +43,7 @@
*Read the proc filesystem.
*CWD must be /proc to avoid problems if / is affected by the killing (ie
depend on fuse).
*/
-@@ -634,6 +666,26 @@ int readproc(int do_stat)
+@@ -650,6 +682,26 @@ int readproc(int do_stat)
p->nfs = 0;
switch (do_stat) {
++ sysvinit-2.88+dsf.dif -> sysvinit-2.90.dif ++
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit-2.88+dsf.dif 2016-02-23
16:51:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit-2.90.dif 2018-08-15
10:29:40.815344008 +0200
@@ -1,13 +1,19 @@
src/Makefile.orig 2015-12-04 14:01:44.134651379 +0100
-+++ src/Makefile 2015-12-04 14:01:50.735728998 +0100
-@@ -9,19 +9,19 @@
+---
+ src/Makefile | 27 +--
+ 1 file changed, 9 insertions(+), 18 deletions(-)
+
+--- src/Makefile
src/Makefile 2018-08-06 12:55:51.256999853 +
+@@ -9,7 +9,7 @@
#
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2018-08-06 11:52:02
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Mon Aug 6 11:52:02 2018 rev:166 rq:626993 version:2.88+
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2018-05-30
12:41:04.976892720 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2018-08-06
11:52:06.541018530 +0200
@@ -1,0 +2,6 @@
+Wed Aug 1 14:50:54 UTC 2018 - sch...@suse.de
+
+- killproc-sysmacros.patch, startpar-sysmacros.patch: Include
+ for makedev
+
+---
New:
killproc-sysmacros.patch
startpar-sysmacros.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.6bUC63/_old 2018-08-06 11:52:07.093019487 +0200
+++ /var/tmp/diff_new_pack.6bUC63/_new 2018-08-06 11:52:07.097019494 +0200
@@ -42,7 +42,9 @@
Patch12:%{name}-%{version}dsf-sulogin.diff
Patch30:killproc-%{KPVER}.dif
Patch31:killproc-2.18-open_flags.dif
+Patch32:killproc-sysmacros.patch
Patch50:startpar-%{START}.dif
+Patch51:startpar-sysmacros.patch
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -78,10 +80,12 @@
pushd ../killproc-%{KPVER}
%patch30
%patch31 -p0 -b .dialog
+%patch32 -p1
ln -t../%{name}-%{SIVER}dsf/doc/killproc README
popd
pushd ../startpar-%{START}
%patch50
+%patch51 -p1
popd
%_fixowner .
%_fixgroup .
++ killproc-sysmacros.patch ++
Index: killproc-2.21/libinit.c
===
--- killproc-2.21.orig/libinit.c
+++ killproc-2.21/libinit.c
@@ -23,6 +23,7 @@
*/
#include
+#include
#include "libinit.h" /* Now get the inlined functions */
#ifndef INITDIR
# define INITDIR "/etc/init.d"
Index: killproc-2.21/rvmtab.c
===
--- killproc-2.21.orig/rvmtab.c
+++ killproc-2.21/rvmtab.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include "libinit.h"
++ startpar-sysmacros.patch ++
Index: startpar-0.58/proc.c
===
--- startpar-0.58.orig/proc.c
+++ startpar-0.58/proc.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2018-05-30 11:41:12
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Wed May 30 11:41:12 2018 rev:165 rq:612627 version:2.88+
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2016-01-20
09:54:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2018-05-30
12:41:04.944893823 +0200
@@ -1,0 +2,5 @@
+Thu May 24 10:30:13 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2016-10-14
09:26:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2018-05-30
12:41:04.976892720 +0200
@@ -1,0 +2,5 @@
+Thu May 24 10:30:28 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.oGVUCr/_old 2018-05-30 12:41:05.764865531 +0200
+++ /var/tmp/diff_new_pack.oGVUCr/_new 2018-05-30 12:41:05.764865531 +0200
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Version:2.0.2
Release:0
Summary:UPS monitoring daemon
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: systemd-rpm-macros
@@ -81,7 +81,8 @@
%files -n powerd
%defattr (-,root,root,755)
-%doc README COPYING SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
+%license COPYING
+%doc README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
/sbin/powerd
/sbin/detectups
%{_sbindir}/rcpowerd
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.oGVUCr/_old 2018-05-30 12:41:05.804864150 +0200
+++ /var/tmp/diff_new_pack.oGVUCr/_new 2018-05-30 12:41:05.808864012 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
Version:%{SIVER}
Release:0
Summary:SysV-Style init
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Base
BuildRequires: blog-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -114,8 +114,8 @@
%files tools
%defattr (-,root,root,755)
-%doc COPYING COPYRIGHT doc/Propaganda
-%doc doc/Changelog doc/killproc
+%license COPYING COPYRIGHT
+%doc doc/Propaganda doc/Changelog doc/killproc
/bin/pidof
/bin/usleep
/bin/fsync
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2016-10-14 09:26:47
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2016-02-23
16:51:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-10-14
09:26:48.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct 4 13:31:43 UTC 2016 - wer...@suse.de
+
+- Avoid spurious waring on a not existin session of a not existing
+ process (boo#1002492)
+
+---
Other differences:
--
sysvinit.spec: same change
++ killproc-2.21.dif ++
--- /var/tmp/diff_new_pack.Kd3vNL/_old 2016-10-14 09:26:50.0 +0200
+++ /var/tmp/diff_new_pack.Kd3vNL/_new 2016-10-14 09:26:50.0 +0200
@@ -1,8 +1,8 @@
---
Makefile|6 ++
- libinit.c |4 ++--
+ libinit.c |7 ---
startproc.c |4 ++--
- 3 files changed, 6 insertions(+), 8 deletions(-)
+ 3 files changed, 8 insertions(+), 9 deletions(-)
--- Makefile
+++ Makefile 2016-01-25 15:42:08.730864821 +
@@ -20,7 +20,7 @@
#
# Architecture
--- libinit.c
-+++ libinit.c 2012-05-23 11:04:58.0 +
libinit.c 2016-10-04 13:22:04.272083140 +
@@ -265,7 +265,7 @@ static inline boolean isnetfs(const char
static void init_mounts(void)
{
@@ -39,6 +39,16 @@
const size_t nlen = strlen(point);
MNTINFO *restrict p;
if (posix_memalign((void*), sizeof(void*), alignof(MNTINFO)+(nlen+1))
!= 0) {
+@@ -626,7 +626,8 @@ static pid_t getsession(const pid_t pid)
+ {
+ pid_t session = getsid(pid);
+ if ((long)session < 0) {
+- warn("can not get session id for process %ld!\n", (long)pid);
++ if (errno != ESRCH)
++ warn("can not get session id for process %ld!\n", (long)pid);
+ session = 1;
+ }
+ return session;
--- startproc.c
+++ startproc.c2014-05-27 12:08:10.0 +
@@ -778,7 +778,7 @@ retry:
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2016-02-23 16:51:58
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2016-01-20
09:54:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-02-23
16:51:59.0 +0100
@@ -1,0 +2,19 @@
+Tue Jan 26 10:24:25 UTC 2016 - sweet_...@gmx.de
+
+- remove unused /etc/pam.d/init
+- remove notify-pam-dead.patch
+
+---
+Mon Jan 25 15:46:22 UTC 2016 - wer...@suse.de
+
+- Use libblogger of package blog-devel now
+
+---
+Thu Jan 21 11:35:01 UTC 2016 - wer...@suse.de
+
+- Split off showconsole as its separate package called blog
+ Moved also the patches: showconsole-1.16.dif, showconsole-1.16-deadlock.diff,
+ showconsole-1.16-glibc.dif
+
+
+---
Old:
notify-pam-dead.patch
showconsole-1.16-deadlock.diff
showconsole-1.16-glibc.dif
showconsole-1.16.dif
showconsole-1.16.tar.bz2
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.YSrWPZ/_old 2016-02-23 16:52:00.0 +0100
+++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:00.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.YSrWPZ/_old 2016-02-23 16:52:00.0 +0100
+++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:00.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,26 +26,22 @@
Summary:SysV-Style init
License:GPL-2.0+
Group: System/Base
+BuildRequires: blog-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: sysvinit-tools
Url:http://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}dsf.tar.bz2
-Source2:killproc-%{KPVER}.tar.bz2
-Source4:showconsole-%{SCVER}.tar.bz2
-Source5:startpar-%{START}.tar.bz2
+Source1:killproc-%{KPVER}.tar.bz2
+Source2:startpar-%{START}.tar.bz2
Patch: %{name}-%{version}dsf.dif
Patch2: %{name}-2.88dsf-suse.patch
Patch3: %{name}-2.88dsf-scripts2.patch
-Patch4: notify-pam-dead.patch
Patch9: %{name}-2.88dsf-no-kill.patch
Patch11:%{name}-%{version}dsf-dostat.patch
# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
Patch12:%{name}-%{version}dsf-sulogin.diff
Patch30:killproc-%{KPVER}.dif
Patch31:killproc-2.18-open_flags.dif
-Patch40:showconsole-%{SCVER}.dif
-Patch41:showconsole-1.16-deadlock.diff
-Patch42:showconsole-1.16-glibc.dif
Patch50:startpar-%{START}.dif
%description
@@ -61,6 +57,7 @@
%package tools
Summary:Tools for basic booting
Group: System/Base
+Requires: blog
%description tools
Helper tools from sysvinit that support booting, including but not exclusive
@@ -68,28 +65,21 @@
sysvinit package.
%prep
-%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 4 -b 5
+%setup -n %{name}-%{SIVER}dsf -q -b 1 -b 2
%patch2 -p0 -b .suse
%patch3 -p0 -b .scripts2
-%patch4 -p0 -b .pam
%patch9 -p0 -b .no-kill
%patch11 -p0 -b .dostat
%patch12 -p0 -b .ka5
%patch
pushd doc
- mkdir killproc showconsole
+ mkdir killproc
popd
pushd ../killproc-%{KPVER}
%patch30
%patch31 -p0 -b .dialog
ln -t../%{name}-%{SIVER}dsf/doc/killproc README
popd
-pushd ../showconsole-%{SCVER}
-%patch40
-%patch41 -p1
-%patch42 -p0
-ln -t../%{name}-%{SIVER}dsf/doc/showconsole README
-popd
pushd ../startpar-%{START}
%patch50
popd
@@ -102,21 +92,15 @@
CC=%__cc
export RPM_OPT_FLAGS CC
make %{?_smp_mflags} WITH_SELINUX=yes DISTRO=SuSE
-pushd ../showconsole-%{SCVER}
- make %{?_smp_mflags} CC="%__cc"
-popd
pushd ../killproc-%{KPVER}
- make %{?_smp_mflags} INC="-I../showconsole-%{SCVER}
-L../showconsole-%{SCVER}" CC="%__cc"
+ make
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2016-01-20 09:54:07
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2014-08-25
11:03:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2016-01-20
09:54:08.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_...@gmx.de
+
+- cleanup package
+
+---
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2015-12-13
09:33:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-01-20
09:54:08.0 +0100
@@ -1,0 +2,25 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_...@gmx.de
+
+- cleanup package:
+ * don't build binaries which are not installed
+ * remove unused sources
+ * remove patches (or parts of patches) which modify unused files
+ * remove old build conditions (sysvinit, util-linux, mkinitrd)
+ * remove unused dependencies
+- this cleanup does not change the resulting binaries (except some
+ package dependencies)
+- list of removed patches:
+ * sysvinit-2.82-startstop.patch
+ * sysvinit-2.88+dsf-blowfish.dif
+ * sysvinit-2.88+dsf-crypt.patch
+ * sysvinit-2.88+dsf-env.patch
+ * sysvinit-2.88dsf-multiple-sulogin.patch
+ * sysvinit-2.88+dsf-run.diff
+ * sysvinit-2.88+dsf-xen.patch
+- list of modified patches:
+ * notify-pam-dead.patch
+ * sysvinit-2.88+dsf.dif
+ * sysvinit-2.88+dsf-sulogin.diff
+ * sysvinit-2.88dsf-suse.patch
+
+---
Old:
mkinitrd-boot.sh
mkinitrd-kill1.sh
mkinitrd-kill2.sh
rc.powerd
sysvinit-2.82-startstop.patch
sysvinit-2.88+dsf-blowfish.dif
sysvinit-2.88+dsf-crypt.patch
sysvinit-2.88+dsf-env.patch
sysvinit-2.88+dsf-run.diff
sysvinit-2.88+dsf-xen.patch
sysvinit-2.88dsf-multiple-sulogin.patch
sysvinit-rpmlintrc
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.0 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.0 +0100
@@ -16,11 +16,6 @@
#
-%if %{undefined systemd_requires}
-%global with_sysvinit 1
-%endif
-%bcond_with sysvinit
-
Name: powerd
Version:2.0.2
Release:0
@@ -28,25 +23,15 @@
License:GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1140
-%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: pkg-config
-BuildRequires: systemd-devel
-%endif
-%endif
Url:https://power.sourceforge.net/
Source0:powerd-%{version}.tar.bz2
-Source1:rc.powerd
Source2:powerd.service
Patch0: powerd-%{version}.dif
Patch1: powerd-%{version}-getaddrinfo.patch
-%if %{without sysvinit}
%if %{undefined _unitdir}
%{expand: %%global %_unitdir %(pkg-config systemd
--variable=systemdsystemunitdir)}
%endif
-%endif
%description -n powerd
powerd monitors the serial port connected to an UPS device and will perform
@@ -82,28 +67,17 @@
echo '# read manual page of detectups(8) and powerd(8) its self.' >>
%{buildroot}/etc/powerd.conf
echo '# ' >> %{buildroot}/etc/powerd.conf
echo '# to enable powerd service run the command' >>
%{buildroot}/etc/powerd.conf
-%if %{with sysvinit}
- echo '#insserv powerd' >> %{buildroot}/etc/powerd.conf
- echo '#rcpowerd start' >> %{buildroot}/etc/powerd.conf
- mkdir -p %{buildroot}/etc/init.d
- install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
- ln -sf /etc/init.d/powerd %{buildroot}%{_sbindir}/rcpowerd
-%else
echo '#systemctl enable powerd.service' >> %{buildroot}/etc/powerd.conf
echo '#systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/%{_unitdir}
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
-%endif
%preun
%stop_on_removal powerd
%postun
%restart_on_update powerd
-%if %{with sysvinit}
-%insserv_cleanup
-%endif
%files -n powerd
%defattr (-,root,root,755)
@@ -112,11 +86,7 @@
/sbin/detectups
%{_sbindir}/rcpowerd
%config /etc/powerd.conf
-%if %{with sysvinit}
-%config /etc/init.d/powerd
-%else
%attr(0644,root,root) %{_unitdir}/powerd.service
-%endif
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.0 +0100
+++
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2015-12-13 09:33:50
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is "sysvinit"
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2015-02-27
11:04:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2015-12-13
09:33:52.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 1 10:48:20 UTC 2015 - sweet_...@gmx.de
+
+- don't install last, we will take it from util-linux
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.HlvYfx/_old 2015-12-13 09:33:54.0 +0100
+++ /var/tmp/diff_new_pack.HlvYfx/_new 2015-12-13 09:33:54.0 +0100
@@ -341,8 +341,6 @@
/bin/pidof
/bin/usleep
/bin/fsync
-/usr/bin/last
-/usr/bin/lastb
/sbin/blogger
/sbin/blogd
/sbin/fstab-decode
@@ -365,8 +363,6 @@
%doc %{_mandir}/man1/utmpdump.1.gz
%doc %{_mandir}/man8/sulogin.8.gz
%endif
-%doc %{_mandir}/man1/last.1.gz
-%doc %{_mandir}/man1/lastb.1.gz
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
# /usr/include/libblogger.h
++ sysvinit-2.88+dsf.dif ++
--- /var/tmp/diff_new_pack.HlvYfx/_old 2015-12-13 09:33:54.0 +0100
+++ /var/tmp/diff_new_pack.HlvYfx/_new 2015-12-13 09:33:54.0 +0100
@@ -13,23 +13,26 @@
BIN =
SBIN = init halt shutdown runlevel killall5 fstab-decode
-USRBIN= last mesg
-+USRBIN= last
++USRBIN=
-MAN1 = last.1 lastb.1 mesg.1
-+MAN1 = last.1 lastb.1
++MAN1 =
MAN5 = initscript.5 inittab.5
MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
MAN8 += shutdown.8 telinit.8 fstab-decode.8
-@@ -170,7 +170,8 @@ endif
+@@ -176,10 +176,8 @@ endif
ln -sf halt $(ROOT)/sbin/reboot
ln -sf halt $(ROOT)/sbin/poweroff
ln -sf init $(ROOT)/sbin/telinit
- ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+- ln -sf last $(ROOT)/usr/bin/lastb; \
+- fi
+ ln -sf killall5 $(ROOT)/sbin/pidof
+ ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \
- fi
+ $(INSTALL_DIR) $(ROOT)/usr/include/
+ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
--- src/bootlogd.c
+++ src/bootlogd.c 2011-03-15 14:58:54.0 +
@@ -241,7 +241,7 @@
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2015-02-27 11:04:22
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2014-09-10
07:28:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2015-02-27
11:04:23.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 23 09:30:00 UTC 2015 - rguent...@suse.com
+
+- Build with -std=gnu89 to deal with GCC 5 defaulting to -std=gnu11
+
+---
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.On3D9x/_old 2015-02-27 11:04:25.0 +0100
+++ /var/tmp/diff_new_pack.On3D9x/_new 2015-02-27 11:04:25.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.On3D9x/_old 2015-02-27 11:04:25.0 +0100
+++ /var/tmp/diff_new_pack.On3D9x/_new 2015-02-27 11:04:25.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -171,7 +171,7 @@
/bin/chmod -Rf a+rX,g-w,o-w .
%build
- RPM_OPT_FLAGS=${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64 -pipe
+ RPM_OPT_FLAGS=${RPM_OPT_FLAGS} -std=gnu89 -D_FILE_OFFSET_BITS=64 -pipe
CC=%__cc
export RPM_OPT_FLAGS CC
make %{?_smp_mflags} WITH_SELINUX=yes DISTRO=SuSE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2014-09-10 07:28:09
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2014-08-25
11:03:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-09-10
07:28:15.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 8 10:31:48 UTC 2014 - wer...@suse.de
+
+- For systemd distributions and products do not build the package
+ sysvinit anymore
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.DKYNg0/_old 2014-09-10 07:28:16.0 +0200
+++ /var/tmp/diff_new_pack.DKYNg0/_new 2014-09-10 07:28:16.0 +0200
@@ -21,9 +21,10 @@
%endif
%bcond_withutil_linux
%if %{undefined systemd_requires}
-%global with_sysvinit 1
-%endif
+%bcond_without sysvinit
+%else
%bcond_with sysvinit
+%endif
%if 0%{?suse_version} 1310
%define have_mkinitrd 0
@@ -242,7 +243,30 @@
rm -vf %{buildroot}%{_mandir}/man1/utmpdump.1*
rm -vf %{buildroot}%{_mandir}/man8/sulogin.8*
%endif
+%if !%{with sysvinit}
+ rm -vf %{buildroot}/sbin/sysvinit
+ rm -vfr %{buildroot}/lib/sysvinit
+ rm -vf %{buildroot}/sbin/halt
+ rm -vf %{buildroot}/sbin/init
+ rm -vf %{buildroot}/sbin/poweroff
+ rm -vf %{buildroot}/sbin/reboot
+ rm -vf %{buildroot}/sbin/runlevel
+ rm -vf %{buildroot}/sbin/shutdown
+ rm -vf %{buildroot}/sbin/telinit
+ rm -vf %{buildroot}%{_mandir}/man8/halt.8
+ rm -vf %{buildroot}%{_mandir}/man5/initscript.5
+ rm -vf %{buildroot}%{_mandir}/man5/inittab.5
+ rm -vf %{buildroot}%{_mandir}/man8/init.8
+ rm -vf %{buildroot}%{_mandir}/man8/sysvinit.8
+ rm -vf %{buildroot}%{_mandir}/man8/poweroff.8
+ rm -vf %{buildroot}%{_mandir}/man8/reboot.8
+ rm -vf %{buildroot}%{_mandir}/man8/runlevel.8
+ rm -vf %{buildroot}%{_mandir}/man8/shutdown.8
+ rm -vf %{buildroot}%{_mandir}/man8/telinit.8
+ rm -vfr %{buildroot}/lib/mkinitrd
+%endif
+%if %{with sysvinit}
%post
ret=0
if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d
/proc/1/root -a ! -d /.build -a -x /sbin/init; then
@@ -302,6 +326,7 @@
/lib/mkinitrd/scripts/boot-killblogd.sh
/lib/mkinitrd/scripts/boot-killblogd2.sh
%endif
+%endif
%files tools
%defattr (-,root,root,755)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2014-08-25 11:02:48
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2014-03-18
16:21:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2014-08-25
11:03:07.0 +0200
@@ -1,0 +2,7 @@
+Thu Aug 21 11:38:06 UTC 2014 - lnus...@suse.de
+
+- use systemd-rpm-macros instead of systemd-devel to avoid build
+ dependency on systemd and it's deps in turn
+- install rcpowerd link also when using systemd
+
+---
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2014-02-11
10:59:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-08-25
11:03:07.0 +0200
@@ -1,0 +2,18 @@
+Thu Aug 21 11:38:06 UTC 2014 - lnus...@suse.de
+
+- use systemd-rpm-macros instead of systemd-devel to avoid build
+ dependency on systemd and it's deps in turn
+- don't install mkinitrd stuff on 131 anymore
+
+---
+Wed May 28 07:11:58 UTC 2014 - wer...@suse.de
+
+- The former entry adds the patch killproc-2.18-open_flags.dif (bnc#863518)
+
+---
+Wed May 21 13:49:37 CEST 2014 - dr...@suse.de
+
+- open(/dev/tty, ...) should use O_RDWR, not O_WRONLY. Otherwise,
+ after dup2(fd, 0);, a process cannot read from stdin. [bnc#863518]
+
+---
New:
killproc-2.18-open_flags.dif
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.xx9FyK/_old 2014-08-25 11:03:09.0 +0200
+++ /var/tmp/diff_new_pack.xx9FyK/_new 2014-08-25 11:03:09.0 +0200
@@ -29,9 +29,13 @@
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} 1140
+%if 0%{?suse_version} 1230
+BuildRequires: systemd-rpm-macros
+%else
BuildRequires: pkg-config
BuildRequires: systemd-devel
%endif
+%endif
Url:https://power.sourceforge.net/
Source0:powerd-%{version}.tar.bz2
Source1:rc.powerd
@@ -39,8 +43,9 @@
Patch0: powerd-%{version}.dif
Patch1: powerd-%{version}-getaddrinfo.patch
%if %{without sysvinit}
-%{expand: %%global sysdsysunitdir %(pkg-config systemd
--variable=systemdsystemunitdir)}
-%{expand: %%global sysdsysconfdir %(pkg-config systemd
--variable=systemdsystemconfdir)}
+%if %{undefined _unitdir}
+%{expand: %%global %_unitdir %(pkg-config systemd
--variable=systemdsystemunitdir)}
+%endif
%endif
%description -n powerd
@@ -68,6 +73,7 @@
%install
mkdir -m 755 -p %{buildroot}/etc
mkdir -m 755 -p %{buildroot}/sbin
+ mkdir -m 755 -p %{buildroot}%{_sbindir}
mkdir -m 755 -p %{buildroot}%{_mandir}/man8
make install DESTDIR=%{buildroot}
echo '# ' %{buildroot}/etc/powerd.conf
@@ -81,12 +87,13 @@
echo '#rcpowerd start' %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/etc/init.d
install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
- ln -sf /etc/init.d/powerd %{buildroot}/sbin/rcpowerd
+ ln -sf /etc/init.d/powerd %{buildroot}%{_sbindir}/rcpowerd
%else
echo '#systemctl enable powerd.service' %{buildroot}/etc/powerd.conf
echo '#systemctl start powerd.service' %{buildroot}/etc/powerd.conf
- mkdir -p %{buildroot}/%{sysdsysunitdir}
- install -m 0644 %{S:2} %{buildroot}/%{sysdsysunitdir}/powerd.service
+ mkdir -p %{buildroot}/%{_unitdir}
+ install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
+ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
%endif
%preun
@@ -103,14 +110,12 @@
%doc README COPYING SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
/sbin/powerd
/sbin/detectups
-%if %{with sysvinit}
-/sbin/rcpowerd
-%endif
+%{_sbindir}/rcpowerd
%config /etc/powerd.conf
%if %{with sysvinit}
%config /etc/init.d/powerd
%else
-%attr(0644,root,root) %{sysdsysunitdir}/powerd.service
+%attr(0644,root,root) %{_unitdir}/powerd.service
%endif
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.xx9FyK/_old 2014-08-25 11:03:09.0 +0200
+++ /var/tmp/diff_new_pack.xx9FyK/_new 2014-08-25 11:03:09.0 +0200
@@ -25,6 +25,12 @@
%endif
%bcond_with sysvinit
+%if 0%{?suse_version} 1310
+%define have_mkinitrd 0
+%else
+%define have_mkinitrd 1
+%endif
+
Name: sysvinit
%define KPVER 2.21
%define SCVER 1.16
@@ -41,12 +47,19 @@
BuildRequires:
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2014-03-18 16:21:21
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2014-01-23
15:57:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2014-03-18
16:21:31.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 13 14:10:35 UTC 2014 - wer...@suse.de
+
+- Now work with latest systemd
+
+---
Other differences:
--
++ powerd.spec ++
--- /var/tmp/diff_new_pack.17e0KF/_old 2014-03-18 16:21:32.0 +0100
+++ /var/tmp/diff_new_pack.17e0KF/_new 2014-03-18 16:21:32.0 +0100
@@ -63,11 +63,7 @@
%configure --prefix= --bindir='$(DESTDIR)/sbin' \
--mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin'
-%if %{with sysvinit}
make %{?_smp_mflags} CFLAGS=-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT
-%else
- make %{?_smp_mflags} CFLAGS=-I. $RPM_OPT_FLAGS
-%endif
%install
mkdir -m 755 -p %{buildroot}/etc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2014-02-11 10:59:15
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2014-01-29
07:17:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-02-11
10:59:16.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb 7 15:42:34 UTC 2014 - wer...@suse.de
+
+- Add patch sysvinit-2.88+dsf-xen.patch to enable sulogin to find
+ suitable console device even if first is not usable (bnc#862078)
+
+---
New:
sysvinit-2.88+dsf-xen.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.M186av/_old 2014-02-11 10:59:16.0 +0100
+++ /var/tmp/diff_new_pack.M186av/_new 2014-02-11 10:59:16.0 +0100
@@ -70,6 +70,8 @@
Patch11:%{name}-%{version}dsf-dostat.patch
# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
Patch12:%{name}-%{version}dsf-sulogin.diff
+# PATCH-FIX-SUSE -- sulogin: find suitable console device even if first is not
usable
+Patch13:%{name}-%{version}dsf-xen.patch
Patch30:killproc-%{KPVER}.dif
Patch40:showconsole-%{SCVER}.dif
Patch41:showconsole-1.16-deadlock.diff
@@ -134,6 +136,7 @@
%patch10 -p0 -b .env
%patch11 -p0 -b .dostat
%patch12 -p0 -b .ka5
+%patch13 -p0 -b .xen
%patch
pushd doc
mkdir killproc showconsole
++ sysvinit-2.88+dsf-xen.patch ++
--- src/consoles.c
+++ src/consoles.c 2014-02-07 15:33:15.786235493 +
@@ -313,16 +313,19 @@ console:
*/
if ((fc = fopen(/proc/consoles, re))) {
char fbuf[16];
- int maj, min;
+ int maj, min, matches;
DIR *dir;
dir = opendir(/dev);
if (!dir) {
fclose(fc);
goto fallback;
}
- while ((fscanf(fc, %*s %*s (%[^)]) %d:%d, fbuf[0], maj,
min) == 3)) {
+ while ((matches = fscanf(fc, %*s %*s (%[^)]) %d:%d, fbuf[0],
maj, min)) = 1) {
char * name;
+ if (matches != 3)
+ continue;
+
if (!strchr(fbuf, 'E'))
continue;
comparedev = makedev(maj, min);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2014-01-29 07:17:27 Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) Package is sysvinit Changes: --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2014-01-23 15:57:03.0 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-01-29 07:17:27.0 +0100 @@ -4 +4,2 @@ -- killall5: handle strange names of executables +- Add patch sysvinit-2.88+dsf-sulogin.diff from upstream to handle + e.g. strange names of executables in killall5 @@ -10,0 +12,2 @@ +- Modify patch powerd-2.0.2.dif to remove sysvinit features +- Adding the systemd unit file powerd.service Other differences: -- sysvinit.spec: same change -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2014-01-22 18:20:03
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2014-01-23
15:57:03.0 +0100
@@ -0,0 +1,11 @@
+---
+Wed Jan 15 09:19:19 UTC 2014 - wer...@suse.de
+
+- Correct version number in configuration file
+
+---
+Tue Jan 14 12:28:42 UTC 2014 - wer...@suse.de
+
+- Split off powerd from sysvinit
+- Support systemd unit file
+
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2013-07-24
23:46:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-01-23
15:57:03.0 +0100
@@ -1,0 +2,11 @@
+Tue Jan 14 12:31:53 UTC 2014 - wer...@suse.de
+
+- killall5: handle strange names of executables
+
+---
+Tue Jan 14 11:04:52 UTC 2014 - wer...@suse.de
+
+- Split off powerd from sysvinit
+- Make powerd work together with systemd
+
+---
New:
powerd.changes
powerd.service
powerd.spec
sysvinit-2.88+dsf-sulogin.diff
Other differences:
--
++ powerd.spec ++
#
# spec file for package powerd
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if %{undefined systemd_requires}
%global with_sysvinit 1
%endif
%bcond_with sysvinit
Name: powerd
Version:2.0.2
Release:0
Summary:UPS monitoring daemon
License:GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} 1140
BuildRequires: pkg-config
BuildRequires: systemd-devel
%endif
Url:https://power.sourceforge.net/
Source0:powerd-%{version}.tar.bz2
Source1:rc.powerd
Source2:powerd.service
Patch0: powerd-%{version}.dif
Patch1: powerd-%{version}-getaddrinfo.patch
%if %{without sysvinit}
%{expand: %%global sysdsysunitdir %(pkg-config systemd
--variable=systemdsystemunitdir)}
%{expand: %%global sysdsysconfdir %(pkg-config systemd
--variable=systemdsystemconfdir)}
%endif
%description -n powerd
powerd monitors the serial port connected to an UPS device and will perform
an unattended shutdown of the system if the UPS is on battery longer
than a specified number of minutes.
%prep
%setup -q
%patch0
%patch1
%_fixowner .
%_fixgroup .
/bin/chmod -Rf a+rX,g-w,o-w .
%build
RPM_OPT_FLAGS=${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe
CC=%__cc
export RPM_OPT_FLAGS CC
%configure --prefix= --bindir='$(DESTDIR)/sbin' \
--mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin'
%if %{with sysvinit}
make %{?_smp_mflags} CFLAGS=-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT
%else
make %{?_smp_mflags} CFLAGS=-I. $RPM_OPT_FLAGS
%endif
%install
mkdir -m 755 -p %{buildroot}/etc
mkdir -m 755 -p %{buildroot}/sbin
mkdir -m 755 -p %{buildroot}%{_mandir}/man8
make install DESTDIR=%{buildroot}
echo '# ' %{buildroot}/etc/powerd.conf
echo '# /etc/powerd.conf for powerd version-%{version}'
%{buildroot}/etc/powerd.conf
echo '# ' %{buildroot}/etc/powerd.conf
echo '# read manual page of detectups(8) and powerd(8) its self.'
%{buildroot}/etc/powerd.conf
echo '# ' %{buildroot}/etc/powerd.conf
echo '# to enable powerd service run the command'
%{buildroot}/etc/powerd.conf
%if %{with sysvinit}
echo '#insserv powerd' %{buildroot}/etc/powerd.conf
echo '#rcpowerd start' %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/etc/init.d
install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
ln -sf /etc/init.d/powerd %{buildroot}/sbin/rcpowerd
%else
echo '#systemctl enable powerd.service' %{buildroot}/etc/powerd.conf
echo '#systemctl start
commit sysvinit for openSUSE:Factory
Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2013-07-24 23:46:07 Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) Package is sysvinit Changes: --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2013-06-07 13:16:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2013-07-24 23:46:09.0 +0200 @@ -1,0 +2,6 @@ +Tue Jul 23 11:58:05 CEST 2013 - oher...@suse.de + +- Remove usage of absolute paths +- List all needed binaries in programs tag + +--- Other differences: -- ++ mkinitrd-boot.sh ++ --- /var/tmp/diff_new_pack.RJShT7/_old 2013-07-24 23:46:10.0 +0200 +++ /var/tmp/diff_new_pack.RJShT7/_new 2013-07-24 23:46:10.0 +0200 @@ -1,7 +1,11 @@ #!/bin/bash #%stage: boot #%depends: udev clock -#%programs: showconsole /sbin/blogd +#%programs: blogd +#%programs: ln +#%programs: mkdir +#%programs: mount +#%programs: showconsole #%if: -x /sbin/blogd #%dontshow # @@ -26,6 +30,6 @@ /dev/shm/initrd.msg ln -sf /dev/shm/initrd.msg /var/log/boot.msg mkdir -p /var/run - /sbin/blogd $REDIRECT + blogd $REDIRECT fi fi ++ mkinitrd-kill1.sh ++ --- /var/tmp/diff_new_pack.RJShT7/_old 2013-07-24 23:46:10.0 +0200 +++ /var/tmp/diff_new_pack.RJShT7/_new 2013-07-24 23:46:10.0 +0200 @@ -2,6 +2,8 @@ # #%stage: setup # +#%programs: kill +#%programs: pidof #%dontshow # # blogd end ++ mkinitrd-kill2.sh ++ --- /var/tmp/diff_new_pack.RJShT7/_old 2013-07-24 23:46:10.0 +0200 +++ /var/tmp/diff_new_pack.RJShT7/_new 2013-07-24 23:46:10.0 +0200 @@ -4,6 +4,8 @@ #%depends: killblogd #%provides: killprogs # +#%programs: kill +#%programs: umount #%programs: usleep #%dontshow # -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2013-06-07 13:16:08
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2013-05-02
12:02:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2013-06-07
13:16:09.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun 7 10:30:04 UTC 2013 - wer...@suse.de
+
+- Skip binaries now part of util-linux
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.9EFR8V/_old 2013-06-07 13:16:10.0 +0200
+++ /var/tmp/diff_new_pack.9EFR8V/_new 2013-06-07 13:16:10.0 +0200
@@ -16,6 +16,11 @@
#
+%bcond_withutil_linux
+%if 0%{suse_version} 1300
+%global with_util_linux 1
+%endif
+
Name: sysvinit
%define PDVER 2.0.2
%define KPVER 2.21
@@ -32,6 +37,7 @@
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: pam-devel
+#!BuildIgnore: sysvinit-tools
Requires(post): coreutils grep mkinitrd
Requires(postun): mkinitrd
Url:http://savannah.nongnu.org/projects/sysvinit/
@@ -231,6 +237,14 @@
rm -f ${RPM_BUILD_ROOT}/sbin/detectups
%endif
chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
+%if ! %{with util_linux}
+ rm -vf ${RPM_BUILD_ROOT}/bin/mountpoint
+ rm -vf ${RPM_BUILD_ROOT}/usr/bin/utmpdump
+ rm -vf ${RPM_BUILD_ROOT}/sbin/sulogin
+ rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/mountpoint.1*
+ rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man1/utmpdump.1*
+ rm -vf ${RPM_BUILD_ROOT}%{_mandir}/man8/sulogin.8*
+%endif
%preun tools
%stop_on_removal powerd
@@ -303,13 +317,16 @@
%doc doc/powerd
%endif
%config /etc/pam.d/init
+%if %{with util_linux}
+/sbin/sulogin
/bin/mountpoint
+/usr/bin/utmpdump
+%endif
/bin/pidof
/bin/usleep
/bin/fsync
/usr/bin/last
/usr/bin/lastb
-/usr/bin/utmpdump
/sbin/blogger
/sbin/blogd
/sbin/fstab-decode
@@ -332,15 +349,17 @@
/sbin/mkill
/sbin/startproc
/sbin/start_daemon
-/sbin/sulogin
+%if %{with util_linux}
+%doc %{_mandir}/man1/mountpoint.1.gz
+%doc %{_mandir}/man1/utmpdump.1.gz
+%doc %{_mandir}/man8/sulogin.8.gz
+%endif
%doc %{_mandir}/man1/last.1.gz
%doc %{_mandir}/man1/lastb.1.gz
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
# /usr/include/libblogger.h
# /usr/lib/libblogger.a
-%doc %{_mandir}/man1/mountpoint.1.gz
-%doc %{_mandir}/man1/utmpdump.1.gz
%doc %{_mandir}/man8/blogger.8.gz
%doc %{_mandir}/man8/blogd.8.gz
%doc %{_mandir}/man8/fstab-decode.8.gz
@@ -359,7 +378,6 @@
%doc %{_mandir}/man8/startproc.8.gz
%doc %{_mandir}/man8/start_daemon.8.gz
%doc %{_mandir}/man8/startpar.8.gz
-%doc %{_mandir}/man8/sulogin.8.gz
%doc %{_mandir}/man8/rvmtab.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2013-05-02 12:02:53
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2013-03-05
06:51:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2013-05-02
12:02:56.0 +0200
@@ -1,0 +2,6 @@
+Wed Apr 24 08:49:40 UTC 2013 - wer...@suse.de
+
+- Add sanity check for /etc/inittab to avoid reload on systemd
+ systems (bnc#813510)
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.TWZ27N/_old 2013-05-02 12:02:58.0 +0200
+++ /var/tmp/diff_new_pack.TWZ27N/_new 2013-05-02 12:02:58.0 +0200
@@ -32,6 +32,8 @@
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: pam-devel
+Requires(post): coreutils grep mkinitrd
+Requires(postun): mkinitrd
Url:http://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}dsf.tar.bz2
Source2:killproc-%{KPVER}.tar.bz2
@@ -234,16 +236,22 @@
%stop_on_removal powerd
%post
+ret=0
if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d
/proc/1/root -a ! -d /.build -a -x /sbin/init; then
-if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root); then
+icount=$(grep -cE '^[[:alnum:]]+:[[:alnum:]]*:' /etc/inittab 2/dev/null
|| echo 0)
+if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) -a
$icount -gt 6 ; then
if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i'
/sbin/sysvinit); then
/sbin/telinit u
fi
+elif test $icount -le 6 ; then
+ echo 'Broken /etc/inittab found, installing and using %{name} make no
sense!' 12
+ ret=1
fi
fi
if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
fi
+exit $ret
%postun tools
%restart_on_update powerd
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2013-03-05 06:50:59
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-09-14
12:39:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2013-03-05
06:51:01.0 +0100
@@ -1,0 +2,6 @@
+Mon Mar 4 16:16:45 UTC 2013 - co...@suse.com
+
+- move mkinitrd scripts of blogs to sysvinit-init, it's breaking
+ systemd/plymouth (bnc#804458)
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.5Bvkc0/_old 2013-03-05 06:51:03.0 +0100
+++ /var/tmp/diff_new_pack.5Bvkc0/_new 2013-03-05 06:51:03.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -241,8 +241,6 @@
fi
fi
fi
-
-%post tools
if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
fi
@@ -250,6 +248,8 @@
%postun tools
%restart_on_update powerd
%insserv_cleanup
+
+%postun
if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
fi
@@ -279,6 +279,11 @@
%doc %{_mandir}/man8/runlevel.8.gz
%doc %{_mandir}/man8/shutdown.8.gz
%doc %{_mandir}/man8/telinit.8.gz
+%dir /lib/mkinitrd
+%dir /lib/mkinitrd/scripts
+/lib/mkinitrd/scripts/boot-blogd.sh
+/lib/mkinitrd/scripts/boot-killblogd.sh
+/lib/mkinitrd/scripts/boot-killblogd2.sh
%files tools
%defattr (-,root,root,755)
@@ -290,11 +295,6 @@
%doc doc/powerd
%endif
%config /etc/pam.d/init
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/boot-blogd.sh
-/lib/mkinitrd/scripts/boot-killblogd.sh
-/lib/mkinitrd/scripts/boot-killblogd2.sh
/bin/mountpoint
/bin/pidof
/bin/usleep
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2012-09-14 12:39:32 Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) Package is sysvinit, Maintainer is wer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-08-12 15:29:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-09-14 12:39:35.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 17 11:48:35 UTC 2012 - wer...@suse.de + +- Added patch from Roger Leigh to correct the manual page of startpar + +--- Other differences: -- ++ startpar-0.58.dif ++ --- /var/tmp/diff_new_pack.zKvEbe/_old 2012-09-14 12:39:37.0 +0200 +++ /var/tmp/diff_new_pack.zKvEbe/_new 2012-09-14 12:39:37.0 +0200 @@ -1,4 +1,31 @@ .#empty -+++ .#empty2012-01-30 17:44:30.343145442 + -@@ -0,0 +1 @@ -+Place holder +--- startpar.8 startpar.8 2012-04-09 13:25:33.0 + +@@ -1,4 +1,4 @@ +-.\ ++'\ e + .\ SuSE man page for startpar + .\ + .\ Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. +@@ -62,13 +62,19 @@ option, the default is full parallelism. + the scripts can be provided with the + .B \-a + option. +-Processes block by pending ++Processes blocked by pending + .B I/O +-will weighting by the factor ++will cause new process creation to be weighted by the iorate factor + .IR 800 . + To change this factor the option + .B \-i +-can be used to specify an other value. ++can be used to specify another value. The amount ++.EQ ++weight = (nblocked times iorate) / 1000 ++.EN ++will be subtracted from the total number of processes which could be ++started, where nblocked is the number of processes currently blocked ++by pending I/O. + + The output of each script is buffered and written when the script + exits, so output lines of different scripts won't mix. You can -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-08-12 15:29:23
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-08-04
13:34:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-08-12
15:29:25.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 10 12:44:29 UTC 2012 - wer...@suse.de
+
+- Increase daemon detection time in startproc to give started
+ process the time to daemonize (bnc#757643)
+
+---
Other differences:
--
++ killproc-2.21.dif ++
--- /var/tmp/diff_new_pack.Qu5ZPp/_old 2012-08-12 15:29:28.0 +0200
+++ /var/tmp/diff_new_pack.Qu5ZPp/_new 2012-08-12 15:29:28.0 +0200
@@ -18,3 +18,14 @@
const size_t nlen = strlen(point);
MNTINFO *restrict p;
if (posix_memalign((void*)p, sizeof(void*), alignof(MNTINFO)+(nlen+1))
!= 0) {
+--- startproc.c
startproc.c2012-08-10 12:43:56.136510304 +
+@@ -778,7 +778,7 @@ retry:
+* to see a process damage.
+*/
+ usleep(10*1000);/* 10 ms time for the child and its child */
+- if (++n 10)
++ if (++n 50)
+ goto retry;
+ break;
+ default:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-08-04 13:34:45
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-06-25
14:56:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-08-04
13:34:46.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 2 13:58:11 UTC 2012 - wer...@suse.de
+
+- Add fix/workaround in blogd for new glibc internal pthread API to
+ avoid an glibc nptl assert report in bnc#772055
+
+---
New:
showconsole-1.16-glibc.dif
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.1O3tXe/_old 2012-08-04 13:34:52.0 +0200
+++ /var/tmp/diff_new_pack.1O3tXe/_new 2012-08-04 13:34:52.0 +0200
@@ -16,7 +16,6 @@
#
-
Name: sysvinit
%define PDVER 2.0.2
%define KPVER 2.21
@@ -61,6 +60,7 @@
Patch30:killproc-%{KPVER}.dif
Patch40:showconsole-%{SCVER}.dif
Patch41:showconsole-1.16-deadlock.diff
+Patch42:showconsole-1.16-glibc.dif
Patch50:startpar-%{START}.dif
Requires: mingetty
Requires: sysvinit-tools
@@ -129,6 +129,7 @@
pushd ../showconsole-%{SCVER}
%patch40
%patch41 -p1
+%patch42 -p0
ln -t../%{name}-%{SIVER}dsf/doc/showconsole README
popd
pushd ../startpar-%{START}
++ showconsole-1.16-glibc.dif ++
--- libconsole.c
+++ libconsole.c2012-08-02 11:45:26.456510085 +
@@ -358,7 +358,9 @@ static void sigio(int sig)
*/
typedef struct _mutex {
-int locked;
+volatile int locked;
+volatile int canceled;
+volatile int used;
pthread_mutex_t mutex;
pthread_t thread;
} mutex_t;
@@ -380,8 +382,8 @@ static inline void unlock(mutex_t *mutex
}
}
-static mutex_t llock = { 0, PTHREAD_MUTEX_INITIALIZER, 0 };
-static mutex_t ljoin = { 0, PTHREAD_MUTEX_INITIALIZER, 0 };
+static mutex_t llock = { 0, 0, 1, PTHREAD_MUTEX_INITIALIZER, 0 };
+static mutex_t ljoin = { 0, 0, 1, PTHREAD_MUTEX_INITIALIZER, 0 };
static pthread_cond_t lcond = PTHREAD_COND_INITIALIZER;
static pthread_tlthread;
static volatile int running;
@@ -429,10 +431,14 @@ xout:
static inline void writelog(void)
{
+int oldstate;
+
+pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, oldstate);
lock(llock);
if (!flog) { /* log file closed, reset buffer */
resetlog();
unlock(llock);
+ pthread_setcancelstate(oldstate, NULL);
return;
}
clearerr(flog);
@@ -468,11 +474,12 @@ static inline void writelog(void)
fflush(flog);
fdatasync(fileno(flog));
}
+pthread_setcancelstate(oldstate, NULL);
}
static inline void flushlog(void)
{
-if (running) pthread_cond_broadcast(lcond);
+if (ljoin.canceled == 0) pthread_cond_broadcast(lcond);
}
static inline int poll(int msec, mutex_t *outer)
@@ -495,11 +502,13 @@ static inline int poll(int msec, mutex_t
abstime.tv_nsec = now.tv_usec * 1000;
do {
- int locked = outer-locked;
/* Note: pthread_cond_timedwait() atomically unlocks the mutex
*/
- outer-locked = 0;
- err = pthread_cond_timedwait(lcond, outer-mutex, abstime);
- outer-locked = locked;
+ if (outer-canceled == 0) {
+ volatile int locked = outer-locked;
+ outer-locked = 0;
+ err = pthread_cond_timedwait(lcond, outer-mutex,
abstime);
+ outer-locked = locked;
+ }
} while (err == EINTR);
if (err == ETIMEDOUT || err == EBUSY)
@@ -507,9 +516,9 @@ static inline int poll(int msec, mutex_t
}
#if 0
} else {
- unlock(ljoin);
+ unlock(outer-mutex);
pthread_yield();
- lock(ljoin);
+ lock(outer-mutex);
#endif
}
@@ -789,6 +798,7 @@ static void *action(void *dummy attribut
unlock(ljoin);
(void)pthread_sigmask(SIG_SETMASK, save_oldset, NULL);
+ljoin.used = 0;
return NULL;
}
@@ -1004,6 +1014,8 @@ void closeIO(void)
(void)tcdrain(c-fd); /* Hold in sync with console */
}
+flushlog();
+
do {
/*
* Repeat this as long as required,
@@ -1020,14 +1032,19 @@ void closeIO(void)
more_input(timeout, 1);
(void)tcdrain(fdread);
+ flushlog();
+
} while (timeout.tv_sec || timeout.tv_nsec);
if (running) {
lock(ljoin);
running = 0;
unlock(ljoin);
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-06-25 14:41:01
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-05-25
16:19:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-06-25
14:56:14.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 21 07:16:05 UTC 2012 - lnus...@suse.de
+
+- fix deadlock in blogd that happens on shutdown (bnc#730193)
+
+---
New:
showconsole-1.16-deadlock.diff
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.dYt8sl/_old 2012-06-25 14:56:16.0 +0200
+++ /var/tmp/diff_new_pack.dYt8sl/_new 2012-06-25 14:56:16.0 +0200
@@ -16,6 +16,7 @@
#
+
Name: sysvinit
%define PDVER 2.0.2
%define KPVER 2.21
@@ -59,6 +60,7 @@
Patch21:powerd-%{PDVER}-getaddrinfo.patch
Patch30:killproc-%{KPVER}.dif
Patch40:showconsole-%{SCVER}.dif
+Patch41:showconsole-1.16-deadlock.diff
Patch50:startpar-%{START}.dif
Requires: mingetty
Requires: sysvinit-tools
@@ -126,6 +128,7 @@
popd
pushd ../showconsole-%{SCVER}
%patch40
+%patch41 -p1
ln -t../%{name}-%{SIVER}dsf/doc/showconsole README
popd
pushd ../startpar-%{START}
++ showconsole-1.16-deadlock.diff ++
From 05c3f60fe02370f4c8d15b996bcc8d6f3dc57e12 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel ludwig.nus...@suse.de
Date: Thu, 21 Jun 2012 09:09:19 +0200
Subject: [PATCH] fix deadlock
writelog() must not call pthread_yield() with the lock held that the
main thread tries to get to cancel the writer thread. writelog()
on the other hand needs to empty the buffer always to make sure
poll() blocks again an doesn't cause a loop.
---
libconsole.c | 25 +
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/libconsole.c b/libconsole.c
index b962032..54b353a 100644
--- a/libconsole.c
+++ b/libconsole.c
@@ -429,21 +429,28 @@ xout:
static inline void writelog(void)
{
-if (!flog)
+lock(llock);
+if (!flog) { /* log file closed, reset buffer */
+ resetlog();
+ unlock(llock);
return;
+}
clearerr(flog);
-lock(llock);
while (avail 0) {
size_t ret = (size_t)avail;
if (avail TRANS_BUFFER_SIZE)
ret = TRANS_BUFFER_SIZE;
- if (!flog || nsigsys)
+ if (!flog || nsigsys) { /* log file closed, reset buffer */
+ resetlog();
break;
+ }
ret = fwrite(head, sizeof(unsigned char), ret, flog);
- if (!ret ferror(flog))
+ if (!ret ferror(flog)) { /* cannot write anymore, reset buffer */
+ resetlog();
break;
+ }
head += ret;
if (head = tail) { /* empty, reset buffer */
@@ -498,8 +505,13 @@ static inline int poll(int msec, mutex_t *outer)
if (err == ETIMEDOUT || err == EBUSY)
ret = 0;
}
-} else
+#if 0
+} else {
+ unlock(ljoin);
pthread_yield();
+ lock(ljoin);
+#endif
+}
return ret;
}
@@ -772,9 +784,6 @@ static void *action(void *dummy attribute((unused)))
if (!poll(30, ljoin))
continue;
- if (!flog)
- break;
-
writelog();
}
unlock(ljoin);
--
1.7.7
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-05-25 16:18:59
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-05-08
06:50:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-05-25
16:19:59.0 +0200
@@ -1,0 +2,6 @@
+Wed May 23 10:45:13 UTC 2012 - wer...@suse.de
+
+- Fix parameter turner in fscanf to really detect the file system
+ type in startproc/checkproc/killproc (bnc#762489)
+
+---
Other differences:
--
++ killproc-2.21.dif ++
--- /var/tmp/diff_new_pack.6WIdr0/_old 2012-05-25 16:20:02.0 +0200
+++ /var/tmp/diff_new_pack.6WIdr0/_new 2012-05-25 16:20:02.0 +0200
@@ -1,4 +1,20 @@
.#empty
-+++ .#empty2012-01-30 17:44:30.343145442 +
-@@ -0,0 +1 @@
-+Place holder
+--- libinit.c
libinit.c 2012-05-23 11:04:58.370146656 +
+@@ -265,7 +265,7 @@ static inline boolean isnetfs(const char
+ static void init_mounts(void)
+ {
+ char point[PATH_MAX+1];
+-char fstype[126];
++char fstype[257];
+ struct stat st;
+ int mid, parid, max = 0;
+ uint maj, min;
+@@ -280,7 +280,7 @@ static void init_mounts(void)
+
+ if ((mnt = fopen(/proc/self/mountinfo, re)) == (FILE*)0)
+ return;
+-while (fscanf(mnt, %i %i %u:%u %*s %s %*s - %*s %s %*[^\n], mid,
parid, maj, min, point[0], fstype[0]) == 6) {
++while (fscanf(mnt, %i %i %u:%u %*s %s %*s - %s %*s %*[^\n], mid,
parid, maj, min, point[0], fstype[0]) == 6) {
+ const size_t nlen = strlen(point);
+ MNTINFO *restrict p;
+ if (posix_memalign((void*)p, sizeof(void*), alignof(MNTINFO)+(nlen+1))
!= 0) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-05-08 06:48:55
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-04-20
15:21:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-05-08
06:50:14.0 +0200
@@ -1,0 +2,7 @@
+Fri May 4 12:47:47 UTC 2012 - wer...@suse.de
+
+- Add two patch from upstream
+ + Avoid crash for exported environment for processes init spawns
+- Fix typo as the script for powerd (bnc#758920)
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.Tcb9ir/_old 2012-05-08 06:50:16.0 +0200
+++ /var/tmp/diff_new_pack.Tcb9ir/_new 2012-05-08 06:50:16.0 +0200
@@ -60,8 +60,8 @@
Patch30:killproc-%{KPVER}.dif
Patch40:showconsole-%{SCVER}.dif
Patch50:startpar-%{START}.dif
-Requires: sysvinit-tools
Requires: mingetty
+Requires: sysvinit-tools
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -227,7 +227,7 @@
chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
%preun tools
-%stop_on_removal powered
+%stop_on_removal powerd
%post
if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d
/proc/1/root -a ! -d /.build -a -x /sbin/init; then
@@ -244,7 +244,7 @@
fi
%postun tools
-%restart_on_update powered
+%restart_on_update powerd
%insserv_cleanup
if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
++ sysvinit-2.88+dsf-env.patch ++
--- /var/tmp/diff_new_pack.Tcb9ir/_old 2012-05-08 06:50:16.0 +0200
+++ /var/tmp/diff_new_pack.Tcb9ir/_new 2012-05-08 06:50:16.0 +0200
@@ -1,8 +1,6 @@
-Index: src/init.c
-===
src/init.c (revision 113)
-+++ src/init.c (working copy)
-@@ -248,7 +248,7 @@ void *imalloc(size_t size)
+--- src/init.c
src/init.c 2012-05-04 13:56:17.470065199 +0200
+@@ -252,7 +252,7 @@ void *imalloc(size_t size)
}
static
@@ -11,7 +9,7 @@
{
char*m;
int l;
-@@ -880,6 +880,27 @@ void initlog(int loglevel, char *s, ...)
+@@ -884,6 +884,27 @@ void initlog(int loglevel, char *s, ...)
}
}
@@ -39,7 +37,7 @@
/*
*Build a new environment for execve().
-@@ -888,7 +909,7 @@ char **init_buildenv(int child)
+@@ -892,35 +913,40 @@ char **init_buildenv(int child)
{
chari_lvl[] = RUNLEVEL=x;
chari_prev[] = PREVLEVEL=x;
@@ -48,17 +46,20 @@
chari_shell[] = SHELL= SHELL;
char**e;
int n, i;
-@@ -898,25 +919,30 @@ char **init_buildenv(int child)
- n += NR_EXTRA_ENV;
+
+ for (n = 0; environ[n]; n++)
+ ;
+- n += NR_EXTRA_ENV;
++ n += NR_EXTRA_ENV + 1; /* Also room for last NULL */
if (child)
n += 8;
- e = calloc(n, sizeof(char *));
-
++
+ while ((e = (char**)calloc(n, sizeof(char *))) == NULL) {
+ initlog(L_VB, out of memory);
+ do_sleep(5);
+ }
-+
+
for (n = 0; environ[n]; n++)
e[n] = istrdup(environ[n]);
@@ -87,7 +88,7 @@
}
e[n++] = NULL;
-@@ -2133,41 +2159,46 @@ void fifo_new_level(int level)
+@@ -2146,41 +2172,46 @@ void fifo_new_level(int level)
static
void initcmd_setenv(char *data, int size)
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-04-20 15:20:22
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-03-20
11:36:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-04-20
15:21:30.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 16 08:18:25 UTC 2012 - mvysko...@suse.cz
+
+- add mingetty to Requires
+ * remove it as dependency from aaa_base ad it's needed for sysvinit only
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.cB9Re4/_old 2012-04-20 15:21:34.0 +0200
+++ /var/tmp/diff_new_pack.cB9Re4/_new 2012-04-20 15:21:34.0 +0200
@@ -61,6 +61,7 @@
Patch40:showconsole-%{SCVER}.dif
Patch50:startpar-%{START}.dif
Requires: sysvinit-tools
+Requires: mingetty
%description
System V style init programs by Miquel van Smoorenburg that control the
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-03-20 11:36:15
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-03-02
13:50:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-03-20
11:36:17.0 +0100
@@ -1,0 +2,10 @@
+Fri Mar 16 16:51:33 UTC 2012 - wer...@suse.de
+
+- Add two patch from upstream
+ + Handle deleted binaries in pidof (was upstream bug #34992)
+ + Allow init to delte extra environment variables (was upstream
+bug #35858)
+ + Avoid that init double environment variables for its childs
+(was upstream bug #35855)
+
+---
New:
sysvinit-2.88+dsf-dostat.patch
sysvinit-2.88+dsf-env.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.EAbMiK/_old 2012-03-20 11:36:19.0 +0100
+++ /var/tmp/diff_new_pack.EAbMiK/_new 2012-03-20 11:36:19.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: sysvinit
%define PDVER 2.0.2
@@ -24,13 +22,16 @@
%define SCVER 1.16
%define SIVER 2.88+
%define START 0.58
-License:GPL-2.0+
-Group: System/Base
Version:%{SIVER}
-Release:58
+Release:0
Summary:SysV-Style init
+License:GPL-2.0+
+Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
+BuildRequires: audit-devel
+BuildRequires: libselinux-devel
+BuildRequires: libsepol-devel
+BuildRequires: pam-devel
Url:http://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}dsf.tar.bz2
Source2:killproc-%{KPVER}.tar.bz2
@@ -52,6 +53,8 @@
Patch7: %{name}-%{version}dsf-crypt.patch
Patch8: %{name}-%{version}dsf-blowfish.dif
Patch9: %{name}-2.88dsf-no-kill.patch
+Patch10:%{name}-%{version}dsf-env.patch
+Patch11:%{name}-%{version}dsf-dostat.patch
Patch20:powerd-%{PDVER}.dif
Patch21:powerd-%{PDVER}-getaddrinfo.patch
Patch30:killproc-%{KPVER}.dif
@@ -71,6 +74,7 @@
%package tools
Summary:Tools for basic booting
+Group: System/Base
%if 0%{suse_version} 1120
Requires(preun): coreutils %insserv_prereq
Requires(postun): coreutils %insserv_prereq
@@ -85,6 +89,7 @@
%package init
Summary:Provides /sbin/init for sysvinit
+Group: System/Base
Provides: sbin_init
Conflicts: otherproviders(sbin_init)
Requires: %{name}
@@ -103,6 +108,8 @@
%patch7 -p0 -b .crypt
%patch8 -p0 -b .blowfish
%patch9 -p0 -b .no-kill
+%patch10 -p0 -b .env
+%patch11 -p0 -b .dostat
%patch
pushd doc
mkdir killproc powerd showconsole
++ sysvinit-2.88+dsf-dostat.patch ++
Index: src/killall5.c
===
--- src/killall5.c (revision 114)
+++ src/killall5.c (working copy)
@@ -638,8 +638,32 @@ int readproc(int do_stat)
if ((p-nfs = check4nfs(path, buf)))
goto link;
case DO_STAT:
- if (stat(path, st) != 0)
+ if (stat(path, st) != 0) {
+ char * ptr;
+
+ len = readlink(path, buf, PATH_MAX);
+ if (len = 0)
+ break;
+ buf[len] = '\0';
+
+ ptr = strstr(buf, (deleted));
+ if (!ptr)
+ break;
+ *ptr = '\0';
+ len -= strlen( (deleted));
+
+ if (stat(buf, st) != 0)
+ break;
+ p-dev = st.st_dev;
+ p-ino = st.st_ino;
+ p-pathname = (char *)xmalloc(len + 1);
+ memcpy(p-pathname,
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-03-02 13:50:11
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-02-08
17:20:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-03-02
13:50:12.0 +0100
@@ -6,0 +7,6 @@
+Wed Feb 1 12:01:05 UTC 2012 - wer...@suse.de
+
+- Avoid useless check for runlevel as access(2) now works on
+ kernel 3.0 and above, this fixes bnc#744538
+
+---
Other differences:
--
++ showconsole-1.16.dif ++
--- /var/tmp/diff_new_pack.FDYML1/_old 2012-03-02 13:50:14.0 +0100
+++ /var/tmp/diff_new_pack.FDYML1/_new 2012-03-02 13:50:14.0 +0100
@@ -1,4 +1,19 @@
.#empty
-+++ .#empty2012-01-30 17:44:30.343145442 +
-@@ -0,0 +1 @@
-+Place holder
+--- libconsole.c
libconsole.c 2012-03-01 09:49:44.493932912 +
+@@ -902,16 +902,6 @@ void safeIO (void)
+ #ifdef DEBUG_SIGIO
+ if (nsigio 0)
+ goto skip;
+-#else
+- if (nsigio 0) {
+- /*
+- * Maybe access() does lie under kernel 2.6
+- * or the root file system is rw mounted
+- */
+- const char *runlevel = getenv(RUNLEVEL);
+- if (runlevel (*runlevel '0' || *runlevel '6'))
+- goto skip;
+- }
+ #endif
+ if (access(BOOT_LOGFILE, W_OK) 0) {
+ if (errno != ENOENT errno != EROFS)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2012-02-08 17:20:50
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes2012-02-01
11:54:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-02-08
17:20:51.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb 8 12:35:24 UTC 2012 - wer...@suse.de
+
+- Work around dully check script of obs
+
+---
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.bLC10n/_old 2012-02-08 17:20:53.0 +0100
+++ /var/tmp/diff_new_pack.bLC10n/_new 2012-02-08 17:20:53.0 +0100
@@ -32,7 +32,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
Url:http://savannah.nongnu.org/projects/sysvinit/
-Source:
http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{SIVER}dsf.tar.bz2
+Source: sysvinit-%{SIVER}dsf.tar.bz2
Source2:killproc-%{KPVER}.tar.bz2
Source3:powerd-%{PDVER}.tar.bz2
Source4:showconsole-%{SCVER}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2011-12-06 19:07:07
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
Package is sysvinit, Maintainer is wer...@suse.com
Changes:
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.cglWaw/_old 2011-12-06 19:41:19.0 +0100
+++ /var/tmp/diff_new_pack.cglWaw/_new 2011-12-06 19:41:19.0 +0100
@@ -25,7 +25,7 @@
%define SCVER 1.15
%define SIVER 2.88+
%define START 0.57
-License:GPLv2+
+License:GPL-2.0+
Group: System/Base
Version:%{SIVER}
Release:58
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Tue Oct 18 14:31:03 CEST 2011.
--- openSUSE:Factory/sysvinit/sysvinit.changes 2011-10-11 18:00:01.0
+0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-10-18
11:33:06.0 +0200
@@ -1,0 +2,13 @@
+Tue Oct 18 09:30:36 UTC 2011 - wer...@suse.de
+
+- Add option -x to be able to identify scripts overwriting their
+ command line (bnc#723708)
+
+---
+Mon Oct 17 09:08:36 UTC 2011 - wer...@suse.de
+
+- There was never a version 1.16 for showconsole
+- Add some code to be able to detect programs even as user with
+ kernel 3.0 and above (bnc#723072)
+
+---
calling whatdependson for head-i586
Old:
showconsole-1.16.dif
showconsole-1.16.tar.gz
New:
showconsole-1.15.dif
showconsole-1.15.tar.bz2
sysvinit-2.88dsf-scripts2.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.sMUCf4/_old 2011-10-18 14:30:59.0 +0200
+++ /var/tmp/diff_new_pack.sMUCf4/_new 2011-10-18 14:30:59.0 +0200
@@ -22,7 +22,7 @@
%define MGVER 0.9.6s
%define PDVER 2.0.2
%define KPVER 2.20
-%define SCVER 1.16
+%define SCVER 1.15
%define SIVER 2.88+
%define START 0.57
License:GPLv2+
@@ -36,7 +36,7 @@
Source:
http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{SIVER}dsf.tar.bz2
Source2:killproc-%{KPVER}.tar.bz2
Source3:powerd-%{PDVER}.tar.bz2
-Source4:showconsole-%{SCVER}.tar.gz
+Source4:showconsole-%{SCVER}.tar.bz2
Source5:startpar-%{START}.tar.bz2
Source6:rc.powerd
Source7:%{name}-rpmlintrc
@@ -46,12 +46,13 @@
Patch: %{name}-%{version}dsf.dif
Patch1: %{name}-2.82-startstop.patch
Patch2: %{name}-2.88dsf-suse.patch
-Patch3: %{name}-2.88dsf-no-kill.patch
+Patch3: %{name}-2.88dsf-scripts2.patch
Patch4: notify-pam-dead.patch
Patch5: %{name}-2.88dsf-multiple-sulogin.patch
Patch6: %{name}-%{version}dsf-run.diff
Patch7: %{name}-%{version}dsf-crypt.patch
Patch8: %{name}-%{version}dsf-blowfish.dif
+Patch9: %{name}-2.88dsf-no-kill.patch
Patch20:powerd-%{PDVER}.dif
Patch21:powerd-%{PDVER}-getaddrinfo.patch
Patch30:killproc-%{KPVER}.dif
@@ -96,12 +97,13 @@
%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5
%patch1 -p0 -b .startstop
%patch2 -p0 -b .suse
-%patch3 -p0 -b .no-kill
+%patch3 -p0 -b .scripts2
%patch4 -p0 -b .pam
%patch5 -p0 -b .sulogin
%patch6 -p0 -b .run
%patch7 -p0 -b .crypt
%patch8 -p0 -b .blowfish
+%patch9 -p0 -b .no-kill
%patch
pushd doc
mkdir killproc powerd showconsole
++ killproc-2.20.dif ++
--- /var/tmp/diff_new_pack.sMUCf4/_old 2011-10-18 14:30:59.0 +0200
+++ /var/tmp/diff_new_pack.sMUCf4/_new 2011-10-18 14:30:59.0 +0200
@@ -1,4 +1,282 @@
.#nothing
-+++ .#nothing 2011-09-01 11:59:52.0 +
-@@ -0,0 +1 @@
-+Please remove if patched
+--- checkproc.8
checkproc.82011-10-18 09:29:16.195166916 +
+@@ -17,6 +17,7 @@ Pidofproc \- Checks for a process by exe
+ .HP
+ .B checkproc
+ .RB [ \-vLkNz ]
++.RB [ \-x ]
+ .RB [ \-p\ \fIpid_file\fP ]
+ .RB [ \-i\ \fIingnore_file\fP ]
+ .RB [ \-c\ \fIroot\fP ]
+@@ -30,10 +31,12 @@ Pidofproc \- Checks for a process by exe
+ .B checkproc
+ .B \ \
+ .RB [ \-vk ]
++.RB [ \-x ]
+ .I basename_of_executable
+ .HP
+ .B pidofproc
+ .RB [ \-LkNz ]
++.RB [ \-x ]
+ .RB [ \-p\ \fIpid_file\fP ]
+ .RB [ \-i\ \fIingnore_file\fP ]
+ .RB [ \-c\ \fIroot\fP ]
+@@ -47,6 +50,7 @@ Pidofproc \- Checks for a process by exe
+ .B pidofproc
+ .B \ \
+ .RB [ \-k ]
++.RB [ \-x ]
+ .I basename_of_executable
+ .SH SYNOPSIS LSB 3.1
+ .HP
+@@ -250,6 +254,15 @@ are in the zombie state. Without this o
+ handled as not existent because such a process isn't
+ alive but listed in the process table and waits on its
+ parent process.
++.TP
++.B \-x
++Tells
++.B checkproc
++as well as
++.B pidofproc
++to use the upto 15 byte long filename name found in
++.I /proc/pid/stat
++to be able to identify scripts overwriting their command line.
+ .PP
+ .\
+ .SH EXAMPLE
+--- checkproc.c
checkproc.c2011-10-17 15:41:46.671646382 +
+@@ -60,7 +60,7 @@ int main(int argc, char **argv)
+ posixa = getenv(_POSIX_OPTION_ORDER); unsetenv(_POSIX_OPTION_ORDER);
+ posixb = getenv(POSIXLY_CORRECT); unsetenv(POSIXLY_CORRECT);
+ opterr = 0;
+-while ((c = getopt(argc, argv, c:kp:nNhqvzLi:)) != -1) {
++while ((c = getopt(argc, argv, c:kp:nNhqvzLi:x)) != -1) {
+ switch (c) {
+ case 'c':
+ if (optarg optarg[0] != '-' !root) {
+@@ -86,6 +86,9 @@ int main(int argc, char
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Tue Oct 11 18:00:01 CEST 2011.
--- openSUSE:Factory/sysvinit/sysvinit.changes 2011-10-04 18:15:13.0
+0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-10-11
15:59:17.0 +0200
@@ -1,0 +2,18 @@
+Tue Oct 11 13:46:46 UTC 2011 - co...@suse.com
+
+- do not telinit u if /sbin/init is not sysvinit
+
+---
+Tue Oct 11 11:04:56 UTC 2011 - co...@suse.com
+
+- split out the symlink /sbin/init into a special subpackage,
+ which does _NOT_ do a split provide. systemd-sysvinit will
+ provide this, so you need to do extra work if you want to stay
+ on sysvinit
+
+---
+Tue Oct 11 10:16:45 UTC 2011 - co...@suse.com
+
+- remove unused files
+
+---
calling whatdependson for head-i586
Old:
killproc-2.20.tar.gz
showconsole-1.15.dif
showconsole-1.15.tar.bz2
showconsole-1.15.tar.gz
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.qq6AhW/_old 2011-10-11 17:59:58.0 +0200
+++ /var/tmp/diff_new_pack.qq6AhW/_new 2011-10-11 17:59:58.0 +0200
@@ -27,7 +27,6 @@
%define START 0.57
License:GPLv2+
Group: System/Base
-AutoReqProv:on
Version:%{SIVER}
Release:58
Summary:SysV-Style init
@@ -59,7 +58,6 @@
Patch40:showconsole-%{SCVER}.dif
Patch50:startpar-%{START}.dif
Requires: sysvinit-tools
-Provides: sbin_init
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -72,9 +70,7 @@
more information.
%package tools
-License:GPLv2+
Summary:Tools for basic booting
-Group: System/Base
%if 0%{suse_version} 1120
Requires(preun): coreutils %insserv_prereq
Requires(postun): coreutils %insserv_prereq
@@ -87,6 +83,15 @@
to startpar, killproc and pidof. System V init specific programs are in the
sysvinit package.
+%package init
+Summary:Provides /sbin/init for sysvinit
+Provides: sbin_init
+Conflicts: otherproviders(sbin_init)
+Requires: %{name}
+
+%description init
+Just some symlinks
+
%prep
%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5
%patch1 -p0 -b .startstop
@@ -157,6 +162,11 @@
mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5
mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT}
WITH_SELINUX=yes DISTRO=SuSE
+ mv ${RPM_BUILD_ROOT}/sbin/init ${RPM_BUILD_ROOT}/sbin/sysvinit
+ ln -s /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/init
+ mkdir -p ${RPM_BUILD_ROOT}/lib/sysvinit
+ ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/lib/sysvinit/telinit
+ ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/telinit
test -p ${RPM_BUILD_ROOT}/dev/initctl || {
rm -f ${RPM_BUILD_ROOT}/dev/initctl
mknod ${RPM_BUILD_ROOT}/dev/initctl p
@@ -208,10 +218,12 @@
%stop_on_removal powered
%post
-if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d
/proc/1/root -a ! -d /.build ; then
-if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then
+if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d
/proc/1/root -a ! -d /.build -a -x /sbin/init; then
+if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root); then
+ if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i'
/sbin/sysvinit); then
/sbin/telinit u
fi
+fi
fi
%post tools
@@ -225,12 +237,14 @@
mkinitrd_setup
fi
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
%files
%defattr (-,root,root,755)
-%config /etc/pam.d/init
+/sbin/sysvinit
+%dir /lib/sysvinit
+/lib/sysvinit/telinit
+
+%files init
+%defattr (-,root,root,755)
/sbin/halt
/sbin/init
/sbin/poweroff
@@ -257,6 +271,7 @@
%config /etc/init.d/powerd
%doc doc/powerd
%endif
+%config /etc/pam.d/init
%dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/boot-blogd.sh
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Tue Oct 4 18:15:13 CEST 2011.
--- openSUSE:Factory/sysvinit/sysvinit.changes 2011-10-02 11:16:21.0
+0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-10-04
10:52:23.0 +0200
@@ -1,0 +2,5 @@
+Tue Oct 4 08:51:19 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc, %configure macros
+
+---
calling whatdependson for head-i586
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.siwtV1/_old 2011-10-04 18:15:10.0 +0200
+++ /var/tmp/diff_new_pack.siwtV1/_new 2011-10-04 18:15:10.0 +0200
@@ -123,25 +123,25 @@
%build
RPM_OPT_FLAGS=${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64 -pipe
- CC=gcc
+ CC=%__cc
export RPM_OPT_FLAGS CC
make %{?_smp_mflags} WITH_SELINUX=yes DISTRO=SuSE
pushd ../showconsole-%{SCVER}
- make %{?_smp_mflags}
+ make %{?_smp_mflags} CC=%__cc
popd
pushd ../killproc-%{KPVER}
- make %{?_smp_mflags} INC=-I../showconsole-%{SCVER}
-L../showconsole-%{SCVER}
+ make %{?_smp_mflags} INC=-I../showconsole-%{SCVER}
-L../showconsole-%{SCVER} CC=%__cc
popd
pushd ../powerd-%{PDVER}
%ifnarch s390 s390x
- ./configure --prefix= --bindir='$(DESTDIR)/sbin' \
+ %configure --prefix= --bindir='$(DESTDIR)/sbin' \
--mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin'
make %{?_smp_mflags} CFLAGS=-I../sysvinit-%{SIVER}dsf/src $RPM_OPT_FLAGS
%endif
popd
pushd ../startpar-%{START}
- make %{?_smp_mflags} INC=-I../showconsole-%{SCVER}
-L../showconsole-%{SCVER}
+ make %{?_smp_mflags} INC=-I../showconsole-%{SCVER}
-L../showconsole-%{SCVER} CC=%__cc
popd
%install
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Mon Sep 5 17:54:44 CEST 2011.
--- sysvinit/sysvinit.changes 2011-08-01 16:48:32.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-09-02
17:44:26.0 +0200
@@ -1,0 +2,7 @@
+Fri Sep 2 15:43:20 UTC 2011 - wer...@suse.de
+
+- Update to killproc-2.20
+- Update to showconsole-1.15
+- Clean spec file
+
+---
calling whatdependson for head-i586
Old:
killproc-2.19.dif
killproc-2.19.tar.bz2
showconsole-1.14.dif
showconsole-1.14.tar.bz2
New:
killproc-2.20.dif
killproc-2.20.tar.bz2
showconsole-1.15.dif
showconsole-1.15.tar.bz2
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.XKBXyu/_old 2011-09-05 17:54:28.0 +0200
+++ /var/tmp/diff_new_pack.XKBXyu/_new 2011-09-05 17:54:28.0 +0200
@@ -21,23 +21,23 @@
Name: sysvinit
%define MGVER 0.9.6s
%define PDVER 2.0.2
-%define KPVER 2.19
-%define SCVER 1.14
+%define KPVER 2.20
+%define SCVER 1.15
%define SIVER 2.88+
%define START 0.57
License:GPLv2+
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:58
+Release:60
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
Url:http://savannah.nongnu.org/projects/sysvinit/
Source:
http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88+dsf.tar.bz2
-Source2:killproc-2.19.tar.bz2
+Source2:killproc-2.20.tar.bz2
Source3:powerd-2.0.2.tar.bz2
-Source4:showconsole-1.14.tar.bz2
+Source4:showconsole-1.15.tar.bz2
Source5:startpar-0.57.tar.bz2
Source6:rc.powerd
Source7:sysvinit-rpmlintrc
@@ -55,8 +55,8 @@
Patch8: sysvinit-2.88+dsf-blowfish.dif
Patch20:powerd-2.0.2.dif
Patch21:powerd-2.0.2-getaddrinfo.patch
-Patch30:killproc-2.19.dif
-Patch40:showconsole-1.14.dif
+Patch30:killproc-2.20.dif
+Patch40:showconsole-1.15.dif
Patch50:startpar-0.57.dif
Requires: sysvinit-tools
Provides: sbin_init
@@ -98,15 +98,21 @@
%patch7 -p0 -b .crypt
%patch8 -p0 -b .blowfish
%patch
+pushd doc
+ mkdir killproc powerd showconsole
+popd
pushd ../powerd-%{PDVER}
%patch20
%patch21
+ln -t ../sysvinit-%{SIVER}dsf/doc/powerd README SUPPORTED FAQ
powerd.conf.monitor powerd.conf.peer
popd
pushd ../killproc-%{KPVER}
%patch30
+ln -t ../sysvinit-%{SIVER}dsf/doc/killproc README
popd
pushd ../showconsole-%{SCVER}
%patch40
+ln -t ../sysvinit-%{SIVER}dsf/doc/showconsole README
popd
pushd ../startpar-%{START}
%patch50
@@ -165,9 +171,6 @@
pushd ../powerd-%{PDVER}
%ifnarch s390 s390x
make install DESTDIR=${RPM_BUILD_ROOT}
- cp README README.powerd
- cp SUPPORTED SUPPORTED.powerd
- cp FAQ FAQ.powerd
echo '# ' ${RPM_BUILD_ROOT}/etc/powerd.conf
echo '# /etc/powerd.conf for powerd version-2.02'
${RPM_BUILD_ROOT}/etc/powerd.conf
echo '# ' ${RPM_BUILD_ROOT}/etc/powerd.conf
@@ -247,16 +250,13 @@
%files tools
%defattr (-,root,root,755)
+%doc COPYING COPYRIGHT doc/Propaganda
+%doc doc/Changelog doc/killproc doc/showconsole
%ifnarch s390 s390x
%config /etc/powerd.conf
%config /etc/init.d/powerd
-%doc ../powerd-%{PDVER}/README.powerd
-%doc ../powerd-%{PDVER}/SUPPORTED.powerd
-%doc ../powerd-%{PDVER}/FAQ.powerd
-%doc ../powerd-%{PDVER}/powerd.conf.monitor
-%doc ../powerd-%{PDVER}/powerd.conf.peer
+%doc doc/powerd
%endif
-# %doc contrib/bootlogd.README
%dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/boot-blogd.sh
@@ -269,8 +269,6 @@
/usr/bin/last
/usr/bin/lastb
/usr/bin/utmpdump
-# /sbin/bootlogd
-# /sbin/intr
/sbin/blogger
/sbin/blogd
/sbin/fstab-decode
@@ -301,7 +299,6 @@
# /usr/lib/libblogger.a
%doc %{_mandir}/man1/mountpoint.1.gz
%doc %{_mandir}/man1/utmpdump.1.gz
-# %doc %{_mandir}/man8/bootlogd.8.gz
%doc %{_mandir}/man8/blogger.8.gz
%doc %{_mandir}/man8/blogd.8.gz
%doc %{_mandir}/man8/fstab-decode.8.gz
@@ -310,7 +307,6 @@
%doc %{_mandir}/man8/isserial.8.gz
%doc %{_mandir}/man8/checkproc.8.gz
%doc %{_mandir}/man8/pidofproc.8.gz
-#%doc %{_mandir}/man8/intr.8.gz
%doc %{_mandir}/man8/killall5.8.gz
%doc %{_mandir}/man8/killproc.8.gz
%doc %{_mandir}/man8/pidof.8.gz
@@ -325,5 +321,12 @@
%doc %{_mandir}/man8/rvmtab.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
+%if 0
+%doc contrib/bootlogd.README
+/sbin/bootlogd
+/sbin/intr
+%doc %{_mandir}/man8/bootlogd.8.gz
+%doc %{_mandir}/man8/intr.8.gz
+%endif
%changelog
++ killproc-2.19.dif - killproc-2.20.dif ++
--- sysvinit/killproc-2.19.dif 2011-04-15 16:49:21.0 +0200
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Tue Aug 2 08:55:35 CEST 2011.
--- sysvinit/sysvinit.changes 2011-07-27 15:22:47.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-08-01
16:48:32.0 +0200
@@ -1,0 +2,7 @@
+Mon Aug 1 14:25:56 UTC 2011 - wer...@suse.de
+
+- libblogger: check for SIGPIPE and block SIGPIPE during write, this
+ also does help startpar not to die on SIGPIPE (bnc#679671)
+- blogd: add a further check for nsigsys in writelog() (bnc#679671)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.ltEFC2/_old 2011-08-02 08:50:17.0 +0200
+++ /var/tmp/diff_new_pack.ltEFC2/_new 2011-08-02 08:50:17.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:56
+Release:58
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
++ showconsole-1.14.dif ++
--- /var/tmp/diff_new_pack.ltEFC2/_old 2011-08-02 08:50:17.0 +0200
+++ /var/tmp/diff_new_pack.ltEFC2/_new 2011-08-02 08:50:17.0 +0200
@@ -170,8 +170,123 @@
.SH FILES
.TP
.I /dev/console
+--- libblogger.c
libblogger.c 2011-08-01 14:32:47.599926864 +
+@@ -15,6 +15,7 @@
+ #include errno.h
+ #include fcntl.h
+ #include paths.h
++#include signal.h
+ #include stdarg.h
+ #include stdio.h
+ #include stdlib.h
+@@ -40,9 +41,58 @@
+ #define ESNS skipped /* Skipped */
+ #define ESNU unused/* Unused */
+
++static struct sigaction saved_sigpipe;
++static volatile sig_atomic_t broken = 0;
+ static int fdfifo = -1;
+ static char * fifo_name = _PATH_BLOG_FIFO;
+
++static void sigpipe(int sig __attribute__((__unused__)))
++{
++broken++;
++}
++
++static void set_signal(int sig, struct sigaction *old, sighandler_t handler)
++{
++do {
++ if (sigaction(sig, NULL, old) == 0)
++ break;
++} while (errno == EINTR);
++
++if (old old-sa_handler != handler) {
++ struct sigaction new;
++ sigset_t sigset;
++
++ new.sa_handler = handler;
++ sigemptyset(new.sa_mask);
++ new.sa_flags = SA_RESTART;
++ do {
++ if (sigaction(sig, new, NULL) == 0)
++ break;
++ } while (errno == EINTR);
++
++ sigemptyset(sigset);
++ sigaddset(sigset, sig);
++ sigprocmask(SIG_UNBLOCK, sigset, NULL);
++}
++}
++
++static void reset_signal(int sig, struct sigaction *old)
++{
++struct sigaction cur;
++
++do {
++ if (sigaction(sig, NULL, cur) == 0)
++ break;
++} while (errno == EINTR);
++
++if (old old-sa_handler == cur.sa_handler) {
++ do {
++ if (sigaction(sig, old, NULL) == 0)
++ break;
++ } while (errno == EINTR);
++}
++}
++
+ static int bootlog_init(const int lvl __attribute__((__unused__)))
+ {
+ int ret = -1;
+@@ -57,6 +107,8 @@ static int bootlog_init(const int lvl __
+ if ((fdfifo = open(fifo_name, O_WRONLY|O_NONBLOCK|O_NOCTTY|O_CLOEXEC))
0)
+ goto out;
+
++set_signal(SIGPIPE, saved_sigpipe, sigpipe);
++
+ ret = 0;
+ out:
+ return ret;
+@@ -66,6 +118,9 @@ void closeblog()
+ {
+ if (fdfifo 0)
+ goto out;
++
++reset_signal(SIGPIPE, saved_sigpipe);
++
+ (void)close(fdfifo);
+ out:
+ return;
+@@ -77,6 +132,7 @@ int bootlog(const int lvl, const char *f
+ int ret = -1;
+ char * head = ESNN;
+ char buf[4096];
++sigset_t blockpipe, oldpipe;
+
+ if (fdfifo 0 bootlog_init(lvl) 0)
+ goto out;
+@@ -106,6 +162,9 @@ int bootlog(const int lvl, const char *f
+ break;
+ }
+
++sigprocmask(SIG_BLOCK, blockpipe, oldpipe);
++if (broken)
++ goto pipe;
+ if (head) {
+ const struct tm *local;
+ struct timeval now;
+@@ -124,6 +183,8 @@ int bootlog(const int lvl, const char *f
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ write(fdfifo, buf, strlen(buf));
++pipe:
++sigprocmask(SIG_SETMASK, oldpipe, NULL);
+ out:
+ return ret;
+ }
--- libconsole.c
-+++ libconsole.c 2011-04-20 11:13:46.815926166 +
libconsole.c 2011-08-01 14:00:51.311926463 +
@@ -59,6 +59,27 @@
#include listing.h
@@ -345,11 +460,13 @@
clearerr(flog);
lock(llock);
while (avail 0) {
-@@ -412,7 +440,7 @@ static inline void writelog(void)
+@@ -411,8 +439,8 @@ static inline void writelog(void)
+ if (avail TRANS_BUFFER_SIZE)
ret = TRANS_BUFFER_SIZE;
- if (!flog)
+- if (!flog)
- goto xout;;
++ if (!flog || nsigsys)
+ break;
ret = fwrite(head,
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Wed Jul 27 18:30:12 CEST 2011.
--- sysvinit/sysvinit.changes 2011-07-26 14:13:52.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-07-27
15:22:47.0 +0200
@@ -1,0 +2,11 @@
+Wed Jul 27 13:11:31 UTC 2011 - wer...@suse.de
+
+- Add workaround for blowfish signedness bug (CVE-2011-2483)
+
+---
+Wed Jul 27 10:41:27 UTC 2011 - wer...@suse.de
+
+- Sulogin: respect byte order that is do not mix chars and ints
+ (bnc#707724)
+
+---
calling whatdependson for head-i586
New:
sysvinit-2.88+dsf-blowfish.dif
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.G9Sblb/_old 2011-07-27 18:29:35.0 +0200
+++ /var/tmp/diff_new_pack.G9Sblb/_new 2011-07-27 18:29:35.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:54
+Release:56
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
@@ -52,6 +52,7 @@
Patch5: sysvinit-2.88dsf-multiple-sulogin.patch
Patch6: sysvinit-2.88+dsf-run.diff
Patch7: sysvinit-2.88+dsf-crypt.patch
+Patch8: sysvinit-2.88+dsf-blowfish.dif
Patch20:powerd-2.0.2.dif
Patch21:powerd-2.0.2-getaddrinfo.patch
Patch30:killproc-2.19.dif
@@ -95,6 +96,7 @@
%patch5 -p0 -b .sulogin
%patch6 -p0 -b .run
%patch7 -p0 -b .crypt
+%patch8 -p0 -b .blowfish
%patch
pushd ../powerd-%{PDVER}
%patch20
++ sysvinit-2.88+dsf-blowfish.dif ++
--- src/consoles.h
+++ src/consoles.h 2011-07-27 11:10:26.620613503 +
@@ -39,6 +39,7 @@ struct console {
int fd, id;
#defineCON_SERIAL 0x0001
#defineCON_NOTTY 0x0002
+#defineCON_EIGHTBIT0x1000
pid_t pid;
struct chardata cp;
struct termios tio;
--- src/sulogin.c
+++ src/sulogin.c 2011-07-27 13:10:16.791925602 +
@@ -635,6 +635,7 @@ char *getpasswd(struct console *con)
ptr = pass[0];
cp-eol = *ptr = '\0';
+ con-flags = ~CON_EIGHTBIT;
eightbit = ((con-flags CON_SERIAL) == 0 || (tty.c_cflag
(PARODD|PARENB)) == 0);
while (cp-eol == '\0') {
if (read(fd, c, 1) 1) {
@@ -697,6 +698,8 @@ char *getpasswd(struct console *con)
goto quit;
}
*ptr++ = ascval;
+ if (((unsigned char)ascval) 0x80)
+ con-flags |= CON_EIGHTBIT;
break;
}
}
@@ -839,6 +842,30 @@ void usage(void)
fprintf(stderr, Usage: sulogin [-e] [-p] [-t timeout] [tty
device]\n\r);
}
+/*
+ * Wrapper for blowfish signedness bug (CVE-2011-2483)
+ */
+
+static
+int checkpw(const char *answer, const char *passwd, const struct console *con)
+{
+ char buf[64];
+
+ if (strcmp(crypt(answer, passwd), passwd) == 0)
+ return 1;
+ if (strncmp(passwd, $2a$, 4) != 0)
+ return 0;
+ if ((con-flags CON_EIGHTBIT) == 0)
+ return 0;
+ if (strlen(passwd) = 64)
+ return 0;
+
+ strncpy(buf, passwd, 64);
+ buf[2] = 'x';
+
+ return (strcmp(crypt(answer, buf), buf) == 0);
+}
+
int main(int argc, char **argv)
{
char *tty = NULL;
@@ -967,8 +994,7 @@ int main(int argc, char **argv)
if ((answer = getpasswd(con)) == NULL)
break;
- if (passwd[0] == '\0' ||
- strcmp(crypt(answer, passwd), passwd) == 0)
{
+ if (passwd[0] == '\0' || checkpw(answer,
passwd, con)) {
*usemask |= (1con-id);
sushell(pwd);
*usemask = ~(1con-id);
++ sysvinit-2.88dsf-multiple-sulogin.patch ++
--- /var/tmp/diff_new_pack.G9Sblb/_old 2011-07-27 18:29:35.0 +0200
+++ /var/tmp/diff_new_pack.G9Sblb/_new 2011-07-27 18:29:35.0 +0200
@@ -503,9 +503,9 @@
+ struct termios tty;
+ char *ret = pass;
+ unsigned char tc;
-+ char ascval;
++ char c, ascval;
+ int eightbit;
-+ int c, fd;
++ int fd;
+
+ if (con-flags CON_NOTTY)
+ goto out;
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands,
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Tue Jul 26 14:58:36 CEST 2011.
--- sysvinit/sysvinit.changes 2011-06-28 10:37:50.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-07-26
14:13:52.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 26 12:13:18 UTC 2011 - wer...@suse.de
+
+- Sulogin: enforce reconnection of stdin/stdout/stderr if a device
+ was specified.
+- Sulogin: if zero is read at reading the passwd guess it's done.
+
+---
@@ -119 +126 @@
- serial system console (bnc#677435)
+ serial system console (bnc#672450)
calling whatdependson for head-i586
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.FasUAq/_old 2011-07-26 14:56:50.0 +0200
+++ /var/tmp/diff_new_pack.FasUAq/_new 2011-07-26 14:56:50.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:52
+Release:54
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
++ sysvinit-2.88dsf-multiple-sulogin.patch ++
--- /var/tmp/diff_new_pack.FasUAq/_old 2011-07-26 14:56:50.0 +0200
+++ /var/tmp/diff_new_pack.FasUAq/_new 2011-07-26 14:56:50.0 +0200
@@ -1,5 +1,5 @@
--- src/sulogin.c
-+++ src/sulogin.c 2011-05-19 10:47:11.783926103 +
src/sulogin.c 2011-07-26 14:01:55.543926269 +0200
@@ -28,8 +28,10 @@
*
*/
@@ -350,7 +350,7 @@
*/
if (p == NULL) {
- fprintf(stderr, %s: no entry for root\n, F_PASSWD);
-+ fprintf(stderr, %s: no entry for root\n\r, F_PASSWD);
++ fprintf(stderr, sulogin: %s: no entry for root\n\r, F_PASSWD);
return pwd;
}
if (valid(pwd.pw_passwd)) return pwd;
@@ -359,21 +359,21 @@
strcpy(pwd.pw_passwd, );
if ((fp = fopen(F_SHADOW, r)) == NULL) {
- fprintf(stderr, %s: root password garbled\n, F_PASSWD);
-+ fprintf(stderr, %s: root password garbled\n\r, F_PASSWD);
++ fprintf(stderr, sulogin: %s: root password garbled\n\r,
F_PASSWD);
return pwd;
}
while((p = fgets(sline, 256, fp)) != NULL) {
-@@ -333,67 +499,212 @@ struct passwd *getrootpwent(int try_manu
+@@ -333,67 +499,215 @@ struct passwd *getrootpwent(int try_manu
* NULL it, and return.
*/
if (p == NULL) {
- fprintf(stderr, %s: no entry for root\n, F_SHADOW);
-+ fprintf(stderr, %s: no entry for root\n\r, F_SHADOW);
++ fprintf(stderr, sulogin: %s: no entry for root\n\r, F_SHADOW);
strcpy(pwd.pw_passwd, );
}
if (!valid(pwd.pw_passwd)) {
- fprintf(stderr, %s: root password garbled\n, F_SHADOW);
-+ fprintf(stderr, %s: root password garbled\n\r, F_SHADOW);
++ fprintf(stderr, sulogin: %s: root password garbled\n\r,
F_SHADOW);
strcpy(pwd.pw_passwd, ); }
return pwd;
}
@@ -532,7 +532,7 @@
+ cp-eol = *ptr = '\0';
+
+ eightbit = ((con-flags CON_SERIAL) == 0 || (tty.c_cflag
(PARODD|PARENB)) == 0);
-+ while (cp-eol == 0) {
++ while (cp-eol == '\0') {
+ if (read(fd, c, 1) 1) {
+ if (errno == EINTR || errno == EAGAIN) {
+ usleep(1000);
@@ -565,6 +565,9 @@
+ }
+
+ switch (ascval) {
++ case 0:
++ *ptr = '\0';
++ goto quit;
+ case CR:
+ case NL:
+ *ptr = '\0';
@@ -607,19 +610,19 @@
return ret;
}
-@@ -411,7 +722,10 @@ void sushell(struct passwd *pwd)
+@@ -411,7 +725,10 @@ void sushell(struct passwd *pwd)
/*
* Set directory and shell.
*/
- (void)chdir(pwd-pw_dir);
+ if (chdir(pwd-pw_dir) 0) {
+ if (chdir(/) 0)
-+ fprintf(stderr, Change of working directory failed:
%m\n);
++ fprintf(stderr, sulogin: change of working directory
failed: %m\n\r);
+ }
if ((p = getenv(SUSHELL)) != NULL)
sushell = p;
else if ((p = getenv(sushell)) != NULL)
-@@ -431,7 +745,8 @@ void sushell(struct passwd *pwd)
+@@ -431,7 +748,8 @@ void sushell(struct passwd *pwd)
/*
* Set some important environment variables.
*/
@@ -629,7 +632,7 @@
setenv(HOME, home, 1);
setenv(LOGNAME, root, 1);
setenv(USER, root, 1);
-@@ -445,17 +760,18 @@ void sushell(struct passwd *pwd)
+@@ -445,17 +763,18 @@ void sushell(struct passwd *pwd)
signal(SIGINT,
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Wed Jun 29 14:16:00 CEST 2011.
--- sysvinit/sysvinit.changes 2011-06-01 14:58:18.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-06-28
10:37:50.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 28 08:36:54 UTC 2011 - a...@suse.de
+
+- Fix build without libcrypt.a (without static glibc), added
+ patch sysvinit-2.88+dsf-crypt.patch.
+
+---
calling whatdependson for head-i586
New:
sysvinit-2.88+dsf-crypt.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.y03TEl/_old 2011-06-29 14:14:11.0 +0200
+++ /var/tmp/diff_new_pack.y03TEl/_new 2011-06-29 14:14:11.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:50
+Release:52
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
@@ -51,6 +51,7 @@
Patch4: notify-pam-dead.patch
Patch5: sysvinit-2.88dsf-multiple-sulogin.patch
Patch6: sysvinit-2.88+dsf-run.diff
+Patch7: sysvinit-2.88+dsf-crypt.patch
Patch20:powerd-2.0.2.dif
Patch21:powerd-2.0.2-getaddrinfo.patch
Patch30:killproc-2.19.dif
@@ -93,6 +94,7 @@
%patch4 -p0 -b .pam
%patch5 -p0 -b .sulogin
%patch6 -p0 -b .run
+%patch7 -p0 -b .crypt
%patch
pushd ../powerd-%{PDVER}
%patch20
++ sysvinit-2.88+dsf-crypt.patch ++
Index: src/Makefile
===
--- src/Makefile.orig
+++ src/Makefile
@@ -70,7 +70,7 @@ MANDIR= /usr/share/man
ifeq ($(WITH_SELINUX),yes)
SELINUX_DEF = -DWITH_SELINUX
INITLIBS += -lsepol -lselinux
- SULOGINLIBS = -lselinux
+ SULOGINLIBS = -lselinux
else
SELINUX_DEF =
INITLIBS =
@@ -78,7 +78,7 @@ else
endif
# Additional libs for GNU libc.
-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
+ifneq ($(wildcard /usr/lib*/libcrypt.so),)
SULOGINLIBS += -lcrypt
endif
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Mon Jun 6 11:05:57 CEST 2011.
--- sysvinit/sysvinit.changes 2011-05-19 12:55:24.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-06-01
14:58:18.0 +0200
@@ -0,0 +1,5 @@
+---
+Wed Jun 1 12:57:08 UTC 2011 - lnus...@suse.de
+
+- use /run for utmp as that's already mounted by the initrd
+
calling whatdependson for head-i586
New:
sysvinit-2.88+dsf-run.diff
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.LR0Nwn/_old 2011-06-06 11:00:36.0 +0200
+++ /var/tmp/diff_new_pack.LR0Nwn/_new 2011-06-06 11:00:36.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:48
+Release:50
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
@@ -50,6 +50,7 @@
Patch3: sysvinit-2.88dsf-no-kill.patch
Patch4: notify-pam-dead.patch
Patch5: sysvinit-2.88dsf-multiple-sulogin.patch
+Patch6: sysvinit-2.88+dsf-run.diff
Patch20:powerd-2.0.2.dif
Patch21:powerd-2.0.2-getaddrinfo.patch
Patch30:killproc-2.19.dif
@@ -91,6 +92,7 @@
%patch3 -p0 -b .no-kill
%patch4 -p0 -b .pam
%patch5 -p0 -b .sulogin
+%patch6 -p0 -b .run
%patch
pushd ../powerd-%{PDVER}
%patch20
++ sysvinit-2.88+dsf-run.diff ++
use /run/utmp
Index: src/paths.h
===
--- src/paths.h.orig
+++ src/paths.h
@@ -48,3 +48,5 @@
#define REBOOTSCRIPT2 /etc/rc.d/rc.6/* Ditto. */
#endif
+#undef UTMP_FILE
+#define UTMP_FILE /run/utmp
Index: src/init.c
===
--- src/init.c.orig
+++ src/init.c
@@ -2634,6 +2634,7 @@ void init_main(void)
*/
if ((fd = open(UTMP_FILE, O_WRONLY|O_CREAT|O_TRUNC, 0644)) = 0)
close(fd);
+ utmpname(UTMP_FILE);
/*
* Say hello to the world
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Thu May 19 16:40:16 CEST 2011.
--- sysvinit/sysvinit.changes 2011-04-15 16:49:22.0 +0200
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-05-19
12:55:24.0 +0200
@@ -1,0 +2,26 @@
+Thu May 19 12:53:51 CEST 2011 - wer...@suse.de
+
+- Add latest change for sulogin multiple console devices support
+
+--
+Wed Apr 20 13:14:43 CEST 2011 - wer...@suse.de
+
+- Aoid possible trouble due raw pts/ptmx terminal line in both
+ blogd and startpar
+- Block SIGTTOU during tcsetattr(3) library call in both blogd
+ and startpar
+- Replace select(2) with pselect(2) in blogd and ensure that
+ the timeout structure will be reseted after a timeout
+
+--
+Tue Apr 19 15:51:23 CEST 2011 - wer...@suse.de
+
+- Correct shutdown messages of startpar send via blogd
+
+--
+Tue Apr 19 14:08:04 CEST 2011 - wer...@suse.de
+
+- Avoid possible races which can be happen if blogd sees a signal
+ and will exit then (related to bnc#642289)
+
+--
@@ -16 +42 @@
-- Let sulogin respect device on the comman line as well as the
+- Let sulogin respect device on the command line as well as the
calling whatdependson for head-i586
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.fdlDL4/_old 2011-05-19 16:39:39.0 +0200
+++ /var/tmp/diff_new_pack.fdlDL4/_new 2011-05-19 16:39:39.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:46
+Release:48
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
++ showconsole-1.14.dif ++
--- /var/tmp/diff_new_pack.fdlDL4/_old 2011-05-19 16:39:39.0 +0200
+++ /var/tmp/diff_new_pack.fdlDL4/_new 2011-05-19 16:39:39.0 +0200
@@ -1,6 +1,53 @@
+--- blogd.8
blogd.82011-04-19 11:59:52.704425678 +
+@@ -65,7 +65,7 @@ says
+ that it should stop writing to disk but
+ continue to repeat messages to the old
+ devices of the system console.
+-\.
++.\
+ .SH BUGS
+ .B blogd
+ needs a mounted
--- blogd.c
-+++ blogd.c2011-03-31 14:59:37.543926064 +
-@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
blogd.c2011-04-20 11:13:46.799926099 +
+@@ -41,6 +41,7 @@
+ # define _POSIX_MAX_CANON 255
+ #endif
+ extern volatile sig_atomic_t nsigsys;
++extern volatile sig_atomic_t signaled;
+
+ static const char console[] = /dev/console;
+
+@@ -66,7 +67,7 @@ void error (const char *fmt, ...)
+ _logger(fmt, ap);
+ va_end(ap);
+ popd();
+-exit (1);
++exit(EXIT_FAILURE);
+ }
+
+ /*
+@@ -122,7 +123,6 @@ static struct sigaction saved_sigint;
+ static struct sigaction saved_sigquit;
+ static struct sigaction saved_sigterm;
+ static struct sigaction saved_sigsys;
+-static volatile sig_atomic_t signaled = 0;
+
+ static void sighandle(int sig)
+ {
+@@ -318,6 +318,10 @@ int main(int argc, char *argv[])
+ cfmakeraw(o);
+ cfsetispeed(o, ispeed);
+ cfsetospeed(o, ospeed);
++o.c_lflag = ~ECHO;
++o.c_lflag |= ISIG;
++o.c_cc[VTIME] = 0;
++o.c_cc[VMIN] = CMIN;
+
+ if (openpty(ptm, pts, ptsname, o, w) 0)
+ error(can not open pty/tty pair: %m\n);
+@@ -336,7 +340,7 @@ int main(int argc, char *argv[])
dup2(0, 2);
secondtty(cons, st.st_rdev);
@@ -9,7 +56,28 @@
(void)ioctl(0, TIOCCONS, NULL); /* Undo any current map if any */
close(0);
-@@ -351,22 +351,34 @@ exit(0);
+@@ -344,6 +348,20 @@ exit(0);
+ error(can not set console device to %s: %m\n, ptsname);
+ close(pts);
+
++signaled = nsigsys = 0;
++set_signal(SIGTTIN, saved_sigttin, SIG_IGN);
++set_signal(SIGTTOU, saved_sigttou, SIG_IGN);
++set_signal(SIGTSTP, saved_sigtstp, SIG_IGN);
++set_signal(SIGHUP, saved_sighup, SIG_IGN);
++set_signal(SIGINT, saved_sigint, sighandle);
++set_signal(SIGQUIT, saved_sigquit, sighandle);
++set_signal(SIGTERM, saved_sigterm, sighandle);
++set_signal(SIGSYS, saved_sigsys, sigsys);
++(void)siginterrupt(SIGINT, 0);
++(void)siginterrupt(SIGQUIT, 0);
++(void)siginterrupt(SIGTERM, 0);
++(void)siginterrupt(SIGSYS, 0);
++
+ for (c = cons; c; c = c-next) {
+ int iflag, oflag;
+ #ifdef _PC_MAX_CANON
+@@ -351,22 +369,34 @@ exit(0);
#endif
c-max_canon = _POSIX_MAX_CANON;
c-tlock = 0;
@@ -52,9 +120,205 @@
if ((c-otio.c_lflag ICANON) == 0) {
c-otio.c_lflag |= ICANON | IEXTEN | ISIG | ECHO|ECHOE|ECHOK|ECHOKE;
commit sysvinit for openSUSE:Factory
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at Fri Apr 1 16:51:08 CEST 2011.
--- sysvinit/sysvinit.changes 2011-03-25 19:01:19.0 +0100
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-04-01
15:02:37.0 +0200
@@ -1 +1,15 @@
+--
+Fri Apr 1 15:00:19 CEST 2011 - wer...@suse.de
+
+- Let sulogin respect device on the comman line as well as the
+ standard input
+- Let sulogin initialize serial terminals
+
+--
+Thu Mar 31 16:14:55 CEST 2011 - wer...@suse.de
+
+- Remove debug code from showconsole/blogd
+- Make serial console tc init work even with blogd
+- sulogin: add support for multiple console devices
+
+--
calling whatdependson for head-i586
New:
sysvinit-2.88dsf-multiple-sulogin.patch
Other differences:
--
++ sysvinit.spec ++
--- /var/tmp/diff_new_pack.EFuG99/_old 2011-04-01 16:50:29.0 +0200
+++ /var/tmp/diff_new_pack.EFuG99/_new 2011-04-01 16:50:29.0 +0200
@@ -29,7 +29,7 @@
Group: System/Base
AutoReqProv:on
Version:2.88+
-Release:2
+Release:44
Summary:SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel
@@ -49,6 +49,7 @@
Patch2: sysvinit-2.88dsf-suse.patch
Patch3: sysvinit-2.88dsf-no-kill.patch
Patch4: notify-pam-dead.patch
+Patch5: sysvinit-2.88dsf-multiple-sulogin.patch
Patch20:powerd-2.0.2.dif
Patch21:powerd-2.0.2-getaddrinfo.patch
Patch30:killproc-2.19.dif
@@ -89,6 +90,7 @@
%patch2 -p0 -b .suse
%patch3 -p0 -b .no-kill
%patch4 -p0 -b .pam
+%patch5 -p0 -b .sulogin
%patch
pushd ../powerd-%{PDVER}
%patch20
++ showconsole-1.14.dif ++
--- /var/tmp/diff_new_pack.EFuG99/_old 2011-04-01 16:50:29.0 +0200
+++ /var/tmp/diff_new_pack.EFuG99/_new 2011-04-01 16:50:29.0 +0200
@@ -1,4 +1,95 @@
.dummy
-+++ .dummy 2011-03-25 17:58:16.867926297 +
-@@ -0,0 +1 @@
-+Remove if real patch is required
+--- blogd.c
blogd.c2011-03-31 14:59:37.543926064 +
+@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
+ dup2(0, 2);
+
+ secondtty(cons, st.st_rdev);
+-exit(0);
++
+ (void)ioctl(0, TIOCCONS, NULL); /* Undo any current map if any */
+ close(0);
+
+@@ -351,22 +351,34 @@ exit(0);
+ #endif
+ c-max_canon = _POSIX_MAX_CANON;
+ c-tlock = 0;
+- if (tcgetattr(cons-fd, cons-otio) 0)
++ if (tcgetattr(c-fd, c-otio) 0)
+ continue;
+ c-tlock = 1;
+-#if 1
++
+ iflag = c-otio.c_iflag;
+ oflag = c-otio.c_oflag;
+
+- c-otio.c_iflag |= (ICRNL | IGNBRK);
+- c-otio.c_iflag = ~(INLCR | IGNCR | BRKINT);
+- c-otio.c_oflag |= (ONLCR | OPOST);
+- c-otio.c_oflag = ~(OCRNL | ONLRET);
+- (void)tcsetattr(cons-fd, TCSADRAIN, cons-otio);
++ if (ioctl(c-fd, TIOCMGET, flags) == 0) {
++ ispeed = cfgetispeed(c-otio);
++ ospeed = cfgetospeed(c-otio);
++
++ c-otio.c_iflag = c-otio.c_lflag = 0;
++ c-otio.c_oflag = (ONLCR | OPOST);
++ c-otio.c_cflag = CREAD | CS8 | HUPCL | (c-otio.c_cflag
CLOCAL);
++
++ cfsetispeed(c-otio, ispeed);
++ cfsetospeed(c-otio, ospeed);
++ } else {
++ c-otio.c_iflag |= (ICRNL | IGNBRK);
++ c-otio.c_iflag = ~(INLCR | IGNCR | BRKINT);
++ c-otio.c_oflag |= (ONLCR | OPOST);
++ c-otio.c_oflag = ~(OCRNL | ONLRET);
++ }
++ (void)tcsetattr(c-fd, TCSADRAIN, c-otio);
+
+ c-otio.c_iflag = iflag;
+ c-otio.c_oflag = oflag;
+-#endif
++
+ if ((c-otio.c_lflag ICANON) == 0) {
+ c-otio.c_lflag |= ICANON | IEXTEN | ISIG | ECHO|ECHOE|ECHOK|ECHOKE;
+ c-otio.c_oflag |= OPOST;
+--- libconsole.c
libconsole.c 2011-03-31 14:44:34.988426227 +
+@@ -302,7 +302,7 @@ out:
+ /*
+ * The stdio file pointer for our log file
+ */
+-struct console *restrict cons;
++struct console *cons;
+ static FILE * flog = NULL;
+ static int fdread = -1;
+ static int fdfifo = -1;
+@@ -1463,6 +1463,10 @@ static void consalloc(struct console *re
+ return;
+ }
+ tail-next = newc;
++tail-tlock = 0;
++tail-max_canon = _POSIX_MAX_CANON;
++memset(tail-ltio, 0, sizeof(tail-ltio));
++memset(tail-otio, 0, sizeof(tail-otio));
+ tail = tail-next;
+
+ if ((flags = fcntl(newc-fd, F_GETFL)) 0)
+--- libconsole.h
libconsole.h 2011-03-31 14:47:22.755926508 +
+@@ -39,7 +39,7 @@ struct
