From 1c4a8418497a02c5f35ea299668b6cc12f15d2ba30620ce6e98f43caac50aa8c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 23 Sep 2013 09:16:12 +0000 Subject: [PATCH] Accepting request 199432 from Base:System - Avoid build require gpg-offline twice - Update to version 2.23.2: nsenter(1): * this NEW COMMAND provides command line interface to setns() Linux syscall and allows to run program with namespaces of other processes unshare(1): * supports new PID and USER namespaces fdisk(8): * provides experimental support for GUID Partition Table (GPT), the implementation is still not complete and some (unimportant) features are missing. * ~50% of fdisk code has been refactored, this task is going to be complete in the next release. The goal is to have libfdisk shared between all fdisks. partx(8): * supports new "update" command (implemented by BLKPG_RESIZE_PARTITION ioctl) mount(8): * supports new userspace mount option x-mount.mkdir[=] to create mountpoints on demand * the support for propagation flags has been improved, now the flags could be specified in /etc/fstab and used together with regular mount options. It's also possible to specify more propagation flags together. This EXPERIMENTAL feature is implemented by additional mount(2) syscalls, because Linux does not allow to use propagation flags with another options or more flags together. umount(8): * supports new command line option --recursive to recursively unmount all sub-mounts for the specified mountpoint * supports new command line option --all-targets to unmount all mountpoints in the current namespace for the specified filesystem * the options --recursive and --all-targets could be used together dmesg(1): * supports new command line options --color, --human and --nopager, the --human option enables relative times, colors and pager support. su(1): * supports new command line options --group and --supp-group to specify primary and supplementary groups chfn(1) and chsh(1): * the commands could be linked with libuser to support non-local accounts modification (e.g. LDAP, etc). kill(1): * the command has been improved to be compatible with procps version, the procps version is deprecated now, the util-linux version is enabled by default. blkdiscard(8): * this NEW COMMAND discard sectors on a device (for example on SSD disks) sulogin(8): * provides multi-console feature from SysVinit findmnt(8): * provides new columns FREQ, PASSNO, ID, OPT-FIELDS, PROPAGATION lslocks(8): * provides new column BLOCKER and detects blocked locks lsblk(8): * supports new command line option --scsi and new columns HCTL, TRANsport VENDOR and REVision swapon(8) and losetup(8): * the commands prints basic overview by default if no option specified column(1): * supports new command line option --output-separator to specify table output delimiter rename(1): * supports new command line option --symlink to rename symlink target hwclock(8): * supports new command line option --compare to periodically compare the Hardware Clock to the System Time (based on adjtimex -c) ipcs(1): * supports new command line options --bytes and --human wipefs(1): * supports new command line option --force to force erase on used devices - Removed upstreamed patches (mkfs.bfs_cleanup_64bit.patch-Patch, mkfs.bfs_cleanup_endian.patch) OBS-URL: https://build.opensuse.org/request/show/199432 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=165 --- mkfs.bfs_cleanup_64bit.patch | 66 -------------------------- mkfs.bfs_cleanup_endian.patch | 76 ------------------------------ util-linux-2.23.1.tar.bz2 | 3 -- util-linux-2.23.2.tar.sign | 17 +++++++ util-linux-2.23.2.tar.xz | 3 ++ util-linux.changes | 89 +++++++++++++++++++++++++++++++++++ util-linux.keyring | 56 ++++++++++++++++++++++ util-linux.spec | 23 +++++---- 8 files changed, 179 insertions(+), 154 deletions(-) delete mode 100644 mkfs.bfs_cleanup_64bit.patch delete mode 100644 mkfs.bfs_cleanup_endian.patch delete mode 100644 util-linux-2.23.1.tar.bz2 create mode 100644 util-linux-2.23.2.tar.sign create mode 100644 util-linux-2.23.2.tar.xz create mode 100644 util-linux.keyring diff --git a/mkfs.bfs_cleanup_64bit.patch b/mkfs.bfs_cleanup_64bit.patch deleted file mode 100644 index 2efb952..0000000 --- a/mkfs.bfs_cleanup_64bit.patch +++ /dev/null @@ -1,66 +0,0 @@ -bla fasel - ---- util-linux-2.21.2.orig/disk-utils/mkfs.bfs.c -+++ util-linux-2.21.2/disk-utils/mkfs.bfs.c -@@ -1,6 +1,7 @@ - /* - * mkfs.bfs - Create SCO BFS filesystem - aeb, 1999-09-07 - * -+ * Usage: mkfs.bfs [-N nr-of-inodes] [-V volume-name] [-F fsname] device - */ - - #include -@@ -27,13 +28,13 @@ - - /* superblock - 512 bytes */ - struct bfssb { -- unsigned int s_magic; -- unsigned int s_start; /* byte offset of start of data */ -- unsigned int s_end; /* sizeof(slice)-1 */ -+ uint32_t s_magic; -+ uint32_t s_start; /* byte offset of start of data */ -+ uint32_t s_end; /* sizeof(slice)-1 */ - - /* for recovery during compaction */ -- int s_from, s_to; /* src and dest block of current transfer */ -- int s_backup_from, s_backup_to; -+ uint32_t s_from, s_to; /* src and dest block of current transfer */ -+ int32_t s_backup_from, s_backup_to; - - /* labels - may well contain garbage */ - char s_fsname[6]; -@@ -43,16 +44,16 @@ - - /* inode - 64 bytes */ - struct bfsi { -- unsigned short i_ino; -+ uint16_t i_ino; - unsigned char i_pad1[2]; -- unsigned long i_first_block; -- unsigned long i_last_block; -- unsigned long i_bytes_to_end; -- unsigned long i_type; /* 1: file, 2: the unique dir */ -- unsigned long i_mode; -- unsigned long i_uid, i_gid; -- unsigned long i_nlinks; -- unsigned long i_atime, i_mtime, i_ctime; -+ uint32_t i_first_block; -+ uint32_t i_last_block; -+ uint32_t i_bytes_to_end; -+ uint32_t i_type; /* 1: file, 2: the unique dir */ -+ uint32_t i_mode; -+ uint32_t i_uid, i_gid; -+ uint32_t i_nlinks; -+ uint32_t i_atime, i_mtime, i_ctime; - unsigned char i_pad2[16]; - }; - -@@ -60,7 +61,7 @@ - - /* directory entry - 16 bytes */ - struct bfsde { -- unsigned short d_ino; -+ uint16_t d_ino; - char d_name[BFS_NAMELEN]; - }; - diff --git a/mkfs.bfs_cleanup_endian.patch b/mkfs.bfs_cleanup_endian.patch deleted file mode 100644 index f27a23a..0000000 --- a/mkfs.bfs_cleanup_endian.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- util-linux-2.21.2/disk-utils/mkfs.bfs.c.old 2013-05-28 19:26:05.000000000 +0200 -+++ util-linux-2.21.2/disk-utils/mkfs.bfs.c 2013-05-28 19:39:28.000000000 +0200 -@@ -98,6 +98,7 @@ - unsigned long long user_specified_total_blocks = 0; - int verbose = 0; - int fd; -+ uint32_t first_block; - struct bfssb sb; - struct bfsi ri; - struct bfsde de; -@@ -224,9 +224,9 @@ - ino_blocks + 33); - - memset(&sb, 0, sizeof(sb)); -- sb.s_magic = BFS_SUPER_MAGIC; -- sb.s_start = ino_bytes + sizeof(struct bfssb); -- sb.s_end = total_blocks * BFS_BLOCKSIZE - 1; -+ sb.s_magic = htole32(BFS_SUPER_MAGIC); -+ sb.s_start = htole32(ino_bytes + sizeof(struct bfssb)); -+ sb.s_end = htole32(total_blocks * BFS_BLOCKSIZE - 1); - sb.s_from = sb.s_to = sb.s_backup_from = sb.s_backup_to = -1; - memcpy(sb.s_fsname, fsname, 6); - memcpy(sb.s_volume, volume, 6); -@@ -244,28 +244,29 @@ - inodes, ino_blocks); - fprintf(stderr, _("Blocks: %lld\n"), total_blocks); - fprintf(stderr, _("Inode end: %d, Data end: %d\n"), -- sb.s_start - 1, sb.s_end); -+ htole32(sb.s_start) - 1, htole32(sb.s_end)); - } - - if (write(fd, &sb, sizeof(sb)) != sizeof(sb)) - err(EXIT_FAILURE, _("error writing superblock")); - - memset(&ri, 0, sizeof(ri)); -- ri.i_ino = BFS_ROOT_INO; -- ri.i_first_block = 1 + ino_blocks; -- ri.i_last_block = ri.i_first_block + -- (inodes * sizeof(de) - 1) / BFS_BLOCKSIZE; -- ri.i_bytes_to_end = ri.i_first_block * BFS_BLOCKSIZE -- + 2 * sizeof(struct bfsde) - 1; -- ri.i_type = BFS_DIR_TYPE; -- ri.i_mode = S_IFDIR | 0755; /* or just 0755 */ -- ri.i_uid = 0; -- ri.i_gid = 1; /* random */ -+ ri.i_ino = htole16(BFS_ROOT_INO); -+ first_block = 1 + ino_blocks; -+ ri.i_first_block = htole32(first_block); -+ ri.i_last_block = htole32(first_block + -+ (inodes * sizeof(de) - 1) / BFS_BLOCKSIZE); -+ ri.i_bytes_to_end = htole32(first_block * BFS_BLOCKSIZE -+ + 2 * sizeof(struct bfsde) - 1); -+ ri.i_type = htole32(BFS_DIR_TYPE); -+ ri.i_mode = htole32(S_IFDIR | 0755); /* or just 0755 */ -+ ri.i_uid = htole32(0); -+ ri.i_gid = htole32(1); /* random */ - ri.i_nlinks = 2; - time(&now); -- ri.i_atime = now; -- ri.i_mtime = now; -- ri.i_ctime = now; -+ ri.i_atime = htole32(now); -+ ri.i_mtime = htole32(now); -+ ri.i_ctime = htole32(now); - - if (write(fd, &ri, sizeof(ri)) != sizeof(ri)) - err(EXIT_FAILURE, _("error writing root inode")); -@@ -279,7 +280,7 @@ - err(EXIT_FAILURE, _("seek error")); - - memset(&de, 0, sizeof(de)); -- de.d_ino = BFS_ROOT_INO; -+ de.d_ino = htole16(BFS_ROOT_INO); - memcpy(de.d_name, ".", 1); - if (write(fd, &de, sizeof(de)) != sizeof(de)) - err(EXIT_FAILURE, _("error writing . entry")); diff --git a/util-linux-2.23.1.tar.bz2 b/util-linux-2.23.1.tar.bz2 deleted file mode 100644 index 8f556e5..0000000 --- a/util-linux-2.23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad4a7831d7b27d0172996fd343e809716c2403b32a94e15194d8ea797223c4af -size 5539830 diff --git a/util-linux-2.23.2.tar.sign b/util-linux-2.23.2.tar.sign new file mode 100644 index 0000000..67239b5 --- /dev/null +++ b/util-linux-2.23.2.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.13 (GNU/Linux) + +iQIcBAABAgAGBQJR+QNKAAoJEOS3HV7sOcKEUSUP/i4HacPa4Lpj6Ub7SmdLGnrn +Eakoy/USxaVIPNe600ER31mAPxa6HL/tJJWGN2V5PNakMWpLPjsgFaV5hoOVJqsX +qBGnL7W5OaovZWgEtj9d0aGv1sTzHqX+NfUhr6AkGTNiebwpRicDFBMW86mDp6E4 +H/jlhv2LVvkd3wSOk8cq6OH0lP1P1T39WfEq3wqwQ+mTKV7ua4iYGQe2bNWhdY7B +F8vtg2VXj2ezU/BxxbMXEfFLiQmSPH6aXyUmniMYYEGlbl+6nz/v1HBDXcublVp9 +2XJJxY8w2MrF46+zd3fIfT71LoqG4orlNk3F45zbnrsAGsnIuqv+0Kmisx2h6CKf +RQJkv9I3jwORpeg2LBhP6e9M/H7mdfVtl7wZ14JUqgc9hO1qG284K4wlSqevIzoc +BXf96IpckhPC2xNHj5jHlTX/bL3YTmjxRL5JhNTVP5MH5szsGy+S4UMj31oS8kjd +ppr+a48FineEbJpHIjg1MFiv1pVSV1W4EyJ9obA/4r4KcT5WrJKhU3wFvXr3VILg +RVXT6hlpka1gIsSes8JB2o4ludEKYQTFzqgzNIhNTMlHiIkx9a/3Bj77//W2w42m +XkAiOVHmJfqJAyWdFOFsWhVHmcr9fh84qdoTH/uc423V0euOQmUoSxDxvlrboeXb +cMXAXk+wHMHYHEV1H142 +=bIui +-----END PGP SIGNATURE----- diff --git a/util-linux-2.23.2.tar.xz b/util-linux-2.23.2.tar.xz new file mode 100644 index 0000000..d0ea2a5 --- /dev/null +++ b/util-linux-2.23.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c4042bd91f621250d7b3b2f34e3b11921a32c7f080c149dcc0c7ce62a8a7cac +size 3383052 diff --git a/util-linux.changes b/util-linux.changes index b0154a4..d70cc6c 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,92 @@ +------------------------------------------------------------------- +Fri Sep 13 07:06:19 UTC 2013 - werner@suse.de + +- Avoid build require gpg-offline twice + +------------------------------------------------------------------- +Wed Sep 11 20:54:24 CEST 2013 - sbrabec@suse.cz + +- Update to version 2.23.2: + nsenter(1): + * this NEW COMMAND provides command line interface to setns() + Linux syscall and allows to run program with namespaces of + other processes + unshare(1): + * supports new PID and USER namespaces + fdisk(8): + * provides experimental support for GUID Partition Table (GPT), + the implementation is still not complete and some (unimportant) + features are missing. + * ~50% of fdisk code has been refactored, this task is going to + be complete in the next release. The goal is to have libfdisk + shared between all fdisks. + partx(8): + * supports new "update" command (implemented by + BLKPG_RESIZE_PARTITION ioctl) + mount(8): + * supports new userspace mount option x-mount.mkdir[=] to + create mountpoints on demand + * the support for propagation flags has been improved, now the + flags could be specified in /etc/fstab and used together with + regular mount options. It's also possible to specify more + propagation flags together. This EXPERIMENTAL feature is + implemented by additional mount(2) syscalls, because Linux does + not allow to use propagation flags with another options or more + flags together. + umount(8): + * supports new command line option --recursive to recursively + unmount all sub-mounts for the specified mountpoint * supports + new command line option --all-targets to unmount all + mountpoints in the current namespace for the specified + filesystem * the options --recursive and --all-targets could be + used together + dmesg(1): + * supports new command line options --color, --human and + --nopager, the --human option enables relative times, colors and + pager support. + su(1): + * supports new command line options --group and --supp-group to + specify primary and supplementary groups + chfn(1) and chsh(1): + * the commands could be linked with libuser to support non-local + accounts modification (e.g. LDAP, etc). + kill(1): + * the command has been improved to be compatible with procps + version, the procps version is deprecated now, the util-linux + version is enabled by default. + blkdiscard(8): + * this NEW COMMAND discard sectors on a device (for example on + SSD disks) + sulogin(8): + * provides multi-console feature from SysVinit + findmnt(8): + * provides new columns FREQ, PASSNO, ID, OPT-FIELDS, PROPAGATION + lslocks(8): + * provides new column BLOCKER and detects blocked locks + lsblk(8): + * supports new command line option --scsi and new columns HCTL, + TRANsport VENDOR and REVision + swapon(8) and losetup(8): + * the commands prints basic overview by default if no option + specified + column(1): + * supports new command line option --output-separator to specify + table output delimiter + rename(1): + * supports new command line option --symlink to rename symlink + target + hwclock(8): + * supports new command line option --compare to periodically + compare the Hardware Clock to the System Time (based on + adjtimex -c) + ipcs(1): + * supports new command line options --bytes and --human + wipefs(1): + * supports new command line option --force to force erase on used + devices +- Removed upstreamed patches (mkfs.bfs_cleanup_64bit.patch-Patch, + mkfs.bfs_cleanup_endian.patch) + ------------------------------------------------------------------- Mon Jul 1 13:43:23 UTC 2013 - mail@bernhard-voelker.de diff --git a/util-linux.keyring b/util-linux.keyring new file mode 100644 index 0000000..a34bbee --- /dev/null +++ b/util-linux.keyring @@ -0,0 +1,56 @@ +pub 4096R/EC39C284 2011-10-10 [expires: 2016-10-08] +uid Karel Zak +sub 4096R/7BA16CAC 2011-10-10 [expires: 2016-10-08] + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.20 (GNU/Linux) + +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 +VeljfCzq +=8wc5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/util-linux.spec b/util-linux.spec index bfb2abf..81e2fc2 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -25,6 +25,13 @@ BuildRequires: audit-devel BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel +# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run +# one-shot check by +# xzcat util-linux-*.tar.xz | \ +# sh -x gpg-offline --verify --package=util-linux *.tar.sign - +%if 0%{?VERIFY_SIG} +BuildRequires: gpg-offline +%endif BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool @@ -35,7 +42,7 @@ BuildRequires: readline-devel BuildRequires: systemd-rpm-macros BuildRequires: utempter-devel BuildRequires: zlib-devel -Version: 2.23.1 +Version: 2.23.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 @@ -53,7 +60,7 @@ Recommends: %{name}-lang = %{version} Summary: A collection of basic system utilities License: GPL-2.0+ Group: System/Base -Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.xz Source1: util-linux-rpmlintrc # XXX: make nologin part of util-linux upstream Source2: nologin.c @@ -66,6 +73,8 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default +Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.sign +Source13: %{name}.keyring # TODO: split to separate package Source40: klogconsole.tar.bz2 # XXX: Run a program in a new session and with controlling tty @@ -103,10 +112,6 @@ Patch20: util-linux-HACK-boot.localfs.diff Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -## fix mkfs.bfs -Patch60: mkfs.bfs_cleanup_64bit.patch -Patch61: mkfs.bfs_cleanup_endian.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed # @@ -205,6 +210,9 @@ Files to develop applications using the libmount library. %lang_package %prep +%if 0%{?VERIFY_SIG} +xzcat %{S:0} | %gpg_verify %{S:12} - +%endif %setup -q -n %{name}-%{version} -b 40 %patch1 -p1 %patch2 -p1 @@ -220,9 +228,6 @@ cp -p %{S:22} %{S:23} . # nologin cp -p %{S:2} %{S:3} %{S:26} %{S:30} . -%patch60 -p1 -%patch61 -p1 - pushd ../klogconsole %patch55 -p1 %patch56 -p1