diff --git a/sysvinit-2.88dsf.dif b/sysvinit-2.88dsf+.dif similarity index 83% rename from sysvinit-2.88dsf.dif rename to sysvinit-2.88dsf+.dif index 6e2d9e0..76f002d 100644 --- a/sysvinit-2.88dsf.dif +++ b/sysvinit-2.88dsf+.dif @@ -31,17 +31,17 @@ ln -sf last $(ROOT)/usr/bin/lastb; \ fi --- src/bootlogd.c -+++ src/bootlogd.c 2006-08-18 12:45:28.000000000 +0000 -@@ -241,7 +241,7 @@ int isconsole(char *s, char *res, int rl - int consolename(char *res, int rlen) ++++ src/bootlogd.c 2011-03-15 14:58:54.000000000 +0000 +@@ -241,7 +241,7 @@ + int consolename(char *res, size_t rlen) { #ifdef TIOCGDEV - unsigned int kdev; + kdev_t kdev; #endif - struct stat st, st2; - char buf[256]; -@@ -555,7 +555,7 @@ int main(int argc, char **argv) + struct stat st; + int n; +@@ -559,7 +559,7 @@ } (void)ioctl(0, TIOCCONS, NULL); diff --git a/sysvinit-2.88dsf+.tar.bz2 b/sysvinit-2.88dsf+.tar.bz2 new file mode 100644 index 0000000..7766365 --- /dev/null +++ b/sysvinit-2.88dsf+.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7307778802f199f533a91f16dee3f5afc260e9e2b10dc59d96e1076553e57e7a +size 107415 diff --git a/sysvinit-2.88dsf-nfs.patch b/sysvinit-2.88dsf-nfs.patch deleted file mode 100644 index 86ec3ea..0000000 --- a/sysvinit-2.88dsf-nfs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/killall5.c -+++ src/killall5.c 2010-10-21 09:51:07.771926189 +0000 -@@ -112,8 +112,8 @@ typedef struct _s_nfs - struct _s_nfs *next; /* Pointer to next struct. */ - struct _s_nfs *prev; /* Pointer to previous st. */ - SHADOW *shadow; /* Pointer to shadows */ -- char * name; - size_t nlen; -+ char * name; - } NFS; - - /* List of processes. */ -@@ -346,7 +346,7 @@ static void clear_mnt(void) - } - - /* -- * Check if path is ia shadow off a NFS partition. -+ * Check if path is a shadow of a NFS partition. - */ - static int shadow(SHADOW *restrict this, const char *restrict name, const size_t nlen) - { diff --git a/sysvinit-2.88dsf-selinux.patch b/sysvinit-2.88dsf-selinux.patch deleted file mode 100644 index 1c37664..0000000 --- a/sysvinit-2.88dsf-selinux.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- src/init.c -+++ src/init.c 2010-05-17 09:32:29.958932802 +0000 -@@ -54,10 +54,6 @@ - - #ifdef WITH_SELINUX - # include --# include --# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ --# define MNT_DETACH 2 --# endif - #endif - - #ifdef __i386__ -@@ -2886,11 +2882,9 @@ int main(int argc, char **argv) - - #ifdef WITH_SELINUX - if (getenv("SELINUX_INIT") == NULL) { -- const int rc = mount("proc", "/proc", "proc", 0, 0); -- if (is_selinux_enabled() > 0) { -- putenv("SELINUX_INIT=YES"); -- if (rc == 0) umount2("/proc", MNT_DETACH); -+ if (is_selinux_enabled() != 1) { - if (selinux_init_load_policy(&enforce) == 0) { -+ putenv("SELINUX_INIT=YES"); - execv(myname, argv); - } else { - if (enforce > 0) { -@@ -2901,7 +2895,6 @@ int main(int argc, char **argv) - } - } - } -- if (rc == 0) umount2("/proc", MNT_DETACH); - } - #endif - /* Start booting. */ diff --git a/sysvinit-2.88dsf-utf8.dif b/sysvinit-2.88dsf-utf8.dif deleted file mode 100644 index 799f73d..0000000 --- a/sysvinit-2.88dsf-utf8.dif +++ /dev/null @@ -1,40 +0,0 @@ ---- doc/Changelog -+++ doc/Changelog 2010-05-12 13:26:34.679992111 +0200 -@@ -35,6 +35,8 @@ sysvinit (2.88dsf) world; urgency=low - get binaries with debug information installed. - - [ Werner Fink ] -+ * Correct fix for Debian bug #547073: use IUTF8 flag if defined -+ and if already set. - * Add the comment from Andrea Arcangeli about the correct - place of setting the default childhandler within spawn(). - * Make sure that newline is printed out for last(1) even ---- src/init.c -+++ src/init.c 2010-05-12 13:24:44.536090878 +0200 -@@ -788,10 +788,11 @@ void console_stty(void) - /* - * Set pre and post processing - */ -- tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY; --#ifdef IUTF8 /* Not defined on FreeBSD */ -- tty.c_iflag |= IUTF8; -+ tty.c_iflag = IGNPAR|ICRNL|IXON|IXANY -+#ifdef IUTF8 /* Not defined on FreeBSD */ -+ | (tty.c_iflag & IUTF8) - #endif /* IUTF8 */ -+ ; - tty.c_oflag = OPOST|ONLCR; - tty.c_lflag = ISIG|ICANON|ECHO|ECHOCTL|ECHOPRT|ECHOKE; - ---- src/sulogin.c -+++ src/sulogin.c 2010-05-12 13:24:44.576090860 +0200 -@@ -101,9 +101,6 @@ void fixtty(void) - * the same result as `stty sane cr0 pass8' - */ - tty.c_iflag |= (BRKINT | ICRNL | IMAXBEL); --#ifdef IUTF8 /* Not defined on FreeBSD */ -- tty.c_iflag |= IUTF8; --#endif /* IUTF8 */ - tty.c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP); - tty.c_oflag |= (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0); - tty.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL |\ diff --git a/sysvinit-2.88dsf.tar.bz2 b/sysvinit-2.88dsf.tar.bz2 deleted file mode 100644 index 296ce52..0000000 --- a/sysvinit-2.88dsf.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 -size 105551 diff --git a/sysvinit-last-ipv6-heuristic.patch b/sysvinit-last-ipv6-heuristic.patch deleted file mode 100644 index 0719fa7..0000000 --- a/sysvinit-last-ipv6-heuristic.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/trunk/src/last.c b/trunk/src/last.c -index 5003c7c..02103e0 100644 ---- a/trunk/src/last.c -+++ b/trunk/src/last.c -@@ -318,30 +318,22 @@ int dns_lookup(char *result, int size, int useip, int32_t *a) - struct sockaddr_in6 sin6; - struct sockaddr *sa; - int salen, flags; -- unsigned int topnibble; -- unsigned int azero = 0, sitelocal = 0; - int mapped = 0; - - flags = useip ? NI_NUMERICHOST : 0; - - /* -- * IPv4 or IPv6 ? We use 2 heuristics: -- * 1. Current IPv6 range uses 2000-3fff or fec0-feff. -- * Outside of that is illegal and must be IPv4. -- * 2. If last 3 bytes are 0, must be IPv4 -- * 3. If IPv6 in IPv4, handle as IPv4 -+ * IPv4 or IPv6 ? -+ * 1. If last 3 4bytes are 0, must be IPv4 -+ * 2. If IPv6 in IPv4, handle as IPv4 -+ * 3. Anything else is IPv6 - * - * Ugly. - */ - if (a[0] == 0 && a[1] == 0 && a[2] == (int32_t)htonl (0xffff)) - mapped = 1; -- topnibble = ntohl((unsigned int)a[0]) >> 28; - -- azero = ntohl((unsigned int)a[0]) >> 16; -- sitelocal = (azero >= 0xfec0 && azero <= 0xfeff) ? 1 : 0; -- -- if (((topnibble < 2 || topnibble > 3) && (!sitelocal)) || mapped || -- (a[1] == 0 && a[2] == 0 && a[3] == 0)) { -+ if (mapped || (a[1] == 0 && a[2] == 0 && a[3] == 0)) { - /* IPv4 */ - sin.sin_family = AF_INET; - sin.sin_port = 0; diff --git a/sysvinit.changes b/sysvinit.changes index c78da4c..fdb1f9f 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Mar 15 16:01:22 CET 2011 - werner@suse.de + +- Update to current SVN version of sysvinit 2.88dsf: + * Fix counting message lines in wall. Patch from Petr Lautrbach. + * Fix bad printf conversion specifier in wall. Patch from Sébastien Luttringer. + * Add patches from Openwall project. Thanks goes to Solar Designer. + * Add code to detect the system consoles with the help of the + new /proc/consoles files of linux kernel 2.6.38+ + * Try to make utmpdump IPv6 valid, change based on suggestion from + Navdeep Bhatia (see local bug #32429) + * Fix signal and alarm handling based on the patch from Florent Viard. + (was local bug #32304) + * Add fix for Redhat bug #573346: last incorrectly displays IPv6 + addresses (was local bug #29497) + * Correct fix for Debian bug #547073: use IUTF8 flag if defined + and if already set to make sure the utf-8 flag is not cleared + from the tty. Patch from Samuel Thibault. + * Include limits.h in killall.c to enforce definition of PATH_MAX + * Fix sysvinit bug #29758 Linker invocation should not contain + headers. Change based on patch from Elias Pipping. + * Add fix for Debian bug #580272: use return value 1 of + is_selinux_enabled() to determine if SELinux is enabled, + otherwise initialize SELinux and load the policy. Patch from + Petter Reinholdtsen. + * Make quotes visible in example of the manual page of fstab-decode + * Add #ifdef in bootlogd.c to avoid gcc warnings about unused + variable on non-linux platforms. + * Only set the VSWTC field for termios in init if it is available, + to get the source building on FreeBSD. + ------------------------------------------------------------------- Fri Mar 11 17:05:55 CET 2011 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index 15318bd..c6d39d9 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -34,7 +34,7 @@ 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.88dsf.tar.bz2 +Source: http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf+.tar.bz2 Source2: killproc-2.19.tar.bz2 Source3: powerd-2.0.2.tar.bz2 Source4: showconsole-1.13.tar.bz2 @@ -44,15 +44,11 @@ Source7: sysvinit-rpmlintrc Source8: mkinitrd-boot.sh Source9: mkinitrd-kill1.sh Source10: mkinitrd-kill2.sh -Patch: sysvinit-2.88dsf.dif +Patch: sysvinit-2.88dsf+.dif Patch1: sysvinit-2.82-startstop.patch Patch2: sysvinit-2.88dsf-suse.patch Patch3: sysvinit-2.88dsf-no-kill.patch Patch4: notify-pam-dead.patch -Patch5: sysvinit-last-ipv6-heuristic.patch -Patch6: sysvinit-2.88dsf-utf8.dif -Patch7: sysvinit-2.88dsf-selinux.patch -Patch8: sysvinit-2.88dsf-nfs.patch Patch20: powerd-2.0.2.dif Patch21: powerd-2.0.2-getaddrinfo.patch Patch30: killproc-2.19.dif @@ -88,15 +84,11 @@ to startpar, killproc and pidof. System V init specific programs are in the sysvinit package. %prep -%setup -n sysvinit-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5 +%setup -n sysvinit-%{SIVER}dsf+ -q -b 2 -b 3 -b 4 -b 5 %patch1 -p0 -b .startstop %patch2 -p0 -b .suse %patch3 -p0 -b .no-kill %patch4 -p0 -b .pam -%patch5 -p2 -b .ipv6 -%patch6 -p0 -b .utf8 -%patch7 -p0 -b .selinux -%patch8 -p0 -b .nfs %patch pushd ../powerd-%{PDVER} %patch20