2.23.2-1: upgrade

Signed-off-by: Karel Zak <kzak@redhat.com>

.gitignore

@@ -26,3 +26,4 @@
 /util-linux-2.23-rc2.tar.xz
 /util-linux-2.23.tar.xz
 /util-linux-2.23.1.tar.xz
+/util-linux-2.23.2.tar.xz

sources

@@ -1 +1 @@
-33ba55ce82f8e3b8d7a38fac0f62779a  util-linux-2.23.1.tar.xz
+b39fde897334a4858bb2098edcce5b3f  util-linux-2.23.2.tar.xz

util-linux-2.23-agetty-clocal.patch

@@ -133,15 +133,6 @@ index a23cf6d..054a1dd 100644
  					continue;
  				}
  				switch (errno) {
-@@ -1633,7 +1674,7 @@ static speed_t bcode(char *s)
- static void __attribute__ ((__noreturn__)) usage(FILE *out)
- {
- 	fputs(USAGE_HEADER, out);
--	fprintf(out, _(" %1$s [options] line baud_rate,... [termtype]\n"
-+	fprintf(out, _(" %1$s [options] line [baud_rate,...] [termtype]\n"
- 		       " %1$s [options] baud_rate,... line [termtype]\n"), program_invocation_short_name);
- 	fputs(USAGE_OPTIONS, out);
- 	fputs(_(" -8, --8bits                assume 8-bit tty\n"), out);
 @@ -1646,7 +1687,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
  	fputs(_(" -i, --noissue              do not display issue file\n"), out);
  	fputs(_(" -I, --init-string <string> set init string\n"), out);

util-linux-2.23-login-TCSANOW.patch

@@ -1,70 +0,0 @@
-From c5bb244ea3f9fe8d4dbe07080ec811e232629ff8 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 5 Jun 2013 14:31:00 +0200
-Subject: [PATCH] login: use TCSANOW to remove HUPCL
-
-Fedora 19, kernel 3.9, systemd 204, telnetd with socket activation.
-
-login(1) code:
-
-        ttt.c_cflag &= ~HUPCL;
-        tcsetattr(0, TCSAFLUSH, &ttt);
-
-        close(STDIN_FILENO);
-        close(STDOUT_FILENO);
-        close(STDERR_FILENO);
-
-        signal(SIGHUP, SIG_IGN);        /* so vhangup() wont kill us */
-        vhangup();
-        signal(SIGHUP, SIG_DFL);
-
-strace :
-
-	ioctl(0, SNDCTL_TMR_CONTINUE or SNDRV_TIMER_IOCTL_GPARAMS or TCSETSF, {B9600 opost isig icanon echo ...}) = 0
-	close(0)                                = 0
-	close(1)                                = 0
-	close(2)                                = 0
-	--- SIGHUP {si_signo=SIGHUP, si_code=SI_KERNEL} ---
-	--- SIGTERM {si_signo=SIGTERM, si_code=SI_USER, si_pid=1, si_uid=0} ---
-	+++ killed by SIGTERM +++
-
-It seems we get SIGHUP (and SIGTERM from systemd) before vhangup().
-The problem occur sometimes.
-
-I guess it's because TCSAFLUSH is not applied immediately, so it would
-be probably better to use TCSANOW to make the code more robust.
-
-References: https://bugzilla.redhat.com/show_bug.cgi?id=962145
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- login-utils/login.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/login-utils/login.c b/login-utils/login.c
-index 442ad40..554c46d 100644
---- a/login-utils/login.c
-+++ b/login-utils/login.c
-@@ -395,7 +395,7 @@ static void init_tty(struct login_context *cxt)
- 	}
- 
- 	/* Kill processes left on this tty */
--	tcsetattr(0, TCSAFLUSH, &ttt);
-+	tcsetattr(0, TCSANOW, &ttt);
- 
- 	/*
- 	 * Let's close file decriptors before vhangup
-@@ -1312,10 +1312,10 @@ int main(int argc, char **argv)
- 		close(cnt);
- 
- 	setpgrp();	 /* set pgid to pid this means that setsid() will fail */
-+	init_tty(&cxt);
- 
- 	openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
- 
--	init_tty(&cxt);
- 	init_loginpam(&cxt);
- 
- 	/* login -f, then the user has already been authenticated */
--- 
-1.8.1.4
-

util-linux.spec

@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.23.1
-Release: 3%{?dist}
+Version: 2.23.2
+Release: 1%{?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
@@ -79,8 +79,6 @@ Patch0: util-linux-ng-2.22-login-lastlog.patch
 
 ### Backport from v2.24 + #972457
 Patch1: util-linux-2.23-agetty-clocal.patch
-### 962145 - in.telnetd immediately closes connection
-Patch2: util-linux-2.23-login-TCSANOW.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -797,6 +795,10 @@ fi
 %{_libdir}/pkgconfig/uuid.pc
 
 %changelog
+* Wed Jul 31 2013 Karel Zak <kzak@redhat.com> 2.23.2-1
+- upgrade to stable release 2.23.2
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23.2-ReleaseNotes
+
 * Thu Jun 13 2013 Karel Zak <kzak@redhat.com> 2.23.1-3
 - fix #972457 - agetty idle I/O polling causes elevated CPU usage