From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 16 Aug 2001 22:24:25 +0000 (+0000)
Subject: - login-problems patch: should solve problems with ash/csh/ksh/zsh as login
X-Git-Tag: util-linux-2_11g-6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=82c54651f674fac23c53391d1289eb4dcd0f5d91;p=packages%2Futil-linux.git

- login-problems patch: should solve problems with ash/csh/ksh/zsh as login
  shell
- release 6

Changed files:
    util-linux-login-problems.patch -> 1.1
    util-linux.spec -> 1.129
---

diff --git a/util-linux-login-problems.patch b/util-linux-login-problems.patch
new file mode 100644
index 0000000..418f713
--- /dev/null
+++ b/util-linux-login-problems.patch
@@ -0,0 +1,33 @@
+--- util-linux-2.11g/login-utils/login.c.orig	Thu Aug 16 20:21:01 2001
++++ util-linux-2.11g/login-utils/login.c	Thu Aug 16 20:23:07 2001
+@@ -1080,6 +1080,9 @@
+      * setsid() or setpgrp(), then a ctrl-\, sending SIGQUIT to every
+      * process in the pgrp, will kill us.
+      * Solution: use TIOCNOTTY and setsid().
++     *
++     * removed "Solution" - caused serious problems with ash/csh/ksh/zsh
++     * as login shell  -- qboosh
+      */
+     signal(SIGINT, SIG_IGN);
+     signal(SIGHUP, SIG_IGN);	/* ignore signal from TIOCNOTTY below */
+@@ -1093,7 +1096,7 @@
+        exit(0);
+     } else if (childPid) {
+        /* parent - wait for child to finish, then cleanup session */
+-       ioctl(0, TIOCNOTTY, NULL);
++    /* ioctl(0, TIOCNOTTY, NULL); */
+        signal(SIGHUP, SIG_DFL);
+ 
+        wait(NULL);
+@@ -1101,9 +1104,9 @@
+        exit(0);
+     }
+     /* child */
+-    setsid();
++/*  setsid(); */
+     /* reopen, as we need controlling tty in the child */
+-    opentty(ttyn);
++/*  opentty(ttyn); */
+ #endif
+     signal(SIGHUP, SIG_DFL);
+     signal(SIGINT, SIG_DFL);
diff --git a/util-linux.spec b/util-linux.spec
index 2c07903..dd59857 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -13,7 +13,7 @@
 %define		_kernel_series	2.2
 %endif
 
-%define		rel	5
+%define		rel	6
 
 Summary:	Collection of basic system utilities for Linux
 Summary(de):	Sammlung von grundlegenden Systemdienstprogrammen für Linux
@@ -71,6 +71,7 @@ Patch16:	%{name}-s390.patch
 Patch18:	%{name}-kerneli-2.4.patch
 Patch20:	%{name}-qnx4.patch
 Patch21:	%{name}-losetup-getpass.patch
+Patch22:	%{name}-login-problems.patch
 BuildRequires:	pam-devel >= 0.66
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	gettext-devel
@@ -337,6 +338,7 @@ Obs
 %if !%{_kernel24}
 %patch21 -p1
 %endif
+%patch22 -p1
 
 %build
 CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses -I%{_kernelsrcdir}/include"