From 95c008ab87adc97ddd15a742b90ed5cc94727d78 Mon Sep 17 00:00:00 2001 From: "Jeremy C. Reed" Date: Tue, 19 Oct 2004 20:01:18 +0000 Subject: [PATCH] Update to util-linux-2.12b. (Newest version may be util-linux-2.12h but not on mirrors.) Added some MASTER_SITES. Fixed how manpages and info files are installed. New tool installed: tailf. Add example file to PLIST. patch-ac and patch-ad removed. They were for compatibility with different Linux kernel versions. Here are the changes from previous version: util-linux 2.12b * chsh: improved error message * dmesg: ask kernel proper buffer size * losetup: handle 64-bit offsets * blockdev: also report BLKGETSIZE64 result * blockdev, elvtune, fdisk: handle new kernel _IOR,_IOW defines * fdisk: remove strange "ends in a digit" heuristic * fdisk: also list Solaris as possible type for 0x82 * mount: added --rbind option * mount: use blkid library * mount: support reiserfs mount by label * mount: attempt to use the right definition of dev_t in struct loopinfo * mount.8: jfs mount options added * readprofile: new -s option * rename.1: added ref to mmv.1 * replay: renamed to scriptreplay; correct typos * script: do not use locale for time delay floating point number format * sfdisk: error messages to stderr * New Catalan, Dutch, Finnish, French, German, Spanish, Swedish, Turkish, Ukrainian messages util-linux 2.12a * chfn, chsh, login, vipw: SElinux support * fdisk: fix for kernels 2.4.15-2.4.17 * fdisk: fix when all partitions are in use * hwclock: add a timeout when waiting for a clock update (Gran Weinholt) * ipcs: compilation fix * ipcs: shminfo.shmall gives pages * login: use getutline() instead of getutid() * login: fix for 64-bit time_t * mount: efs support * partx: bigendian fix * readprofile: support for 64-bit addresses * setterm: fix klogctl error message (Joern Heissler) * setterm.1: clarification * sfdisk: fix check for is_ide_cdrom_or_tape * umount: skip proc, devfs, devpts on umount -a util-linux 2.12 * losetup: cryptoloop support * losetup: -p option specifies fd for passphrase * fdisk: sgi layout fix * mount: -p option specifies fd for passphrase * mount: recognize some PCDOS floppies * umount: in "umount name", first try to interpret "name" as a mount point util-linux 2.12pre * Catalan messages (Antoni Bella Perez) * Danish messages (Claus Hindsgaul) * Dutch messages (Taco Witte) * Finnish messages (Lauri Nurmi) * French messages (Michel Robitaille) * German messages (Michael Piefel) * Slovenian messages (Primoz Peterlin) * Spanish messages (Santiago Vila Doncel) * Swedish messages (Christian Rose) * Turkish messages (Nilgn Belma Bugner) * cfdisk: localize the Y/N answer, improve printing localized messages * cfdisk: make various variables long long - some disks are close to 2 TB * cfdisk: use BLKGETSIZE64 * fdisk: make various variables unsigned to lengthen the life of 32-bit vars * fdisk: some sgi fixes (Phillip Kesling) * fdisk: k=1000, K=1024 * fdisk: removed last occurrences of HDIO_REQ * fdisk: use BLKGETSIZE64 * hwclock: fix rtc test (Heiko Zuerker) * login: set a timeout on printing the timeout message (Robert Ambrose) * md5: x86_64 fix (mmj) * more: POSIX fixes * mount: do not supply MS_MGC_VAL when there are conflicting flags * mount: ncp and smb are called smbfs and ncpfs - global change * mount: add support for xvm mount by label (Eric Sandeen) * mount: correct hfs magic recognition * mount: keep original umask - it influences the mount call (mmj) * raw.8: documented unbinding of raw devices * readprofile: fixed off-by eight error (Werner Almesberger) * script: add -c option (Wayne Davison) * sfdisk.8: added an example of partitioning with logical partitions * sfdisk: only add a AA55 signature for DOS-type partition tables * tailf: new (Rik Faith) --- util-linux/Makefile | 16 +++++++++++----- util-linux/PLIST | 6 +++++- util-linux/distinfo | 10 ++++------ util-linux/patches/patch-aa | 33 +++++++++------------------------ util-linux/patches/patch-ac | 28 ---------------------------- util-linux/patches/patch-ad | 29 ----------------------------- 6 files changed, 29 insertions(+), 93 deletions(-) delete mode 100644 util-linux/patches/patch-ac delete mode 100644 util-linux/patches/patch-ad diff --git a/util-linux/Makefile b/util-linux/Makefile index 1f58156b8c..8c77c64479 100644 --- a/util-linux/Makefile +++ b/util-linux/Makefile @@ -1,11 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2004/04/01 10:59:29 jeremy-c-reed Exp $ +# $NetBSD: Makefile,v 1.5 2004/10/19 20:01:19 jeremy-c-reed Exp $ -DISTNAME= util-linux-2.11z +# newest version may be util-linux-2.12h but not on mirrors +DISTNAME= util-linux-2.12b CATEGORIES= sysutils -MASTER_SITES= http://www.kernel.org/pub/linux/utils/util-linux/ \ +MASTER_SITES= ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/ \ + ${MASTER_SITE_SUNSITE:=system/misc/} \ + ftp://ftp.cwi.nl/pub/aeb/util-linux/ \ + http://www.kernel.org/pub/linux/utils/util-linux/ \ ftp://ftp.fr.kernel.org/pub/linux/utils/util-linux/ \ ftp://ftp.cn.kernel.org/pub/linux/utils/util-linux/ -EXTRACT_SUFX= .tar.bz2 +#EXTRACT_SUFX= .tar.bz2 MAINTAINER= reed@reedmedia.net #HOMEPAGE @@ -20,7 +24,9 @@ GNU_CONFIGURE= YES MAKE_ENV+= DESTDIR=${PREFIX} MAKE_ENV+= ETCDIR=${PREFIX}/share/examples/util-linux MAKE_ENV+= FDPRMFILE=${PKG_SYSCONFDIR}/fdprm -MAKE_ENV+= INFODIR=${PREFIX}/${INFO_DIR} +MAKE_ENV+= INFO_DIR=/${INFO_DIR} +PKGMANDIR?= man +MAKE_ENV+= MAN_DIR=/${PKGMANDIR} INFO_FILES= ipc.info diff --git a/util-linux/PLIST b/util-linux/PLIST index ac224aa798..9498a86ad4 100644 --- a/util-linux/PLIST +++ b/util-linux/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/04/01 10:19:11 jeremy-c-reed Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/10/19 20:01:19 jeremy-c-reed Exp $ bin/arch bin/cal bin/chkdupexe @@ -32,6 +32,7 @@ bin/script bin/setfdprm bin/setsid bin/setterm +bin/tailf bin/ul bin/umount bin/whereis @@ -59,6 +60,7 @@ man/man1/rename.1 man/man1/rev.1 man/man1/script.1 man/man1/setterm.1 +man/man1/tailf.1 man/man1/ul.1 man/man1/whereis.1 man/man1/write.1 @@ -116,8 +118,10 @@ sbin/sfdisk sbin/swapoff sbin/swapon sbin/tunelp +share/examples/util-linux/fdprm share/misc/getopt/getopt-parse.bash share/misc/getopt/getopt-parse.tcsh share/misc/getopt/getopt-test.bash share/misc/getopt/getopt-test.tcsh @dirrm share/misc/getopt +@dirrm share/examples/util-linux diff --git a/util-linux/distinfo b/util-linux/distinfo index 8dcfdf7839..5f28373173 100644 --- a/util-linux/distinfo +++ b/util-linux/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/04/01 10:16:42 jeremy-c-reed Exp $ +$NetBSD: distinfo,v 1.3 2004/10/19 20:01:19 jeremy-c-reed Exp $ -SHA1 (util-linux-2.11z.tar.bz2) = 6b48b47540bcb18e71928c258161a4d1aa34bd16 -Size (util-linux-2.11z.tar.bz2) = 1266784 bytes -SHA1 (patch-aa) = 29cfb203f66ac691f08880700e4f753e5f24f967 +SHA1 (util-linux-2.12b.tar.gz) = 6e0c9873792156af3dfa0031c67ce3f02c013cef +Size (util-linux-2.12b.tar.gz) = 1967337 bytes +SHA1 (patch-aa) = d4ffa79f6a2afec8fa4bb99156e3099bff5a4e1d SHA1 (patch-ab) = 058439aaa2db18e5bcbebf3522315086d2c4060e -SHA1 (patch-ac) = c4393fe87351173ee2e42bb90b6f1825d0b9a742 -SHA1 (patch-ad) = b65ae76fecb76e508753ecbc22bf7e9e8a69d871 diff --git a/util-linux/patches/patch-aa b/util-linux/patches/patch-aa index a6cd9aa6d1..208c610e6d 100644 --- a/util-linux/patches/patch-aa +++ b/util-linux/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ +$NetBSD: patch-aa,v 1.3 2004/10/19 20:01:18 jeremy-c-reed Exp $ ---- MCONFIG.orig 2002-11-25 02:29:48.000000000 -0800 +--- MCONFIG.orig 2004-03-04 12:14:17.000000000 -0800 +++ MCONFIG -@@ -88,7 +88,7 @@ HAVE_RESET=yes +@@ -92,7 +92,7 @@ HAVE_RESET=yes # If HAVE_SLN is set to "yes", then sln won't be installed # (but the man page sln.8 will be installed anyway). # sln also comes with libc and glibc. @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed. HAVE_FDUTILS=no -@@ -100,7 +100,7 @@ SILENT_PG=no +@@ -104,7 +104,7 @@ SILENT_PG=no # If configure decides that Native Language Support (NLS) is available, # it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set # DISABLE_NLS to "yes". @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ # Different optimizations for different cpus. # gcc 3.0 likes options -mcpu=i486 instead of -m486 -@@ -146,23 +146,23 @@ LIBSLANG=-lslang +@@ -150,23 +150,24 @@ LIBSLANG=-lslang DEV_DIR= /dev ETC_DIR= /etc SBIN_DIR= /sbin @@ -41,8 +41,9 @@ $NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ LOG_DIR= /var/log -MAN_DIR= /usr/share/man -INFO_DIR= /usr/share/info -+MAN_DIR= /man -+INFO_DIR= /info ++#MAN_DIR= /usr/share/man ++#INFO_DIR= /usr/share/info ++ # # Paths used for install @@ -53,16 +54,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ SBINDIR= $(DESTDIR)$(SBIN_DIR) USRSBINDIR= $(DESTDIR)$(USRSBIN_DIR) USRLIBDIR= $(DESTDIR)$(USRLIB_DIR) -@@ -179,7 +179,7 @@ MAN3DIR= $(MANDIR)/man3 - MAN5DIR= $(MANDIR)/man5 - MAN6DIR= $(MANDIR)/man6 - MAN8DIR= $(MANDIR)/man8 --INFODIR= $(DESTDIR)$(INFO_DIR) -+#INFODIR= $(DESTDIR)$(INFO_DIR) - - # Directory for shutdown, halt, reboot, etc. - SHUTDOWNDIR= $(SBINDIR) -@@ -212,6 +212,7 @@ CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ +@@ -216,6 +217,7 @@ CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ -DLOGDIR=\"$(LOG_DIR)\" \ -DVARPATH=\"$(VAR_PATH)\" \ -DLOCALEDIR=\"$(LOCALE_DIR)\" \ @@ -70,10 +62,3 @@ $NetBSD: patch-aa,v 1.2 2004/04/01 10:19:12 jeremy-c-reed Exp $ $(CFLAGS) -@@ -219,5 +220,5 @@ CFLAGS := $(OPT) -I$(LIB) $(WARNFLAGS) \ - $(CC) -c $(CFLAGS) $< -o $@ - - %: %.cc -- $(CXX) $(CFLAGS) $< -o $@ -+ $(CXX) $(CFLAGS) $< -o $@ - diff --git a/util-linux/patches/patch-ac b/util-linux/patches/patch-ac deleted file mode 100644 index 1a9f808966..0000000000 --- a/util-linux/patches/patch-ac +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/04/01 10:16:37 jeremy-c-reed Exp $ -http://lists.ibiblio.org/pipermail/sm-discuss/2004-January/005086.html -http://www.ece.cmu.edu/~rholzer/cryptoloop/util-linux-2.12-kernel-2.6.patch - ---- disk-utils/blockdev.c.orig 2002-03-08 14:57:02.000000000 -0800 -+++ disk-utils/blockdev.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - #include "nls.h" - -@@ -24,8 +25,13 @@ - #define BLKRASET _IO(0x12,98) - #define BLKRAGET _IO(0x12,99) - #define BLKSSZGET _IO(0x12,104) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #define BLKBSZGET _IOR(0x12,112,sizeof(int)) - #define BLKBSZSET _IOW(0x12,113,sizeof(int)) -+#else -+#define BLKBSZGET _IOR(0x12,112,int) -+#define BLKBSZSET _IOW(0x12,113,int) -+#endif - #endif - - /* Maybe could be included */ diff --git a/util-linux/patches/patch-ad b/util-linux/patches/patch-ad deleted file mode 100644 index bd122cb533..0000000000 --- a/util-linux/patches/patch-ad +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/04/01 10:16:37 jeremy-c-reed Exp $ -http://lists.ibiblio.org/pipermail/sm-discuss/2004-January/005086.html -http://www.ece.cmu.edu/~rholzer/cryptoloop/util-linux-2.12-kernel-2.6.patch - ---- disk-utils/elvtune.c.orig 2002-03-08 14:57:49.000000000 -0800 -+++ disk-utils/elvtune.c -@@ -26,6 +26,8 @@ - #include - #include - #include -+#include -+ - #include "nls.h" - - /* this has to match with the kernel structure */ -@@ -37,8 +39,13 @@ typedef struct blkelv_ioctl_arg_s { - int max_bomb_segments; - } blkelv_ioctl_arg_t; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t)) - #define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t)) -+#else -+#define BLKELVGET _IOR(0x12,106,blkelv_ioctl_arg_t) -+#define BLKELVSET _IOW(0x12,107,blkelv_ioctl_arg_t) -+#endif - - static void - usage(void) {