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.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-04-01
15:02:37.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.EFuG99/_new 2011-04-01 16:50:29.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.EFuG99/_new 2011-04-01 16:50:29.000000000 +0200
@@ -1,4 +1,95 @@
---- .dummy
-+++ .dummy 2011-03-25 17:58:16.867926297 +0000
-@@ -0,0 +1 @@
-+Remove if real patch is required
+--- blogd.c
++++ blogd.c 2011-03-31 14:59:37.543926064 +0000
+@@ -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 +0000
+@@ -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 +0000
+@@ -39,7 +39,7 @@ struct console {
+ int fd, tlock;
+ ssize_t max_canon;
+ struct termios ltio, otio;
+- struct console *restrict next;
++ struct console * next;
+ };
+ extern void error (const char *fmt, ...) attribute((__noreturn__,
__format__(__printf__, 1, 2)));
+ extern void warn (const char *fmt, ...) attribute((__format__(__printf__, 1,
2)));
+@@ -50,6 +50,6 @@ extern void secondtty(struct console *re
+ extern void prepareIO(void (*rfunc)(int), void (*pfunc)(void), const pid_t,
const int);
+ extern void safeIO (void);
+ extern void closeIO(void);
+-extern struct console *restrict cons;
++extern struct console *cons;
+ #define alignof(type) ((sizeof(type)+(sizeof(void*)-1)) &
~(sizeof(void*)-1))
+ #define strsize(string) ((strlen(string)+1)*sizeof(char))
++++++ sysvinit-2.88dsf-multiple-sulogin.patch ++++++
++++ 1448 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
