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.changes 2016-01-20 09:54:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2016-02-23 16:51:59.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Jan 26 10:24:25 UTC 2016 - [email protected] + +- remove unused /etc/pam.d/init +- remove notify-pam-dead.patch + +------------------------------------------------------------------- +Mon Jan 25 15:46:22 UTC 2016 - [email protected] + +- Use libblogger of package blog-devel now + +------------------------------------------------------------------- +Thu Jan 21 11:35:01 UTC 2016 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:00.000000000 +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.000000000 +0100 +++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:00.000000000 +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 %{?_smp_mflags} CC="%__cc" popd pushd ../startpar-%{START} - make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" CC="%__cc" + make %{?_smp_mflags} CC="%__cc" popd %install make install -C src MANPATH=%{_mandir} ROOT=%{buildroot} DISTRO=SuSE -pushd ../showconsole-%{SCVER} - make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0700" DESTDIR=%{buildroot} -popd pushd ../killproc-%{KPVER} make install MANPATH=%{_mandir} INSTBINFLAGS="-m 0755" DESTDIR=%{buildroot} popd @@ -126,24 +110,16 @@ # # Remove files not packed: # - rm %{buildroot}/usr/include/{initreq.h,libblogger.h} - rm %{buildroot}/usr/lib/libblogger.a - chmod 444 %{buildroot}%{_mandir}/man?/* + rm -vf %{buildroot}/usr/include/initreq.h %files tools %defattr (-,root,root,755) %doc COPYING COPYRIGHT doc/Propaganda -%doc doc/Changelog doc/killproc doc/showconsole -%config /etc/pam.d/init +%doc doc/Changelog doc/killproc /bin/pidof /bin/usleep /bin/fsync -/sbin/blogger -/sbin/blogd /sbin/fstab-decode -/sbin/showconsole -/sbin/setconsole -/sbin/isserial /sbin/checkproc /sbin/pidofproc /sbin/killproc @@ -157,14 +133,7 @@ /sbin/start_daemon %doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/fsync.1.gz -# /usr/include/libblogger.h -# /usr/lib/libblogger.a -%doc %{_mandir}/man8/blogger.8.gz -%doc %{_mandir}/man8/blogd.8.gz %doc %{_mandir}/man8/fstab-decode.8.gz -%doc %{_mandir}/man8/showconsole.8.gz -%doc %{_mandir}/man8/setconsole.8.gz -%doc %{_mandir}/man8/isserial.8.gz %doc %{_mandir}/man8/checkproc.8.gz %doc %{_mandir}/man8/pidofproc.8.gz %doc %{_mandir}/man8/killall5.8.gz ++++++ killproc-2.21.dif ++++++ --- /var/tmp/diff_new_pack.YSrWPZ/_old 2016-02-23 16:52:00.000000000 +0100 +++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:00.000000000 +0100 @@ -1,5 +1,26 @@ +--- + Makefile | 6 ++---- + libinit.c | 4 ++-- + startproc.c | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +--- Makefile ++++ Makefile 2016-01-25 15:42:08.730864821 +0000 +@@ -15,10 +15,8 @@ DESTDIR = + VERSION = 2.21 + DATE = $(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]') + +-ifneq ($(INC),) +- LIBS += -lblogger +- COPTS += -DUSE_BLOGD +-endif ++ LIBS += -lblogger -lpthread ++ COPTS += -DUSE_BLOGD + + # + # Architecture --- libinit.c -+++ libinit.c 2012-05-23 11:04:58.370146656 +0000 ++++ libinit.c 2012-05-23 11:04:58.000000000 +0000 @@ -265,7 +265,7 @@ static inline boolean isnetfs(const char static void init_mounts(void) { @@ -19,7 +40,7 @@ MNTINFO *restrict p; if (posix_memalign((void*)&p, sizeof(void*), alignof(MNTINFO)+(nlen+1)) != 0) { --- startproc.c -+++ startproc.c 2012-08-10 12:43:56.136510304 +0000 ++++ startproc.c 2014-05-27 12:08:10.000000000 +0000 @@ -778,7 +778,7 @@ retry: * to see a process damage. */ ++++++ sysvinit-2.88+dsf.dif ++++++ --- /var/tmp/diff_new_pack.YSrWPZ/_old 2016-02-23 16:52:01.000000000 +0100 +++ /var/tmp/diff_new_pack.YSrWPZ/_new 2016-02-23 16:52:01.000000000 +0100 @@ -3,7 +3,7 @@ @@ -9,19 +9,19 @@ # - CPPFLAGS = -DUSE_PAM + CPPFLAGS = -CFLAGS ?= -ansi -O2 -fomit-frame-pointer +CFLAGS ?= $(RPM_OPT_FLAGS) override CFLAGS += -W -Wall -D_GNU_SOURCE @@ -39,8 +39,8 @@ endif ID = $(shell id -u) -@@ -173,13 +168,8 @@ - endif +@@ -161,13 +156,8 @@ + done # $(INSTALL_DIR) $(ROOT)/etc/ # $(INSTALL_EXEC) initscript.sample $(ROOT)/etc/ - ln -sf halt $(ROOT)/sbin/reboot
