2.23.2-3: refresh patches
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak
parent
5a1ed95fbe
commit
d7262717be
|
|
@ -1,7 +1,6 @@
|
|||
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
|
||||
index a23cf6d..054a1dd 100644
|
||||
--- a/term-utils/agetty.c
|
||||
+++ b/term-utils/agetty.c
|
||||
diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils/agetty.c
|
||||
--- util-linux-2.23.2/term-utils/agetty.c.kzak 2013-07-30 11:14:18.124912322 +0200
|
||||
+++ util-linux-2.23.2/term-utils/agetty.c 2013-09-09 09:07:46.406689270 +0200
|
||||
@@ -132,13 +132,20 @@ struct options {
|
||||
int delay; /* Sleep seconds before prompt */
|
||||
int nice; /* Run login with this priority */
|
||||
|
|
@ -24,16 +23,22 @@ index a23cf6d..054a1dd 100644
|
|||
#define F_INITSTRING (1<<4) /* initstring is set */
|
||||
#define F_WAITCRLF (1<<5) /* wait for CR or LF */
|
||||
#define F_CUSTISSUE (1<<6) /* give alternative issue file */
|
||||
@@ -235,6 +242,9 @@ static void login_options_to_argv(char *argv[], int *argc, char *str, char *user
|
||||
@@ -235,10 +242,13 @@ static void login_options_to_argv(char *
|
||||
static char *fakehost;
|
||||
|
||||
#ifdef DEBUGGING
|
||||
+#ifndef
|
||||
+# define DEBUG_OUTPUT "/dev/ttyp0"
|
||||
+#endif
|
||||
#define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)
|
||||
-#define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)
|
||||
+# ifndef DEBUG_OUTPUT
|
||||
+# define DEBUG_OUTPUT "/dev/ttyp0"
|
||||
+# endif
|
||||
+# define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0)
|
||||
FILE *dbf;
|
||||
#else
|
||||
-#define debug(s) do { ; } while (0)
|
||||
+# define debug(s) do { ; } while (0)
|
||||
#endif
|
||||
|
||||
int main(int argc, char **argv)
|
||||
@@ -270,7 +280,7 @@ int main(int argc, char **argv)
|
||||
sigaction(SIGINT, &sa, &sa_int);
|
||||
|
||||
|
|
@ -69,7 +74,7 @@ index a23cf6d..054a1dd 100644
|
|||
/* Let the login program take care of password validation. */
|
||||
execv(options.login, login_argv);
|
||||
log_err(_("%s: can't exec %s: %m"), options.tty, login_argv[0]);
|
||||
@@ -532,7 +550,7 @@ static void parse_args(int argc, char **argv, struct options *op)
|
||||
@@ -534,7 +552,7 @@ static void parse_args(int argc, char **
|
||||
{ "init-string", required_argument, 0, 'I' },
|
||||
{ "noclear", no_argument, 0, 'J' },
|
||||
{ "login-program", required_argument, 0, 'l' },
|
||||
|
|
@ -78,7 +83,7 @@ index a23cf6d..054a1dd 100644
|
|||
{ "extract-baud", no_argument, 0, 'm' },
|
||||
{ "skip-login", no_argument, 0, 'n' },
|
||||
{ "nonewline", no_argument, 0, 'N' },
|
||||
@@ -601,7 +619,18 @@ static void parse_args(int argc, char **argv, struct options *op)
|
||||
@@ -603,7 +621,18 @@ static void parse_args(int argc, char **
|
||||
op->login = optarg;
|
||||
break;
|
||||
case 'L':
|
||||
|
|
@ -98,7 +103,7 @@ index a23cf6d..054a1dd 100644
|
|||
break;
|
||||
case 'm':
|
||||
op->flags |= F_PARSE;
|
||||
@@ -1088,8 +1117,19 @@ static void termio_init(struct options *op, struct termios *tp)
|
||||
@@ -1090,8 +1119,19 @@ static void termio_init(struct options *
|
||||
cfsetispeed(tp, ispeed);
|
||||
cfsetospeed(tp, ospeed);
|
||||
|
||||
|
|
@ -120,7 +125,7 @@ index a23cf6d..054a1dd 100644
|
|||
#ifdef HAVE_STRUCT_TERMIOS_C_LINE
|
||||
tp->c_line = 0;
|
||||
#endif
|
||||
@@ -1410,9 +1450,10 @@ static char *get_logname(struct options *op, struct termios *tp, struct chardata
|
||||
@@ -1412,9 +1452,10 @@ static char *get_logname(struct options
|
||||
|
||||
if (read(STDIN_FILENO, &c, 1) < 1) {
|
||||
|
||||
|
|
@ -133,7 +138,7 @@ index a23cf6d..054a1dd 100644
|
|||
continue;
|
||||
}
|
||||
switch (errno) {
|
||||
@@ -1646,7 +1687,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
|
||||
@@ -1648,7 +1689,7 @@ static void __attribute__ ((__noreturn__
|
||||
fputs(_(" -i, --noissue do not display issue file\n"), out);
|
||||
fputs(_(" -I, --init-string <string> set init string\n"), out);
|
||||
fputs(_(" -l, --login-program <file> specify login program\n"), out);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up util-linux-2.22.2/login-utils/login.c.kzak util-linux-2.22.2/login-utils/login.c
|
||||
--- util-linux-2.22.2/login-utils/login.c.kzak 2012-12-12 21:04:47.906355128 +0100
|
||||
+++ util-linux-2.22.2/login-utils/login.c 2013-02-19 16:14:33.224339106 +0100
|
||||
@@ -514,7 +514,7 @@ static void log_lastlog(struct login_con
|
||||
diff -up util-linux-2.23.2/login-utils/login.c.kzak util-linux-2.23.2/login-utils/login.c
|
||||
--- util-linux-2.23.2/login-utils/login.c.kzak 2013-07-30 10:39:26.222738397 +0200
|
||||
+++ util-linux-2.23.2/login-utils/login.c 2013-09-09 09:01:39.923225757 +0200
|
||||
@@ -502,7 +502,7 @@ static void log_lastlog(struct login_con
|
||||
if (!cxt->pwd)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: A collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.23.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
Group: System Environment/Base
|
||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||
|
|
@ -795,6 +795,9 @@ fi
|
|||
%{_libdir}/pkgconfig/uuid.pc
|
||||
|
||||
%changelog
|
||||
* Mon Sep 9 2013 Karel Zak <kzak@redhat.com> 2.23.2-3
|
||||
- refresh patches
|
||||
|
||||
* Thu Aug 1 2013 Karel Zak <kzak@redhat.com> 2.23.2-2
|
||||
- fix 990083 - su doesn't work with pam_ecryptfs
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue