rpms/util-linux-ng/devel util-linux-ng-2.14-blockdev-rmpart.patch, NONE, 1.1 util-linux-ng-2.14-mount-managed.patch, NONE, 1.1 util-linux-ng.spec, 1.24, 1.25 util-linux-ng-2.13-blockdev-rmpart.patch, 1.2, NONE util-linux-ng-2.13-mkswap-uuid.patch, 1.1, NONE util-linux-ng-2.13-mount-managed.patch, 1.1, NONE util-linux-ng-2.13-mount-twiceloop.patch, 1.1, NONE util-linux-ng-2.13-swapon-swsuspend.patch, 1.3, NONE
Karel Zak (kzak)
fedora-extras-commits at redhat.com
Mon May 19 11:49:32 UTC 2008
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18850
Modified Files:
util-linux-ng.spec
Added Files:
util-linux-ng-2.14-blockdev-rmpart.patch
util-linux-ng-2.14-mount-managed.patch
Removed Files:
util-linux-ng-2.13-blockdev-rmpart.patch
util-linux-ng-2.13-mkswap-uuid.patch
util-linux-ng-2.13-mount-managed.patch
util-linux-ng-2.13-mount-twiceloop.patch
util-linux-ng-2.13-swapon-swsuspend.patch
Log Message:
* Mon May 19 2008 Karel Zak <kzak at redhat.com> 2.14-0.1
- upgrade to 2.14-rc3
- remove arch(8) (deprecated in favor of uname(1) or arch(1) from coreutils)
- add a new command ldattach(8)
- cfdisk(8) linked with libncursesw
util-linux-ng-2.14-blockdev-rmpart.patch:
--- NEW FILE util-linux-ng-2.14-blockdev-rmpart.patch ---
diff -up util-linux-ng-2.14-rc3/disk-utils/blockdev.c.rm util-linux-ng-2.14-rc3/disk-utils/blockdev.c
--- util-linux-ng-2.14-rc3/disk-utils/blockdev.c.rm 2008-04-22 10:59:53.000000000 +0200
+++ util-linux-ng-2.14-rc3/disk-utils/blockdev.c 2008-05-19 12:31:52.000000000 +0200
@@ -10,6 +10,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <errno.h>
+#include <linux/blkpg.h>
#include "nls.h"
#include "blkdev.h"
@@ -47,8 +48,11 @@ struct bdc {
{ "--setfra", "BLKFRASET", BLKFRASET, ARGINTA, 0, "FSREADAHEAD", N_("set filesystem readahead") },
{ "--getfra", "BLKFRAGET", BLKFRAGET, ARGLINTG, -1, NULL, N_("get filesystem readahead") },
{ "--flushbufs", "BLKFLSBUF", BLKFLSBUF, ARGNONE, 0, NULL, N_("flush buffers") },
- { "--rereadpt", "BLKRRPART", BLKRRPART, ARGNONE, 0, NULL,
- N_("reread partition table") },
+ { "--rereadpt", "BLKRRPART", BLKRRPART, ARGNONE, 0, NULL, N_("reread partition table") },
+#ifdef BLKPG
+ { "--rmpart", "BLKPG", BLKPG, ARGINTAP, 0, "PARTNO", N_("disable partition") },
+ { "--rmparts", "BLKPG", BLKPG, ARGNONE, 0, NULL, N_("disable all partitions") },
+#endif
};
#define SIZE(a) (sizeof(a)/sizeof((a)[0]))
@@ -89,6 +93,40 @@ find_cmd(char *s) {
return -1;
}
+#ifdef BLKPG
+static int
+disable_partition(int fd, int partno) {
+ struct blkpg_partition part = {
+ .pno = partno,
+ .start = 0,
+ .length = 0,
+ .devname[0] = 0,
+ .volname[0] = 0,
+ };
+ struct blkpg_ioctl_arg io = {
+ .op = BLKPG_DEL_PARTITION,
+ .datalen = sizeof(part),
+ .data = &part,
+ .flags = 0,
+ };
+ int res;
+
+ res = ioctl(fd, BLKPG, &io);
+ if (res < 0)
+ return 0;
+ return 1;
+}
+
+static int
+disable_partitions(int fd) {
+ int p, res = 0;
+
+ for (p = 1; p <= 256; p++)
+ res += disable_partition(fd, p);
+ return res ? 0 : -1;
+}
+#endif
+
void do_commands(int fd, char **argv, int d);
void report_header(void);
void report_device(char *device, int quiet);
@@ -206,6 +244,12 @@ do_commands(int fd, char **argv, int d)
switch(bdcms[j].argtype) {
default:
case ARGNONE:
+#ifdef BLKPG
+ if (bdcms[j].ioc == BLKPG) {
+ res = disable_partitions(fd);
+ break;
+ }
+#endif
res = ioctl(fd, bdcms[j].ioc, 0);
break;
case ARGINTA:
@@ -223,6 +267,13 @@ do_commands(int fd, char **argv, int d)
bdcms[j].name);
usage();
}
+#ifdef BLKPG
+ if (bdcms[j].ioc == BLKPG) {
+ iarg = atoi(argv[++i]);
+ res = disable_partition(fd, iarg) ? 0 : -1;
+ break;
+ }
+#endif
iarg = atoi(argv[++i]);
res = ioctl(fd, bdcms[j].ioc, &iarg);
break;
util-linux-ng-2.14-mount-managed.patch:
--- NEW FILE util-linux-ng-2.14-mount-managed.patch ---
diff -up util-linux-ng-2.14-rc3/mount/mount.c.mng util-linux-ng-2.14-rc3/mount/mount.c
--- util-linux-ng-2.14-rc3/mount/mount.c.mng 2008-05-14 12:55:32.000000000 +0200
+++ util-linux-ng-2.14-rc3/mount/mount.c 2008-05-19 12:11:39.000000000 +0200
@@ -176,6 +176,8 @@ static const struct opt_map opt_map[] =
{ "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
to mtime/ctime */
#endif
+ { "kudzu", 0, 0, MS_COMMENT }, /* Silently remove this option (backwards compat use only - deprecated) */
+ { "managed", 0, 0, MS_COMMENT }, /* Silently remove this option */
{ "nofail", 0, 0, MS_COMMENT}, /* Do not fail if ENOENT on dev */
{ NULL, 0, 0, 0 }
};
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- util-linux-ng.spec 22 Apr 2008 19:35:02 -0000 1.24
+++ util-linux-ng.spec 19 May 2008 11:48:40 -0000 1.25
@@ -1,8 +1,8 @@
### Header
Summary: A collection of basic system utilities
Name: util-linux-ng
-Version: 2.13.1
-Release: 9%{?dist}
+Version: 2.14
+Release: 0.1%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -30,13 +30,12 @@
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: slang-devel
BuildRequires: texinfo
BuildRequires: zlib-devel
BuildRequires: popt-devel
### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.1.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14-rc3.tar.bz2
Source1: util-linux-ng-login.pamd
Source2: util-linux-ng-remote.pamd
Source3: util-linux-ng-chsh-chfn.pamd
@@ -81,7 +80,7 @@
# 91174 - Patch to enabled remote service for login/pam
Patch0: util-linux-ng-2.13-login-pamstart.patch
# RHEL/Fedora specific mount options
-Patch1: util-linux-ng-2.13-mount-managed.patch
+Patch1: util-linux-ng-2.14-mount-managed.patch
Patch2: util-linux-ng-2.13-mount-pamconsole.patch
# add note about ATAPI IDE floppy to fdformat.8
Patch3: util-linux-ng-2.13-fdformat-man-ide.patch
@@ -95,19 +94,10 @@
Patch7: util-linux-ng-2.13-fdisk-b-4096.patch
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.13-ipcs-32bit.patch
-# 174111 - mount allows loopback devices to be mounted more than once to the
-# same mount point (move to upstream?)
-Patch9: util-linux-ng-2.13-mount-twiceloop.patch
-# 165863 - swsusp swaps should be reinitialized
-Patch10: util-linux-ng-2.13-swapon-swsuspend.patch
# add a missing header
-Patch11: util-linux-ng-2.13-floppy-locale.patch
+Patch9: util-linux-ng-2.13-floppy-locale.patch
# remove partitions
-Patch12: util-linux-ng-2.13-blockdev-rmpart.patch
-# 439984 - backport mkswap -U
-Patch13: util-linux-ng-2.13-mkswap-uuid.patch
-# CVE-2007-3102
-Patch14: util-linux-ng-2.13-login-audit.patch
+Patch10: util-linux-ng-2.14-blockdev-rmpart.patch
%description
The util-linux-ng package contains a large variety of low-level system
@@ -116,7 +106,7 @@
program.
%prep
-%setup -q -a 11
+%setup -q -a 11 -n util-linux-ng-2.14-rc3
cp %{SOURCE8} %{SOURCE9} .
%patch0 -p1
@@ -130,10 +120,6 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
%build
unset LINGUAS || :
@@ -149,7 +135,6 @@
--enable-login-utils \
--enable-kill \
--enable-write \
- --enable-arch \
%if %{include_raw}
--enable-raw \
%endif
@@ -348,7 +333,6 @@
%doc */README.* NEWS AUTHORS licenses/* README*
%doc getopt/getopt-*.{bash,tcsh}
-/bin/arch
/bin/dmesg
%attr(755,root,root) /bin/login
/bin/more
@@ -414,7 +398,7 @@
%endif
%{_bindir}/ddate
%ifnarch s390 s390x
-%{_bindir}/fdformat
+%{_sbindir}/fdformat
%endif
%{_bindir}/flock
%{_bindir}/getopt
@@ -453,10 +437,10 @@
%{_sbindir}/tunelp
%endif
%{_sbindir}/rtcwake
+%{_sbindir}/ldattach
%{_infodir}/ipc.info*
-%{_mandir}/man1/arch.1*
%{_mandir}/man1/cal.1*
%{_mandir}/man1/chfn.1*
%{_mandir}/man1/chsh.1*
@@ -513,6 +497,7 @@
%endif
%{_mandir}/man8/setarch.8*
%{_mandir}/man8/rtcwake.8*
+%{_mandir}/man8/ldattach.8*
%attr(4755,root,root) /bin/mount
%attr(4755,root,root) /bin/umount
@@ -527,6 +512,12 @@
/sbin/losetup
%changelog
+* Mon May 19 2008 Karel Zak <kzak at redhat.com> 2.14-0.1
+- upgrade to 2.14-rc3
+- remove arch(8) (deprecated in favor of uname(1) or arch(1) from coreutils)
+- add a new command ldattach(8)
+- cfdisk(8) linked with libncursesw
+
* Tue Apr 22 2008 Karel Zak <kzak at redhat.com> 2.13.1-9
- fix audit log injection attack via login
--- util-linux-ng-2.13-blockdev-rmpart.patch DELETED ---
--- util-linux-ng-2.13-mkswap-uuid.patch DELETED ---
--- util-linux-ng-2.13-mount-managed.patch DELETED ---
--- util-linux-ng-2.13-mount-twiceloop.patch DELETED ---
--- util-linux-ng-2.13-swapon-swsuspend.patch DELETED ---
More information about the fedora-extras-commits
mailing list