Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2016-01-20 09:54:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysvinit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2014-08-25 11:03:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2016-01-20 09:54:08.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_f_a@gmx.de
+
+- cleanup package
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2015-12-13 09:33:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-01-20 09:54:08.000000000 +0100
@@ -1,0 +2,25 @@
+Fri Dec 4 15:24:01 UTC 2015 - sweet_f_a@gmx.de
+
+- cleanup package:
+ * don't build binaries which are not installed
+ * remove unused sources
+ * remove patches (or parts of patches) which modify unused files
+ * remove old build conditions (sysvinit, util-linux, mkinitrd)
+ * remove unused dependencies
+- this cleanup does not change the resulting binaries (except some
+ package dependencies)
+- list of removed patches:
+ * sysvinit-2.82-startstop.patch
+ * sysvinit-2.88+dsf-blowfish.dif
+ * sysvinit-2.88+dsf-crypt.patch
+ * sysvinit-2.88+dsf-env.patch
+ * sysvinit-2.88dsf-multiple-sulogin.patch
+ * sysvinit-2.88+dsf-run.diff
+ * sysvinit-2.88+dsf-xen.patch
+- list of modified patches:
+ * notify-pam-dead.patch
+ * sysvinit-2.88+dsf.dif
+ * sysvinit-2.88+dsf-sulogin.diff
+ * sysvinit-2.88dsf-suse.patch
+
+-------------------------------------------------------------------
Old:
----
mkinitrd-boot.sh
mkinitrd-kill1.sh
mkinitrd-kill2.sh
rc.powerd
sysvinit-2.82-startstop.patch
sysvinit-2.88+dsf-blowfish.dif
sysvinit-2.88+dsf-crypt.patch
sysvinit-2.88+dsf-env.patch
sysvinit-2.88+dsf-run.diff
sysvinit-2.88+dsf-xen.patch
sysvinit-2.88dsf-multiple-sulogin.patch
sysvinit-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerd.spec ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -16,11 +16,6 @@
#
-%if %{undefined systemd_requires}
-%global with_sysvinit 1
-%endif
-%bcond_with sysvinit
-
Name: powerd
Version: 2.0.2
Release: 0
@@ -28,25 +23,15 @@
License: GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1140
-%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: pkg-config
-BuildRequires: systemd-devel
-%endif
-%endif
Url: https://power.sourceforge.net/
Source0: powerd-%{version}.tar.bz2
-Source1: rc.powerd
Source2: powerd.service
Patch0: powerd-%{version}.dif
Patch1: powerd-%{version}-getaddrinfo.patch
-%if %{without sysvinit}
%if %{undefined _unitdir}
%{expand: %%global %_unitdir %(pkg-config systemd --variable=systemdsystemunitdir)}
%endif
-%endif
%description -n powerd
powerd monitors the serial port connected to an UPS device and will perform
@@ -82,28 +67,17 @@
echo '# read manual page of detectups(8) and powerd(8) its self.' >> %{buildroot}/etc/powerd.conf
echo '# ' >> %{buildroot}/etc/powerd.conf
echo '# to enable powerd service run the command' >> %{buildroot}/etc/powerd.conf
-%if %{with sysvinit}
- echo '# insserv powerd' >> %{buildroot}/etc/powerd.conf
- echo '# rcpowerd start' >> %{buildroot}/etc/powerd.conf
- mkdir -p %{buildroot}/etc/init.d
- install -m 0744 %{S:1} %{buildroot}/etc/init.d/powerd
- ln -sf /etc/init.d/powerd %{buildroot}%{_sbindir}/rcpowerd
-%else
echo '# systemctl enable powerd.service' >> %{buildroot}/etc/powerd.conf
echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/%{_unitdir}
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
-%endif
%preun
%stop_on_removal powerd
%postun
%restart_on_update powerd
-%if %{with sysvinit}
-%insserv_cleanup
-%endif
%files -n powerd
%defattr (-,root,root,755)
@@ -112,11 +86,7 @@
/sbin/detectups
%{_sbindir}/rcpowerd
%config /etc/powerd.conf
-%if %{with sysvinit}
-%config /etc/init.d/powerd
-%else
%attr(0644,root,root) %{_unitdir}/powerd.service
-%endif
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
++++++ sysvinit.spec ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -16,22 +16,6 @@
#
-%if 0%{suse_version} < 1300
-%global with_util_linux 1
-%endif
-%bcond_with util_linux
-%if %{undefined systemd_requires}
-%bcond_without sysvinit
-%else
-%bcond_with sysvinit
-%endif
-
-%if 0%{?suse_version} > 1310
-%define have_mkinitrd 0
-%else
-%define have_mkinitrd 1
-%endif
-
Name: sysvinit
%define KPVER 2.21
%define SCVER 1.16
@@ -43,57 +27,26 @@
License: GPL-2.0+
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: audit-devel
-BuildRequires: libselinux-devel
-BuildRequires: libsepol-devel
-BuildRequires: pam-devel
-%if 0%{?suse_version} > 1140
-%if 0%{?suse_version} > 1230
-BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: pkg-config
-BuildRequires: systemd-devel
-%endif
-%endif
#!BuildIgnore: sysvinit-tools
-Requires(post): coreutils grep
-%if %have_mkinitrd
-Requires(post): mkinitrd
-Requires(postun): mkinitrd
-%endif
Url: http://savannah.nongnu.org/projects/sysvinit/
Source: sysvinit-%{SIVER}dsf.tar.bz2
Source2: killproc-%{KPVER}.tar.bz2
Source4: showconsole-%{SCVER}.tar.bz2
Source5: startpar-%{START}.tar.bz2
-Source7: %{name}-rpmlintrc
-Source8: mkinitrd-boot.sh
-Source9: mkinitrd-kill1.sh
-Source10: mkinitrd-kill2.sh
Patch: %{name}-%{version}dsf.dif
-Patch1: %{name}-2.82-startstop.patch
Patch2: %{name}-2.88dsf-suse.patch
Patch3: %{name}-2.88dsf-scripts2.patch
Patch4: notify-pam-dead.patch
-Patch5: %{name}-2.88dsf-multiple-sulogin.patch
-Patch6: %{name}-%{version}dsf-run.diff
-Patch7: %{name}-%{version}dsf-crypt.patch
-Patch8: %{name}-%{version}dsf-blowfish.dif
Patch9: %{name}-2.88dsf-no-kill.patch
-Patch10: %{name}-%{version}dsf-env.patch
Patch11: %{name}-%{version}dsf-dostat.patch
# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
Patch12: %{name}-%{version}dsf-sulogin.diff
-# PATCH-FIX-SUSE -- sulogin: find suitable console device even if first is not usable
-Patch13: %{name}-%{version}dsf-xen.patch
Patch30: killproc-%{KPVER}.dif
Patch31: killproc-2.18-open_flags.dif
Patch40: showconsole-%{SCVER}.dif
Patch41: showconsole-1.16-deadlock.diff
Patch42: showconsole-1.16-glibc.dif
Patch50: startpar-%{START}.dif
-Requires: mingetty
-Requires: sysvinit-tools
%description
System V style init programs by Miquel van Smoorenburg that control the
@@ -108,46 +61,20 @@
%package tools
Summary: Tools for basic booting
Group: System/Base
-%if 0%{suse_version} > 1120
-Requires(preun): coreutils %insserv_prereq
-Requires(postun): coreutils %insserv_prereq
-%else
-PreReq: coreutils %insserv_prereq
-%endif
%description tools
Helper tools from sysvinit that support booting, including but not exclusive
to startpar, killproc and pidof. System V init specific programs are in the
sysvinit package.
-%package init
-Summary: Provides /sbin/init for sysvinit
-Group: System/Base
-Provides: sbin_init
-Conflicts: otherproviders(sbin_init)
-Requires: %{name}
-%ifnarch s390 s390x
-Requires: powerd
-%endif
-
-%description init
-Just some symlinks and manual page for sysvinit
-
%prep
%setup -n %{name}-%{SIVER}dsf -q -b 2 -b 4 -b 5
-%patch1 -p0 -b .startstop
%patch2 -p0 -b .suse
%patch3 -p0 -b .scripts2
%patch4 -p0 -b .pam
-%patch5 -p0 -b .sulogin
-%patch6 -p0 -b .run
-%patch7 -p0 -b .crypt
-%patch8 -p0 -b .blowfish
%patch9 -p0 -b .no-kill
-%patch10 -p0 -b .env
%patch11 -p0 -b .dostat
%patch12 -p0 -b .ka5
-%patch13 -p0 -b .xen
%patch
pushd doc
mkdir killproc showconsole
@@ -186,30 +113,7 @@
popd
%install
- rm -rf %{buildroot}
- mkdir %{buildroot}
- mkdir -m 755 -p %{buildroot}/bin
- mkdir -m 755 -p %{buildroot}/dev
- mkdir -m 755 -p %{buildroot}/etc
- mkdir -m 755 -p %{buildroot}/sbin
- mkdir -m 755 -p %{buildroot}/usr/bin
- mkdir -m 755 -p %{buildroot}/usr/include
- mkdir -m 755 -p %{buildroot}%{_mandir}/man1
- mkdir -m 755 -p %{buildroot}%{_mandir}/man5
- mkdir -m 755 -p %{buildroot}%{_mandir}/man8
- make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} WITH_SELINUX=yes DISTRO=SuSE
- mv %{buildroot}/sbin/init %{buildroot}/sbin/sysvinit
- mv %{buildroot}%{_mandir}/man8/init.8 %{buildroot}/%{_mandir}/man8/sysvinit.8
- ln -s /sbin/sysvinit %{buildroot}/sbin/init
- ln -s sysvinit.8 %{buildroot}%{_mandir}/man8/init.8
- mkdir -p %{buildroot}/lib/sysvinit
- ln -sf /sbin/sysvinit %{buildroot}/lib/sysvinit/telinit
- ln -sf /sbin/sysvinit %{buildroot}/sbin/telinit
- test -p %{buildroot}/dev/initctl || {
- rm -f %{buildroot}/dev/initctl
- mknod %{buildroot}/dev/initctl p
- chmod 600 %{buildroot}/dev/initctl
- }
+ make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} DISTRO=SuSE
pushd ../showconsole-%{SCVER}
make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0700" DESTDIR=%{buildroot}
popd
@@ -220,124 +124,17 @@
make install DESTDIR=%{buildroot}
popd
#
-# Install mkinitrd scriptlets
-#
-%if %have_mkinitrd
- install -d %{buildroot}/lib/mkinitrd/scripts
- install -m 0755 %{SOURCE8} %{buildroot}/lib/mkinitrd/scripts/boot-blogd.sh
- install -m 0755 %{SOURCE9} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd.sh
- install -m 0755 %{SOURCE10} %{buildroot}/lib/mkinitrd/scripts/boot-killblogd2.sh
-%endif
-#
# Remove files not packed:
#
- rm -f %{buildroot}/usr/include/{initreq.h,libblogger.h}
- rm -f %{buildroot}/usr/lib/libblogger.a
- rm -f %{buildroot}%{_mandir}/man1/mesg.1*
+ rm %{buildroot}/usr/include/{initreq.h,libblogger.h}
+ rm %{buildroot}/usr/lib/libblogger.a
chmod 444 %{buildroot}%{_mandir}/man?/*
-%if ! %{with util_linux}
- rm -vf %{buildroot}/bin/mountpoint
- rm -vf %{buildroot}/usr/bin/utmpdump
- rm -vf %{buildroot}/sbin/sulogin
- rm -vf %{buildroot}%{_mandir}/man1/mountpoint.1*
- rm -vf %{buildroot}%{_mandir}/man1/utmpdump.1*
- rm -vf %{buildroot}%{_mandir}/man8/sulogin.8*
-%endif
-%if !%{with sysvinit}
- rm -vf %{buildroot}/sbin/sysvinit
- rm -vfr %{buildroot}/lib/sysvinit
- rm -vf %{buildroot}/sbin/halt
- rm -vf %{buildroot}/sbin/init
- rm -vf %{buildroot}/sbin/poweroff
- rm -vf %{buildroot}/sbin/reboot
- rm -vf %{buildroot}/sbin/runlevel
- rm -vf %{buildroot}/sbin/shutdown
- rm -vf %{buildroot}/sbin/telinit
- rm -vf %{buildroot}%{_mandir}/man8/halt.8
- rm -vf %{buildroot}%{_mandir}/man5/initscript.5
- rm -vf %{buildroot}%{_mandir}/man5/inittab.5
- rm -vf %{buildroot}%{_mandir}/man8/init.8
- rm -vf %{buildroot}%{_mandir}/man8/sysvinit.8
- rm -vf %{buildroot}%{_mandir}/man8/poweroff.8
- rm -vf %{buildroot}%{_mandir}/man8/reboot.8
- rm -vf %{buildroot}%{_mandir}/man8/runlevel.8
- rm -vf %{buildroot}%{_mandir}/man8/shutdown.8
- rm -vf %{buildroot}%{_mandir}/man8/telinit.8
- rm -vfr %{buildroot}/lib/mkinitrd
-%endif
-
-%if %{with sysvinit}
-%post
-ret=0
-if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build -a -x /sbin/init; then
- icount=$(grep -cE '^[[:alnum:]]+:[[:alnum:]]*:' /etc/inittab 2>/dev/null || echo 0)
- if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) -a $icount -gt 6 ; then
- if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i' /sbin/sysvinit); then
- /sbin/telinit u
- fi
- elif test $icount -le 6 ; then
- echo 'Broken /etc/inittab found, installing and using %{name} make no sense!' 1>&2
- ret=1
- fi
-fi
-%if %have_mkinitrd
-if test -x /sbin/mkinitrd_setup; then
- mkinitrd_setup
-fi
-%endif
-exit $ret
-
-%if %have_mkinitrd
-%postun
-if test -x /sbin/mkinitrd_setup; then
- mkinitrd_setup
-fi
-%endif
-
-%files
-%defattr (-,root,root,755)
-/sbin/sysvinit
-%dir /lib/sysvinit
-/lib/sysvinit/telinit
-
-%files init
-%defattr (-,root,root,755)
-/sbin/halt
-/sbin/init
-/sbin/poweroff
-/sbin/reboot
-/sbin/runlevel
-/sbin/shutdown
-/sbin/telinit
-%doc %{_mandir}/man8/halt.8.gz
-%doc %{_mandir}/man5/initscript.5.gz
-%doc %{_mandir}/man5/inittab.5.gz
-%doc %{_mandir}/man8/init.8.gz
-%doc %{_mandir}/man8/sysvinit.8.gz
-%doc %{_mandir}/man8/poweroff.8.gz
-%doc %{_mandir}/man8/reboot.8.gz
-%doc %{_mandir}/man8/runlevel.8.gz
-%doc %{_mandir}/man8/shutdown.8.gz
-%doc %{_mandir}/man8/telinit.8.gz
-%if %have_mkinitrd
-%dir /lib/mkinitrd
-%dir /lib/mkinitrd/scripts
-/lib/mkinitrd/scripts/boot-blogd.sh
-/lib/mkinitrd/scripts/boot-killblogd.sh
-/lib/mkinitrd/scripts/boot-killblogd2.sh
-%endif
-%endif
%files tools
%defattr (-,root,root,755)
%doc COPYING COPYRIGHT doc/Propaganda
%doc doc/Changelog doc/killproc doc/showconsole
%config /etc/pam.d/init
-%if %{with util_linux}
-/sbin/sulogin
-/bin/mountpoint
-/usr/bin/utmpdump
-%endif
/bin/pidof
/bin/usleep
/bin/fsync
@@ -358,11 +155,6 @@
/sbin/mkill
/sbin/startproc
/sbin/start_daemon
-%if %{with util_linux}
-%doc %{_mandir}/man1/mountpoint.1.gz
-%doc %{_mandir}/man1/utmpdump.1.gz
-%doc %{_mandir}/man8/sulogin.8.gz
-%endif
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
# /usr/include/libblogger.h
@@ -384,12 +176,5 @@
%doc %{_mandir}/man8/rvmtab.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
-%if 0
-%doc contrib/bootlogd.README
-/sbin/bootlogd
-/sbin/intr
-%doc %{_mandir}/man8/bootlogd.8.gz
-%doc %{_mandir}/man8/intr.8.gz
-%endif
%changelog
++++++ notify-pam-dead.patch ++++++
--- /var/tmp/diff_new_pack.n59bbX/_old 2016-01-20 09:54:10.000000000 +0100
+++ /var/tmp/diff_new_pack.n59bbX/_new 2016-01-20 09:54:10.000000000 +0100
@@ -35,59 +35,6 @@
# $(INSTALL_DIR) $(ROOT)/etc/
# $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/
ln -sf halt $(ROOT)/sbin/reboot
---- src/init.c
-+++ src/init.c 2010-04-13 00:00:00.000000000 +0000
-@@ -79,6 +79,10 @@
- #include "reboot.h"
- #include "set.h"
-
-+#ifdef USE_PAM
-+extern void notify_pam_dead_session(const char *id);
-+#endif
-+
- #ifndef SIGPWR
- # define SIGPWR SIGUSR2
- #endif
-@@ -1132,6 +1136,9 @@ pid_t spawn(CHILD *ch, int *res)
- }
- dup(f);
- dup(f);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- }
-
- /*
-@@ -1551,6 +1558,9 @@ void read_inittab(void)
- INITDBG(L_VB, "Updating utmp for pid %d [id %s]",
- ch->pid, ch->id);
- ch->flags &= ~RUNNING;
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
-@@ -2012,6 +2022,9 @@ void re_exec(void)
- if (ch->flags & ZOMBIE) {
- INITDBG(L_VB, "Child died, PID= %d", ch->pid);
- ch->flags &= ~(RUNNING|ZOMBIE|WAITING);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
-@@ -2465,6 +2478,9 @@ void process_signals()
- if (ch->flags & ZOMBIE) {
- INITDBG(L_VB, "Child died, PID= %d", ch->pid);
- ch->flags &= ~(RUNNING|ZOMBIE|WAITING);
-+#ifdef USE_PAM
-+ notify_pam_dead_session(ch->id);
-+#endif
- if (ch->process[0] != '+')
- write_utmp_wtmp("", ch->id, ch->pid, DEAD_PROCESS, NULL);
- }
--- src/init.sample
+++ src/init.sample 2010-04-13 00:00:00.000000000 +0000
@@ -0,0 +1,8 @@
@@ -99,113 +46,4 @@
+auth sufficient pam_rootok.so
+account include common-account
+session requisite pam_lastlog.so silent
---- src/utmp.c
-+++ src/utmp.c 2010-04-13 00:00:00.000000000 +0000
-@@ -34,10 +34,18 @@
- #include
participants (1)
-
root@hilbert.suse.de