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.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/powerd.changes 2014-08-25 11:03:07.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 21 11:38:06 UTC 2014 - [email protected] + +- 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.changes 2014-02-11 10:59:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2014-08-25 11:03:07.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Aug 21 11:38:06 UTC 2014 - [email protected] + +- 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 - [email protected] + +- The former entry adds the patch killproc-2.18-open_flags.dif (bnc#863518) + +------------------------------------------------------------------- +Wed May 21 13:49:37 CEST 2014 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.xx9FyK/_new 2014-08-25 11:03:09.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.xx9FyK/_new 2014-08-25 11:03:09.000000000 +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: 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 mkinitrd +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 @@ -73,16 +86,13 @@ # 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 -%if %{without sysvinit} -%{expand: %%global sysdsysunitdir %(pkg-config systemd --variable=systemdsystemunitdir)} -%{expand: %%global sysdsysconfdir %(pkg-config systemd --variable=systemdsystemconfdir)} -%endif %description System V style init programs by Miquel van Smoorenburg that control the @@ -143,6 +153,7 @@ popd pushd ../killproc-%{KPVER} %patch30 +%patch31 -p0 -b .dialog ln -t../%{name}-%{SIVER}dsf/doc/killproc README popd pushd ../showconsole-%{SCVER} @@ -210,10 +221,12 @@ # # 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: # @@ -243,15 +256,19 @@ 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) @@ -278,11 +295,13 @@ %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 %files tools %defattr (-,root,root,755) ++++++ killproc-2.18-open_flags.dif ++++++ --- startproc.c +++ startproc.c 2014-05-27 12:08:10.498235871 +0000 @@ -624,7 +624,7 @@ static int do_start(const char *inname, char * redirect; if (!(redirect = getenv("REDIRECT"))) redirect = "/dev/tty"; - if ((tty = open(redirect,O_WRONLY|O_NONBLOCK,0)) < 0) + if ((tty = open(redirect,O_RDWR|O_NONBLOCK,0)) < 0) error(LSB_PROOF," cannot open %s: %s\n", redirect, strerror(errno)); dup2(tty, fileno(stdin)); dup2(tty, fileno(stdout)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
