sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 231816 from Base:System

Browse Source 
- minor update to util-linux 2.24.2
- remove tty3270-on-serial-line-of-s390.patch (was already upstream
  since 2.24.1)
- remove barrier_documentation.patch (applied upstream)
- rebase blkid-convert-superblocks-to-new-calling-convention.patch (forwarded request 231272 from rudi_m)

OBS-URL: https://build.opensuse.org/request/show/231816
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=185
This commit is contained in:
Stephan Kulow 2014-05-03 14:51:32 +00:00 committed by Git OBS Bridge
commit 256258167b
9 changed files with 181 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
blkid-convert-superblocks-to-new-calling-convention.patch
View File

@ -1,4 +1,4 @@
From 5cb7e4a24f8fb29ddf36309419aa1172f13f3310 Mon Sep 17 00:00:00 2001
From 9d3bb346fb30f5e03f919b4f68dc8e7e59499bc7 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 21 Jan 2014 10:10:19 +0100
Subject: [PATCH] blkid: convert superblocks to new calling convention
@ -12,6 +12,7 @@ This patch updates all superblock scanning functions
to the new calling convention.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
libblkid/src/partitions/aix.c | 2 +-
libblkid/src/partitions/bsd.c | 14 ++++++---
@ -2202,19 +2203,19 @@ index fdab85a..4537560 100644
blkid_probe_sprintf_version(pr, "%u", (unsigned int) vxs->vs_version);
return 0;
diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c
index b485917..3c8b5ea 100644
index f4bb721..58a985d 100644
--- a/libblkid/src/superblocks/xfs.c
+++ b/libblkid/src/superblocks/xfs.c
@@ -41,7 +41,7 @@ static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
@@ -164,7 +164,7 @@ static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag)
xs = blkid_probe_get_sb(pr, mag, struct xfs_super_block);
if (!xs)
- return -1;
+ return errno ? -1 : 1;
if (strlen(xs->xs_fname))
blkid_probe_set_label(pr, (unsigned char *) xs->xs_fname,
@@ -123,7 +123,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
if (!xfs_verify_sb(xs))
return 1;
@@ -249,7 +249,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
buf = blkid_probe_get_buffer(pr, 0, 256*1024);
if (!buf)
@ -2223,7 +2224,7 @@ index b485917..3c8b5ea 100644
if (memcmp(buf, "XFSB", 4) == 0)
return 1; /* this is regular XFS, ignore */
@@ -138,7 +138,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
@@ -264,7 +264,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag)
}
}
@ -2264,5 +2265,5 @@ index fb86aec..d28786b 100644
return 0;
}
--
1.8.1.4
1.8.4.5

34
tty3270-on-serial-line-of-s390.patch
View File

@ -1,34 +0,0 @@
Support the special terminal on first serial line on a S/390(x) which
is due legacy reasons a block terminal of type 3270 or higher. Whereas
the second serial line on a S/390(x) is a real character terminal which
is compatible with VT220.
---
term-utils/agetty.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: util-linux-2.24.1/term-utils/agetty.c
===================================================================
--- util-linux-2.24.1.orig/term-utils/agetty.c 2014-02-09 21:19:01.000000000 +0000
+++ util-linux-2.24.1/term-utils/agetty.c 2014-02-09 21:19:27.000000000 +0000
@@ -1042,6 +1042,20 @@ static void open_tty(char *tty, struct t
/* make stdio unbuffered for slow modem lines */
setvbuf(stdout, NULL, _IONBF, 0);
+#if defined (__s390__) || defined (__s390x__)
+ if (!op->term) {
+ /*
+ * Special terminal on first serial line on a S/390(x) which
+ * is due legacy reasons a block terminal of type 3270 or
+ * higher. Whereas the second serial line on a S/390(x) is
+ * a real character terminal which is compatible with VT220.
+ */
+ if (strcmp(op->tty, "ttyS0") == 0 || strncmp(op->tty, "3270/tty", 8) == 0)
+ op->term = DEFAULT_TTYS0;
+ else if (strcmp(op->tty, "ttyS1") == 0)
+ op->term = DEFAULT_TTYS1;
+ }
+#endif
/*
* The following ioctl will fail if stdin is not a tty, but also when
* there is noise on the modem control lines. In the latter case, the

17
util-linux-2.24.1.tar.sign
View File

@ -1,17 +0,0 @@
-----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-----

3
util-linux-2.24.1.tar.xz
View File

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

17
util-linux-2.24.2.tar.sign Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJTWOMEAAoJEOS3HV7sOcKENCYP+wbqkV8Oj9rfvgQguiN7hFje
xGshx7s7R4q3ZOK3k7Iw6yln0vT/XWAieEmuy1SIitsQ7GWe81qMloJ85hGKeryQ
G6U/+T5RX3F3bpGBGAMrQ8Z1VM85+6Q84g4LbXK9QclVNpdYuIF68hs5KWjSlx+R
GhH87GpEVIskpTlNE7UmEGoxYm5sdmwb3pIg04SkVFPtvjlRxlTgL5uLjNc1d2tW
XVKgflMD6RLX/OeQTpmqPpfE8yQwwi20hph9ISQ/0cHXsp3Ab6Tx+hSZUlujQPZT
7ljuTioRplp0n7tBbE4Fu0r7BqummGgRTA8q1JakOCxs5UGDvhhILjNxf42jpkL4
g++J6M2IoiMPbZlXu3NQEwaTkbIRY4THnWj0SSZtc6WVNdcPggwV8sx9fuzVHYjR
+FPRkPLFMsTYg1FZDFFNHVU0DynzHhCvY2idWEFTUFxou71dS1EMlaF7yu8uHN1R
QJZqfl0K1s76uffnzU3ljTg6ZD6PgVSYrJj85Q4UBUjxz3FLlj7XP9n/rNZszmc0
YGRwmkifdiAh1g5vmax8LRPWs46450XUjd+U+d5NvAfLihtNhwsjlXs+Xqsnk9Do
Aq6IeyoVLO+pi2KRbYEWFzajUhBp5qpcNPjQHXn/1FOTuVFDpMwWhEhHrVb/SYlo
9qhwLq9ab+rI3J7Zgiqh
=JB8F
-----END PGP SIGNATURE-----

3
util-linux-2.24.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0
size 3586580

131
util-linux-ng-2.19.1-barrier_documentation.patch
View File

@ -1,131 +0,0 @@
From: Jan Kara <jack@suse.cz>
Subject: Update documentation of mount(8) about barrier mount options
Signed-off-by: Jan Kara <jack@suse.cz>
Index: util-linux-2.24.1/sys-utils/mount.8
===================================================================
--- util-linux-2.24.1.orig/sys-utils/mount.8
+++ util-linux-2.24.1/sys-utils/mount.8
@@ -1524,12 +1524,13 @@ ordered mode.
Abort the journal if an error occurs in a file data buffer in ordered mode.
.TP
.BR barrier=0 " / " barrier=1 "
-This enables/disables barriers. barrier=0 disables it, barrier=1 enables it.
-Write barriers enforce proper on-disk ordering of journal commits, making
-volatile disk write caches safe to use, at some performance penalty. The ext3
-filesystem does not enable write barriers by default. Be sure to enable
-barriers unless your disks are battery-backed one way or another. Otherwise
-you risk filesystem corruption in case of power failure.
+This disables / enables the use of write barriers in the jbd code. barrier=0
+disables, barrier=1 enables (default). This also requires an IO stack which can
+support barriers, and if jbd gets an error on a barrier write, it will disable
+barriers again with a warning. Write barriers enforce proper on-disk ordering
+of journal commits, making volatile disk write caches safe to use, at some
+performance penalty. If your disks are battery-backed in one way or another,
+disabling barriers may safely improve performance.
.TP
.BI commit= nrsec
Sync all data and metadata every
@@ -1577,15 +1578,9 @@ enabled older kernels cannot mount the d
This will enable 'journal_checksum' internally.
.TP
.BR barrier=0 " / " barrier=1 " / " barrier " / " nobarrier
-This enables/disables the use of write barriers in the jbd code. barrier=0
-disables, barrier=1 enables. This also requires an IO stack which can support
-barriers, and if jbd gets an error on a barrier write, it will disable again
-with a warning. Write barriers enforce proper on-disk ordering of journal
-commits, making volatile disk write caches safe to use, at some performance
-penalty. If your disks are battery-backed in one way or another, disabling
-barriers may safely improve performance. The mount options "barrier" and
-"nobarrier" can also be used to enable or disable barriers, for consistency
-with other ext4 mount options.
+These mount options have the same effect as in ext3. The mount options
+"barrier" and "nobarrier" are added for consistency with other ext4 mount
+options.
The ext4 filesystem enables write barriers by default.
.TP
@@ -2266,13 +2261,13 @@ Enable POSIX Access Control Lists. See t
manual page.
.TP
.BR barrier=none " / " barrier=flush "
-This enables/disables the use of write barriers in the journaling code.
-barrier=none disables it, barrier=flush enables it. Write barriers enforce
+This disables / enables the use of write barriers in the journaling code.
+barrier=none disables, barrier=flush enables (default). This also requires an
+IO stack which can support barriers, and if reiserfs gets an error on a barrier
+write, it will disable barriers again with a warning. Write barriers enforce
proper on-disk ordering of journal commits, making volatile disk write caches
-safe to use, at some performance penalty. The reiserfs filesystem does not
-enable write barriers by default. Be sure to enable barriers unless your disks
-are battery-backed one way or another. Otherwise you risk filesystem
-corruption in case of power failure.
+safe to use, at some performance penalty. If your disks are battery-backed in
+one way or another, disabling barriers may safely improve performance.
.SH "Mount options for romfs"
None.
Index: util-linux-2.24.1/mount-deprecated/mount.8
===================================================================
--- util-linux-2.24.1.orig/mount-deprecated/mount.8
+++ util-linux-2.24.1/mount-deprecated/mount.8
@@ -1389,12 +1389,13 @@ in files after a crash and journal recov
.RE
.TP
.BR barrier=0 " / " barrier=1 "
-This enables/disables barriers. barrier=0 disables it, barrier=1 enables it.
-Write barriers enforce proper on-disk ordering of journal commits, making
-volatile disk write caches safe to use, at some performance penalty. The ext3
-filesystem does not enable write barriers by default. Be sure to enable
-barriers unless your disks are battery-backed one way or another. Otherwise
-you risk filesystem corruption in case of power failure.
+This disables / enables the use of write barriers in the jbd code. barrier=0
+disables, barrier=1 enables (default). This also requires an IO stack which can
+support barriers, and if jbd gets an error on a barrier write, it will disable
+barriers again with a warning. Write barriers enforce proper on-disk ordering
+of journal commits, making volatile disk write caches safe to use, at some
+performance penalty. If your disks are battery-backed in one way or another,
+disabling barriers may safely improve performance.
.TP
.BI commit= nrsec
Sync all data and metadata every
@@ -1433,15 +1434,9 @@ enabled older kernels cannot mount the d
This will enable 'journal_checksum' internally.
.TP
.BR barrier=0 " / " barrier=1 " / " barrier " / " nobarrier
-This enables/disables the use of write barriers in the jbd code. barrier=0
-disables, barrier=1 enables. This also requires an IO stack which can support
-barriers, and if jbd gets an error on a barrier write, it will disable again
-with a warning. Write barriers enforce proper on-disk ordering of journal
-commits, making volatile disk write caches safe to use, at some performance
-penalty. If your disks are battery-backed in one way or another, disabling
-barriers may safely improve performance. The mount options "barrier" and
-"nobarrier" can also be used to enable or disable barriers, for consistency
-with other ext4 mount options.
+These mount options have the same effect as in ext3. The mount options
+"barrier" and "nobarrier" are added for consistency with other ext4 mount
+options.
The ext4 filesystem enables write barriers by default.
.TP
@@ -2099,13 +2094,13 @@ Enable POSIX Access Control Lists. See t
manual page.
.TP
.BR barrier=none " / " barrier=flush "
-This enables/disables the use of write barriers in the journaling code.
-barrier=none disables it, barrier=flush enables it. Write barriers enforce
+This disables / enables the use of write barriers in the journaling code.
+barrier=none disables, barrier=flush enables (default). This also requires an
+IO stack which can support barriers, and if reiserfs gets an error on a barrier
+write, it will disable barriers again with a warning. Write barriers enforce
proper on-disk ordering of journal commits, making volatile disk write caches
-safe to use, at some performance penalty. The reiserfs filesystem does not
-enable write barriers by default. Be sure to enable barriers unless your disks
-are battery-backed one way or another. Otherwise you risk filesystem
-corruption in case of power failure.
+safe to use, at some performance penalty. If your disks are battery-backed in
+one way or another, disabling barriers may safely improve performance.
.SH "Mount options for romfs"
None.

151
util-linux.changes
View File

@ -1,3 +1,154 @@
-------------------------------------------------------------------
Thu Apr 24 11:33:36 UTC 2014 - sweet_f_a@gmx.de
- Update to util-linux-2.24.2:
addpart:
* minor man page improvements
blockdev:
* Some minor corrections to the manual
build-sys:
* don't connect _DEPENDENCIES and _LIBADD
* fix .h.in usage in libblkid and libmount
* libmount/python/__init__.py is always a dist file
chcpu:
* cleanup return codes
* cleanup stdout/stderr usage
delpart:
* minor man page improvements
dmesg:
* -w output not line-buffered
* don't report EPIPE
docs:
* update AUTHORS file
fallocate:
* Clarify that space can also be deallocated
fdformat:
* Some minor change to the manual
fdisk:
* don't colorize "foo " prefixes
flock:
* use nfs4 fallback on EBADF too
fsck:
* Some typographical corrections to the manual
fsck.minix:
* A few typographical corrections to the manual
fstrim:
* add hint to man page
getopt:
* getopt.1 The usual doc dir is /usr/share/doc, not .../docs
hwclock:
* fix possible hang and other set_hardware_clock_exact() issues
include/closestream:
* don't wipe errno on EPIPE
ipcs:
* cleanup jumplabel stlyes
* fix ipc_msg_get_info fallback case
* fix ipc_sem_get_info fallback case
* fix ipc_shm_get_info fallback case
* fix memleak in ipc_*_get_info functions
isosize:
* A few typographical changes to the manual
last:
* fix minor typos in the man page
lib/sysfs:
* make dirent d_type usage more robust
libblkid:
* add extra checks to XFS prober
libfdisk:
* fix logical partition reorder command
* make qsort_r() optional
* properly implement read-only mode
libmount:
* FS id and parent ID could be zero
* accept (deleted) path suffix in mountinfo file
* initialize *root to NULL in mnt_table_get_root_fs
login:
* fix minor typos in the man page
losetup:
* wait for udev
lscpu:
* cleanup, use _PATH_SYS_CPU/NODE
* don't abort if cache size is unknown
* don't assume filesystem supports d_type when searching for NUMA nodes
* read_hypervisor_dmi only fallback to memory scan on x86/x86_64
mkfs:
* Some typographical changes to the manual
mkfs.bfs:
* One typographical correction to the manual
mkfs.cramfs:
* Some typographical corrections to the manual
mkfs.minix:
* Some typographical changes in the manual
mkswap:
* Some minor typographical corrections to the manual
more:
* improve formatting and wording of man page and help text
mount:
* apply "nofail" to MNT_ERR_NOSOURCE libmount error
* fix --all and nofail return code
* mount.8 Some typographical and prefix corrections to the manual
* remove obsolete and confusing statement from mount.8
* update mount.8 about barrier mount options defaults
nologin:
* minor man page improvements
nsenter:
* fix set{gid,uid} order,drop supplementary groups
partx:
* Improve the typesetting of the manual
* make dirent d_type usage more robust
po:
* merge changes
* update cs.po (from translationproject.org)
* update da.po (from translationproject.org)
* update de.po (from translationproject.org)
raw:
* Improve the typesetting of the manual
renice:
* correct max priority in renice man page
runuser:
* fix minor typos in the man page
script:
* Also flush writes to timing file.
* time from end of read() call partially fixes #58
scriptreplay:
* no need to skip first time value or last bytes fixes #58
setarch:
* Fix ppc64le architectures
setpriv:
* Fix --apparmor-profile
su:
* don't use kill(0, ...) when propagate signal
* fix minor typos in the man page
sulogin:
* minor man page improvements
swaplabel:
* Improve the typesetting of the manual
* wrong version number in check
switch_root:
* make dirent d_type usage more robust
* verify initramfs by f_type, not devno
tests:
* add fdisk 'f' command MBR test
* add lscpu dump for ppc cpu with no cache size
* clean up backport
* cleanup, remove unused lscpu output
* update Py parse mountinfo test
* update libmount tabdiff tests
* use old output format
umount:
* fix typo in usage
* more robust success message for --all
unshare:
* include libmount.h to provide missing MS_* defines
utmpdump:
* minor man page improvements
vipw:
* minor man page improvements
- remove tty3270-on-serial-line-of-s390.patch (was already upstream
since 2.24.1)
- remove barrier_documentation.patch (applied upstream)
- rebase blkid-convert-superblocks-to-new-calling-convention.patch
-------------------------------------------------------------------
Thu Apr 17 22:43:31 CEST 2014 - sbrabec@suse.cz

8
util-linux.spec
View File

@ -47,7 +47,7 @@ BuildRequires: systemd-rpm-macros
%endif
BuildRequires: utempter-devel
BuildRequires: zlib-devel
Version: 2.24.1
Version: 2.24.2
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-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
Patch15: agetty-fooled-on-serial-line-due-plymouth.patch
# PATCH-FIX-SUSE -- Let agetty detect /dev/3270/tty1 as device not as baud rate
@ -120,8 +118,6 @@ Patch19: util-linux-setarch-uname26.patch
Patch20: util-linux-HACK-boot.localfs.diff
# PATCH-FEATURE-SLES util-linux-ng-2.16-squashfs3-detect.patch bnc666893 mszeredi@suse.cz -- Detect squashfs version <= 3 as squashfs3 and version >= 4 as squashfs.
Patch21: util-linux-ng-2.16-squashfs3-detect.patch
# PATCH-FEATURE-SLES util-linux-ng-2.19.1-barrier_documentation.patch bnc489740 jack@suse.cz -- Document barrier option in mount.8.
Patch23: util-linux-ng-2.19.1-barrier_documentation.patch
# PATCH-FEATURE-SLES util-linux-lscpu-improve-hypervisor-detection.patch fate310255 puzel@novell.com -- Improve hypervisor detection.
Patch24: util-linux-lscpu-improve-hypervisor-detection.patch
# PATH-FIX-SLES blkid-stop-scanning-on-I-O-error.patch bnc859062 hare@suse.de -- Abort blkid probing on I/O errors
@ -251,7 +247,6 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
%patch2 -p1
%patch4 -p1
%patch12 -p1
%patch14 -p1
%patch15 -p0
%patch16 -p0
%patch17 -p0
@ -261,7 +256,6 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
%patch20 -p1
#
%patch21 -p1
%patch23 -p1
%patch24 -p1
%patch30 -p1
%patch31 -p1