Accepting request 222119 from Base:System

util-linux 2.24.1 (forwarded request 221543 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/222119
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=180

blkdiscard-BLKSSZGET-fills-in-an-int.patch

@@ -1,27 +0,0 @@
-Subject: [PATCH] blkdiscard: BLKSSZGET fills in an int, not a uint64
-Message-ID: 1383435966-29337-1-git-send-email-tytso@mit.edu
-
-Reported-by: Jason Cipriani <jason.cipriani@gmail.com>
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
----
- sys-utils/blkdiscard.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
-index af9ed66..2ddcdb1 100644
---- a/sys-utils/blkdiscard.c
-+++ b/sys-utils/blkdiscard.c
-@@ -70,8 +70,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
- int main(int argc, char **argv)
- {
- 	char *path;
--	int c, fd, verbose = 0, secure = 0;
--	uint64_t end, blksize, secsize, range[2];
-+	int c, fd, verbose = 0, secure = 0, secsize;
-+	uint64_t end, blksize, range[2];
- 	struct stat sb;
- 
- 	static const struct option longopts[] = {
--- 
-1.7.12.rc0.22.gcdd159b
-

tty3270-on-serial-line-of-s390.patch

@@ -4,25 +4,16 @@ the second serial line on a S/390(x) is a real character terminal which
 is compatible with VT220.
 
 ---
- agetty.c |   18 ++++++++++++++++++
+ term-utils/agetty.c |   14 ++++++++++++++
- 1 file changed, 18 insertions(+)
+ 1 file changed, 14 insertions(+)
 
---- term-utils/agetty.c
+Index: util-linux-2.24.1/term-utils/agetty.c
-+++ term-utils/agetty.c	2013-11-29 11:57:11.000000000 +0000
+===================================================================
-@@ -49,6 +49,10 @@
+--- util-linux-2.24.1.orig/term-utils/agetty.c	2014-02-09 21:19:01.000000000 +0000
- #  ifndef DEFAULT_VCTERM
++++ util-linux-2.24.1/term-utils/agetty.c	2014-02-09 21:19:27.000000000 +0000
- #    define DEFAULT_VCTERM "linux"
+@@ -1042,6 +1042,20 @@ static void open_tty(char *tty, struct t
- #  endif
+ 	/* make stdio unbuffered for slow modem lines */
-+#  if defined (__s390__) || defined (__s390x__)
+ 	setvbuf(stdout, NULL, _IONBF, 0);
-+#    define DEFAULT_TTYS0  "ibm327x"
-+#    define DEFAULT_TTYS1  "vt220"
-+#  endif
- #  ifndef DEFAULT_STERM
- #    define DEFAULT_STERM  "vt102"
- #  endif
-@@ -983,6 +987,20 @@ static void open_tty(char *tty, struct t
- 	if (tcgetattr(STDIN_FILENO, tp) < 0)
- 		log_err(_("%s: failed to get terminal attributes: %m"), tty);
  
 +#if defined (__s390__) || defined (__s390x__)
 +	if (!op->term) {
@@ -39,5 +30,5 @@ is compatible with VT220.
 +	}
 +#endif
  	/*
- 	 * Detect if this is a virtual console or serial/modem line.
+ 	 * The following ioctl will fail if stdin is not a tty, but also when
- 	 * In case of a virtual console the ioctl TIOCMGET fails and
+ 	 * there is noise on the modem control lines. In the latter case, the

util-linux-2.24.1.tar.sign

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJS3R7fAAoJEOS3HV7sOcKEODUP/2BqIqmRfuqP9rJkwQ5K19pk
+vpoVSNIPVgcjkImP+CAz6PGkLGBjCEeVurY0QgblebVFgowK430LaejW5uwrz9ca
+5OWqmDJXxrUQWDj9HLmABNkOclAtgT/BF8gt+J2uB8HWcVHKt8PKc6guX4+KJ3vE
+Ct6kQcE7gWFxdQtdrBodst4546YDABasqxZncoz+AaakJW5IM70nmfKrzoEV1Seu
+BQHivazmJMdHgPlUaz2Ujl6NPcQ4QtdKCWc0f0EkwaN1jSP7ArWPBQZdDynA6vRv
+qkQ3JC4VBoxec9AMUVDSqy09kXhP6jxDMqLJ29JRi2EJ8MeNh9naT7snSvejaX1e
+plbJARuRAyRSlFDhunFydAQXNHjLfAI4TME2TbRi9z+pYLbcuiHfq2eJQXPZAaHL
+BY3esejflzytLpQ5ABDDGRNJhLIZgF9dUYElVHONC5oTA/TnzuzhLxzcY2QENHtr
+mZoJhlR+7hyyLTFWWdACGGFextwdl2Qjxeh6zw911QKRSu64qn3Velg3Hm21CYYB
+s0CpWVHxKnTJ9wIOY6unZuqDSg2fElXJpwD8EYzts/dxhZ08bCFulrPoYQsFcajm
+amAf03xKz6akRp4pc5061Yprl/0jDIRYjuttFpFVLrB32lZiBrzN+hMjF4ioDorh
+6U6NLJVF4YRXQ6gTfVf3
+=gxA/
+-----END PGP SIGNATURE-----

util-linux-2.24.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410
+size 3543692

util-linux-2.24.tar.sign

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.15 (GNU/Linux)
-
-iQIcBAABAgAGBQJSZS9lAAoJEOS3HV7sOcKEVVEP/25GXdItGSiajLPnWumK5QDl
-eVMqhCtqnS7cR+WcOr3S11ngE2wpZyp63ednBrQnK+OZRNvyJaXTqqQ8+naYZ86G
-gfK+EtnBOemuUS9yFSLEjseJvBJoRsSWSoJyA5w3id0exiLJiziAM/KTNKvzbPuK
-QX09CtUDNWCFuV/wzYSa0Ur7MMk+dZkxb+e9gm0TKhaz4XMr4LXgv+nApTp6LVnO
-6DMrFid7kuQrvXdZya04T7GSuev7sLslsiVzWlwVM+aD+jKBTqQeBarb39/vok6n
-JlbJl1M8EwwIkwuLL+BoBsioNXBLRB/vhRcbiyx3DNY0n/1Glm+DqbgSmv+FMvgo
-wmp1T+q/8uoTN2moi8TKeGMvt2rdf9VRAMBqeUwryqfCZKwAw/koQQmfCN/5oqtX
-2uggYFaZPGgDS/ovoOads8Gee7NXkKLW81Yn7WtLUiDSkt4kyVYCaqhthGvkAUtG
-Fun9UtIaPr7V80g2VyxHZqitzjJn8zIdsxvLalJsB7HarZKAg3CpvB1G7MZaKEle
-lOn/oCoPWGvbAEOjl4t4M3mgjitfmhBwVmhjal3pY0Oq844s1km8z096Xb8oOzdN
-g+TzWvfn5dQO+SEIAUv+t2FEIgRQH0e+wMk0dR8rVy4YmcjVwsyoNTQ3sV4lTDTy
-o4LwYqKNU+uQ6EmDsnZ2
-=6YN4
------END PGP SIGNATURE-----

util-linux-2.24.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30add9a8869cef9e5a76755214f074689b6294cea63f4569711faeb099aecc06
-size 3531936

util-linux.changes

@@ -1,4 +1,124 @@
 -------------------------------------------------------------------
+Sun Feb  9 21:20:31 UTC 2014 - andreas.stieger@gmx.de
+
+- util-linux 2.24.1
+- agetty:
+  * support the special terminal on first serial line on a S/390 
+- blkdiscard:
+  * BLKSSZGET fills in an int, not a uint64
+- blkid:
+  * escape quotes in the output
+  * simple typo
+- blockdev:
+  * don't use HDIO_GETGEO
+- build-sys:
+  * add --with-smack to config-gen.d
+  * fstrim depends on libmount
+- chsh, chfn:
+  * add info about non-local support to the man pages
+- dmesg:
+  * fix --raw zero timestamp for kmsg
+- docs:
+  * add patching process to howto-contribute.txt
+  * update AUTHORS file
+  * update links to http //git.kernel.org/ web repository views
+ -fdisk:
+  * don't care about partition type
+  * fix printf stuff
+  * fix usage(), -l [<disk>]
+- flock:
+  * Change the 'exit status' man page section to make more sense
+- fsck:
+  * add ext4 to list of filesystems with progress bars in fsck man page
+- fstrim:
+  * add --all to discard all filesystem
+  * cleanup usage()
+- lib/path:
+  * add path_strdup()
+- libblkid:
+  * (nilfs2) check also backup superblock
+  * detect alone PMBR
+  * fix memory leak in blkid_parse_tag_string()
+  * fix swap-area version
+- libfdisk:
+  * (dos) be more verbose when change bootable flag
+  * (dos) fix free part counter
+  * (dos) warn on type 0
+  * (gpt) add /home GUID
+  * (gpt) improve and cleanup recovery code
+  * (gpt) recover from corrupted primary/backup PT
+  * (sgi) generate partname according to partition position
+  * (sun) fix end sectors with +1 error
+- libmount:
+  * add efivarfs to the list of pseudo filesystems
+  * add mnt_tag_is_valid()
+  * cleanup fix_optstr() regards to selinux and smack
+  * fix typo in smack path
+  * remove smackfs* option when SMACK not enabled
+- lsblk:
+  * fix -D segfault
+- lscpu:
+  * sort NUMA nodes to keep output human readable
+  * support discontinuous NUMA nodes
+  * support non sequentially numbering of CPUs
+- man:
+  * Syntax and spelling fixes
+- mkfs.minix:
+  * fix fscanf() format string [coverity scan]
+- mkswap:
+  * fix compiler warning [-Wunused-variable]
+  * remove cruft from the man page
+- mount:
+  * add note about "noauto" to --all description
+  * correct mount man page default iso9660 permission
+  * fix man mount page type
+  * improve -s man mage info
+  * make NAME=value tags usable for non-root
+  * mount.8 fix grammar
+  * update man page ext3/4 mount options
+- partx:
+  * fix --update ranges and out of order tables
+- po:
+  * merge changes
+  * update da.po (from translationproject.org)
+  * update de.po (from translationproject.org)
+  * update pt_BR.po (from translationproject.org)
+  * update zh_CN.po (from translationproject.org)
+- pylibmount:
+  * correctly import from pylibmount.so
+  * import directly from pylibmount in tests
+  * remove unncessary subdirectory
+- script:
+  * don't call TIOCGWINSZ in signal handler
+  * restore errno in signal handler
+  * use poll() rather then O_NONBLOCK
+- setpriv:
+  * simplify usage()
+- setterm:
+  * fix -dump man page info
+- sulogin:
+  * use dirent->d_type when scans /dev
+- taskset:
+  * fix PERMISSIONS section of taskset man page
+- tests:
+  * update blkid swap tests
+  * update build-sys tests
+  * update lscpu tests
+- textual:
+  * small inprovements to usage and man page of fstrim
+- umount:
+  * fix umount by tag for non-roots
+- unshare:
+  * add more hints about mount namespaces to the man page
+- wipefs:
+  * call BLKRRPART when erase partition table
+- removed patches:
+  * blkdiscard-BLKSSZGET-fills-in-an-int.patch, applied upstream
+- modified patches:
+  * tty3270-on-serial-line-of-s390.patch, one hunk applied
+    upstream
+
+------------------------------------------------------------------
 Fri Feb  7 15:59:20 UTC 2014 - werner@suse.de
 
 - Add patch sulogin-does-not-find-any-console.patch to enable sulogin

util-linux.spec

@@ -47,7 +47,7 @@ BuildRequires:  systemd-rpm-macros
 %endif
 BuildRequires:  utempter-devel
 BuildRequires:  zlib-devel
-Version:        2.24
+Version:        2.24.1
 Release:        0
 # util-linux is a base package and uuidd pre-requiring pwdutils pulls
 # that into the core build cycle.  pwdutils also pulls in the whole
@@ -104,8 +104,6 @@ Patch2:         util-linux-2.23.1-eject-fpie.patch
 Patch4:         make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
 # disable encryption
 Patch12:        util-linux-2.23.1-noenc-suse.diff
-# PATCH-FIX-UPSTREAM blkdiscard-BLKSSZGET-fills-in-an-int.patch tytso@mit.edu
-Patch13:        blkdiscard-BLKSSZGET-fills-in-an-int.patch
 # PATCH-FIX-SUSE -- better support of S390 in agetty
 Patch14:        tty3270-on-serial-line-of-s390.patch
 # PATCH-FIX-SUSE -- Let agetty not be fooled by locked termios srtucture
@@ -232,8 +230,7 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
 %patch2 -p1
 %patch4 -p1
 %patch12 -p1
-%patch13 -p1
+%patch14 -p1
-%patch14 -p0
 %patch15 -p0
 %patch16 -p0
 %patch17 -p0