rpms/util-linux
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.23.2-3: rename patches

Browse Source
This commit is contained in:
Karel Zak 2013-09-09 09:22:51 +02:00
parent d7262717be
commit 706e746809
3 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util-linux-ng-2.22-login-lastlog.patch → 2.23-login-lastlog-create.patch
View File

@ -2,11 +2,10 @@ diff -up util-linux-2.23.2/login-utils/login.c.kzak util-linux-2.23.2/login-util
--- 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.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 +++ 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 @@ -502,7 +502,7 @@ static void log_lastlog(struct login_con
if (!cxt->pwd) if (!cxt->pwd)
return; return;
- fd = open(_PATH_LASTLOG, O_RDWR, 0); - fd = open(_PATH_LASTLOG, O_RDWR, 0);
+ fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0); + fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0);
if (fd < 0) if (fd < 0)
return; return;

84
util-linux-2.23-agetty-clocal.patch → 2.24-agetty-clocal.patch
View File

@ -2,11 +2,11 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
--- 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.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 +++ util-linux-2.23.2/term-utils/agetty.c 2013-09-09 09:07:46.406689270 +0200
@@ -132,13 +132,20 @@ struct options { @@ -132,13 +132,20 @@ struct options {
int delay; /* Sleep seconds before prompt */ int delay; /* Sleep seconds before prompt */
int nice; /* Run login with this priority */ int nice; /* Run login with this priority */
int numspeed; /* number of baud rates to try */ int numspeed; /* number of baud rates to try */
+ int clocal; /* CLOCAL_MODE_* */ + int clocal; /* CLOCAL_MODE_* */
speed_t speeds[MAX_SPEED]; /* baud rates to be tried */ speed_t speeds[MAX_SPEED]; /* baud rates to be tried */
}; };
+enum { +enum {
@ -40,17 +40,17 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -270,7 +280,7 @@ int main(int argc, char **argv) @@ -270,7 +280,7 @@ int main(int argc, char **argv)
sigaction(SIGINT, &sa, &sa_int); sigaction(SIGINT, &sa, &sa_int);
#ifdef DEBUGGING #ifdef DEBUGGING
- dbf = fopen("/dev/ttyp0", "w"); - dbf = fopen("/dev/ttyp0", "w");
+ dbf = fopen(DEBUG_OUTPUT, "w"); + dbf = fopen(DEBUG_OUTPUT, "w");
for (int i = 1; i < argc; i++) for (int i = 1; i < argc; i++)
debug(argv[i]); debug(argv[i]);
#endif /* DEBUGGING */ #endif /* DEBUGGING */
@@ -311,8 +321,10 @@ int main(int argc, char **argv) @@ -311,8 +321,10 @@ int main(int argc, char **argv)
strlen(options.initstring)); strlen(options.initstring));
} }
- if (!serial_tty_option(&options, F_LOCAL)) - if (!serial_tty_option(&options, F_LOCAL))
- /* Go to blocking write mode unless -L is specified. */ - /* Go to blocking write mode unless -L is specified. */
@ -58,12 +58,12 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
+ /* Go to blocking mode unless -L is specified, this change + /* Go to blocking mode unless -L is specified, this change
+ * affects stdout, stdin and stderr as all the file descriptors + * affects stdout, stdin and stderr as all the file descriptors
+ * are created by dup(). */ + * are created by dup(). */
fcntl(STDOUT_FILENO, F_SETFL, fcntl(STDOUT_FILENO, F_SETFL,
fcntl(STDOUT_FILENO, F_GETFL, 0) & ~O_NONBLOCK); fcntl(STDOUT_FILENO, F_GETFL, 0) & ~O_NONBLOCK);
@@ -420,6 +432,12 @@ int main(int argc, char **argv) @@ -420,6 +432,12 @@ int main(int argc, char **argv)
options.tty); options.tty);
} }
+#ifdef DEBUGGING +#ifdef DEBUGGING
+ fprintf(dbf, "read %c\n", ch); + fprintf(dbf, "read %c\n", ch);
@ -71,22 +71,22 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
+ log_err("write failed: %s", DEBUG_OUTPUT); + log_err("write failed: %s", DEBUG_OUTPUT);
+#endif +#endif
+ +
/* Let the login program take care of password validation. */ /* Let the login program take care of password validation. */
execv(options.login, login_argv); execv(options.login, login_argv);
log_err(_("%s: can't exec %s: %m"), options.tty, login_argv[0]); log_err(_("%s: can't exec %s: %m"), options.tty, login_argv[0]);
@@ -534,7 +552,7 @@ static void parse_args(int argc, char ** @@ -534,7 +552,7 @@ static void parse_args(int argc, char **
{ "init-string", required_argument, 0, 'I' }, { "init-string", required_argument, 0, 'I' },
{ "noclear", no_argument, 0, 'J' }, { "noclear", no_argument, 0, 'J' },
{ "login-program", required_argument, 0, 'l' }, { "login-program", required_argument, 0, 'l' },
- { "local-line", no_argument, 0, 'L' }, - { "local-line", no_argument, 0, 'L' },
+ { "local-line", optional_argument, 0, 'L' }, + { "local-line", optional_argument, 0, 'L' },
{ "extract-baud", no_argument, 0, 'm' }, { "extract-baud", no_argument, 0, 'm' },
{ "skip-login", no_argument, 0, 'n' }, { "skip-login", no_argument, 0, 'n' },
{ "nonewline", no_argument, 0, 'N' }, { "nonewline", no_argument, 0, 'N' },
@@ -603,7 +621,18 @@ static void parse_args(int argc, char ** @@ -603,7 +621,18 @@ static void parse_args(int argc, char **
op->login = optarg; op->login = optarg;
break; break;
case 'L': case 'L':
- op->flags |= F_LOCAL; - op->flags |= F_LOCAL;
+ /* -L and -L=always have the same meaning */ + /* -L and -L=always have the same meaning */
+ op->clocal = CLOCAL_MODE_ALWAYS; + op->clocal = CLOCAL_MODE_ALWAYS;
@ -100,12 +100,12 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
+ else + else
+ log_err(_("unssuported --local-line mode argument")); + log_err(_("unssuported --local-line mode argument"));
+ } + }
break; break;
case 'm': case 'm':
op->flags |= F_PARSE; op->flags |= F_PARSE;
@@ -1090,8 +1119,19 @@ static void termio_init(struct options * @@ -1090,8 +1119,19 @@ static void termio_init(struct options *
cfsetispeed(tp, ispeed); cfsetispeed(tp, ispeed);
cfsetospeed(tp, ospeed); cfsetospeed(tp, ospeed);
- if (op->flags & F_LOCAL) - if (op->flags & F_LOCAL)
- tp->c_cflag |= CLOCAL; - tp->c_cflag |= CLOCAL;
@ -123,27 +123,27 @@ diff -up util-linux-2.23.2/term-utils/agetty.c.kzak util-linux-2.23.2/term-utils
+ } + }
+ +
#ifdef HAVE_STRUCT_TERMIOS_C_LINE #ifdef HAVE_STRUCT_TERMIOS_C_LINE
tp->c_line = 0; tp->c_line = 0;
#endif #endif
@@ -1412,9 +1452,10 @@ static char *get_logname(struct options @@ -1412,9 +1452,10 @@ static char *get_logname(struct options
if (read(STDIN_FILENO, &c, 1) < 1) { if (read(STDIN_FILENO, &c, 1) < 1) {
- /* Do not report trivial like EINTR/EIO errors. */ - /* Do not report trivial like EINTR/EIO errors. */
+ /* The terminal could be open with O_NONBLOCK when + /* The terminal could be open with O_NONBLOCK when
+ * -L (force CLOCAL) is specified... */ + * -L (force CLOCAL) is specified... */
if (errno == EINTR || errno == EAGAIN) { if (errno == EINTR || errno == EAGAIN) {
- usleep(1000); - usleep(1000);
+ usleep(250000); + usleep(250000);
continue; continue;
} }
switch (errno) { switch (errno) {
@@ -1648,7 +1689,7 @@ static void __attribute__ ((__noreturn__ @@ -1648,7 +1689,7 @@ static void __attribute__ ((__noreturn__
fputs(_(" -i, --noissue do not display issue file\n"), out); fputs(_(" -i, --noissue do not display issue file\n"), out);
fputs(_(" -I, --init-string <string> set init string\n"), out); fputs(_(" -I, --init-string <string> set init string\n"), out);
fputs(_(" -l, --login-program <file> specify login program\n"), out); fputs(_(" -l, --login-program <file> specify login program\n"), out);
- fputs(_(" -L, --local-line force local line\n"), out); - fputs(_(" -L, --local-line force local line\n"), out);
+ fputs(_(" -L, --local-line[=<mode>] cotrol local line flag\n"), out); + fputs(_(" -L, --local-line[=<mode>] cotrol local line flag\n"), out);
fputs(_(" -m, --extract-baud extract baud rate during connect\n"), out); fputs(_(" -m, --extract-baud extract baud rate during connect\n"), out);
fputs(_(" -n, --skip-login do not prompt for login\n"), out); fputs(_(" -n, --skip-login do not prompt for login\n"), out);
fputs(_(" -o, --login-options <opts> options that are passed to login\n"), out); fputs(_(" -o, --login-options <opts> options that are passed to login\n"), out);

6
util-linux.spec
View File

@ -75,10 +75,10 @@ Requires: libmount = %{version}-%{release}
### Ready for upstream? ### Ready for upstream?
### ###
# 151635 - makeing /var/log/lastlog # 151635 - makeing /var/log/lastlog
Patch0: util-linux-ng-2.22-login-lastlog.patch Patch0: 2.23-login-lastlog-create.patch
### Backport from v2.24 + #972457 ### Backport from v2.24 + #972457
Patch1: util-linux-2.23-agetty-clocal.patch Patch1: 2.24-agetty-clocal.patch
%description %description
The util-linux package contains a large variety of low-level system The util-linux package contains a large variety of low-level system
@ -796,7 +796,7 @@ fi
%changelog %changelog
* Mon Sep 9 2013 Karel Zak <kzak@redhat.com> 2.23.2-3 * Mon Sep 9 2013 Karel Zak <kzak@redhat.com> 2.23.2-3
- refresh patches - refresh and rename patches
* Thu Aug 1 2013 Karel Zak <kzak@redhat.com> 2.23.2-2 * Thu Aug 1 2013 Karel Zak <kzak@redhat.com> 2.23.2-2
- fix 990083 - su doesn't work with pam_ecryptfs - fix 990083 - su doesn't work with pam_ecryptfs