The complete set of CITI util-linux patches combined into one jumbo patch. Changes since 2.12-CITI_NFS4_ALL-2: * remove redhat-specific warnings from redhat-nfs-mount.dif --- util-linux-2.12-bfields/MCONFIG | 11 util-linux-2.12-bfields/configure | 25 util-linux-2.12-bfields/debian/README.Debian.hwclock | 65 util-linux-2.12-bfields/debian/README.script | 38 util-linux-2.12-bfields/debian/bsdutils.postinst | 1 util-linux-2.12-bfields/debian/bsdutils.prerm | 5 util-linux-2.12-bfields/debian/changelog | 1240 +++++++++++ util-linux-2.12-bfields/debian/changelog.Debian-mount.old | 168 + util-linux-2.12-bfields/debian/conffiles | 2 util-linux-2.12-bfields/debian/control | 62 util-linux-2.12-bfields/debian/copyright | 25 util-linux-2.12-bfields/debian/fdformat | 9 util-linux-2.12-bfields/debian/fstab.example2 | 39 util-linux-2.12-bfields/debian/hwclock.sh | 129 + util-linux-2.12-bfields/debian/hwclockfirst.sh | 102 util-linux-2.12-bfields/debian/lintian-override | 3 util-linux-2.12-bfields/debian/mime.util-linux | 2 util-linux-2.12-bfields/debian/mount.fstab | 39 util-linux-2.12-bfields/debian/mount.postinst | 1 util-linux-2.12-bfields/debian/mount.prerm | 5 util-linux-2.12-bfields/debian/postinst | 35 util-linux-2.12-bfields/debian/postrm | 17 util-linux-2.12-bfields/debian/preinst | 13 util-linux-2.12-bfields/debian/prerm | 14 util-linux-2.12-bfields/debian/rejected-upstream | 76 util-linux-2.12-bfields/debian/rules | 344 +++ util-linux-2.12-bfields/debian/util-linux-locales.postinst | 1 util-linux-2.12-bfields/debian/util-linux-locales.prerm | 15 util-linux-2.12-bfields/disk-utils/Makefile | 22 util-linux-2.12-bfields/disk-utils/blockdev.c | 4 util-linux-2.12-bfields/disk-utils/elvtune.c | 4 util-linux-2.12-bfields/disk-utils/fsck.minix.c | 4 util-linux-2.12-bfields/disk-utils/mkfs.bfs.c | 17 util-linux-2.12-bfields/disk-utils/mkfs.c | 9 util-linux-2.12-bfields/disk-utils/mkfs.minix.c | 51 util-linux-2.12-bfields/disk-utils/mkswap.8 | 2 util-linux-2.12-bfields/disk-utils/mkswap.c | 63 util-linux-2.12-bfields/fdisk/Makefile | 6 util-linux-2.12-bfields/fdisk/cfdisk.c | 39 util-linux-2.12-bfields/fdisk/fdisk.c | 26 util-linux-2.12-bfields/fdisk/fdiskaixlabel.h | 1 util-linux-2.12-bfields/fdisk/fdiskbsdlabel.c | 20 util-linux-2.12-bfields/fdisk/fdiskbsdlabel.h | 72 util-linux-2.12-bfields/fdisk/fdisksgilabel.c | 16 util-linux-2.12-bfields/fdisk/fdisksgilabel.h | 6 util-linux-2.12-bfields/fdisk/fdisksunlabel.c | 16 util-linux-2.12-bfields/fdisk/fdisksunlabel.h | 10 util-linux-2.12-bfields/fdisk/sfdisk.c | 53 util-linux-2.12-bfields/getopt/getopt.1 | 5 util-linux-2.12-bfields/hwclock/Makefile | 2 util-linux-2.12-bfields/hwclock/cmos.c | 1 util-linux-2.12-bfields/hwclock/hwclock.8 | 9 util-linux-2.12-bfields/hwclock/kd.c | 1 util-linux-2.12-bfields/hwclock/rtc.c | 1 util-linux-2.12-bfields/lib/Makefile | 9 util-linux-2.12-bfields/lib/README.xgethostname | 76 util-linux-2.12-bfields/lib/get_blocks.c | 98 util-linux-2.12-bfields/lib/get_blocks.h | 7 util-linux-2.12-bfields/lib/xgethostname.2 | 37 util-linux-2.12-bfields/lib/xgethostname.c | 126 + util-linux-2.12-bfields/lib/xgethostname.h | 48 util-linux-2.12-bfields/login-utils/Makefile | 30 util-linux-2.12-bfields/login-utils/agetty.c | 232 +- util-linux-2.12-bfields/login-utils/checktty.c | 2 util-linux-2.12-bfields/login-utils/last.c | 7 util-linux-2.12-bfields/login-utils/login.c | 72 util-linux-2.12-bfields/login-utils/simpleinit.c | 2 util-linux-2.12-bfields/login-utils/simpleinit.h | 2 util-linux-2.12-bfields/login-utils/wall.1 | 6 util-linux-2.12-bfields/login-utils/wall.c | 53 util-linux-2.12-bfields/misc-utils/Makefile | 4 util-linux-2.12-bfields/misc-utils/cal.c | 49 util-linux-2.12-bfields/misc-utils/ddate.1 | 2 util-linux-2.12-bfields/misc-utils/mcookie.c | 14 util-linux-2.12-bfields/misc-utils/namei.c | 26 util-linux-2.12-bfields/misc-utils/script.c | 2 util-linux-2.12-bfields/misc-utils/setterm.c | 53 util-linux-2.12-bfields/misc-utils/write.c | 52 util-linux-2.12-bfields/mount/Makefile | 10 util-linux-2.12-bfields/mount/README.mount | 1 util-linux-2.12-bfields/mount/fstab.5 | 1 util-linux-2.12-bfields/mount/fstab.c | 2 util-linux-2.12-bfields/mount/lomount.c | 222 +- util-linux-2.12-bfields/mount/lomount.h | 2 util-linux-2.12-bfields/mount/loop.h | 37 util-linux-2.12-bfields/mount/losetup.8 | 18 util-linux-2.12-bfields/mount/mount.8 | 97 util-linux-2.12-bfields/mount/mount.c | 49 util-linux-2.12-bfields/mount/my_dev_t.h | 2 util-linux-2.12-bfields/mount/nfs.5 | 219 ++ util-linux-2.12-bfields/mount/nfs4_mount.h | 82 util-linux-2.12-bfields/mount/nfs4mount.c | 401 +++ util-linux-2.12-bfields/mount/nfs_mount4.h | 22 util-linux-2.12-bfields/mount/nfsmount.c | 1356 ++++++++----- util-linux-2.12-bfields/mount/rmd160.c | 532 +++++ util-linux-2.12-bfields/mount/rmd160.h | 9 util-linux-2.12-bfields/mount/sundries.h | 3 util-linux-2.12-bfields/mount/swapon.c | 5 util-linux-2.12-bfields/mount/umount.c | 7 util-linux-2.12-bfields/po/Makefile | 2 util-linux-2.12-bfields/po/es.po | 8 util-linux-2.12-bfields/sys-utils/Makefile | 28 util-linux-2.12-bfields/sys-utils/dmesg.8 | 2 util-linux-2.12-bfields/sys-utils/ipcrm.c | 2 util-linux-2.12-bfields/sys-utils/ipcs.c | 4 util-linux-2.12-bfields/sys-utils/readprofile.c | 2 util-linux-2.12-bfields/text-utils/more.c | 14 107 files changed, 6122 insertions(+), 972 deletions(-) diff -puN mount/Makefile~CITI_NFS4_ALL mount/Makefile --- util-linux-2.12/mount/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -10,10 +10,12 @@ RPCGEN = rpcgen COMPILE = $(CC) -c $(CFLAGS) $(DEFINES) LINK = $(CC) $(LDFLAGS) +ifeq "$(OS)" "linux" SUID_PROGS = mount umount NOSUID_PROGS = swapon losetup MAN5 = fstab.5 nfs.5 MAN8 = mount.8 swapoff.8 swapon.8 umount.8 losetup.8 +endif ifeq "$(HAVE_PIVOT_ROOT)" "yes" NOSUID_PROGS := $(NOSUID_PROGS) pivot_root @@ -24,8 +26,8 @@ PROGS = $(SUID_PROGS) $(NOSUID_PROGS) MAYBE = pivot_root swapoff -LO_OBJS = lomount.o $(LIB)/xstrncpy.o -NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o +LO_OBJS = lomount.o $(LIB)/xstrncpy.o rmd160.o +NFS_OBJS = nfsmount.o nfsmount_xdr.o nfs4mount.o GEN_FILES = nfsmount.h nfsmount_xdr.c nfsmount_clnt.c all: $(PROGS) @@ -48,7 +50,7 @@ mount: mount.o fstab.o sundries.o realpa $(LINK) $^ -o $@ umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \ - get_label_uuid.o version.o $(LIB)/env.o $(LO_OBJS) + get_label_uuid.o version.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS) $(LINK) $^ -o $@ swapon: swapon.o version.o @@ -57,7 +59,7 @@ swapon: swapon.o version.o main_losetup.o: lomount.c $(COMPILE) -DMAIN lomount.c -o $@ -losetup: main_losetup.o $(LIB)/xstrncpy.o +losetup: main_losetup.o $(LIB)/xstrncpy.o rmd160.o $(LINK) $^ -o $@ mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h diff -puN mount/nfsmount.c~CITI_NFS4_ALL mount/nfsmount.c --- util-linux-2.12/mount/nfsmount.c~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/nfsmount.c 2004-12-13 17:42:04.000000000 -0500 @@ -34,6 +34,7 @@ #include "../defines.h" /* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */ +#include #include #include #include @@ -72,11 +73,121 @@ #define NFS_FHSIZE 32 #endif +#define MNT_SENDBUFSIZE ((u_int)2048) +#define MNT_RECVBUFSIZE ((u_int)1024) + static char *nfs_strerror(int stat); #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) #define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2) +#define MAX_MNTPROT ((nfs_mount_version >= 4) ? 3 : 2) +#define HAVE_RELIABLE_TCP (nfs_mount_version >= 4) + +#ifndef HAVE_inet_aton +#define inet_aton(a,b) (0) +#endif + +typedef dirpath mnt2arg_t; +typedef dirpath mnt3arg_t; +typedef dirpath mntarg_t; + +typedef struct fhstatus mnt2res_t; +typedef struct mountres3 mnt3res_t; +typedef union { + mnt2res_t nfsv2; + mnt3res_t nfsv3; +} mntres_t; + +typedef struct { + char **hostname; + struct sockaddr_in saddr; + struct pmap pmap; +} clnt_addr_t; + +/* RPC call timeout values */ +static const struct timeval TIMEOUT = { 20, 0 }; +static const struct timeval RETRY_TIMEOUT = { 3, 0 }; + +static int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp); + +int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int); + +/* Convert RPC errors into strings */ +void rpc_strerror(void) +{ + int cf_stat = rpc_createerr.cf_stat; + int cf_errno = rpc_createerr.cf_error.re_errno; + char *ptr, *estr = clnt_sperrno(cf_stat); + + if (estr) { + if ((ptr = index(estr, ':'))) + estr = ++ptr; + + fprintf(stderr, "RPC Error: %d (%s )\n", cf_stat, estr); + if (cf_stat == RPC_SYSTEMERROR) + fprintf(stderr, "System Error: %d (%s)\n", cf_errno, strerror(cf_errno)); + } +} + +/* Define the order in which to probe for UDP/TCP services */ +static const u_int * +proto_probelist(const int use_tcp) +{ + static const u_int probe_both[] = { IPPROTO_TCP, IPPROTO_UDP, 0 }; + static const u_int probe_udponly[] = { IPPROTO_UDP, 0 }; + if (use_tcp) + return probe_both; + return probe_udponly; +} + +/* Define the order in which NFS versions are probed on portmapper */ +static const u_long * +nfs_probelist(const int vers) +{ + static const u_long nfs2_probe[] = { 2, 0}; + static const u_long nfs3_probe[] = { 3, 2, 0}; + switch (vers) { + case 3: + return nfs3_probe; + default: + return nfs2_probe; + } +} + +/* Define the order in which Mountd versions are probed on portmapper */ +static const u_long * +mnt_probelist(const int vers) +{ + static const u_long mnt1_probe[] = { 1, 2, 0 }; + static const u_long mnt3_probe[] = { 3, 1, 2, 0 }; + switch (vers) { + case 3: + return mnt3_probe; + default: + return mnt1_probe; + } +} + +/* Map an NFS version into the corresponding Mountd version */ +static u_long +nfsvers_to_mnt(const u_long vers) +{ + static const u_long nfs_to_mnt[] = { 0, 0, 1, 3 }; + if (vers <= 3) + return nfs_to_mnt[vers]; + return 0; +} + +/* Map a Mountd version into the corresponding NFS version */ +static u_long +mntvers_to_nfs(const u_long vers) +{ + static const u_long mnt_to_nfs[] = { 0, 2, 2, 3 }; + if (vers <= 3) + return mnt_to_nfs[vers]; + return 0; +} static int linux_version_code(void) { @@ -102,123 +213,627 @@ linux_version_code(void) { * NFS_MOUNT_VERSION: these nfsmount sources at compile time * nfs_mount_version: version this source and running kernel can handle */ +static int nfs_mount_version = NFS_MOUNT_VERSION; + static int find_kernel_nfs_mount_version(void) { static int kernel_version = -1; - int nfs_mount_version = NFS_MOUNT_VERSION; + int mnt_version = NFS_MOUNT_VERSION; if (kernel_version == -1) kernel_version = linux_version_code(); if (kernel_version) { if (kernel_version < MAKE_VERSION(2,1,32)) - nfs_mount_version = 1; + mnt_version = 1; else if (kernel_version < MAKE_VERSION(2,2,18)) - nfs_mount_version = 3; + mnt_version = 3; else if (kernel_version < MAKE_VERSION(2,3,0)) - nfs_mount_version = 4; /* since 2.2.18pre9 */ + mnt_version = 4; /* since 2.2.18pre9 */ else if (kernel_version < MAKE_VERSION(2,3,99)) - nfs_mount_version = 3; + mnt_version = 3; + else if (kernel_version < MAKE_VERSION(2,6,3)) + mnt_version = 4; else - nfs_mount_version = 4; /* since 2.3.99pre4 */ + mnt_version = 6; } - if (nfs_mount_version > NFS_MOUNT_VERSION) - nfs_mount_version = NFS_MOUNT_VERSION; - return nfs_mount_version; -} - -static struct pmap * -get_mountport(struct sockaddr_in *server_addr, - long unsigned prog, - long unsigned version, - long unsigned proto, - long unsigned port, - int nfs_mount_version) -{ - struct pmaplist *pmap; - static struct pmap p = {0, 0, 0, 0}; - - if (version > MAX_NFSPROT) - version = MAX_NFSPROT; - if (!prog) - prog = MOUNTPROG; - p.pm_prog = prog; - p.pm_vers = version; - p.pm_prot = proto; - p.pm_port = port; - - server_addr->sin_port = PMAPPORT; - pmap = pmap_getmaps(server_addr); - - while (pmap) { - if (pmap->pml_map.pm_prog != prog) - goto next; - if (!version && p.pm_vers > pmap->pml_map.pm_vers) - goto next; - if (version > 2 && pmap->pml_map.pm_vers != version) - goto next; - if (version && version <= 2 && pmap->pml_map.pm_vers > 2) - goto next; - if (pmap->pml_map.pm_vers > MAX_NFSPROT || - (proto && p.pm_prot && pmap->pml_map.pm_prot != proto) || - (port && pmap->pml_map.pm_port != port)) - goto next; - memcpy(&p, &pmap->pml_map, sizeof(p)); - next: - pmap = pmap->pml_next; - } - if (!p.pm_vers) - p.pm_vers = MOUNTVERS; - if (!p.pm_prot) - p.pm_prot = IPPROTO_TCP; -#if 0 - if (!p.pm_port) { - p.pm_port = pmap_getport(server_addr, p.pm_prog, p.pm_vers, - p.pm_prot); + if (mnt_version > NFS_MOUNT_VERSION) + mnt_version = NFS_MOUNT_VERSION; + return mnt_version; +} + +static int +nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr) +{ + struct hostent *hp; + + saddr->sin_family = AF_INET; + if (!inet_aton(hostname, &saddr->sin_addr)) { + if ((hp = gethostbyname(hostname)) == NULL) { + fprintf(stderr, _("mount: can't get address for %s\n"), + hostname); + return 0; + } else { + if (hp->h_length > sizeof(*saddr)) { + fprintf(stderr, + _("mount: got bad hp->h_length\n")); + hp->h_length = sizeof(*saddr); + } + memcpy(&saddr->sin_addr, hp->h_addr, hp->h_length); + } + } + return 1; +} + +/* + * Sigh... pmap_getport() doesn't actually check the version number. + * In order to make sure that the server actually supports the service + * we're requesting, we open and RPC client, and fire off a NULL + * RPC call. + */ +int +clnt_ping(struct sockaddr_in *saddr, const u_long prog, const u_long vers, + const u_int prot) +{ + CLIENT *clnt=NULL; + int sock, stat; + static char clnt_res; + + rpc_createerr.cf_stat = stat = 0; + sock = RPC_ANYSOCK; + switch(prot) { + case IPPROTO_UDP: + clnt = clntudp_bufcreate(saddr, prog, vers, + RETRY_TIMEOUT, &sock, + RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + break; + case IPPROTO_TCP: + clnt = clnttcp_create(saddr, prog, vers, &sock, + RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + break; + default: + goto out_bad; + } + if (!clnt) + goto out_bad; + memset(&clnt_res, 0, sizeof(clnt_res)); + stat = clnt_call(clnt, NULLPROC, + (xdrproc_t)xdr_void, (caddr_t)NULL, + (xdrproc_t)xdr_void, (caddr_t)&clnt_res, + TIMEOUT); + clnt_destroy(clnt); + close(sock); + if (stat != RPC_PROGVERSMISMATCH) + return 1; + + out_bad: + return 0; +} + +/* + * Use the portmapper to discover whether or not the service we want is + * available. The lists 'versions' and 'protos' define ordered sequences + * of service versions and udp/tcp protocols to probe for. + */ +static int +probe_port(clnt_addr_t *server, + const u_long *versions, + const u_int *protos) +{ + struct sockaddr_in *saddr = &server->saddr; + struct pmap *pmap = &server->pmap; + const u_long prog = pmap->pm_prog, + vers = pmap->pm_vers, + *p_vers; + const u_int prot = (u_int)pmap->pm_prot, + *p_prot; + const u_short port = (u_short) pmap->pm_port; + u_short p_port; + p_prot = prot ? &prot : protos; + p_vers = vers ? &vers : versions; + rpc_createerr.cf_stat = 0; + for (;;) { + saddr->sin_port = htons(PMAPPORT); + p_port = pmap_getport(saddr, prog, *p_vers, *p_prot); + if (p_port) { + if (!port || port == p_port) { + saddr->sin_port = htons(port); + if (clnt_ping(saddr, prog, *p_vers, *p_prot)) + goto out_ok; + } + } else if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED) + break; + if (!prot) { + if (*++p_prot) + continue; + p_prot = protos; + } + if (vers || !*++p_vers) + break; + } + return 0; + out_ok: + if (!vers) + pmap->pm_vers = *p_vers; + if (!prot) + pmap->pm_prot = *p_prot; + if (!port) + pmap->pm_port = p_port; + rpc_createerr.cf_stat = 0; + return 1; +} + +static int +probe_nfsport(clnt_addr_t *nfs_server) +{ + const struct pmap *pmap = &nfs_server->pmap; + const u_long *probe_vers; + const u_int *probe_prot; + + if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port) + return 1; + probe_vers = nfs_probelist(MAX_NFSPROT); + probe_prot = proto_probelist(HAVE_RELIABLE_TCP); + return probe_port(nfs_server, probe_vers, probe_prot); +} + +static int +probe_mntport(clnt_addr_t *mnt_server) +{ + const struct pmap *pmap = &mnt_server->pmap; + const u_long *probe_vers; + const u_int *probe_prot; + + if (pmap->pm_vers && pmap->pm_prot && pmap->pm_port) + return 1; + probe_vers = mnt_probelist(MAX_MNTPROT); + probe_prot = proto_probelist(HAVE_RELIABLE_TCP); + return probe_port(mnt_server, probe_vers, probe_prot); +} + +static int +probe_bothports(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server) +{ + struct pmap *nfs_pmap = &nfs_server->pmap; + struct pmap *mnt_pmap = &mnt_server->pmap; + struct pmap save_nfs, save_mnt; + int res; + const u_long *probe_vers; + + if (mnt_pmap->pm_vers && !nfs_pmap->pm_vers) + nfs_pmap->pm_vers = mntvers_to_nfs(mnt_pmap->pm_vers); + else if (nfs_pmap->pm_vers && !mnt_pmap->pm_vers) + mnt_pmap->pm_vers = nfsvers_to_mnt(nfs_pmap->pm_vers); + if (nfs_pmap->pm_vers) + goto version_fixed; + memcpy(&save_nfs, nfs_pmap, sizeof(save_nfs)); + memcpy(&save_mnt, mnt_pmap, sizeof(save_mnt)); + for (probe_vers = mnt_probelist(MAX_MNTPROT); *probe_vers; probe_vers++) { + nfs_pmap->pm_vers = mntvers_to_nfs(*probe_vers); + if ((res = probe_nfsport(nfs_server) != 0)) { + mnt_pmap->pm_vers = *probe_vers; + if ((res = probe_mntport(mnt_server)) != 0) + return 1; + memcpy(mnt_pmap, &save_mnt, sizeof(*mnt_pmap)); + } + if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED) + break; + memcpy(nfs_pmap, &save_nfs, sizeof(*nfs_pmap)); + } + out_bad: + return 0; + version_fixed: + if (!probe_nfsport(nfs_server)) + goto out_bad; + return probe_mntport(mnt_server); +} + +static CLIENT * +mnt_openclnt(clnt_addr_t *mnt_server, int *msock, const int report_errs) +{ + struct sockaddr_in *mnt_saddr = &mnt_server->saddr; + struct pmap *mnt_pmap = &mnt_server->pmap; + CLIENT *clnt; + + /* contact the mount daemon via TCP */ + mnt_saddr->sin_port = htons((u_short)mnt_pmap->pm_port); + *msock = RPC_ANYSOCK; + + switch (mnt_pmap->pm_prot) { + case IPPROTO_UDP: + clnt = clntudp_bufcreate(mnt_saddr, + mnt_pmap->pm_prog, mnt_pmap->pm_vers, + RETRY_TIMEOUT, msock, + MNT_SENDBUFSIZE, MNT_RECVBUFSIZE); + break; + case IPPROTO_TCP: + clnt = clnttcp_create(mnt_saddr, + mnt_pmap->pm_prog, mnt_pmap->pm_vers, + msock, + MNT_SENDBUFSIZE, MNT_RECVBUFSIZE); + break; + default: + goto out_bad; + } + if (!clnt) + goto report_err; + /* try to mount hostname:dirname */ + clnt->cl_auth = authunix_create_default(); + return clnt; + report_err: + if (report_errs) + clnt_pcreateerror("mount"); + out_bad: + return NULL; +} + +static inline void +mnt_closeclnt(CLIENT *clnt, int msock) +{ + auth_destroy(clnt->cl_auth); + clnt_destroy(clnt); + close(msock); +} + +static inline enum clnt_stat +nfs3_mount(CLIENT *clnt, mnt3arg_t *mnt3arg, mnt3res_t *mnt3res) +{ + return clnt_call(clnt, MOUNTPROC3_MNT, + (xdrproc_t) xdr_dirpath, (caddr_t) mnt3arg, + (xdrproc_t) xdr_mountres3, (caddr_t) mnt3res, + TIMEOUT); +} + +static inline enum clnt_stat +nfs2_mount(CLIENT *clnt, mnt2arg_t *mnt2arg, mnt2res_t *mnt2res) +{ + return clnt_call(clnt, MOUNTPROC_MNT, + (xdrproc_t) xdr_dirpath, (caddr_t) mnt2arg, + (xdrproc_t) xdr_fhstatus, (caddr_t) mnt2res, + TIMEOUT); +} + +static int +nfs_call_mount(clnt_addr_t *mnt_server, clnt_addr_t *nfs_server, + mntarg_t *mntarg, mntres_t *mntres, const int report_errs) +{ + CLIENT *clnt; + enum clnt_stat stat; + int msock; + + if (!probe_bothports(mnt_server, nfs_server)) { + if (report_errs) { + fprintf(stderr, "mount to NFS server '%s' failed", + *nfs_server->hostname); + if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED) { + fprintf(stderr, ": server is down.\n"); + } else if (nfs_server->pmap.pm_prot) { + fprintf(stderr, ": possible invalid protocol.\n"); + } else if (nfs_server->pmap.pm_port) { + fprintf(stderr, ": possible invalid port.\n"); + } else { + fprintf(stderr, ".\n"); + } + if (verbose) { + rpc_strerror(); + } + } + goto out_bad; } + + clnt = mnt_openclnt(mnt_server, &msock, report_errs); + if (!clnt) + goto out_bad; + /* make pointers in xdr_mountres3 NULL so + * that xdr_array allocates memory for us + */ + memset(mntres, 0, sizeof(*mntres)); + switch (mnt_server->pmap.pm_vers) { + case 3: + stat = nfs3_mount(clnt, mntarg, &mntres->nfsv3); + break; + case 2: + case 1: + stat = nfs2_mount(clnt, mntarg, &mntres->nfsv2); + break; + default: + goto out_bad; + } + if (stat != RPC_SUCCESS && report_errs) + clnt_perror(clnt, "mount"); + mnt_closeclnt(clnt, msock); + if (stat == RPC_SUCCESS) + return 1; + out_bad: + return 0; +} + +static int +parse_options(char *old_opts, struct nfs_mount_data *data, + int *bg, int *retry, clnt_addr_t *mnt_server, + clnt_addr_t *nfs_server, char *new_opts, const int opt_size) +{ + struct sockaddr_in *mnt_saddr = &mnt_server->saddr; + struct pmap *mnt_pmap = &mnt_server->pmap; + struct pmap *nfs_pmap = &nfs_server->pmap; + int len; + char *opt, *opteq; + char *mounthost = NULL; + char cbuf[128]; + + data->flags = 0; + *bg = 0; + + len = strlen(new_opts); + for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) { + if (strlen(opt) >= sizeof(cbuf)) + goto bad_parameter; + if ((opteq = strchr(opt, '=')) && isdigit(opteq[1])) { + int val = atoi(opteq + 1); + *opteq = '\0'; + if (!strcmp(opt, "rsize")) + data->rsize = val; + else if (!strcmp(opt, "wsize")) + data->wsize = val; + else if (!strcmp(opt, "timeo")) + data->timeo = val; + else if (!strcmp(opt, "retrans")) + data->retrans = val; + else if (!strcmp(opt, "acregmin")) + data->acregmin = val; + else if (!strcmp(opt, "acregmax")) + data->acregmax = val; + else if (!strcmp(opt, "acdirmin")) + data->acdirmin = val; + else if (!strcmp(opt, "acdirmax")) + data->acdirmax = val; + else if (!strcmp(opt, "actimeo")) { + data->acregmin = val; + data->acregmax = val; + data->acdirmin = val; + data->acdirmax = val; + } + else if (!strcmp(opt, "retry")) + *retry = val; + else if (!strcmp(opt, "port")) + nfs_pmap->pm_port = val; + else if (!strcmp(opt, "mountport")) + mnt_pmap->pm_port = val; + else if (!strcmp(opt, "mountprog")) + mnt_pmap->pm_prog = val; + else if (!strcmp(opt, "mountvers")) + mnt_pmap->pm_vers = val; + else if (!strcmp(opt, "nfsprog")) + nfs_pmap->pm_prog = val; + else if (!strcmp(opt, "nfsvers") || + !strcmp(opt, "vers")) { + nfs_pmap->pm_vers = val; + opt = "nfsvers"; +#if NFS_MOUNT_VERSION >= 2 + } else if (!strcmp(opt, "namlen")) { + if (nfs_mount_version >= 2) + data->namlen = val; + else if (!sloppy) + goto bad_parameter; #endif -#if 0 -#define MOUNTPORT 635 - /* HJLu wants to remove all traces of the old default port. - Are there still people running a mount RPC service on this - port without having a portmapper? */ - if (!p.pm_port) - p.pm_port = MOUNTPORT; -#endif - return &p; + } else if (!strcmp(opt, "addr")) { + /* ignore */; + continue; + } else if (!sloppy) + goto bad_parameter; + sprintf(cbuf, "%s=%s,", opt, opteq+1); + } else if (opteq) { + *opteq = '\0'; + if (!strcmp(opt, "proto")) { + if (!strcmp(opteq+1, "udp")) { + nfs_pmap->pm_prot = IPPROTO_UDP; +#if NFS_MOUNT_VERSION >= 2 + data->flags &= ~NFS_MOUNT_TCP; + } else if (!strcmp(opteq+1, "tcp") && + nfs_mount_version >= 2) { + nfs_pmap->pm_prot = IPPROTO_TCP; + data->flags |= NFS_MOUNT_TCP; +#endif + } else if (!sloppy) + goto bad_parameter; +#if NFS_MOUNT_VERSION >= 5 + } else if (!strcmp(opt, "sec")) { + char *secflavor = opteq+1; + /* see RFC 2623 */ + if (nfs_mount_version < 5) { + printf(_("Warning: ignoring sec=%s option\n"), secflavor); + continue; + } else if (!strcmp(secflavor, "sys")) + data->pseudoflavor = AUTH_SYS; + else if (!strcmp(secflavor, "krb5")) + data->pseudoflavor = AUTH_GSS_KRB5; + else if (!strcmp(secflavor, "krb5i")) + data->pseudoflavor = AUTH_GSS_KRB5I; + else if (!strcmp(secflavor, "krb5p")) + data->pseudoflavor = AUTH_GSS_KRB5P; + else if (!strcmp(secflavor, "lipkey")) + data->pseudoflavor = AUTH_GSS_LKEY; + else if (!strcmp(secflavor, "lipkey-i")) + data->pseudoflavor = AUTH_GSS_LKEYI; + else if (!strcmp(secflavor, "lipkey-p")) + data->pseudoflavor = AUTH_GSS_LKEYP; + else if (!strcmp(secflavor, "spkm3")) + data->pseudoflavor = AUTH_GSS_SPKM; + else if (!strcmp(secflavor, "spkm3i")) + data->pseudoflavor = AUTH_GSS_SPKMI; + else if (!strcmp(secflavor, "spkm3p")) + data->pseudoflavor = AUTH_GSS_SPKMP; + else if (!sloppy) { + printf(_("Warning: Unrecognized security flavor %s.\n"), + secflavor); + goto bad_parameter; + } + data->flags |= NFS_MOUNT_SECFLAVOUR; +#endif + } else if (!strcmp(opt, "mounthost")) + mounthost=xstrndup(opteq+1, + strcspn(opteq+1," \t\n\r,")); + else if (!strcmp(opt, "context")) { + char *context = opteq + 1; + + if (strlen(context) > NFS_MAX_CONTEXT_LEN) { + printf(_("context parameter exceeds limit of %d\n"), + NFS_MAX_CONTEXT_LEN); + goto bad_parameter; + } + strncpy(data->context, context, NFS_MAX_CONTEXT_LEN); + } else if (!sloppy) + goto bad_parameter; + sprintf(cbuf, "%s=%s,", opt, opteq+1); + } else { + int val = 1; + if (!strncmp(opt, "no", 2)) { + val = 0; + opt += 2; + } + if (!strcmp(opt, "bg")) + *bg = val; + else if (!strcmp(opt, "fg")) + *bg = !val; + else if (!strcmp(opt, "soft")) { + data->flags &= ~NFS_MOUNT_SOFT; + if (val) + data->flags |= NFS_MOUNT_SOFT; + } else if (!strcmp(opt, "hard")) { + data->flags &= ~NFS_MOUNT_SOFT; + if (!val) + data->flags |= NFS_MOUNT_SOFT; + } else if (!strcmp(opt, "intr")) { + data->flags &= ~NFS_MOUNT_INTR; + if (val) + data->flags |= NFS_MOUNT_INTR; + } else if (!strcmp(opt, "posix")) { + data->flags &= ~NFS_MOUNT_POSIX; + if (val) + data->flags |= NFS_MOUNT_POSIX; + } else if (!strcmp(opt, "cto")) { + data->flags &= ~NFS_MOUNT_NOCTO; + if (!val) + data->flags |= NFS_MOUNT_NOCTO; + } else if (!strcmp(opt, "ac")) { + data->flags &= ~NFS_MOUNT_NOAC; + if (!val) + data->flags |= NFS_MOUNT_NOAC; +#if NFS_MOUNT_VERSION >= 2 + } else if (!strcmp(opt, "tcp")) { + data->flags &= ~NFS_MOUNT_TCP; + if (val) { + if (nfs_mount_version < 2) + goto bad_option; + nfs_pmap->pm_prot = IPPROTO_TCP; + data->flags |= NFS_MOUNT_TCP; + } else + nfs_pmap->pm_prot = IPPROTO_UDP; + } else if (!strcmp(opt, "udp")) { + data->flags &= ~NFS_MOUNT_TCP; + if (!val) { + if (nfs_mount_version < 2) + goto bad_option; + nfs_pmap->pm_prot = IPPROTO_TCP; + data->flags |= NFS_MOUNT_TCP; + } else + nfs_pmap->pm_prot = IPPROTO_UDP; +#endif +#if NFS_MOUNT_VERSION >= 3 + } else if (!strcmp(opt, "lock")) { + data->flags &= ~NFS_MOUNT_NONLM; + if (!val) { + if (nfs_mount_version < 3) + goto bad_option; + data->flags |= NFS_MOUNT_NONLM; + } +#endif +#if NFS_MOUNT_VERSION >= 4 + } else if (!strcmp(opt, "broken_suid")) { + data->flags &= ~NFS_MOUNT_BROKEN_SUID; + if (val) { + if (nfs_mount_version < 4) + goto bad_option; + data->flags |= NFS_MOUNT_BROKEN_SUID; + } +#endif + } else if (!sloppy) { + bad_option: + printf(_("Unsupported nfs mount option: " + "%s%s\n"), val ? "" : "no", opt); + goto out_bad; + } + sprintf(cbuf, val ? "%s,":"no%s,", opt); + } + len += strlen(cbuf); + if (len >= opt_size) { + printf(_("mount: excessively long option argument\n")); + goto out_bad; + } + strcat(new_opts, cbuf); + } + /* See if the nfs host = mount host. */ + if (mounthost) { + if (!nfs_gethostbyname(mounthost, mnt_saddr)) + goto out_bad; + *mnt_server->hostname = mounthost; + } + return 1; + bad_parameter: + printf(_("Bad nfs mount parameter: %s\n"), opt); + out_bad: + return 0; +} + +static inline int +nfsmnt_check_compat(const struct pmap *nfs_pmap, const struct pmap *mnt_pmap) +{ + if (nfs_pmap->pm_vers && + (nfs_pmap->pm_vers > MAX_NFSPROT || nfs_pmap->pm_vers < 2)) { + if (nfs_pmap->pm_vers == 4) + fprintf(stderr, _("'vers=4' is not supported. " + "Use '-t nfs4' instead.\n")); + else + fprintf(stderr, _("NFS version %ld is not supported.\n"), + nfs_pmap->pm_vers); + goto out_bad; + } + if (mnt_pmap->pm_vers > MAX_MNTPROT) { + fprintf(stderr, _("NFS mount version %ld s not supported.\n"), + mnt_pmap->pm_vers); + goto out_bad; + } + return 1; + out_bad: + return 0; } -int nfsmount(const char *spec, const char *node, int *flags, - char **extra_opts, char **mount_opts, int *nfs_mount_vers, - int running_bg) +int +nfsmount(const char *spec, const char *node, int *flags, + char **extra_opts, char **mount_opts, int *nfs_mount_vers, + int running_bg) { static char *prev_bg_host; char hostdir[1024]; - CLIENT *mclient; char *hostname, *dirname, *old_opts, *mounthost = NULL; - char new_opts[1024]; - struct timeval total_timeout; - enum clnt_stat clnt_stat; + char new_opts[1024], cbuf[20]; static struct nfs_mount_data data; - char *opt, *opteq; - int nfs_mount_version; int val; - struct hostent *hp; - struct sockaddr_in server_addr; - struct sockaddr_in mount_server_addr; - struct pmap *pm_mnt; - int msock, fsock; - struct timeval retry_timeout; - union { - struct fhstatus nfsv2; - struct mountres3 nfsv3; - } status; + + clnt_addr_t mnt_server = { &mounthost, }; + clnt_addr_t nfs_server = { &hostname, }; + struct sockaddr_in *nfs_saddr = &nfs_server.saddr; + struct pmap *mnt_pmap = &mnt_server.pmap, + *nfs_pmap = &nfs_server.pmap; + struct pmap save_mnt, save_nfs; + + int fsock; + + mntres_t mntres; + struct stat statbuf; char *s; - int port, mountport, proto, bg, soft, intr; - int posix, nocto, noac, nolock, broken_suid; - int retry, tcp; - int mountprog, mountvers, nfsprog, nfsvers; + int bg, retry; int retval; time_t t; time_t prevt; @@ -231,8 +846,7 @@ int nfsmount(const char *spec, const cha nfs_mount_version = *nfs_mount_vers; retval = EX_FAIL; - msock = fsock = -1; - mclient = NULL; + fsock = -1; if (strlen(spec) >= sizeof(hostdir)) { fprintf(stderr, _("mount: " "excessively long host:dir argument\n")); @@ -258,49 +872,23 @@ int nfsmount(const char *spec, const cha goto fail; } - server_addr.sin_family = AF_INET; -#ifdef HAVE_inet_aton - if (!inet_aton(hostname, &server_addr.sin_addr)) -#endif - { - if ((hp = gethostbyname(hostname)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - hostname); - goto fail; - } else { - if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length\n")); - hp->h_length = sizeof(struct in_addr); - } - memcpy(&server_addr.sin_addr, - hp->h_addr, hp->h_length); - } - } - - memcpy (&mount_server_addr, &server_addr, sizeof (mount_server_addr)); + if (!nfs_gethostbyname(hostname, nfs_saddr)) + goto fail; + mounthost = hostname; + memcpy (&mnt_server.saddr, nfs_saddr, sizeof (mnt_server.saddr)); /* add IP address to mtab options for use when unmounting */ - s = inet_ntoa(server_addr.sin_addr); + s = inet_ntoa(nfs_saddr->sin_addr); old_opts = *extra_opts; if (!old_opts) old_opts = ""; - if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { - fprintf(stderr, _("mount: " - "excessively long option argument\n")); - goto fail; - } - sprintf(new_opts, "%s%saddr=%s", - old_opts, *old_opts ? "," : "", s); - *extra_opts = xstrdup(new_opts); /* Set default options. * rsize/wsize (and bsize, for ver >= 3) are left 0 in order to * let the kernel decide. * timeo is filled in after we know whether it'll be TCP or UDP. */ memset(&data, 0, sizeof(data)); - data.retrans = 3; data.acregmin = 3; data.acregmax = 60; data.acdirmin = 30; @@ -308,169 +896,24 @@ int nfsmount(const char *spec, const cha #if NFS_MOUNT_VERSION >= 2 data.namlen = NAME_MAX; #endif + data.pseudoflavor = AUTH_SYS; bg = 0; - soft = 0; - intr = 0; - posix = 0; - nocto = 0; - nolock = 0; - broken_suid = 0; - noac = 0; retry = 10000; /* 10000 minutes ~ 1 week */ - tcp = 0; - mountprog = MOUNTPROG; - mountvers = 0; - port = 0; - mountport = 0; - nfsprog = NFS_PROGRAM; - nfsvers = 0; + memset(mnt_pmap, 0, sizeof(*mnt_pmap)); + mnt_pmap->pm_prog = MOUNTPROG; + memset(nfs_pmap, 0, sizeof(*nfs_pmap)); + nfs_pmap->pm_prog = NFS_PROGRAM; /* parse options */ + new_opts[0] = 0; + if (!parse_options(old_opts, &data, &bg, &retry, &mnt_server, &nfs_server, + new_opts, sizeof(new_opts))) + goto fail; + if (!nfsmnt_check_compat(nfs_pmap, mnt_pmap)) + goto fail; - for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) { - if ((opteq = strchr(opt, '='))) { - val = atoi(opteq + 1); - *opteq = '\0'; - if (!strcmp(opt, "rsize")) - data.rsize = val; - else if (!strcmp(opt, "wsize")) - data.wsize = val; - else if (!strcmp(opt, "timeo")) - data.timeo = val; - else if (!strcmp(opt, "retrans")) - data.retrans = val; - else if (!strcmp(opt, "acregmin")) - data.acregmin = val; - else if (!strcmp(opt, "acregmax")) - data.acregmax = val; - else if (!strcmp(opt, "acdirmin")) - data.acdirmin = val; - else if (!strcmp(opt, "acdirmax")) - data.acdirmax = val; - else if (!strcmp(opt, "actimeo")) { - data.acregmin = val; - data.acregmax = val; - data.acdirmin = val; - data.acdirmax = val; - } - else if (!strcmp(opt, "retry")) - retry = val; - else if (!strcmp(opt, "port")) - port = val; - else if (!strcmp(opt, "mountport")) - mountport = val; - else if (!strcmp(opt, "mounthost")) - mounthost=xstrndup(opteq+1, - strcspn(opteq+1," \t\n\r,")); - else if (!strcmp(opt, "mountprog")) - mountprog = val; - else if (!strcmp(opt, "mountvers")) - mountvers = val; - else if (!strcmp(opt, "nfsprog")) - nfsprog = val; - else if (!strcmp(opt, "nfsvers") || - !strcmp(opt, "vers")) - nfsvers = val; - else if (!strcmp(opt, "proto")) { - if (!strncmp(opteq+1, "tcp", 3)) - tcp = 1; - else if (!strncmp(opteq+1, "udp", 3)) - tcp = 0; - else - printf(_("Warning: Unrecognized proto= option.\n")); - } else if (!strcmp(opt, "namlen")) { -#if NFS_MOUNT_VERSION >= 2 - if (nfs_mount_version >= 2) - data.namlen = val; - else -#endif - printf(_("Warning: Option namlen is not supported.\n")); - } else if (!strcmp(opt, "addr")) { - /* ignore */; - } else { - printf(_("unknown nfs mount parameter: " - "%s=%d\n"), opt, val); - goto fail; - } - } else { - val = 1; - if (!strncmp(opt, "no", 2)) { - val = 0; - opt += 2; - } - if (!strcmp(opt, "bg")) - bg = val; - else if (!strcmp(opt, "fg")) - bg = !val; - else if (!strcmp(opt, "soft")) - soft = val; - else if (!strcmp(opt, "hard")) - soft = !val; - else if (!strcmp(opt, "intr")) - intr = val; - else if (!strcmp(opt, "posix")) - posix = val; - else if (!strcmp(opt, "cto")) - nocto = !val; - else if (!strcmp(opt, "ac")) - noac = !val; - else if (!strcmp(opt, "tcp")) - tcp = val; - else if (!strcmp(opt, "udp")) - tcp = !val; - else if (!strcmp(opt, "lock")) { - if (nfs_mount_version >= 3) - nolock = !val; - else - printf(_("Warning: option nolock is not supported.\n")); - } else if (!strcmp(opt, "broken_suid")) { - broken_suid = val; - } else { - if (!sloppy) { - printf(_("unknown nfs mount option: " - "%s%s\n"), val ? "" : "no", opt); - goto fail; - } - } - } - } - proto = (tcp) ? IPPROTO_TCP : IPPROTO_UDP; - - data.flags = (soft ? NFS_MOUNT_SOFT : 0) - | (intr ? NFS_MOUNT_INTR : 0) - | (posix ? NFS_MOUNT_POSIX : 0) - | (nocto ? NFS_MOUNT_NOCTO : 0) - | (noac ? NFS_MOUNT_NOAC : 0); -#if NFS_MOUNT_VERSION >= 2 - if (nfs_mount_version >= 2) - data.flags |= (tcp ? NFS_MOUNT_TCP : 0); -#endif -#if NFS_MOUNT_VERSION >= 3 - if (nfs_mount_version >= 3) - data.flags |= (nolock ? NFS_MOUNT_NONLM : 0); -#endif -#if NFS_MOUNT_VERSION >= 4 - if (nfs_mount_version >= 4) - data.flags |= (broken_suid ? NFS_MOUNT_BROKEN_SUID : 0); -#endif - if (nfsvers > MAX_NFSPROT) { - fprintf(stderr, "NFSv%d not supported!\n", nfsvers); - return 0; - } - if (mountvers > MAX_NFSPROT) { - fprintf(stderr, "NFSv%d not supported!\n", nfsvers); - return 0; - } - if (nfsvers && !mountvers) - mountvers = (nfsvers < 3) ? 1 : nfsvers; - if (nfsvers && nfsvers < mountvers) - mountvers = nfsvers; - - /* Adjust options if none specified */ - if (!data.timeo) - data.timeo = tcp ? 70 : 7; #ifdef NFS_MOUNT_DEBUG printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", @@ -478,9 +921,10 @@ int nfsmount(const char *spec, const cha printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n", data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); printf("port = %d, bg = %d, retry = %d, flags = %.8x\n", - port, bg, retry, data.flags); + nfs_pmap->pm_port, bg, retry, data.flags); printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n", - mountprog, mountvers, nfsprog, nfsvers); + mnt_pmap->pm_prog, mnt_pmap->pm_vers, + nfs_pmap->pm_prog, nfs_pmap->pm_vers); printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n", (data.flags & NFS_MOUNT_SOFT) != 0, (data.flags & NFS_MOUNT_INTR) != 0, @@ -491,13 +935,16 @@ int nfsmount(const char *spec, const cha printf("tcp = %d\n", (data.flags & NFS_MOUNT_TCP) != 0); #endif +#if NFS_MOUNT_VERSION >= 5 + printf("sec = %u\n", data.pseudoflavor); +#endif #endif data.version = nfs_mount_version; *mount_opts = (char *) &data; if (*flags & MS_REMOUNT) - return 0; + goto out_ok; /* * If the previous mount operation on the same host was @@ -512,28 +959,6 @@ int nfsmount(const char *spec, const cha } /* create mount deamon client */ - /* See if the nfs host = mount host. */ - if (mounthost) { - if (mounthost[0] >= '0' && mounthost[0] <= '9') { - mount_server_addr.sin_family = AF_INET; - mount_server_addr.sin_addr.s_addr = inet_addr(hostname); - } else { - if ((hp = gethostbyname(mounthost)) == NULL) { - fprintf(stderr, _("mount: can't get address for %s\n"), - mounthost); - goto fail; - } else { - if (hp->h_length > sizeof(struct in_addr)) { - fprintf(stderr, - _("mount: got bad hp->h_length?\n")); - hp->h_length = sizeof(struct in_addr); - } - mount_server_addr.sin_family = AF_INET; - memcpy(&mount_server_addr.sin_addr, - hp->h_addr, hp->h_length); - } - } - } /* * The following loop implements the mount retries. On the first @@ -551,15 +976,13 @@ int nfsmount(const char *spec, const cha * * Only the first error message will be displayed. */ - retry_timeout.tv_sec = 3; - retry_timeout.tv_usec = 0; - total_timeout.tv_sec = 20; - total_timeout.tv_usec = 0; timeout = time(NULL) + 60 * retry; prevt = 0; t = 30; val = 1; + memcpy(&save_nfs, nfs_pmap, sizeof(save_nfs)); + memcpy(&save_mnt, mnt_pmap, sizeof(save_mnt)); for (;;) { if (bg && stat(node, &statbuf) == -1) { /* no mount point yet - sleep */ @@ -570,89 +993,18 @@ int nfsmount(const char *spec, const cha val = 30; } } else { + int stat; /* be careful not to use too many CPU cycles */ if (t - prevt < 30) sleep(30); - pm_mnt = get_mountport(&mount_server_addr, - mountprog, - mountvers, - proto, - mountport, - nfs_mount_version); - - /* contact the mount daemon via TCP */ - mount_server_addr.sin_port = htons(pm_mnt->pm_port); - msock = RPC_ANYSOCK; - - switch (pm_mnt->pm_prot) { - case IPPROTO_UDP: - mclient = clntudp_create(&mount_server_addr, - pm_mnt->pm_prog, - pm_mnt->pm_vers, - retry_timeout, - &msock); - if (mclient) - break; - mount_server_addr.sin_port = - htons(pm_mnt->pm_port); - msock = RPC_ANYSOCK; - case IPPROTO_TCP: - mclient = clnttcp_create(&mount_server_addr, - pm_mnt->pm_prog, - pm_mnt->pm_vers, - &msock, 0, 0); + stat = nfs_call_mount(&mnt_server, &nfs_server, + &dirname, &mntres, + !running_bg && prevt == 0); + if (stat) break; - default: - mclient = 0; - } - - if (mclient) { - /* try to mount hostname:dirname */ - mclient->cl_auth = authunix_create_default(); - - /* make pointers in xdr_mountres3 NULL so - * that xdr_array allocates memory for us - */ - memset(&status, 0, sizeof(status)); - - if (pm_mnt->pm_vers == 3) - clnt_stat = clnt_call(mclient, - MOUNTPROC3_MNT, - (xdrproc_t) xdr_dirpath, - (caddr_t) &dirname, - (xdrproc_t) xdr_mountres3, - (caddr_t) &status, - total_timeout); - else - clnt_stat = clnt_call(mclient, - MOUNTPROC_MNT, - (xdrproc_t) xdr_dirpath, - (caddr_t) &dirname, - (xdrproc_t) xdr_fhstatus, - (caddr_t) &status, - total_timeout); - - if (clnt_stat == RPC_SUCCESS) - break; /* we're done */ -#if 0 - /* errno? who sets errno? */ - /* this fragment breaks bg mounting */ - if (errno != ECONNREFUSED) { - clnt_perror(mclient, "mount"); - goto fail; /* don't retry */ - } -#endif - if (!running_bg && prevt == 0) - clnt_perror(mclient, "mount"); - auth_destroy(mclient->cl_auth); - clnt_destroy(mclient); - mclient = 0; - close(msock); - } else { - if (!running_bg && prevt == 0) - clnt_pcreateerror("mount"); - } + memcpy(nfs_pmap, &save_nfs, sizeof(*nfs_pmap)); + memcpy(mnt_pmap, &save_mnt, sizeof(*mnt_pmap)); prevt = t; } @@ -668,36 +1020,63 @@ int nfsmount(const char *spec, const cha if (t >= timeout) goto fail; } - nfsvers = (pm_mnt->pm_vers < 2) ? 2 : pm_mnt->pm_vers; - if (nfsvers == 2) { - if (status.nfsv2.fhs_status != 0) { + if (nfs_pmap->pm_vers == 2) { + if (mntres.nfsv2.fhs_status != 0) { fprintf(stderr, - "mount: %s:%s failed, reason given by server: %s\n", + _("mount: %s:%s failed, reason given by server: %s\n"), hostname, dirname, - nfs_strerror(status.nfsv2.fhs_status)); + nfs_strerror(mntres.nfsv2.fhs_status)); goto fail; } memcpy(data.root.data, - (char *) status.nfsv2.fhstatus_u.fhs_fhandle, + (char *) mntres.nfsv2.fhstatus_u.fhs_fhandle, NFS_FHSIZE); #if NFS_MOUNT_VERSION >= 4 data.root.size = NFS_FHSIZE; memcpy(data.old_root.data, - (char *) status.nfsv2.fhstatus_u.fhs_fhandle, + (char *) mntres.nfsv2.fhstatus_u.fhs_fhandle, NFS_FHSIZE); #endif } else { #if NFS_MOUNT_VERSION >= 4 + mountres3_ok *mountres; fhandle3 *fhandle; - if (status.nfsv3.fhs_status != 0) { + int i, *flavor, yum = 0; + if (mntres.nfsv3.fhs_status != 0) { fprintf(stderr, - "mount: %s:%s failed, reason given by server: %s\n", + _("mount: %s:%s failed, reason given by server: %s\n"), hostname, dirname, - nfs_strerror(status.nfsv3.fhs_status)); + nfs_strerror(mntres.nfsv3.fhs_status)); goto fail; } - fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle; +#if NFS_MOUNT_VERSION >= 5 + mountres = &mntres.nfsv3.mountres3_u.mountinfo; + i = mountres->auth_flavours.auth_flavours_len; + if (i <= 0) + goto noauth_flavours; + + flavor = mountres->auth_flavours.auth_flavours_val; + while (--i >= 0) { + if (flavor[i] == data.pseudoflavor) + yum = 1; +#ifdef NFS_MOUNT_DEBUG + printf("auth flavor %d: %d\n", + i, flavor[i]); +#endif + } + if (!yum) { + fprintf(stderr, + "mount: %s:%s failed, " + "security flavor not supported\n", + hostname, dirname); + /* server has registered us in mtab, send umount */ + nfs_call_umount(&mnt_server, &dirname); + goto fail; + } +noauth_flavours: +#endif + fhandle = &mntres.nfsv3.mountres3_u.mountinfo.fhandle; memset(data.old_root.data, 0, NFS_FHSIZE); memset(&data.root, 0, sizeof(data.root)); data.root.size = fhandle->fhandle3_len; @@ -711,13 +1090,9 @@ int nfsmount(const char *spec, const cha /* create nfs socket for kernel */ - if (tcp) { - if (nfs_mount_version < 3) { - printf(_("NFS over TCP is not supported.\n")); - goto fail; - } + if (nfs_pmap->pm_prot == IPPROTO_TCP) fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - } else + else fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); if (fsock < 0) { perror(_("nfs socket")); @@ -727,72 +1102,163 @@ int nfsmount(const char *spec, const cha perror(_("nfs bindresvport")); goto fail; } - if (port == 0) { - server_addr.sin_port = PMAPPORT; - port = pmap_getport(&server_addr, nfsprog, nfsvers, - tcp ? IPPROTO_TCP : IPPROTO_UDP); -#if 1 - /* Here we check to see if user is mounting with the - * tcp option. If so, and if the portmap returns a - * '0' for port (service unavailable), we then exit, - * notifying the user, rather than hanging up mount. - */ - if (port == 0 && tcp == 1) { - perror(_("nfs server reported service unavailable")); - goto fail; - } -#endif - - if (port == 0) - port = NFS_PORT; -#ifdef NFS_MOUNT_DEBUG - else - printf(_("used portmapper to find NFS port\n")); -#endif - } #ifdef NFS_MOUNT_DEBUG - printf(_("using port %d for nfs deamon\n"), port); + printf(_("using port %d for nfs deamon\n"), nfs_pmap->pm_port); #endif - server_addr.sin_port = htons(port); + nfs_saddr->sin_port = htons(nfs_pmap->pm_port); /* * connect() the socket for kernels 1.3.10 and below only, * to avoid problems with multihomed hosts. * --Swen */ if (linux_version_code() <= 66314 - && connect(fsock, (struct sockaddr *) &server_addr, - sizeof (server_addr)) < 0) { + && connect(fsock, (struct sockaddr *) nfs_saddr, + sizeof (*nfs_saddr)) < 0) { perror(_("nfs connect")); goto fail; } +#if NFS_MOUNT_VERSION >= 2 + if (nfs_pmap->pm_prot == IPPROTO_TCP) + data.flags |= NFS_MOUNT_TCP; + else + data.flags &= ~NFS_MOUNT_TCP; +#endif + /* prepare data structure for kernel */ data.fd = fsock; - memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr)); + memcpy((char *) &data.addr, (char *) nfs_saddr, sizeof(data.addr)); strncpy(data.hostname, hostname, sizeof(data.hostname)); - /* clean up */ + out_ok: + /* Ensure we have enough padding for the following strcat()s */ + if (strlen(new_opts) + strlen(s) + 30 >= sizeof(new_opts)) { + fprintf(stderr, _("mount: " + "excessively long option argument\n")); + goto fail; + } + + sprintf(cbuf, "addr=%s", s); + strcat(new_opts, cbuf); - auth_destroy(mclient->cl_auth); - clnt_destroy(mclient); - close(msock); + *extra_opts = xstrdup(new_opts); return 0; /* abort */ - fail: - if (msock != -1) { - if (mclient) { - auth_destroy(mclient->cl_auth); - clnt_destroy(mclient); - } - close(msock); - } if (fsock != -1) close(fsock); return retval; -} +} + +static inline enum clnt_stat +nfs3_umount(dirpath *argp, CLIENT *clnt) +{ + static char clnt_res; + memset (&clnt_res, 0, sizeof(clnt_res)); + return clnt_call(clnt, MOUNTPROC_UMNT, + (xdrproc_t) xdr_dirpath, (caddr_t)argp, + (xdrproc_t) xdr_void, (caddr_t) &clnt_res, + TIMEOUT); +} + +static inline enum clnt_stat +nfs2_umount(dirpath *argp, CLIENT *clnt) +{ + static char clnt_res; + memset (&clnt_res, 0, sizeof(clnt_res)); + return clnt_call(clnt, MOUNTPROC_UMNT, + (xdrproc_t) xdr_dirpath, (caddr_t)argp, + (xdrproc_t) xdr_void, (caddr_t) &clnt_res, + TIMEOUT); +} + +static int +nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) +{ + CLIENT *clnt; + enum clnt_stat res = 0; + int msock; + + clnt = mnt_openclnt(mnt_server, &msock, 1); + if (!clnt) + goto out_bad; + switch (mnt_server->pmap.pm_vers) { + case 3: + res = nfs3_umount(argp, clnt); + break; + case 2: + case 1: + res = nfs2_umount(argp, clnt); + break; + default: + break; + } + mnt_closeclnt(clnt, msock); + if (res == RPC_SUCCESS) + return 1; + out_bad: + return 0; +} + +int +nfsumount(const char *spec, const char *opts) +{ + char *hostname; + char *dirname; + clnt_addr_t mnt_server = { &hostname, }; + struct pmap *pmap = &mnt_server.pmap; + char *p; + + nfs_mount_version = find_kernel_nfs_mount_version(); + if (spec == NULL || (p = strchr(spec,':')) == NULL) + goto out_bad; + hostname = xstrndup(spec, p-spec); + dirname = xstrdup(p+1); +#ifdef NFS_MOUNT_DEBUG + printf(_("host: %s, directory: %s\n"), hostname, dirname); +#endif + + if (opts && (p = strstr(opts, "addr="))) { + char *q; + + free(hostname); + p += 5; + q = p; + while (*q && *q != ',') q++; + hostname = xstrndup(p,q-p); + } + + if (opts && (p = strstr(opts, "mounthost="))) { + char *q; + + free(hostname); + p += 10; + q = p; + while (*q && *q != ',') q++; + hostname = xstrndup(p,q-p); + } + + pmap->pm_prog = MOUNTPROG; + pmap->pm_vers = MOUNTVERS; + if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10))) + pmap->pm_prog = atoi(p+10); + if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10))) + pmap->pm_port = atoi(p+10); + if (opts && (p = strstr(opts, "nfsvers=")) && isdigit(*(p+8))) + pmap->pm_vers = nfsvers_to_mnt(atoi(p+8)); + if (opts && (p = strstr(opts, "mountvers=")) && isdigit(*(p+10))) + pmap->pm_vers = atoi(p+10); + + if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) + goto out_bad; + if (!probe_mntport(&mnt_server)) + goto out_bad; + return nfs_call_umount(&mnt_server, &dirname); + out_bad: + return 0; +} /* * We need to translate between nfs status return values and diff -puN mount/sundries.h~CITI_NFS4_ALL mount/sundries.h --- util-linux-2.12/mount/sundries.h~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/sundries.h 2004-12-13 17:42:03.000000000 -0500 @@ -37,6 +37,9 @@ void die (int errcode, const char *fmt, #ifdef HAVE_NFS int nfsmount (const char *spec, const char *node, int *flags, char **orig_opts, char **opt_args, int *version, int running_bg); +int nfs4mount (const char *spec, const char *node, int *flags, + char **orig_opts, char **opt_args, int running_bg); +int nfsumount(const char *spec, const char *opts); #endif /* exit status - bits below are ORed */ diff -puN mount/umount.c~CITI_NFS4_ALL mount/umount.c --- util-linux-2.12/mount/umount.c~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/umount.c 2004-12-13 17:42:03.000000000 -0500 @@ -112,6 +112,9 @@ int verbose = 0; /* True if ruid != euid. */ int suid = 0; +/* Needed by nfs4mount.c */ +int sloppy = 0; + #ifdef USE_SPECIAL_UMOUNTPROG /* unimplemented so far */ static int @@ -122,7 +125,7 @@ check_special_umountprog() { } #endif -#ifdef HAVE_NFS +#if 0 static int xdr_dir(XDR *xdrsp, char *dirp) { return (xdr_string(xdrsp, &dirp, MNTPATHLEN)); @@ -265,7 +268,7 @@ umount_one (const char *spec, const char /* Ignore any RPC errors, so that you can umount the filesystem if the server is down. */ if (strcasecmp(type, "nfs") == 0) - nfs_umount_rpc_call(spec, opts); + nfsumount(spec, opts); #endif umnt_err = umnt_err2 = 0; diff -puN mount/fstab.5~CITI_NFS4_ALL mount/fstab.5 --- util-linux-2.12/mount/fstab.5~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/fstab.5 2004-12-13 17:42:03.000000000 -0500 @@ -115,6 +115,7 @@ of filesystem types, such as .IR msdos , .IR ncpfs , .IR nfs , +.IR nfs4 , .IR ntfs , .IR proc , .IR qnx4 , diff -puN mount/mount.8~CITI_NFS4_ALL mount/mount.8 --- util-linux-2.12/mount/mount.8~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/mount.8 2004-12-13 17:42:08.000000000 -0500 @@ -270,6 +270,12 @@ Print a help message. .B \-v Verbose mode. .TP +.B \-p "\fInum\fP" +If the mount requires a passphrase to be entered, read it from file +descriptor +.IR num\fP +instead of from the terminal. +.TP .B \-a Mount all filesystems (of the given types) mentioned in .IR fstab . @@ -370,6 +376,7 @@ currently supported are: .IR msdos , .IR ncpfs , .IR nfs , +.IR nfs4 , .IR ntfs , .IR proc , .IR qnx4 , @@ -403,7 +410,7 @@ For most types all the program has to do is issue a simple .IR mount (2) system call, and no detailed knowledge of the filesystem type is required. -For a few types however (like nfs, smbfs, ncpfs) ad hoc code is +For a few types however (like nfs, nfs4, smbfs, ncpfs) ad hoc code is necessary. The nfs ad hoc code is built in, but smbfs and ncpfs have a separate mount program. In order to make it possible to treat all types in a uniform way, mount will execute the program @@ -451,9 +458,10 @@ or, if that does not exist, All of the filesystem types listed there will be tried, except for those that are labeled "nodev" (e.g., .IR devpts , -.I proc +.IR proc , +.IR nfs , and -.IR nfs ). +.IR nfs4 ). If .I /etc/filesystems ends in a line with a single * only, mount will read @@ -633,6 +641,15 @@ This option implies the options .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). +.TP +.B encryption +Specifies an encryption algorithm to use. Used in conjunction with the +.BR loop " option." +.TP +.B keybits +Specifies the key size to use for an encryption algorithm. Used in conjunction +with the +.BR loop " and " encryption " options." .RE .TP .B \-\-bind @@ -1243,6 +1260,73 @@ Usually it just causes lots of trouble. .B nolock Do not use locking. Do not start lockd. +.SH "Mount options for nfs4" +Instead of a textual option string, parsed by the kernel, the +.I nfs4 +file system expects a binary argument of type +.IR "struct nfs4_mount_data" . +The program +.B mount +itself parses the following options of the form `tag=value', +and puts them in the structure mentioned: +.BI rsize= n, +.BI wsize= n, +.BI timeo= n, +.BI retrans= n, +.BI acregmin= n, +.BI acregmax= n, +.BI acdirmin= n, +.BI acdirmax= n, +.BI actimeo= n, +.BI retry= n, +.BI port= n, +.BI proto= n, +.BI clientaddr= n, +.BI sec= n. +The option +.BI addr= n +is accepted but ignored. +Also the following Boolean options, possibly preceded by +.B no +are recognized: +.BR bg , +.BR fg , +.BR soft , +.BR hard , +.BR intr , +.BR cto , +.BR ac , +For details, see +.BR nfs (5). + +Especially useful options include +.TP +.B rsize=32768,wsize=32768 +This will make your NFS connection faster than with the default +buffer size of 4096. +.TP +.B hard +The program accessing a file on a NFS mounted file system will hang +when the server crashes. The process cannot be interrupted or +killed unless you also specify +.BR intr . +When the NFS server is back online the program will continue undisturbed +from where it was. This is probably what you want. +.TP +.B soft +This option allows the kernel to time out if the NFS server is not +responding for some time. The time can be +specified with +.BR timeo=time . +This timeout value is expressed in tenths of a second. +The +.BR soft +option might be useful if your NFS server sometimes doesn't respond +or will be rebooted while some process tries to get a file from the server. +Avoid using this option with +.BR proto=udp +or with a short timeout. + .SH "Mount options for ntfs" .TP .BI iocharset= name @@ -1696,7 +1780,10 @@ This type of mount knows about three opt .BR loop ", " offset " and " encryption , that are really options to .BR losetup (8). -If no explicit loop device is mentioned +If the mount requires a passphrase, you will be prompted for one unless +you specify a file descriptor to read from instead with the +.BR \-\-pass-fd +option. If no explicit loop device is mentioned (but just an option `\fB\-o loop\fP' is given), then .B mount will try to find some unused loop device and use that. @@ -1767,7 +1854,7 @@ temporary file .BR e2label (8), .BR xfs_admin (8), .BR mountd (8), -.BR nfsd (8), +.BR rpc.nfsd (8), .BR mke2fs (8), .BR tune2fs (8), .BR losetup (8) diff -puN mount/mount.c~CITI_NFS4_ALL mount/mount.c --- util-linux-2.12/mount/mount.c~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/mount.c 2004-12-13 17:42:08.000000000 -0500 @@ -92,6 +92,9 @@ static int readonly = 0; /* Nonzero for chatty (-v). */ int verbose = 0; +/* Do we hash the password or not */ +int hash_password = 1; + /* Nonzero for sloppy (-s). */ int sloppy = 0; @@ -116,6 +119,9 @@ static int suid = 0; /* Contains the fd to read the passphrase from, if any. */ static int pfd = -1; +/* Contains the preferred keysize in bits we want to use */ +static int keysz = 0; + /* Map from -o and fstab option strings to the flag argument to mount(2). */ struct opt_map { const char *opt; /* option name */ @@ -195,7 +201,7 @@ static const struct opt_map opt_map[] = }; static char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_encryption, - *opt_speed; + *opt_keybits, *opt_nohashpass, *opt_speed; static struct string_opt_map { char *tag; @@ -206,6 +212,8 @@ static struct string_opt_map { { "vfs=", 1, &opt_vfstype }, { "offset=", 0, &opt_offset }, { "encryption=", 0, &opt_encryption }, + { "keybits=", 0, &opt_keybits }, + { "nohashpass", 0, &opt_nohashpass }, { "speed=", 0, &opt_speed }, { NULL, 0, NULL } }; @@ -586,7 +594,8 @@ loop_check(char **spec, char **type, int *type = opt_vfstype; } - *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_encryption); + *loop = ((*flags & MS_LOOP) || *loopdev || opt_offset || opt_encryption || + opt_keybits); *loopfile = *spec; if (*loop) { @@ -604,8 +613,12 @@ loop_check(char **spec, char **type, int if (verbose) printf(_("mount: going to use the loop device %s\n"), *loopdev); offset = opt_offset ? strtoul(opt_offset, NULL, 0) : 0; - if (set_loop(*loopdev, *loopfile, offset, - opt_encryption, pfd, &loopro)) { + if (!keysz && opt_keybits) + keysz = strtoul(opt_keybits, NULL, 0); + if (opt_nohashpass) + hash_password=0; + if (set_loop (*loopdev, *loopfile, offset, opt_encryption, pfd, + keysz, &loopro, hash_password)) { if (verbose) printf(_("mount: failed setting up loop device\n")); return EX_FAIL; @@ -821,8 +834,23 @@ retry_nfs: "without support for the type `nfs'")); #endif } +#ifdef HAVE_NFS + /* + * NFSv4 support + */ + if (!fake && types && streq (types, "nfs4")) { + mnt_err = nfs4mount(spec, node, &flags, &extra_opts, &mount_opts, bg); + if (mnt_err) + return mnt_err; + goto nosigblock; +#else + die (EX_SOFTWARE, _("mount: this version was compiled " + "without support for the type `nfs4'")); +#endif + } block_signals (SIG_BLOCK); +nosigblock: if (!fake) mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS, @@ -1371,6 +1399,7 @@ static struct option longopts[] = { { "options", 1, 0, 'o' }, { "test-opts", 1, 0, 'O' }, { "pass-fd", 1, 0, 'p' }, + { "keybits", 1, 0, 'k' }, { "types", 1, 0, 't' }, { "bind", 0, 0, 128 }, { "replace", 0, 0, 129 }, @@ -1424,6 +1453,8 @@ main (int argc, char *argv[]) { int c, result = 0, specseen; char *options = NULL, *test_opts = NULL, *spec, *node; char *volumelabel = NULL; + char *passfd = NULL; + char *keysize = NULL; char *uuid = NULL; char *types = NULL; struct mntentchn *mc; @@ -1447,7 +1478,7 @@ main (int argc, char *argv[]) { initproctitle(argc, argv); #endif - while ((c = getopt_long (argc, argv, "afFhilL:no:O:p:rsU:vVwt:", + while ((c = getopt_long (argc, argv, "afFhilL:k:no:O:p:rsU:vVwt:", longopts, NULL)) != -1) { switch (c) { case 'a': /* mount everything in fstab */ @@ -1471,6 +1502,9 @@ main (int argc, char *argv[]) { case 'L': volumelabel = optarg; break; + case 'k': + keysize = optarg; + break; case 'n': /* do not write /etc/mtab */ ++nomtab; break; @@ -1598,6 +1632,11 @@ main (int argc, char *argv[]) { } else spec = NULL; /* just for gcc */ + if (passfd && sscanf(passfd,"%d",&pfd) != 1) + die (EX_USAGE, _("mount: argument to --pass-fd or -p must be a number")); + if (keysize && sscanf(keysize,"%d",&keysz) != 1) + die (EX_USAGE, _("mount: argument to --keybits or -k must be a number")); + switch (argc+specseen) { case 0: /* mount -a */ diff -puN /dev/null mount/nfs4mount.c --- /dev/null 2004-08-19 17:44:20.000000000 -0400 +++ util-linux-2.12-bfields/mount/nfs4mount.c 2004-12-13 17:42:03.000000000 -0500 @@ -0,0 +1,401 @@ +/* + * nfs4mount.c -- Linux NFS mount + * Copyright (C) 2002 Trond Myklebust + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Note: this file based on the original nfsmount.c + */ + +#include "../defines.h" /* for HAVE_rpcsvc_nfs_prot_h and HAVE_inet_aton */ + +#include +#include +#undef __FD_CLR +#undef __FD_SET +#undef __FD_ISSET +#undef __FD_ZERO + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef HAVE_rpcsvc_nfs_prot_h +#include +#else +#include +#define nfsstat nfs_stat +#endif + +#include "sundries.h" + +#include "mount_constants.h" +#include "nfs4_mount.h" + +#include "nls.h" + +#ifndef NFS_PORT +#define NFS_PORT 2049 +#endif + +extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int); +extern void rpc_strerror(void); + +struct { + char *flavour; + int fnum; +} flav_map[] = { + { "krb5", RPC_AUTH_GSS_KRB5 }, + { "krb5i", RPC_AUTH_GSS_KRB5I }, + { "krb5p", RPC_AUTH_GSS_KRB5P }, + { "lipkey", RPC_AUTH_GSS_LKEY }, + { "lipkey-i", RPC_AUTH_GSS_LKEYI }, + { "lipkey-p", RPC_AUTH_GSS_LKEYP }, + { "spkm3", RPC_AUTH_GSS_SPKM }, + { "spkm3i", RPC_AUTH_GSS_SPKMI }, + { "spkm3p", RPC_AUTH_GSS_SPKMP }, + { "unix", AUTH_UNIX }, + { "sys", AUTH_SYS }, + { "null", AUTH_NULL }, + { "none", AUTH_NONE }, +}; + +#define FMAPSIZE (sizeof(flav_map)/sizeof(flav_map[0])) +#define MAX_USER_FLAVOUR 16 + +static int parse_sec(char *sec, int *pseudoflavour) +{ + int i, num_flavour = 0; + + for (sec = strtok(sec, ":"); sec; sec = strtok(NULL, ":")) { + if (num_flavour >= MAX_USER_FLAVOUR) { + fprintf(stderr, + _("mount: maximum number of security flavors " + "exceeded\n")); + return 0; + } + for (i = 0; i < FMAPSIZE; i++) { + if (strcmp(sec, flav_map[i].flavour) == 0) { + pseudoflavour[num_flavour++] = flav_map[i].fnum; + break; + } + } + if (i == FMAPSIZE) { + fprintf(stderr, + _("mount: unknown security type %s\n"), sec); + return 0; + } + } + if (!num_flavour) + fprintf(stderr, + _("mount: no security flavors passed to sec= option\n")); + return num_flavour; +} + +static int parse_devname(char *hostdir, char **hostname, char **dirname) +{ + char *s; + + if (!(s = strchr(hostdir, ':'))) { + fprintf(stderr, + _("mount: " + "directory to mount not in host:dir format\n")); + return -1; + } + *hostname = hostdir; + *dirname = s + 1; + *s = '\0'; + /* Ignore all but first hostname in replicated mounts + until they can be fully supported. (mack@sgi.com) */ + if ((s = strchr(hostdir, ','))) { + *s = '\0'; + fprintf(stderr, + _("mount: warning: " + "multiple hostnames not supported\n")); + } + return 0; +} + +static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr) +{ + struct hostent *hp; + addr->sin_family = AF_INET; + + if (inet_aton(hostname, &addr->sin_addr)) + return 0; + if ((hp = gethostbyname(hostname)) == NULL) { + fprintf(stderr, _("mount: can't get address for %s\n"), + hostname); + return -1; + } + if (hp->h_length > sizeof(struct in_addr)) { + fprintf(stderr, + _("mount: got bad hp->h_length\n")); + hp->h_length = sizeof(struct in_addr); + } + memcpy(&addr->sin_addr, hp->h_addr, hp->h_length); + return 0; +} + +static int get_my_ipv4addr(char *ip_addr, int len) +{ + char myname[1024]; + struct sockaddr_in myaddr; + + if (gethostname(myname, sizeof(myname))) { + fprintf(stderr, _("mount: can't determine client address\n")); + return -1; + } + if (fill_ipv4_sockaddr(myname, &myaddr)) + return -1; + snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr)); + ip_addr[len-1] = '\0'; + return 0; +} + +int nfs4mount(const char *spec, const char *node, int *flags, + char **extra_opts, char **mount_opts, + int running_bg) +{ + static struct nfs4_mount_data data; + static char hostdir[1024]; + static char ip_addr[16] = "127.0.0.1"; + static struct sockaddr_in server_addr; + static int pseudoflavour[MAX_USER_FLAVOUR]; + int num_flavour = 0; + + char *hostname, *dirname, *old_opts; + char new_opts[1024]; + char *opt, *opteq; + char *s; + int val; + int bg, soft, intr; + int nocto, noac; + int retry; + int retval; + + retval = EX_FAIL; + if (strlen(spec) >= sizeof(hostdir)) { + fprintf(stderr, _("mount: " + "excessively long host:dir argument\n")); + goto fail; + } + strcpy(hostdir, spec); + if (parse_devname(hostdir, &hostname, &dirname)) + goto fail; + + if (fill_ipv4_sockaddr(hostname, &server_addr)) + goto fail; + if (get_my_ipv4addr(ip_addr, sizeof(ip_addr))) + goto fail; + + /* add IP address to mtab options for use when unmounting */ + s = inet_ntoa(server_addr.sin_addr); + old_opts = *extra_opts; + if (!old_opts) + old_opts = ""; + if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) { + fprintf(stderr, _("mount: " + "excessively long option argument\n")); + goto fail; + } + snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s", + old_opts, *old_opts ? "," : "", s); + *extra_opts = xstrdup(new_opts); + + /* Set default options. + * rsize/wsize and timeo are left 0 in order to + * let the kernel decide. + */ + memset(&data, 0, sizeof(data)); + data.retrans = 3; + data.acregmin = 3; + data.acregmax = 60; + data.acdirmin = 30; + data.acdirmax = 60; + data.proto = IPPROTO_TCP; + + bg = 0; + soft = 0; + intr = NFS4_MOUNT_INTR; + nocto = 0; + noac = 0; + retry = 10000; /* 10000 minutes ~ 1 week */ + + /* + * NFSv4 specifies that the default port should be 2049 + */ + server_addr.sin_port = htons(NFS_PORT); + + /* parse options */ + + for (opt = strtok(old_opts, ","); opt; opt = strtok(NULL, ",")) { + if ((opteq = strchr(opt, '='))) { + val = atoi(opteq + 1); + *opteq = '\0'; + if (!strcmp(opt, "rsize")) + data.rsize = val; + else if (!strcmp(opt, "wsize")) + data.wsize = val; + else if (!strcmp(opt, "timeo")) + data.timeo = val; + else if (!strcmp(opt, "retrans")) + data.retrans = val; + else if (!strcmp(opt, "acregmin")) + data.acregmin = val; + else if (!strcmp(opt, "acregmax")) + data.acregmax = val; + else if (!strcmp(opt, "acdirmin")) + data.acdirmin = val; + else if (!strcmp(opt, "acdirmax")) + data.acdirmax = val; + else if (!strcmp(opt, "actimeo")) { + data.acregmin = val; + data.acregmax = val; + data.acdirmin = val; + data.acdirmax = val; + } + else if (!strcmp(opt, "retry")) + retry = val; + else if (!strcmp(opt, "port")) + server_addr.sin_port = htons(val); + else if (!strcmp(opt, "proto")) { + if (!strncmp(opteq+1, "tcp", 3)) + data.proto = IPPROTO_TCP; + else if (!strncmp(opteq+1, "udp", 3)) + data.proto = IPPROTO_UDP; + else + printf(_("Warning: Unrecognized proto= option.\n")); + } else if (!strcmp(opt, "clientaddr")) { + if (strlen(opteq+1) >= sizeof(ip_addr)) + printf(_("Invalid client address %s"), + opteq+1); + strncpy(ip_addr,opteq+1, sizeof(ip_addr)); + ip_addr[sizeof(ip_addr)-1] = '\0'; + } else if (!strcmp(opt, "sec")) { + num_flavour = parse_sec(opteq+1, pseudoflavour); + if (!num_flavour) + goto fail; + } else if (!strcmp(opt, "addr")) { + /* ignore */; + } else { + printf(_("unknown nfs mount parameter: " + "%s=%d\n"), opt, val); + goto fail; + } + } else { + val = 1; + if (!strncmp(opt, "no", 2)) { + val = 0; + opt += 2; + } + if (!strcmp(opt, "bg")) + bg = val; + else if (!strcmp(opt, "fg")) + bg = !val; + else if (!strcmp(opt, "soft")) + soft = val; + else if (!strcmp(opt, "hard")) + soft = !val; + else if (!strcmp(opt, "intr")) + intr = val; + else if (!strcmp(opt, "cto")) + nocto = !val; + else if (!strcmp(opt, "ac")) + noac = !val; + else { + if (!sloppy) { + printf(_("unknown nfs mount option: " + "%s%s\n"), val ? "" : "no", opt); + goto fail; + } + } + } + } + + data.flags = (soft ? NFS4_MOUNT_SOFT : 0) + | (intr ? NFS4_MOUNT_INTR : 0) + | (nocto ? NFS4_MOUNT_NOCTO : 0) + | (noac ? NFS4_MOUNT_NOAC : 0); + + if (num_flavour == 0) + pseudoflavour[num_flavour++] = AUTH_UNIX; + data.auth_flavourlen = num_flavour; + data.auth_flavours = pseudoflavour; + + data.client_addr.data = ip_addr; + data.client_addr.len = strlen(ip_addr); + + data.mnt_path.data = dirname; + data.mnt_path.len = strlen(dirname); + + data.hostname.data = hostname; + data.hostname.len = strlen(hostname); + data.host_addr = (struct sockaddr *)&server_addr; + data.host_addrlen = sizeof(server_addr); + +#ifdef NFS_MOUNT_DEBUG + printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n", + data.rsize, data.wsize, data.timeo, data.retrans); + printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n", + data.acregmin, data.acregmax, data.acdirmin, data.acdirmax); + printf("port = %d, bg = %d, retry = %d, flags = %.8x\n", + ntohs(server_addr.sin_port), bg, retry, data.flags); + printf("soft = %d, intr = %d, nocto = %d, noac = %d\n", + (data.flags & NFS4_MOUNT_SOFT) != 0, + (data.flags & NFS4_MOUNT_INTR) != 0, + (data.flags & NFS4_MOUNT_NOCTO) != 0, + (data.flags & NFS4_MOUNT_NOAC) != 0); + + if (num_flavour > 0) { + int pf_cnt, i; + + printf("sec = "); + for (pf_cnt = 0; pf_cnt < num_flavour; pf_cnt++) { + for (i = 0; i < FMAPSIZE; i++) { + if (flav_map[i].fnum == pseudoflavour[pf_cnt]) { + printf("%s", flav_map[i].flavour); + break; + } + } + printf("%s", (pf_cnt < num_flavour-1) ? ":" : "\n"); + } + } + printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp"); +#endif + + data.version = NFS4_MOUNT_VERSION; + + clnt_ping(&server_addr, NFS_PROGRAM, 4, data.proto); + if (rpc_createerr.cf_stat) { + fprintf(stderr, "mount to NFS server '%s' failed.\n", data.hostname.data); + goto fail; + } + + *mount_opts = (char *) &data; + /* clean up */ + return 0; + +fail: + if (verbose) { + rpc_strerror(); + } + return retval; +} diff -puN /dev/null mount/nfs4_mount.h --- /dev/null 2004-08-19 17:44:20.000000000 -0400 +++ util-linux-2.12-bfields/mount/nfs4_mount.h 2004-12-13 17:42:03.000000000 -0500 @@ -0,0 +1,82 @@ +#ifndef _LINUX_NFS4_MOUNT_H +#define _LINUX_NFS4_MOUNT_H + +/* + * linux/include/linux/nfs4_mount.h + * + * Copyright (C) 2002 Trond Myklebust + * + * structure passed from user-space to kernel-space during an nfsv4 mount + */ + +/* + * WARNING! Do not delete or change the order of these fields. If + * a new field is required then add it to the end. The version field + * tracks which fields are present. This will ensure some measure of + * mount-to-kernel version compatibility. Some of these aren't used yet + * but here they are anyway. + */ +#define NFS4_MOUNT_VERSION 1 + +struct nfs_string { + unsigned int len; + const char* data; +}; + +struct nfs4_mount_data { + int version; /* 1 */ + int flags; /* 1 */ + int rsize; /* 1 */ + int wsize; /* 1 */ + int timeo; /* 1 */ + int retrans; /* 1 */ + int acregmin; /* 1 */ + int acregmax; /* 1 */ + int acdirmin; /* 1 */ + int acdirmax; /* 1 */ + + /* see the definition of 'struct clientaddr4' in RFC3010 */ + struct nfs_string client_addr; /* 1 */ + + /* Mount path */ + struct nfs_string mnt_path; /* 1 */ + + /* Server details */ + struct nfs_string hostname; /* 1 */ + /* Server IP address */ + unsigned int host_addrlen; /* 1 */ + struct sockaddr* host_addr; /* 1 */ + + /* Transport protocol to use */ + int proto; /* 1 */ + + /* Pseudo-flavours to use for authentication. See RFC2623 */ + int auth_flavourlen; /* 1 */ + int *auth_flavours; /* 1 */ +}; + +/* bits in the flags field */ +/* Note: the fields that correspond to existing NFSv2/v3 mount options + * should mirror the values from include/linux/nfs_mount.h + */ + +#define NFS4_MOUNT_SOFT 0x0001 /* 1 */ +#define NFS4_MOUNT_INTR 0x0002 /* 1 */ +#define NFS4_MOUNT_NOCTO 0x0010 /* 1 */ +#define NFS4_MOUNT_NOAC 0x0020 /* 1 */ +#define NFS4_MOUNT_STRICTLOCK 0x1000 /* 1 */ +#define NFS4_MOUNT_FLAGMASK 0xFFFF + +/* pseudoflavors: */ + +#define RPC_AUTH_GSS_KRB5 390003 +#define RPC_AUTH_GSS_KRB5I 390004 +#define RPC_AUTH_GSS_KRB5P 390005 +#define RPC_AUTH_GSS_LKEY 390006 +#define RPC_AUTH_GSS_LKEYI 390007 +#define RPC_AUTH_GSS_LKEYP 390008 +#define RPC_AUTH_GSS_SPKM 390009 +#define RPC_AUTH_GSS_SPKMI 390010 +#define RPC_AUTH_GSS_SPKMP 390011 + +#endif diff -puN mount/nfs.5~CITI_NFS4_ALL mount/nfs.5 --- util-linux-2.12/mount/nfs.5~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/nfs.5 2004-12-13 17:42:03.000000000 -0500 @@ -3,7 +3,7 @@ .\" patches. " .TH NFS 5 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual" .SH NAME -nfs \- nfs fstab format and options +nfs \- nfs and nfs4 fstab format and options .SH SYNOPSIS .B /etc/fstab .SH DESCRIPTION @@ -17,14 +17,51 @@ the local directory that is the mount po and the NFS specific options that control the way the filesystem is mounted. .P -Here is an example from an \fI/etc/fstab\fP file from an NFS mount. +Three different versions of the NFS protocol are +supported by the Linux NFS client: +NFS version 2, NFS version 3, and NFS version 4. +To mount via NFS version 2, use the +.BR nfs +file system type and specify +.BR nfsvers=2 . +Version 2 is the default protocol version for the +.BR nfs +file system type when +.BR nfsvers= +is not specified on the mount command. +To mount via NFS version 3, use the +.BR nfs +file system type and specify +.BR nfsvers=3 . +To mount via NFS version 4, use the +.BR nfs4 +file system type. +The +.BR nfsvers= +keyword is not supported for the +.BR nfs4 +file system type. +.P +These file system types share similar mount options; +the differences are listed below. +.P +Here is an example from an \fI/etc/fstab\fP file for an NFSv2 mount +over UDP. .sp .nf .ta 2.5i +0.75i +0.75i +1.0i server:/usr/local/pub /pub nfs rsize=8192,wsize=8192,timeo=14,intr .fi +.P +Here is an example for an NFSv4 mount over TCP using Kerberos +5 mutual authentication. +.sp +.nf +.ta 2.5i +0.75i +0.75i +1.0i +server:/usr/local/pub /pub nfs4 proto=tcp,sec=krb5,hard,intr +.fi .DT -.SS Options +.SS Options for the nfs file system type .TP 1.5i .I rsize=n The number of bytes NFS uses when reading files from an NFS server. @@ -128,7 +165,7 @@ mount daemon program number. Use an alternate RPC version number to contact the mount daemon on the remote host. This option is useful for hosts that can run multiple NFS servers. -The default value is version 1. +The default value depends on which kernel you are using. .TP 1.5i .I nfsprog=n Use an alternate RPC program number to contact the @@ -141,7 +178,7 @@ NFS daemon program number. Use an alternate RPC version number to contact the NFS daemon on the remote host. This option is useful for hosts that can run multiple NFS servers. -The default value is version 2. +The default value depends on which kernel you are using. .TP 1.5i .I nolock Disable NFS locking. Do not start lockd. @@ -193,9 +230,25 @@ Suppress the retrieval of new attributes .TP 1.5i .I noac Disable all forms of attribute caching entirely. This extracts a -server performance penalty but it allows two different NFS clients -to get reasonable good results when both clients are actively -writing to common filesystem on the server. +significant performance penalty but it allows two different NFS clients +to get reasonable results when both clients are actively +writing to a common export on the server. +.TP 1.5i +.I sec=mode +Set the security flavor for this mount to "mode". +The default setting is \f3sec=sys\f1, which uses local +unix uids and gids to authenticate NFS operations (AUTH_SYS). +Other currently supported settings are: +\f3sec=krb5\f1, which uses Kerberos V5 instead of local unix uids +and gids to authenticate users; +\f3sec=krb5i\f1, which uses Kerberos V5 for user authentication +and performs integrity checking of NFS operations using secure +checksums to prevent data tampering; and +\f3sec=krb5p\f1, which uses Kerberos V5 for user authentication +and integrity checking, and encrypts NFS traffic to prevent +traffic sniffing (this is the most secure setting). +Note that there is a performance penalty when using integrity +or privacy. .TP 1.5i .I tcp Mount the NFS filesystem using the TCP protocol instead of the @@ -208,6 +261,156 @@ is the default. All of the non-value options have corresponding nooption forms. For example, nointr means don't allow file operations to be interrupted. +.SS Options for the nfs4 file system type +.TP 1.5i +.I rsize=n +The number of bytes NFS uses when reading files from an NFS server. +The default value is dependent on the kernel, currently 4096 bytes. +(However, throughput is improved greatly by asking for +.IR rsize=32768 .) +This value is negotiated with the server. +.TP 1.5i +.I wsize=n +The number of bytes NFS uses when writing files to an NFS server. +The default value is dependent on the kernel, currently 4096 bytes. +(However, throughput is improved greatly by asking for +.IR wsize=32768 .) +This value is negotiated with the server. +.TP 1.5i +.I timeo=n +The value in tenths of a second before sending the +first retransmission after an RPC timeout. +The default value depends on whether +.IR proto=udp +or +.IR proto=tcp +is in effect (see below). +The default value for UDP is 7 tenths of a second. +The default value for TCP is 60 seconds. +After the first timeout, +the timeout is doubled after each successive timeout until a maximum +timeout of 60 seconds is reached or the enough retransmissions +have occured to cause a major timeout. Then, if the filesystem +is hard mounted, each new timeout cascade restarts at twice the +initial value of the previous cascade, again doubling at each +retransmission. The maximum timeout is always 60 seconds. +.TP 1.5i +.I retrans=n +The number of minor timeouts and retransmissions that must occur before +a major timeout occurs. The default is 5 timeouts for +.IR proto=udp +and 2 timeouts for +.IR proto=tcp . +When a major timeout +occurs, the file operation is either aborted or a "server not responding" +message is printed on the console. +.TP 1.5i +.I acregmin=n +The minimum time in seconds that attributes of a regular file should +be cached before requesting fresh information from a server. +The default is 3 seconds. +.TP 1.5i +.I acregmax=n +The maximum time in seconds that attributes of a regular file can +be cached before requesting fresh information from a server. +The default is 60 seconds. +.TP 1.5i +.I acdirmin=n +The minimum time in seconds that attributes of a directory should +be cached before requesting fresh information from a server. +The default is 30 seconds. +.TP 1.5i +.I acdirmax=n +The maximum time in seconds that attributes of a directory can +be cached before requesting fresh information from a server. +The default is 60 seconds. +.TP 1.5i +.I actimeo=n +Using actimeo sets all of +.I acregmin, +.I acregmax, +.I acdirmin, +and +.I acdirmax +to the same value. +There is no default value. +.TP 1.5i +.I retry=n +The number of minutes to retry an NFS mount operation +in the foreground or background before giving up. +The default value is 10000 minutes, which is roughly one week. +.TP 1.5i +.I port=n +The numeric value of the port to connect to the NFS server on. +If the port number is 0 (the default) then query the +remote host's portmapper for the port number to use. +If the remote host's NFS daemon is not registered with +its portmapper, the standard NFS port number 2049 is +used instead. +.TP 1.5i +.I proto=n +Mount the NFS filesystem using a specific network protocol +instead of the default UDP protocol. +Many NFS version 4 servers only support TCP. +Valid protocol types are +.IR udp +and +.IR tcp . +.TP 1.5i +.I clientaddr=n +On a multi-homed client, this +causes the client to use a specific callback address when +communicating with an NFS version 4 server. +This option is currently ignored. +.TP 1.5i +.I sec=mode +Same as \f3sec=mode\f1 for the nfs filesystem type (see above). +.TP 1.5i +.I bg +If an NFS mount attempt times out, retry the mount +in the background. +After a mount operation is backgrounded, all subsequent mounts +on the same NFS server will be backgrounded immediately, without +first attempting the mount. +A missing mount point is treated as a timeout, +to allow for nested NFS mounts. +.TP 1.5i +.I fg +If the first NFS mount attempt times out, retry the mount +in the foreground. +This is the complement of the +.I bg +option, and also the default behavior. +.TP 1.5i +.I soft +If an NFS file operation has a major timeout then report an I/O error to +the calling program. +The default is to continue retrying NFS file operations indefinitely. +.TP 1.5i +.I hard +If an NFS file operation has a major timeout then report +"server not responding" on the console and continue retrying indefinitely. +This is the default. +.TP 1.5i +.I intr +If an NFS file operation has a major timeout and it is hard mounted, +then allow signals to interupt the file operation and cause it to +return EINTR to the calling program. The default is to not +allow file operations to be interrupted. +.TP 1.5i +.I nocto +Suppress the retrieval of new attributes when creating a file. +.TP 1.5i +.I noac +Disable attribute caching, and force synchronous writes. +This extracts a +server performance penalty but it allows two different NFS clients +to get reasonable good results when both clients are actively +writing to common filesystem on the server. +.P +All of the non-value options have corresponding nooption forms. +For example, nointr means don't allow file operations to be +interrupted. .SH FILES .I /etc/fstab .SH "SEE ALSO" diff -puN mount/nfs_mount4.h~CITI_NFS4_ALL mount/nfs_mount4.h --- util-linux-2.12/mount/nfs_mount4.h~CITI_NFS4_ALL 2004-12-13 17:42:03.000000000 -0500 +++ util-linux-2.12-bfields/mount/nfs_mount4.h 2004-12-13 17:42:04.000000000 -0500 @@ -8,7 +8,9 @@ * so it is easiest to ignore the kernel altogether (at compile time). */ -#define NFS_MOUNT_VERSION 4 +#define NFS_MOUNT_VERSION 6 +#define NFS_MAX_CONTEXT_LEN 256 + struct nfs2_fh { char data[32]; @@ -36,6 +38,9 @@ struct nfs_mount_data { int namlen; /* 2 */ unsigned int bsize; /* 3 */ struct nfs3_fh root; /* 4 */ + int pseudoflavor; /* 5 */ + char context[NFS_MAX_CONTEXT_LEN + 1]; /* 6 */ + }; /* bits in the flags field */ @@ -51,4 +56,19 @@ struct nfs_mount_data { #define NFS_MOUNT_KERBEROS 0x0100 /* 3 */ #define NFS_MOUNT_NONLM 0x0200 /* 3 */ #define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */ +#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ + +/* security pseudoflavors */ + +#ifndef AUTH_GSS_KRB5 +#define AUTH_GSS_KRB5 390003 +#define AUTH_GSS_KRB5I 390004 +#define AUTH_GSS_KRB5P 390005 +#define AUTH_GSS_LKEY 390006 +#define AUTH_GSS_LKEYI 390007 +#define AUTH_GSS_LKEYP 390008 +#define AUTH_GSS_SPKM 390009 +#define AUTH_GSS_SPKMI 390010 +#define AUTH_GSS_SPKMP 390011 +#endif diff -puN configure~CITI_NFS4_ALL configure --- util-linux-2.12/configure~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/configure 2004-12-13 17:42:08.000000000 -0500 @@ -274,6 +274,7 @@ rm -f conftest conftest.c # # F6. For agetty.c: is updwtmp() available? +# F7. For mcookie.c: is gettimeofday() available? # echo ' #include @@ -490,7 +491,7 @@ echo ' #include int main(int a, char **v){ if (a == -1) /* false */ - gettext("There is no gettext man page\n"); + gettext("There is no gettext man page"); exit(0); } ' > conftest.c @@ -506,6 +507,28 @@ else fi rm -f conftest conftest.c +# +# F7. For mcookie.c: is gettimeofday() available? +# +echo ' +#include +#include +main(int a, char **v){ + struct timeval tv; + struct timezone tz; + gettimeofday( &tv, &tz ); + exit(0); +} +' > conftest.c +eval $compile +if test -s conftest && ./conftest 2>/dev/null; then + echo "#define HAVE_gettimeofday" >> defines.h + echo "You have gettimeofday()" +else + echo "You don't have gettimeofday()" +fi +rm -f conftest conftest.c + # # 7. Does xgettext exist and take the option --foreign-user? diff -puN debian/bsdutils.postinst~CITI_NFS4_ALL debian/bsdutils.postinst --- util-linux-2.12/debian/bsdutils.postinst~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/bsdutils.postinst 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1 @@ +#!/bin/sh -e diff -puN debian/bsdutils.prerm~CITI_NFS4_ALL debian/bsdutils.prerm --- util-linux-2.12/debian/bsdutils.prerm~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/bsdutils.prerm 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,5 @@ +#!/bin/sh -e + +if [ -L /usr/doc/bsdutils ] ; then + rm -f /usr/doc/bsdutils +fi diff -puN debian/changelog~CITI_NFS4_ALL debian/changelog --- util-linux-2.12/debian/changelog~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/changelog 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,1240 @@ +util-linux (2.12.nfsv4-11) unstable; urgency=low + + * Remove redhat-specific mount warnings + + -- J. Bruce Fields Mon, 13 Dec 2004 12:41:37 -0500 + +util-linux (2.12.nfsv4-10) unstable; urgency=low + * Miscellaneous nfs mount fixes + * Add support for NFSv4 and krb5 + + -- J. Bruce Fields Tue, 12 Oct 2004 12:58:22 -0400 + +util-linux (2.12-10) unstable; urgency=low + + * The "SO WHY IS LETTING TWO PROCESSES OPEN THE SAME TTY FOR READ A + _GOOD_ THING" Release. + * Admit that the kernel API doesn't provide what we need, and turn the code + back off. Discussions will follow on how to deal with this post-sarge. + Closes: #272689, Reopens: #216658 + + -- LaMont Jones Thu, 23 Sep 2004 22:29:09 -0600 + +util-linux (2.12-9) unstable; urgency=high + + * The I-HATE-LINUX-TTY-HANDLING Release + * New and improved tty-in-use check, that actually works. Closes: #272689 + + -- LaMont Jones Wed, 22 Sep 2004 12:30:01 -0600 + +util-linux (2.12-8) unstable; urgency=high + + * Fix tty-in-use check. Many thanks to Samuel Thibault for tracking this + down and providing a patch. Closes: #226443 + + -- LaMont Jones Mon, 20 Sep 2004 08:53:42 -0600 + +util-linux (2.12-7) unstable; urgency=low + + * Have pri= only affect that entry in swapon -a. Closes: #214407 + * Mention the freshmeat site. Closes: #225605 + * fix disk sun label creation in fdisk. Closes: #228747 + * Use a more general form for uname. Closes: #231477 + * Provide fdisk-udeb for sparc. Closes: #228444 + * Cleanup vty code in getty. Closes: #224028, #224067, #226443, #229788 + * Changes from Javier Fernandez-Sanguino Pen~a + - Added amd64 architecture (Closes: #241855) + - Fixed manpage to avoid pointing to non existant files (Closes: #234875) + - Fixed Theodore Tso's address to the new one in dmesg (Closes: #222106) + - Modified cfdisk's es.po in order to not ask for an accented character + since it will not be shown in cfdisk and causes confusion amongst + users, this change could be reverted when upstream manages + 8-bit characters better (Closes: #210363, #204162) + - mkswap manpage now mentiones --sparece=never option to cp + (Closes: #184492) + - Added upstream maintainers to debian/copyright (Closes: #130858) + + -- LaMont Jones Fri, 6 Feb 2004 14:50:09 -0700 + +util-linux (2.12-6) unstable; urgency=low + + * Clean up FTBFS isses. Closes: #223149 + * Deal with hwclock.sh on s390x. Closes: #216567 + * Have getty check before opening a device. Closes: #216658 + + -- LaMont Jones Sat, 6 Dec 2003 18:42:20 -0700 + +util-linux (2.12-5) unstable; urgency=low + + * Fix compile error in get_blocks.c. Closes: #218894 + * Help out fdisk-udeb. Closes: #218920 + + -- LaMont Jones Mon, 3 Nov 2003 15:02:04 -0700 + +util-linux (2.12-4) unstable; urgency=low + + * Version the build-depends on slang1-utf8-dev to make life clearer for + woody backporters... Closes: #211974 + * Deliver pg. Closes: #217310 + + -- LaMont Jones Fri, 24 Oct 2003 19:54:10 -0600 + +util-linux (2.12-3) unstable; urgency=low + + * Re-add support for kerneli (if cryptoapi is there, we use it. If not, we assume + that -e refers to kerneli). Closes: #65068, #131044, #163639, #211534. + + -- LaMont Jones Fri, 19 Sep 2003 20:42:08 -0600 + +util-linux (2.12-2) unstable; urgency=low + + * release to unstable. Closes: #206396,#180353 + + -- LaMont Jones Tue, 16 Sep 2003 23:07:27 -0600 + +util-linux (2.12-1) experimental; urgency=low + + * Fix package priorities. + * Cleanup cryptoapi patch. (Really just needed the keybits patch.) + + -- LaMont Jones Sun, 14 Sep 2003 20:40:56 -0600 + +util-linux (2.12-0) experimental; urgency=low + + * New upstream release. + * cryptoapi patch (sort of) migrated forward, along with code inspired by + the patch in #206396. Still fighting with 2.4.22 crypto api, patches + welcome. + + -- LaMont Jones Sun, 14 Sep 2003 11:30:17 -0600 + +util-linux (2.11z-5) unstable; urgency=low + + * Fix mount -p (to make -p an accepted option), and add back in okeybits= + to make the natives happy. Closes: #131863, #197211, #157843 + * Merge in dependency change from -4.1, and cleanup the dirty diff that + brought. Closes: #200327, #205382, #206621 + * Was creating invalid swap files. Closes: #196149, #203528 + * Fix LSB failures in cal. Closes: #184885 + * Fix wall copyright, patch from Shaul Karl. Closes: #196850 + * Fix HURD patch. Closes: #198026 + * Include cramfs support. Closes: #207207 + * Fix configure bug. Closes: #207227 + * Create /etc/mtab mode 0600. Closes: #208860 + * Fix man page ref to rpc.nfsd(8). Closes: #165381 + + -- LaMont Jones Sat, 6 Sep 2003 16:43:20 -0600 + +util-linux (2.11z-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Correct build-depend from slang1-dev to slang1-utf8-dev to get cfdisk in + fdisk-udeb to link with the same slang library as the other d-i modules. + Patch from Joe Nahmias. (Closes: #200327, #205382) + + -- Petter Reinholdtsen Fri, 5 Sep 2003 22:18:21 +0200 + +util-linux (2.11z-4) unstable; urgency=low + + * Put ddate back in, just to keep the natives quiet. + + -- LaMont Jones Wed, 21 May 2003 14:36:14 -0600 + +util-linux (2.11z-3) unstable; urgency=low + + * Fix bashism in postinst from hurd port. Closes: #194149 + * Drop ddate. Closes: #149321, #174459, #180737 + * Clean up messages in hwclock.sh. Closes: #167484 + * Some package description changes. Closes: #139953 + * properly install changelog. Closes: #148714 + * Fix hwclock man page reference to /usr/local/timezone. Closes: #149996 + + -- LaMont Jones Wed, 21 May 2003 07:47:41 -0600 + +util-linux (2.11z-2) unstable; urgency=low + + * add in hurd patch. Closes: #153410 + * Actually fixed in 2.11z-1 (or earlier)... Closes: #81531, #138215, #138388, #185430 + * Install line. Closes: #141498 + * Suggest dosfstools (home of mkfs.vfat). Closes: #175369 + + -- LaMont Jones Mon, 19 May 2003 21:17:22 -0600 + +util-linux (2.11z-1) unstable; urgency=low + + * New upstream version. Closes: #167967, #127086, #122288 + + -- LaMont Jones Fri, 21 Mar 2003 14:02:39 -0700 + +util-linux (2.11y-2) unstable; urgency=low + + * Fix sparc build. sigh. + + -- LaMont Jones Thu, 30 Jan 2003 01:00:28 -0700 + +util-linux (2.11y-1) unstable; urgency=low + + * New upstream version + * don't build fdisk on m68k. Closes: #170669 + * Honor HWCLOCKACCESS in hwcolockfirst.sh. Closes: #127972 + + -- LaMont Jones Fri, 3 Jan 2003 22:05:53 -0700 + +util-linux (2.11x-1) unstable; urgency=low + + * New upstream version. Closes: #163851 + * Include errno.h where needed. Closes: #168539 + + -- LaMont Jones Sun, 24 Nov 2002 12:12:23 -0700 + +util-linux (2.11u-2) unstable; urgency=low + + * Fix changelog. + + -- LaMont Jones Mon, 7 Oct 2002 09:42:22 -0600 + +util-linux (2.11u-1) unstable; urgency=low + + * New upstream release + * Incorporate udeb fix from Tollef Fog Heen. Closes: #156648 + * Build fdisk-udeb only where we built fdisk... Closes: #163461 + + -- LaMont Jones Sun, 6 Oct 2002 23:31:42 -0600 + +util-linux (2.11n-4.1) unstable; urgency=low + + * NMU with maintainer's permission + * Generate udeb with *fdisk in it. Closes: 156648 + + -- Tollef Fog Heen Sun, 22 Sep 2002 14:44:24 +0200 + +util-linux (2.11n-4) unstable; urgency=low + + * New maintainer. Closes: #130842 + * Fix Standards-Version. Closes: #97040 + * Loosen dependency of util-linux-locales to match upstream version. + + -- LaMont Jones Sat, 26 Jan 2002 11:21:41 -0700 + +util-linux (2.11n-3) unstable; urgency=low + + * Orphaned this package. + + -- Adrian Bunk Fri, 25 Jan 2002 14:36:06 +0100 + +util-linux (2.11n-2) unstable; urgency=high + + * Applied a patch to hwclock/cmos.c that should fix the + compilation on alpha. (closes: #123357) + + -- Adrian Bunk Tue, 11 Dec 2001 12:13:30 +0100 + +util-linux (2.11n-1) unstable; urgency=high + + * New upstream release. + - It's now possible to build pivot_root on all architectures. + - The confusing error message in mount is fixed. + (closes: #109483) + - minix v2 filesystems are now autodetected by mount. + (closes: #118092) + - tmpfs is now documented in mount (8). (closes: #120930) + - s/top/Top/g in ipc.texi. (closes: #117438) + + -- Adrian Bunk Mon, 10 Dec 2001 19:46:36 +0100 + +util-linux (2.11m-1) unstable; urgency=high + + * New upstream release. + The following bugs are fixed in this release: + - "setterm -foreground default" does work now. + (closes: #115447) + - "more" on empty files does no longer print junk on powerpc. + (closes: #114973) + - The entry in the expert menu the option to create a + SGI disklabel is now called + "create an IRIX (SGI) partition table". (closes: #110277) + * debian/rules: "raw" does now compile on m68k. + * Remove the special handling for PowerPC/PReP machines from + the postinst. (closes: #118367) + + -- Adrian Bunk Thu, 8 Nov 2001 22:46:55 +0100 + +util-linux (2.11l-4) unstable; urgency=high + + * Corrected the bug introduced in the last upload that did let + the installation of util-linux fail on powerpc. + (closes: 117393) + * s/"uname -m"/`uname -m`/ in the postinst of util-linux. + + -- Adrian Bunk Sun, 28 Oct 2001 20:11:11 +0100 + +util-linux (2.11l-3) unstable; urgency=low + + * Don't install debian/tmp/DEBIAN/conffiles on s390 (since + there's no longer a hwclock on s390). + + -- Adrian Bunk Tue, 23 Oct 2001 20:39:06 +0200 + +util-linux (2.11l-2) unstable; urgency=low + + * Don't install hwclock on s390. (closes: #115019) + * Make the warning in hwclockfirst.sh that occurs when the + timezone couldn't be determined more silent. + (closes: #116003) + + -- Adrian Bunk Sun, 21 Oct 2001 12:50:40 +0200 + +util-linux (2.11l-1) unstable; urgency=high + + * New upstream release that consists of bug fixes and several + security fixes. (closes: #112271) + - renice does no longer incorrectly report a priority of 20. + (closes: #37348) + - Upstream has included the "replay" script written by + Joey Hess . (closes: #68556) + * Added a hwclockfirst.sh script that runs before S20modutils. + (closes: #50572) + + -- Adrian Bunk Tue, 9 Oct 2001 02:15:34 +0200 + +util-linux (2.11h-1) unstable; urgency=high + + * New upstream release. + - This release contains some fixes in more (1). + (closes: #46590) + * Don't build pivot_root on ia64 (ia64 has broken kernel + headers). + + -- Adrian Bunk Fri, 27 Jul 2001 19:20:25 +0200 + +util-linux (2.11g-4) unstable; urgency=low + + * m68k doesn't has pivot_root, too. (closes: #103812) + + -- Adrian Bunk Mon, 9 Jul 2001 23:20:36 +0200 + +util-linux (2.11g-3) unstable; urgency=low + + * Don't build "raw" on m68k because it doesn't compile. + (closes: #103812) + + -- Adrian Bunk Sat, 7 Jul 2001 16:48:23 +0200 + +util-linux (2.11g-2) unstable; urgency=low + + * hwclock.sh does now check $HWCLOCKACCESS. (closes: #87187) + + -- Adrian Bunk Fri, 6 Jul 2001 19:35:04 +0200 + +util-linux (2.11g-1) unstable; urgency=low + + * New upstream release. + * fdisk does now know about the partition type of the + Linux/PA-RISC boot loader. (closes: #101853) + + -- Adrian Bunk Wed, 27 Jun 2001 18:56:34 +0200 + +util-linux (2.11f-1) unstable; urgency=low + + * New upstream release. Bugs fixed in this release: + - Fix for big endian architectures in disk-utils/raw.c. + (closes: #100462) + - Support for SuperH in mount. (closes: #99804) + - The alpha options in hwclock do now work as documented. + (closes: #84346) + - mount (8) does now mention that the quota utilities do use + the *quota options in /etc/fstab. (closes: #98485) + + -- Adrian Bunk Sun, 24 Jun 2001 22:11:23 +0200 + +util-linux (2.11d-1) unstable; urgency=low + + * New upstream release. This release contains fixes for the + following bugs: + - Different fix for the problems with the "user" option in + umount. (closes: #98129) + - Support x86 RTC on UltraSPARC III's. (closes: #91774) + - An error message in mount is now proper english. + (closes: #92198) + * Install more.help in /usr/share/util-linux. (closes: #96375) + * Updated README.Debian.hwclock.gz. (closes: #76618) + + -- Adrian Bunk Thu, 24 May 2001 10:57:43 +0200 + +util-linux (2.11b-6) unstable; urgency=low + + * Corrected the "charset" in po/nl.po . + * Standards-Version: 526.7.8.9.13-Foo.6 + + -- Adrian Bunk Wed, 9 May 2001 15:54:51 +0200 + +util-linux (2.11b-5) unstable; urgency=low + + * Made util-linux-locales binary-all. + + -- Adrian Bunk Thu, 26 Apr 2001 23:57:45 +0200 + +util-linux (2.11b-4) unstable; urgency=low + + * Applied a fdisk patch for hppa and added hppa to fdisk_arch in + debian/rules. (closes: #92912) + + -- Adrian Bunk Sun, 15 Apr 2001 03:01:40 +0200 + +util-linux (2.11b-3) unstable; urgency=high + + * Fixed the bug in umount that did let a user umount a file system + mounted by root when the "user" option is set in /etc/fstab. + (closes: #44749) + * Corrected a build error on powerpc in debian/rules. + * Corrected in util-linux-locales: + Section : base -> utils + Priority: required -> optional + * Added the crypto patch again. (closes: #36939) + Fixed in the new crypto patch: + - It's now the complete crypto patch. (closes: #55435) + - "losetup" no longer lists the available ciphers. + (closes: #61425) + - It already includes the patch from #68804. (closes: #68804) + * Added blockdev to util-linux. (closes: #61488) + + -- Adrian Bunk Thu, 12 Apr 2001 19:41:14 +0200 + +util-linux (2.11b-2) unstable; urgency=low + + * Include pivot_root in util-linux. (closes: #91215) + * Added a lintian override for mount and umount. + + -- Adrian Bunk Sun, 25 Mar 2001 20:16:39 +0200 + +util-linux (2.11b-1) unstable; urgency=high + + * New upstream release. This release fixes the following bugs: + - the problem with extended partitions when using the "o" command + in fdisk is fixed (closes: #45827) + - adfs options are now documentated in mount (8) (closes: #79181) + - missing .TP in mount (8) was added (closes: #56230) + * The locales are now in a seperate util-linux-locales package that + is not essential. (closes: #62651) + * util-linux "Suggests: kbd | console-tools" to help people to + find where "kbdrate" is. + * Added support for devfs in rdev. (closes: #74962) + * Include the "raw" program in util-linux. (closes: #85695) + * Include fdformat again. (closes: #81362) + * Moved the "install-info" call from the postrm to the prerm. + (closes: #90883) + * Install "HOSTORY" as "changelog.gz" in all packages. + * Removed the "swapdev" link to "rdev". Upstream says about swapdev: + Nevertheless, all this is ancient junk. I just checked swapdev + and found that it was last used in kernel 0.12 but that swapdev + (or rdev -s) has not done anything in any kernel later than 0.12. + + -- Adrian Bunk Fri, 23 Mar 2001 15:50:23 +0100 + +util-linux (2.11a-2) unstable; urgency=low + + * Corrected the location of the examples in getopt (1). + (closes: #63036) + * Added the missing build dependency on gettext. + * Added mips, mipsel and ia64 to fdisk_arch in debian/rules. + + -- Adrian Bunk Mon, 12 Mar 2001 23:10:03 +0100 + +util-linux (2.11a-1) unstable; urgency=low + + * New upstream release. + * This release contains a fix for an overrun sprintf in mount. + (closes: #85739) + * A message of cfdisk is less confusing in this release. + (closes: #76664) + * Don't include a group writable /usr/share/locale/da . + + -- Adrian Bunk Sat, 10 Mar 2001 01:41:51 +0100 + +util-linux (2.11-1) unstable; urgency=low + + * New upstream release. + * Upstream removed "kbdrate" from util-linux (it's now in the + packages kbd and console-tools). + Let util-linux conflict with kbd (<< 1.05-3) and + console-tools (<< 1:0.2.3-21) to avoid that a user of these + packages has a system without "kbdrate". + + -- Adrian Bunk Fri, 9 Mar 2001 19:40:53 +0100 + +util-linux (2.10s-2) unstable; urgency=low + + * New maintainer. (closes: #86872) + + -- Adrian Bunk Wed, 21 Feb 2001 18:21:03 +0100 + +util-linux (2.10s-1) unstable; urgency=low + + * New upstream release, Closes: #85492 + * login-utils/wall now checks whether the devices has a colon in it and skips + it if it does. This prevents wall from trying to send to X connectiosn. + Closes: #34217 + * added joeyh's script patch for handling SIGWINCH, Closes: #42497 + * debian has long been modifying the man page to point at proper file + locations, these two bugs were merged with two other bugs that are actually + bugs in docs v. reality and so were not getting closed. unmerged and are + now being closed. Closes: #55500. + * DEB_HOST_ARCH is set if not run from within dpkg-buildpackage, + Closes: #71978 + * devfs code now in the upstream, Closes: #72241 + * upstream fixed the wrong NAME, Closes: #79794 + * umount knows that mips does not support umount2, Closes: #80386 + * removed calls to suidregister + * orphaning package + + -- Sean 'Shaleh' Perry Mon, 12 Feb 2001 14:43:32 -0800 + +util-linux (2.10q-1) unstable; urgency=low + + * New upstream release + * New maintainer (possibly temporarily) + * I left out the alpha fdisk patch and the crypto patch. Debian needs to + line up with the upstream. If there is demand, will see what I can do. + Closes: #77259, #69717 + * has patch for autofs from #31251, Closes: #31251 + * loop mounts leaking seems to have been fixed long ago, Closes: #37063 + * nfs(5) updated to mention (no)lock option, Closes: #50300 + * umount sigsegv'ing when user lacks permisions seems to have been fixed + long ago, Closes: #54757 + * FHS transition started in last upload forgot to, Closes: #61287, #66322 + * umount -f is now documented and tries to be functional, Closes: #62625 + * for all of those "please update this package" bugs, Closes: #64927, #64416 + * umount -f seems to work now, I believe it was a kernel issue, Closes: #70484 + * bsdutils description cleaned, no longer refers to missing binaries, + Closes: #63617 + * Patch rejected by upstream, Closes: #25832 + * problems with alpha and bsd partitions believed fixed in 2.9w, + Closes: #34572 + * /dev/vcsa patch accepted, Closes: #54204 + * msglevel fixed by upstream, Closes: #54213 + * update-mime call seems to have been fixed in previous release, + Closes: #55140 + * looks like user error, Closes: #57757, #58833, #70651 + * does not look valid any more, Closes: #64226, #67815, #60197 + * LVM supported in current release, Closes: #67297 + * forgot to Closes: #69442, when I put elvtune's manpage where it belongs + * prerm typo, oops, Closes: #77300 + * fdformat is just a wrapper, no more confusing messages, + Closes: #52364, #53037 + * hwclock.sh supports a BADYEAR argument from etc/default/rcS. + * no longer include example.files, they do not readily apply to debian + Closes: #59711 + + -- Sean 'Shaleh' Perry Thu, 16 Nov 2000 14:25:50 -0800 + +util-linux (2.10p-1.0) unstable; urgency=low + + * New upstream release + * NMU with maintainer's permission + * added Build-Depends, Closes: #75713 + * upstream added the patch from #36340, so Closes: #36340 + * upstream put '--More--' back to reverse video, Closes: #55165 + * hwclock man page points at /usr/share/zoneinfo, not usr/lib + * all created packages' postints now sets usr/doc/ symlink, its prerm removes + said link + * copyright file now points to usr/share/common-licenses and the typo in the + URL was fixed (it is misc, not Misc) + * update hwclock.sh to reflect FHS changes + * debian/rules file brought up to date for FHS + * elvtune man page put with the binary + * The above changes allow Closes: #69698 + * edited fr.po, fixed "Nombre de partitions" to "Numéro de partition", + Closes: #71743 + * whereis knows that /usr/share/man/* is valid, Closes: #72097 + * debian/rules now sets SHELL to bash, so it can use bashisms, Closes: #74095 + * upstream HISTORY file included as changelog.gz, Closes: #63175 + * removed /etc/fdprm, Closes: #62955 + * made fdformat a sh script instead of a bash script (the bash was unneeded) + + -- Sean 'Shaleh' Perry Thu, 9 Nov 2000 17:55:10 -0800 + +util-linux (2.10o-1) unstable; urgency=low + + * New upstream code. Add elvtune. + closes: #69166: util-linux package not complete. + + -- Vincent Renardias Thu, 17 Aug 2000 18:17:34 +0200 + +util-linux (2.10n-1) unstable; urgency=low + + * New upstream code. + closes: #68976 util-linux needs new upstream version. + closes: #64536 util-linux: [PATCH] mkswap refuses to create big swap partitions. + closes: #63747 Option parsing bug of 'mkswap' command Debian Package util-linux. + closes: #62935 mkswap BUG of option parsing in Debian Package util-linux. + closes: #59264 util-linux: mkswap: erroneous option parsing, documentation outdated. + closes: #64079 util-linux: mkswap's -v[01] option is broken. + + -- Vincent Renardias Sun, 13 Aug 2000 00:54:51 +0200 + +util-linux (2.10f-5.1) frozen unstable; urgency=low + + * Non-Maintainer Upload + * Patch from Ben Collins to fix the -v[01] option in mkswap + (closes: #64079) + * Patch from Chris Butler to fix hwclock's handling of RTC + (closes: #62688) + * Change to line 879 of fdiskbsdlabel.c to allow building on sparc + (patch sent to maintainer) + + -- Stephen R. Gore Sun, 25 Jun 2000 22:18:47 +0500 + +util-linux (2.10f-5) frozen unstable; urgency=low + + * Patch from David Huggins-Daines + which is required to get a working fdisk on alpha. + + -- Vincent Renardias Mon, 1 May 2000 22:40:17 +0200 + +util-linux (2.10f-4) unstable; urgency=low + + * Patch for mips support from Florian Lohoff . + closes: #62247: patch for mips/mipsel and bsddisklabel. + + -- Vincent Renardias Wed, 12 Apr 2000 17:26:24 +0200 + +util-linux (2.10f-3) frozen unstable; urgency=low + + * included patch from David Huggins-Daines so + that fdisk behaves correctly with OSF/1 disklabels. + closes: #59385: Fixes for BSD disklabel support (for Alpha) + (Important bug) + + -- Vincent Renardias Thu, 2 Mar 2000 13:21:40 +0100 + +util-linux (2.10f-2) frozen unstable; urgency=low + + * Now that 2.10f-1 has been tested in unstable, re-upload it to frozen. + closes: #54252: cfdisk fails to detect DAC960 partitions. (CRITICAL) + + -- Vincent Renardias Sat, 5 Feb 2000 19:05:29 +0100 + +util-linux (2.10f-1) unstable; urgency=low + + * New upstream release: + * Security fix for mount (okir) + * Avoid infinite loop in namei (Brett Wuth) + closes: #56761: namei segment faults on circular links. + * added clock-ppc.c (from Matsuura Takanori), not merged yet + * deleted clockB subdirectory + * recognize mkdosfs string (Michal Svec) + * New: rename + * Added option to mkswap so that user can override pagesize + * fdisk -l now reads /proc/partitions when no device was given + closes: #55614: util-linux: 'fdisk -l' no longer works?. + * Fixed fdisk.8 (James Manning) + * Added devpts info to mount.8 (Elrond) + * Newline fix for logger output to stdout (Henri Spencer) + + -- Vincent Renardias Thu, 3 Feb 2000 14:19:33 +0100 + +util-linux (2.10d-7) frozen unstable; urgency=low + + * There is no real concensus about what we should do about the + hwclock issue. Now at least the problem is enough documented + to let the user decide. (Thanks to Henrique M Holschuh + for the patch). + When this package is installed, I'll examine one by one which BR can + be closed. + + -- Vincent Renardias Mon, 31 Jan 2000 14:34:03 +0100 + +util-linux (2.10d-6) frozen unstable; urgency=low + + * kbdrate isn't suid anymore. + closes: #54978: ordinary user can change keyboard repeat vor all users. + + -- Vincent Renardias Fri, 28 Jan 2000 16:52:27 +0100 + +util-linux (2.10d-5) unstable; urgency=low + + * Included patch from "J.H.M. Dassen (Ray)" : + - Restored enhanced losetup(8) manpage. + - Restored encrypted filesystem support, by applying util-linux-2.9w from + patch-int-2.2.13.3.gz as found on ftp.kerneli.org (modified to work with + Debian's kernel-patch-int's crypto.h). + (closes: #54657) + * Recompiled with ncurses5. + + -- Vincent Renardias Wed, 12 Jan 2000 12:24:12 +0100 + +util-linux (2.10d-4) unstable; urgency=low + + * ipcrm now accepts multiple ids thanks to a patch from Topi Miettinen. + closes: #15110: ipcrm doesn't work with xargs. + * fix postinst script: + closes: #53254: util-linux: ppc chunk of postinst script has syntactical error. + + -- Vincent Renardias Wed, 22 Dec 1999 17:24:46 +0100 + +util-linux (2.10d-3) unstable; urgency=low + + * Disabled 'hwclock --adjust' on boot. + closes: #37657: util-linux: hwclock --systohc dangerous. + closes: #40283: util-linux: hwclock --systohc dangerous. + closes: #41263: hwclock --adjust doesn't work (temporary fix included). + closes: #51805: /etc/adjtime. + closes: #35432: "/etc/init.d/hwclock.sh" possible bug. + closes: #43228: Clock taking advance in potato. + + -- Vincent Renardias Mon, 20 Dec 1999 13:55:21 +0100 + +util-linux (2.10d-2) unstable; urgency=low + + * cfdisk must be build with slang; not ncurses. + closes: #52559: cfdisk linked against libncurses instead of slang. + + -- Vincent Renardias Fri, 10 Dec 1999 11:21:36 +0100 + +util-linux (2.10d-1) unstable; urgency=low + + * New upstream release. + closes: #52151: mount: mount/umount infinite loop on stale lockfiles. + * Put renice manpage in section 1 instead of 8. + closes: #52370: bsdutils: wrong section for renice manpage. + * kbdrate's PAM now uses pam_unix.so by default. + closes: #51273: util-linux: uses pam_pwdb for kbdrate. + * already fixed in 2.10-5: + closes: #49823: name conflict. + + -- Vincent Renardias Fri, 10 Dec 1999 11:21:36 +0100 + +util-linux (2.10-6) unstable; urgency=low + + * Patch by Topi Miettinen to a longstanding + bug in logger. closes: #19666. + + -- Vincent Renardias Mon, 6 Dec 1999 11:49:10 +0100 + +util-linux (2.10-5) unstable; urgency=low + + * replace fdformat by a notice asking to use superformat instead. + * remove setfdprm; closes: #44941. + + -- Vincent Renardias Mon, 6 Dec 1999 11:49:10 +0100 + +util-linux (2.10-4) unstable; urgency=low + + * conflict/replace with fdisk on sparc. + closes: #50254: please conflict and replace fdisk on sparc. + + -- Vincent Renardias Mon, 15 Nov 1999 17:28:00 +0100 + +util-linux (2.10-3) unstable; urgency=low + + * re-introduce missing c?fdisk... (oops ;) + closes: #49406, #49457, #49337, #49313, #46732. + + -- Vincent Renardias Mon, 8 Nov 1999 13:01:12 +0100 + +util-linux (2.10-2) unstable; urgency=low + + * Do TheRightThing(tm) for bug #47219. + * from NMU prepared by Torsten Landschoff : + * Fixed case expression in hwclock.sh + (closes: #42431, #42435, #42856). + * Added usage information to hwclock (closes: #23184). + * Upstream has long changed mount.c to handle nouser properly + (closes: #24954, #24956). + * Excluded clock.8 link from powerpc build (closes: #46010). + * Replaced "$(shell dpkg --print-architecture)" with + "$DEB_HOST_ARCH" in debian/rules. + + -- Vincent Renardias Thu, 4 Nov 1999 10:53:37 +0100 + +util-linux (2.10-1) unstable; urgency=low + + * New upstream release. + * make /etc/rc{0,6}.d/*hwclock.sh correctly. + closes: #47111: util-linux: hwclock.sh: wrong names on rc*.d links. + closes: #47373: hwclock.sh links are wrong. + * Correct kdbrate pam entry. + closes: #45674: kbdrate PAM config references missing pam_console.so. + * Fix fdiskdsblabel.h. + closes: #47219: util-linux: errors compiling on sparc. + * Use jgg's patch for hwclock.sh + closes: #43793: Support for both GMT and UTC default/rc.S setting is wrong. + * Really link kbdrate with pam. + closes: #48425: pam support for kbdrate useless. + + -- Vincent Renardias Wed, 3 Nov 1999 11:41:44 +0100 + +util-linux (2.9x-1) unstable; urgency=low + + * New upstream release. + closes: #32916: hwclock freezes m68k system. + closes: #44986: util-linux: PAM support for kbdrate. + closes: #44821: util-linux: pam.d entry contains a path. + closes: #44727: util-linux: sfdisk examples are present twice in the package. + closes: #45565: removed /bin/kill. this is now provided by procps. + closes: #36332: problems with our /bin/kill. + closes: #41171: wall should be sgid tty, not root. + + -- Vincent Renardias Tue, 21 Sep 1999 17:54:47 +0200 + +util-linux (2.9w-3) unstable; urgency=low + + * Include PowerPC patch from Matt Porter . + * Should be 100% PAMified(tm). Please report anomalies. + + -- Vincent Renardias Tue, 7 Sep 1999 18:53:37 +0200 + +util-linux (2.9w-2) unstable; urgency=low + + * updated losetup.8 from "J.H.M. Dassen (Ray)" . + + -- Vincent Renardias Tue, 24 Aug 1999 17:44:06 +0200 + +util-linux (2.9w-1) unstable; urgency=low + + * Upstream upgrade: + util-linux 2.9w: + * Updated mount.8 (Yann Droneaud) + * Improved makefiles + * Fixed flaw in fdisk + util-linux 2.9v: + * cfdisk no longer believes the kernel's HDGETGEO + (and may be able to partition a 2 TB disk) + util-linux 2.9u: + * Czech more.help and messages (Jiøí Pavlovský) + * Japanese messages (Daisuke Yamashita) + * fdisk fix (Klaus G. Wagner) + * mount fix (Hirokazu Takahashi) + * agetty: enable hardware flow control (Thorsten Kranzkowski) + * minor cfdisk improvements + * fdisk no longer accepts a default device + * Makefile fix + * now uses the script(1) supplied with util-linux instead + of the one from the old bsdutils package. + * remove alpha specific build patch: + closes: #41256. + * remove useless warning in preinst. + + -- Vincent Renardias Tue, 24 Aug 1999 17:44:06 +0200 + +util-linux (2.9t-3) unstable; urgency=low + + * include missing fdformat, setfdprm. (How comes nobody noticed yet?!) + * recompile against slang1-dev 1.2.2-3. + + -- Vincent Renardias Tue, 24 Aug 1999 09:23:59 +0200 + +util-linux (2.9t-2) unstable; urgency=low + + * correct hwclock.sh; + closes: #35429 sysvinit: bad comments in /etc/defaults/rcS. + + -- Vincent Renardias Wed, 28 Jul 1999 18:43:05 +0200 + +util-linux (2.9t-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Applied util-linux-2.9s.patch from patch-int-2.2.10.4.gz as found on + ftp.kerneli.org to enable support for mounting encrypted filesystems + through the loopback devices when using an international kernel. + (Fixes: Bug#36939, #38371) + * Include and in the source, so as not to + rely on source outside main. + * Updated the losetup(8) manpage. + + -- J.H.M. Dassen (Ray) Thu, 22 Jul 1999 18:32:16 +0200 + +util-linux (2.9t-1) unstable; urgency=low + + * Upstream upgrade: + * national language support for hwclock + * Japanese messages (both by Daisuke Yamashita) + * German messages and some misc i18n fixes (Elrond) + * Czech messages (Jiøí Pavlovský) + * wall fixed for /dev/pts/xx ttys + * make last and wall use getutent() (Sascha Schumann) + [Maybe this is bad: last reading all of wtmp may be too slow. + Revert in case people complain.] + * documented UUID= and LABEL= in fstab.5 + * added some partition types + * swapon: warn only if verbose + closes: #37008: de.po file integrated upstream. + closes: #37380: it.po file integrated upstream. + closes: #38232: patch integrated upstream. + closes: #36124: examples included. + closes: #36848, #37153, #38101, #38416: pts bug fixed upstream. + closes: #40868: use suidregister /usr/bin/wall. + closes: #34728: patch integrated upstream. + closes: #38219: typo. fixed; patch sent upstream. + closes: #37585: bug corrected upstream. + closes: #37002: CRLF fstab isn't a problem anymore. + * changed hwclock.sh to get rid of a lintian error. + + -- Vincent Renardias Fri, 9 Jul 1999 16:15:01 +0200 + +util-linux (2.9r-3) unstable; urgency=low + + * Added missing *.gmo files + * Re-add Harmut's powerpc patch that somehow got left out (closes: #37973). + + -- Vincent Renardias Wed, 19 May 1999 12:45:09 +0200 + +util-linux (2.9r-2) unstable; urgency=low + + * Fix stupid bug #37916. + + -- Vincent Renardias Tue, 18 May 1999 15:51:08 +0200 + +util-linux (2.9r-1) unstable; urgency=low + + * Upstream upgrade. + * Now compiled with PAM=yes. + * initial .it localisation. + * Improved .fr translation. + * corrected hwclock.sh (reassigned #35429 back to sysvinit). + * put rev into /usr/bin instead of /usr/sbin (Fix #34188,#35421). + * include getopt examples (Fix #34705). + + -- Vincent Renardias Fri, 14 May 1999 16:21:44 +0200 + +util-linux (2.9i-1) unstable; urgency=low + + * Upstream upgrade. + * This source package now also provides the 'bsdutils' binary + package. + * Included patch for logger.1 from and1000@debian.org. + * Included patch to logger.c from Joey (closes: #32109). + * renice.c: include (closes: #31288). + * re-use script(1) from the 'old' bsdutils package as well + as README.script (closes: #988). + * Now umount is compiled with '-f' support (closes: #33147). + * Re-add suidregister support for mount (closes: #32495). + + -- Vincent Renardias Sun, 21 Feb 1999 20:16:20 +0100 + +util-linux (2.9g-6) frozen unstable; urgency=low + + * modify mount.8 manpage to warn that nosuid is useless + if something like suidperl is installed. + (doesn't fix the critical bug #31980 reported on suidperl, + but at least warn about its existance) + * add missing manpages (ramsize,rootflags,swapdev) + * #32414: changed a 'rm' into 'rm -f' so the source + package builds cleanly. + * also target the upload for frozen since this is the only missing + package to be able to safely use kernels 2.2.x: + To the FTP/Release maintainers: + util-linux_2.9g has been introduced in unstable on Dec, 31st 98; + so far I received no bug reports about it except for the missing + manpages. Also compared to the 2.7.1 version from frozen, this + package fixes _57_ bugs. (see www.debian.org/Bugs/db/pa/lutil-linux.html) + + -- Vincent Renardias Tue, 26 Jan 1999 23:51:57 +0100 + +util-linux (2.9g-5) unstable; urgency=low + + * Fix bug #31981. + * Localised cfdisk + provided initial French translation. + New translations welcome; you can get the potfile at + http://www.ldsol.com/~vincent/util-linux.pot + + -- Vincent Renardias Sat, 23 Jan 1999 21:55:06 +0100 + +util-linux (2.9g-4) unstable; urgency=low + + * Add rev and readprofile commands. + * Updated fstab.5 regarding spaces in mount points names. + * Fix bugs #32235,#31997 (missing hwclock.8 manpage). + * Fix bug #32097 (missing mkswap.8 manpage). + * Improve somewhat cfdisk regarding exit codes thanks to + Enrique's patch (#31607). + + -- Vincent Renardias Fri, 22 Jan 1999 19:13:25 +0100 + +util-linux (2.9g-3) unstable; urgency=low + + * Include patch from Hartmut Koptein for better powerpc support. + + -- Vincent Renardias Wed, 13 Jan 1999 22:46:04 +0100 + +util-linux (2.9g-2) unstable; urgency=high + + * Patch from Topi Miettinen (Thanks Topi ;) to fix + bug #31554,#31573. + + -- Vincent Renardias Mon, 11 Jan 1999 03:59:19 +0100 + +util-linux (2.9g-1) unstable; urgency=high + + * Adopting the package from Guy Maor. + * Re-add hwclock & kbdrate which had been lost + (Fix bug #31476). + + -- Vincent Renardias Fri, 1 Jan 1999 19:53:33 +0100 + +util-linux (2.9g-0.3) unstable; urgency=high + + * YA NMU. + * Split mount out into separate package so as not to + force the dangerous replacement of an essential package. + + -- Joel Klecker Sun, 3 Jan 1999 19:00:31 -0800 + +util-linux (2.9g-0.2) unstable; urgency=low + + * NMU (Part II): Fix more problems in 'mount'. + * swapon now warn if swap device has insecure mode; + Patch from Topi Miettinen + (Fix bug #23249). + * mount can now handle multiple hostnames for NFS mounts + in fstab (Fix bug #29309). + * Do'h; add missing /sbin/swapoff ;). + + -- Vincent Renardias Fri, 1 Jan 1999 19:53:33 +0100 + +util-linux (2.9g-0.1) unstable; urgency=low + + * NMU. + * This package now provides /bin/mount & co. and thus + obsoletes the mount package. + * provides the ddate command (Fix bugs #30015 & #19820). + * Move wtmp lockfile from /etc to /var/lock + (Fix bug #29128). + * Set bug #28885 to 'fixed' (this-is-not-a-bug,-but-a-feature(tm)). + * Set bug #27931 to 'fixed' (works again since version 2.8). + * Set bug #27723 to 'fixed' (been fixed by the ARM NMU). + * Set bug #25831 to 'fixed' (hwclock now works as advertised). + * Set buffering off on the output channel in chkdupexe.pl + (Fix bug #22839). + * Include patch for powerpc build by Joel Klecker + (Fix bug #21374). + * Removed the confusing references to agetty (Fix bug #20668). + * Check the result for the malloc()s added in the code to chown + vcsa to root.sys (Fix bug #18696). + * Include patch for sparc build by + Eric Delaunay (Fix bug #17784). + * Set bug #17752 to 'fixed' (Appear to work with current versions + of xvt and /bin/more). + * Include patch for alpha build by + Christopher C Chimelis + (Fix bug #17661). + * Patch mkfs.minix doesn't go into infinate loop any more depending + on the argument passed to -i (Fix bug #17648). + * Set bug #17483 to 'fixed' (now that util-linux is compiled with + libc6 > =2.0.6 it should be fixed). + * Set bug #26625 to 'fixed' (this patch has already been applied). + * Applied patch from Bcwhite to get mime support + (Fix bug #26715). + * Applied patch from Topi Miettinen : + POSIX etc fixes: + - ioctl(.., TCSETSF,..) -> tcsetattr() + - ioctl(.., TCGETS,..) -> tcgetattr() + - ioctl(.., TIOCGPGRP,..) -> tcgetpgprp() + - gcc -Wall warning fixes + - write(2, ..) -> write(fileno(stderr), ..) + - vi -> sensible-editor + - added setlocale(LC_ALL, "") + - use perror, isdigit, isprint, iscntrl where applicable + - execv -> execvp + - added simple ELF detection + OpenBSD fixes: + - UCB fix + - POSIX: rindex -> strrchr + - obsolete fseek flag L_SET -> SEEK_SET + - control-F == f + - $EDITOR support + (Fix bug #27635). + * Link clock.8.gz to hwclock.8.gz (Fix bug #25852). + + -- Vincent Renardias Thu, 31 Dec 1998 23:48:42 +0100 + +util-linux (2.9e-0.4) unstable; urgency=high + + * Non-maintainer upload. + * Recompiled with slang1. + + -- James Troup Sat, 19 Dec 1998 20:42:52 +0000 + +util-linux (2.9e-0.3) unstable; urgency=low + + * Non-maintainer upload + * Include /etc/init.d/hwclock.sh + * Fix some of the (pre|post)(inst|rm) script wrt $1 processing + Fixes: + #18007: sysvinit: hwclock.sh uses GMT env variable - but how? + #26904: hwclock.sh doesn't "test -x" + #24649: [Peter Kundrat ] hwclock startup script + #20728: util-linux: hwlock: GMT status lost? + #19248: util-linux should install /etc/init.d/hwclock.sh + + -- Miquel van Smoorenburg Thu, 17 Dec 1998 13:56:45 +0100 + +util-linux (2.9e-0.2) unstable; urgency=low + + * NMU: Added ARM architecture in 'disk-utils/fdiskbsdlabel.h' and + 'disk-utils/fdiskbsdlabel.c'. + * Removed '-m3' flag from arm-specific optimizations in MCONFIG. + + -- Tor Slettnes Sun, 29 Nov 1998 01:20:13 -0800 + +util-linux (2.9e-0.1) unstable; urgency=low + + * Non-maintainer upload - new 2GB swap areas, removed hostid + * upstream uses fixed more.c (line 813 had *p++) + + -- Adrian Bridgett Sat, 21 Nov 1998 17:35:35 +0000 + +util-linux (2.7.1-3.1) frozen unstable; urgency=low + + * Non-maintainer upload + * recompiled with slang1 and ncurses4 + + -- Joseph Carter Sun, 25 Oct 1998 21:48:16 -0800 + +util-linux (2.7.1-3) unstable; urgency=low + + * Another m68k patch from Roman Hodek + + * fdisk patch from Russell Coker for better + behavior on IDE CD's when HDIO_GETGEO fails. + * fix getopt(1) typo. (16227) + * Use slang for cfdisk. + * fdisk -l tries eda also (13841). + * Fix fdisk -l segfaults (15236,15603). + * Install rdev on only i386 (15228). + * Don't strip perl script (15480). + * Add type 17=Hidden IFS to cfdisk (16843). + + -- Guy Maor Sun, 11 Jan 1998 17:20:23 -0800 + +util-linux (2.7.1-2) unstable; urgency=low + + * Removed sync (13291). + * Added m68k hwclock patches from Roman Hodek (9870). + * agetty.c: set vcs,vcsa to root.sys 600 when starting. + + -- Guy Maor Thu, 25 Sep 1997 16:51:34 -0500 + +util-linux (2.7.1-1) unstable; urgency=low + + * libc6 compile of new upstream version (10098, 11744, 13123). + * Updated cfdisk to cfdisk 0.8k + * Added old patches; I'll send them upstream. + * fdisk - extended paritions, exit on EOF. + * mkfs - fix search paths. + * mkfs.minix - set owner of root dir to invoker. + * chkdupexe - remove upstream brokenness by checking PATH too. + * mcookie - fix man page + * whereis - fix search paths, find .gz files. + * sync - put it back (doh!) + * Folded in getty: + * glibc patch (8815, 11687, 12738). + * Set tty to 660 root.dialout (8960). + * Register pager alternative (12475). + + -- Guy Maor Mon, 22 Sep 1997 18:29:53 -0500 + +util-linux (2.5-12) frozen unstable; urgency=low + + * Updated cfdisk to ftp.win.tue.nl:/pub/linux/util/cfdisk-0.8i.tar.gz + + -- Guy Maor Tue, 6 May 1997 15:29:56 -0500 + +util-linux (2.5-11) frozen unstable; urgency=medium + + * Updated cfdisk to ftp.win.tue.nl:/pub/linux/util/cfdisk-0.8g.tar.gz (#9146) + * -i from 2.5-9 removed as no longer needed. + + -- Guy Maor Tue, 29 Apr 1997 13:40:26 -0500 + +util-linux (2.5-10) frozen unstable; urgency=medium + + * cfdisk: really fixed cast this time so should be able to deal with + >2GB disks(#6747, #8041) + * fdisk, cfdisk: Added partition id 0xa6 = OpenBSD (#7571) + * setterm: use putp to output (#7852) + * Removed miscutils removal trick as it no longer works (#5757, #6862) + * mkfs.minix: added patch from Volker Leiendecker + to set owner of root directory to invoker (like mkfs.ext2). (#6902) + * Fix dpkg-shlibddeps rules line for m68k (#5818) + + -- Guy Maor Thu, 27 Mar 1997 13:04:35 -0600 + +util-linux (2.5-9) frozen unstable; urgency=low + + * Add undocumented "-i" flag to ignore bad partition tables when starting + instead of throwing a fatal error. Let's pass this to the upstream + maintainer, please. + + -- Bruce Perens Fri, 6 Dec 1996 22:12:31 -0800 + +util-linux (2.5-8) frozen unstable; urgency=low + + * disk-utils/cfdisk.c: cast sector number to ext2_loff_t in calls to + ext2_llseek() + + -- Guy Maor Sat, 23 Nov 1996 23:07:59 -0600 + +util-linux (2.5-7) unstable; urgency=low + + * sys-utils/clock.c: fixed bug on machines without RTC enabled. + * sys-utils/whereis.c: better path, compare function. + * Install whereis, cytune, setsid. + + -- Guy Maor Fri, 27 Sep 1996 23:02:09 -0500 + +util-linux (2.5-6) unstable; urgency=low + + * sys-utils/clock.c: Fixed bugs when real-time clock device is enabled + in kernel. + * New source format. + + -- Guy Maor Tue, 3 Sep 1996 14:25:31 -0500 + +util-linux (2.5-5) unstable; urgency=low + + * disk-utils/fdisk.c: Added type a7 = NEXTSTEP (fixes bug 3259) + * fdisk.c,cfdisk.c: Applied patch from Miquel van Smoorenburg + to let fdisk and cfdisk support Linux + extended partitions. + * Applied patch from Frank Neumann + for Linux/m68k + support. + * Install mkcookie. + * disk-utils/mkfs.minix: fixed bug 3777 re parsing oddities. + + -- Guy Maor Tue, 20 Aug 1996 16:21:21 -0500 + +util-linux (2.5-4) unstable; urgency=low + + * misc-utils/setterm.c (tc_entry): Applied patch from Michael + Nonweiler to make it work with ncurses. + * misc-utils/chkdupexe.pl: Fixed some bugs with duplicate path + and symbolic links. Put in a better value for exedirs. + * Install chkdupexe, setterm. + + -- Guy Maor Wed, 05 Jun 1996 08:44:25 -0500 + +util-linux (2.5-3) unstable; urgency=low + + * text-utils/more.c (getline): more now handles files with lines ending + with "\r\n". Fixes Bug #2579. + * Added 'priority: required' + + -- Guy Maor Thu, 25 Apr 1996 04:55:22 -0500 + +util-linux (2.5-2) unstable; urgency=low + + * disk-utils/fdisk.c (read_line): EOF now exits instead of looping + forever. Fixes Bug #1206. + * Added 'section: base' + + -- Guy Maor Fri, 19 Apr 1996 05:13:09 -0500 + +util-linux (2.5-1) unstable; urgency=low + + * Initial release + + -- Guy Maor Thu, 18 Apr 1996 04:32:22 -0500 + + diff -puN debian/changelog.Debian-mount.old~CITI_NFS4_ALL debian/changelog.Debian-mount.old --- util-linux-2.12/debian/changelog.Debian-mount.old~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/changelog.Debian-mount.old 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,168 @@ +mount (2.8a-1.2) frozen unstable; urgency=low + + * Non-maintainer upload. + * Update lineno when reading fstab + * Cope with systems that don't have a newline on the last line of + /etc/fstab (Fixes#29282) + + -- Anthony Towns Wed, 11 Nov 1998 23:53:24 +1000 + +mount (2.8a-1.1) unstable; urgency=low + + * Non-maintainer upload with permision by Vincent + * Fixed wrong while loop that caused too many lines to be ignored. The + code for the whole condition is generated with all variables replaced + by their values as they were when the condition was entered. This + means that if one uses variable assignments, the variable to which a + new value was assigned still contains the old value later in the same + condition. Thanks to Peter Moulder that prevents mount + from crashing when an empty argument list is used with `-t'. (fixes: + Bug#27130) + + -- Martin Schulze Wed, 14 Oct 1998 23:11:14 +0200 + +mount (2.8a-1) unstable; urgency=low + + * New upstream version (Bug #26686). + + -- Vincent Renardias Wed, 23 Sep 1998 18:05:44 +0200 + +mount (2.7l-5) frozen unstable; urgency=low + + * Applied Roman Hodek's patch so the package now builds with stock libc6-dev + (This patch seems badly needed by m68k folks) + Fix bugs #22037, #14767, #15341, #22037. + + -- Vincent Renardias Mon, 8 Jun 1998 17:08:52 +0200 + +mount (2.7l-4) unstable; urgency=low + + * Fix to allow compilation on sparc + (Bug #21510, patch from Eric Delaunay ) + + -- Vincent Renardias Thu, 23 Apr 1998 20:26:49 +0200 + +mount (2.7l-3) unstable; urgency=low + + * updated swapon(8) manpage. + + -- Vincent Renardias Fri, 17 Apr 1998 01:56:43 +0200 + +mount (2.7l-2) unstable; urgency=low + + * Update to debian std 2.4.0.0. + * Corrected snafu with md5sums (Bugs #19369, #18682). + + -- Vincent Renardias Sat, 14 Mar 1998 18:33:02 +0100 + +mount (2.7l-1) unstable; urgency=low + + * New upstream release (Bug #17745, Said to fix #17523). + * Apply the usual patches to get it to compile under libc6 *sigh*. + * Removed dependency on libc6 (already Pre-Depends:): Bug #18245. + * Remove doubled example in example fstab (Bug #16889). + + -- Vincent Renardias Tue, 17 Feb 1998 20:10:55 +0100 + +mount (2.7g-2) unstable; urgency=low + + * Recompile with kernel 2.0.32 headers so the option noatime works + (Bug #15304). + * compress changelog.Debian (Bug #15430). + + -- Vincent Renardias Thu, 18 Dec 1997 04:39:22 +0100 + +mount (2.7g-1) unstable; urgency=low + + * New upstream version: + - 'mount -aF': This will do the mounts on different devices + or different NFS servers in parallel. (Fix Bug #?????) + * mount.c: patch to get it compile with DO_PS_FIDDLING. + * patch to get 'swapon -s' error messages more explicit. + * improved debian/rules cleanup rule. + + -- Vincent Renardias Sat, 13 Dec 1997 17:53:46 +0100 + +mount (2.7f-1) unstable; urgency=low + + * New upstream version (Bug #14585). + * Corrected documentation buglet (Bugs #13050, #14015). + + -- Vincent Renardias Sun, 9 Nov 1997 03:50:27 +0100 + +mount (2.6g-2) unstable; urgency=low + + * Rebuilt with libc6. + + -- Vincent Renardias Sat, 21 Jun 1997 17:26:47 +0200 + +mount (2.6g-1) unstable; urgency=low + + * Upstream upgrade. + + -- Vincent Renardias Thu, 1 May 1997 13:50:09 +0200 + +mount (2.6d-2) unstable; urgency=low + + * Included Patch from M. Dorman for glibc support (Bug #8810). + + -- Vincent Renardias Fri, 18 Apr 1997 20:40:17 +0200 + +mount (2.6d-1) unstable; urgency=low + + * New upstream source + (includes the patch I made to fix Bug #4289) + + -- Vincent Renardias Sat, 8 Mar 1997 23:29:53 +0100 + +mount (2.6c-0.1) unstable; urgency=low + + * Patched swapon.c to fix bug #4289: + 'swapon -s' now gives a summary of mounted partitions. + + -- Vincent Renardias Tue, 18 Feb 1997 04:05:31 +0100 + +mount (2.6c-0) unstable; urgency=low + + * Upstream upgrade requested to author to fix bug #5498. + * it also appears to fix bug #7428, cool... + + -- Vincent Renardias Tue, 18 Feb 1997 02:22:11 +0100 + +mount (2.6b-0.1) unstable; urgency=low + + * Added 'Essential: yes' into debian/control. + + -- Vincent Renardias Sun, 16 Feb 1997 07:53:36 +0100 + +mount (2.6b-0) unstable; urgency=low + + * Upstream upgrade. + * Now users can umount user mounts (Fixes bug #3993). + + -- Vincent Renardias Sun, 16 Feb 1997 00:26:22 +0100 + +mount (2.5p-1.2) unstable; urgency=low + + * Corrected source package (Can now be extracted with + 'dpkg-source -x'). + * Changed 'Depends' into 'Pre-depends' on libc5. + + -- Vincent Renardias Sat, 15 Feb 1997 22:31:29 +0100 + +mount (2.5p-1.1) unstable; urgency=low + + * Just an interim release, the real maintainer is + Robert Leslie + * Converted to the new package format (Fixes bug #7114). + * Corrected bug #6315: compressed man pages, + added '/usr/doc/mount/copyright' file, + moved examples to '/usr/doc/mount/examples'. + + -- Vincent Renardias Sun, 9 Feb 1997 22:08:56 +0100 + +Local variables: +mode: debian-changelog +End: diff -puN debian/conffiles~CITI_NFS4_ALL debian/conffiles --- util-linux-2.12/debian/conffiles~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/conffiles 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,2 @@ +/etc/init.d/hwclock.sh +/etc/init.d/hwclockfirst.sh diff -puN debian/control~CITI_NFS4_ALL debian/control --- util-linux-2.12/debian/control~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/control 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,62 @@ +Source: util-linux +Section: base +Priority: required +Build-Depends: libncurses5-dev, slang1-utf8-dev (>=1.4.9), gettext, zlib1g-dev +Maintainer: LaMont Jones +Standards-Version: 3.5.6.0 + +Package: util-linux +Architecture: any +Pre-Depends: ${util-linux:Depends} +Section: base +Priority: required +Essential: yes +Suggests: util-linux-locales, kbd | console-tools, dosfstools +Replaces: miscutils, setterm, fdisk, ${util-linux:Conflicts} +Conflicts: setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), ${util-linux:Conflicts} +Description: Miscellaneous system utilities + This package contains a number of important utilities, most of which + are oriented towards maintenance of your system. Some of the more + important utilities included in this package allow you to partition + your hard disk, view kernel messages, and create new filesystems. + +Package: util-linux-locales +Architecture: all +Section: utils +Priority: optional +Depends: util-linux (>= ${Upstream}-0), util-linux (<< ${Upstream}.0-0) +Replaces: util-linux (<< 2.11b) +Description: Locales files for util-linux + This package contains the internationalization files of for the util-linux + package. + . + They are needed when you want the programs in util-linux to print their + messages in other languages than English. + +Package: mount +Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sh s390 sparc sparc64 +Essential: yes +Pre-Depends: ${mount:Depends} +Description: Tools for mounting and manipulating filesystems + This package provides the mount(8), umount(8), swapon(8), + swapoff(8), and losetup(8) commands. + +Package: bsdutils +Architecture: any +Essential: yes +Pre-Depends: ${bsdutils:Depends} +Recommends: bsdmainutils +Description: Basic utilities from 4.4BSD-Lite + This package contains the bare minimum number of BSD utilities needed + to boot a Debian system. You should probably also install + bsdmainutils to get the remaining standard BSD utilities. + . + Included are: logger, renice, replay, script, wall + +Package: fdisk-udeb +Architecture: alpha arm hppa i386 ia64 mips mipsel powerpc hurd-i386 sparc +Priority: extra +Section: debian-installer +Depends: ${cfdisk-udeb:Depends} +Description: Partition a hard drive (manual, cfdisk) + Cfdisk package diff -puN debian/copyright~CITI_NFS4_ALL debian/copyright --- util-linux-2.12/debian/copyright~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/copyright 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,25 @@ +This is the Debian GNU/Linux prepackaged version of util-linux. + +This package was put together by Guy Maor and later +maintained by Sean 'Shaleh' Perry , and Adrian Bunk +. + +The current maintainer is LaMont Jones . + +It was downloaded from ftp://ftp.cwi.nl/pub/aeb/util-linux/ + +Upstream maintainers include: +Maintainer: Andries Brouwer +Maintainer address: util-linux@math.uio.no +Maintainer of getopt: Frodo Looijaard +Maintainer of simpleinit: Richard Gooch + +Copyright: + +getopt, more, pg, wall, and whereis may be redistributed under the terms +of the UCB BSD license found on Debian systems in the file +/usr/share/common-licenses/BSD + +Everything else may be redistributed under the terms of the GNU GPL +Version 2 or later found on Debian systems in the file +/usr/share/common-licenses/GPL diff -puN debian/fdformat~CITI_NFS4_ALL debian/fdformat --- util-linux-2.12/debian/fdformat~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/fdformat 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,9 @@ +#!/bin/sh + +echo ' +Note: /usr/bin/fdformat is obsolete and is no longer available. +Please use /usr/bin/superformat instead (make sure you have the +fdutils package installed first). Also, there had been some +major changes from version 4.x. Please refer to the documentation. +' + diff -puN debian/fstab.example2~CITI_NFS4_ALL debian/fstab.example2 --- util-linux-2.12/debian/fstab.example2~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/fstab.example2 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,39 @@ +# /etc/fstab: static file system information. +# +# The following is an example. Please see fstab(5) for further details. +# Please refer to mount(1) for a complete description of mount options. +# +# Format: +# +# +# dump(8) uses the field to determine which file systems need +# to be dumped. fsck(8) uses the column to determine which file +# systems need to be checked--the root file system should have a 1 in +# this field, other file systems a 2, and any file systems that should +# not be checked (such as MS-DOS or NFS file systems) a 0. +# +# The `sw' option indicates that the swap partition is to be activated +# with `swapon -a'. +/dev/hda2 none swap sw 0 0 + +# The `bsdgroups' option indicates that the file system is to be mounted +# with BSD semantics (files inherit the group ownership of the directory +# in which they live). `ro' can be used to mount a file system read-only. +/dev/hda3 / ext2 defaults 0 1 +/dev/hda5 /home ext2 defaults 0 2 +/dev/hda6 /var ext2 defaults 0 2 +/dev/hda7 /usr ext2 defaults,ro 0 2 +/dev/hda8 /usr/local ext2 defaults,bsdgroups 0 2 + +# The `noauto' option indicates that the file system should not be mounted +# with `mount -a'. `user' indicates that normal users are allowed to mount +# the file system. +/dev/cdrom /cdrom iso9660 defaults,noauto,ro,user 0 0 +/dev/fd0 /floppy minix defaults,noauto,user 0 0 +/dev/fd1 /floppy minix defaults,noauto,user 0 0 + +# NFS file systems: +server:/export/usr /usr nfs defaults 0 0 + +# proc file system: +proc /proc proc defaults 0 0 diff -puN debian/hwclockfirst.sh~CITI_NFS4_ALL debian/hwclockfirst.sh --- util-linux-2.12/debian/hwclockfirst.sh~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/hwclockfirst.sh 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,102 @@ +#!/bin/bash +# hwclockset.sh Set system clock to hardware clock, according to the UTC +# setting in /etc/default/rcS (see also rcS(5)). +# +# +# WARNING: Runs without write permission on /etc, and before +# mounting all filesystems! If you need write permission +# to do something, do it in hwclockadj.sh. +# +# WARNING: If your hardware clock is not in UTC/GMT, this script +# must know the local time zone. This information is +# stored in /etc/localtime. This might be a problem if +# your /etc/localtime is a symlink to something in +# /usr/share/zoneinfo AND /usr isn't in the root +# partition! The workaround is to define TZ either +# in /etc/default/rcS, or in the proper place below. +# +# REMEMBER TO EDIT hwclockadj.sh AS WELL! + +# Set this to any options you might need to give to hwclock, such +# as machine hardware clock type for Alphas. +HWCLOCKPARS= + +[ ! -x /sbin/hwclock ] && exit 0 + +. /etc/default/rcS + +# Define TZ to the desired timezone here if you need it. +# see tzset(3) for how to define TZ. +# WARNING: TZ takes precedence over /etc/localtime ! +TZ= + + +case "$UTC" in + no|"") GMT="--localtime" + UTC="" + if [ ! -r /etc/localtime ] + then + if [ -z "$TZ" ] + then + echo "$0: System clock was not updated at this time." >&2 + exit 1 + fi + fi + ;; + yes) GMT="--utc" + UTC="--utc" + ;; + *) echo "$0: Unknown UTC setting: \"$UTC\"" >&2 + exit 1 + ;; +esac + + +case "$1" in + start) + # Copies Hardware Clock time to System Clock using the correct + # timezone for hardware clocks in local time, and sets kernel + # timezone. DO NOT REMOVE. + if [ "$HWCLOCKACCESS" != no ] + then + hwclock --hctosys $GMT $BADYEAR + fi + if [ "$VERBOSE" != no ] + then + echo "System time was `date --utc`." + echo "Setting the System Clock using the Hardware Clock as reference..." + fi + + # Copies Hardware Clock time to System Clock using the correct + # timezone for hardware clocks in local time, and sets kernel + # timezone. DO NOT REMOVE. + if [ -z "$TZ" ] + then + hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS + else + TZ="$TZ" hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS + fi + + if hwclock --show $GMT $HWCLOCKPARS 2>&1 > /dev/null | grep -q '^The Hardware Clock registers contain values that are either invalid'; then + echo "Invalid system date -- setting to 1/1/2002" + hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS + fi + + if [ "$VERBOSE" != no ] + then + echo "System Clock set. System local time is now `date $UTC`." + fi + ;; + stop|restart|reload|force-reload) + # Does nothing + exit 0 + ;; + *) + echo "Usage: hwclockset.sh {start|stop|reload|restart}" >&2 + echo " start sets kernel (system) clock from hardware (RTC) clock" >&2 + echo " stop, restart, reload and force-reload do nothing." >&2 + echo " Refer to hwclock.sh as well." >&2 + exit 1 + ;; +esac + diff -puN debian/hwclock.sh~CITI_NFS4_ALL debian/hwclock.sh --- util-linux-2.12/debian/hwclock.sh~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/hwclock.sh 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,129 @@ +#!/bin/sh +# hwclock.sh Set and adjust the CMOS clock, according to the UTC +# setting in /etc/default/rcS (see also rcS(5)). +# +# Version: @(#)hwclock.sh 2.00 14-Dec-1998 miquels@cistron.nl +# +# Patches: +# 2000-01-30 Henrique M. Holschuh +# - Minor cosmetic changes in an attempt to help new +# users notice something IS changing their clocks +# during startup/shutdown. +# - Added comments to alert users of hwclock issues +# and discourage tampering without proper doc reading. + +# WARNING: Please read /usr/share/doc/util-linux/README.Debian.hwclock +# before changing this file. You risk serious clock +# misbehaviour otherwise. + +. /etc/default/rcS +[ "$GMT" = "-u" ] && UTC="yes" +case "$UTC" in + no|"") GMT="--localtime" ;; + yes) GMT="--utc" ;; + *) echo "$0: unknown UTC setting: \"$UTC\"" >&2 ;; +esac + +case "$BADYEAR" in + no|"") BADYEAR="" ;; + yes) BADYEAR="--badyear" ;; + *) echo "$0: unknown BADYEAR setting: \"$BADYEAR\"" >&2 ;; +esac + +case "$1" in + start) + if [ ! -f /etc/adjtime ] + then + echo "0.0 0 0.0" > /etc/adjtime + fi + + # Uncomment the hwclock --adjust line below if you want + # hwclock to try to correct systematic drift errors in the + # Hardware Clock. + # + # WARNING: If you uncomment this option, you must either make + # sure *nothing* changes the Hardware Clock other than + # hwclock --systohc, or you must delete /etc/adjtime + # every time someone else modifies the Hardware Clock. + # + # Common "vilains" are: ntp, MS Windows, the BIOS Setup + # program. + # + # WARNING: You must remember to invalidate (delete) + # /etc/adjtime if you ever need to set the system clock + # to a very different value and hwclock --adjust is being + # used. + # + # Please read /usr/share/doc/util-linux/README.Debian.hwclock + # before enablig hwclock --adjust. + # + # hwclock --adjust $GMT $BADYEAR + + if [ "$HWCLOCKACCESS" != no ] + then + if [ "$VERBOSE" != no ] + then + echo + echo "Setting the System Clock using the Hardware Clock as reference..." + fi + # Copies Hardware Clock time to System Clock using the correct + # timezone for hardware clocks in local time, and sets kernel + # timezone. DO NOT REMOVE. + hwclock --hctosys $GMT $BADYEAR + # + # Now that /usr/share/zoneinfo should be available, + # announce the local time. + # + if [ "$VERBOSE" != no ] + then + echo "System Clock set. Local time: `date`" + echo + fi + else + if [ "$VERBOSE" != no ] + then + echo "Not setting System Clock" + fi + fi + ;; + stop|restart|reload|force-reload) + # + # Updates the Hardware Clock with the System Clock time. + # This will *override* any changes made to the Hardware Clock. + # + # WARNING: If you disable this, any changes to the system + # clock will not be carried across reboots. + # + if [ "$HWCLOCKACCESS" != no ] + then + if [ "$VERBOSE" != no ] + then + echo "Saving the System Clock time to the Hardware Clock..." + fi + [ "$GMT" = "-u" ] && GMT="--utc" + hwclock --systohc $GMT $BADYEAR + if [ "$VERBOSE" != no ] + then + echo "Hardware Clock updated to `date`." + fi + else + if [ "$VERBOSE" != no ] + then + echo "Not saving System Clock" + fi + fi + ;; + show) + if [ "$HWCLOCKACCESS" != no ] + then + hwclock --show $GMT $BADYEAR + fi + ;; + *) + echo "Usage: hwclock.sh {start|stop|reload|force-reload|show}" >&2 + echo " start sets kernel (system) clock from hardware (RTC) clock" >&2 + echo " stop and reload set hardware (RTC) clock from kernel (system) clock" >&2 + exit 1 + ;; +esac + diff -puN debian/lintian-override~CITI_NFS4_ALL debian/lintian-override --- util-linux-2.12/debian/lintian-override~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/lintian-override 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,3 @@ +mount: setuid-binary bin/mount 4755 root/root +mount: setuid-binary bin/umount 4755 root/root +bsdutils: setgid-binary usr/bin/wall 2755 root/tty diff -puN debian/mime.util-linux~CITI_NFS4_ALL debian/mime.util-linux --- util-linux-2.12/debian/mime.util-linux~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/mime.util-linux 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,2 @@ +text/plain; more %s; needsterminal; priority=5 +text/*; more %s; needsterminal; priority=1 diff -puN debian/mount.fstab~CITI_NFS4_ALL debian/mount.fstab --- util-linux-2.12/debian/mount.fstab~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/mount.fstab 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,39 @@ +# /etc/fstab: static file system information. +# +# The following is an example. Please see fstab(5) for further details. +# Please refer to mount(1) for a complete description of mount options. +# +# Format: +# +# +# dump(8) uses the field to determine which file systems need +# to be dumped. fsck(8) uses the column to determine which file +# systems need to be checked--the root file system should have a 1 in +# this field, other file systems a 2, and any file systems that should +# not be checked (such as MS-DOS or NFS file systems) a 0. +# +# The `sw' option indicates that the swap partition is to be activated +# with `swapon -a'. +/dev/hda2 none swap sw 0 0 + +# The `bsdgroups' option indicates that the file system is to be mounted +# with BSD semantics (files inherit the group ownership of the directory +# in which they live). `ro' can be used to mount a file system read-only. +/dev/hda3 / ext2 defaults 0 1 +/dev/hda5 /home ext2 defaults 0 2 +/dev/hda6 /var ext2 defaults 0 2 +/dev/hda7 /usr ext2 defaults,ro 0 2 +/dev/hda8 /usr/local ext2 defaults,bsdgroups 0 2 + +# The `noauto' option indicates that the file system should not be mounted +# with `mount -a'. `user' indicates that normal users are allowed to mount +# the file system. +/dev/cdrom /cdrom iso9660 defaults,noauto,ro,user 0 0 +/dev/fd0 /floppy minix defaults,noauto,user 0 0 +/dev/fd1 /floppy minix defaults,noauto,user 0 0 + +# NFS file systems: +server:/export/usr /usr nfs defaults 0 0 + +# proc file system: +proc /proc proc defaults 0 0 diff -puN debian/mount.postinst~CITI_NFS4_ALL debian/mount.postinst --- util-linux-2.12/debian/mount.postinst~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/mount.postinst 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1 @@ +#!/bin/sh -e diff -puN debian/mount.prerm~CITI_NFS4_ALL debian/mount.prerm --- util-linux-2.12/debian/mount.prerm~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/mount.prerm 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,5 @@ +#!/bin/sh -e + +if [ -L /usr/doc/mount ] ; then + rm -f /usr/doc/mount +fi diff -puN debian/postinst~CITI_NFS4_ALL debian/postinst --- util-linux-2.12/debian/postinst~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/postinst 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,35 @@ +#! /bin/sh + +umask 022 +set -e + +install-info --quiet --section "Development" "Development" \ + --description="System V interprocess communication facilities" \ + /usr/share/info/ipc.info.gz +update-alternatives --install /usr/bin/pager pager /bin/more 50 + + +# +# Check if links to hwclock.sh are present in runlevel "6". +# If not, remove the ones from runlevel "S" so that +# update-rc.d will do it's job. +# +if [ ! -f /etc/rc6.d/???hwclock.sh ] && [ ! -f /etc/rc0.d/???hwclock.sh ] +then + rm -f /etc/rcS.d/???hwclock.sh +fi + +# hwclock works on all Linux architectures, except s390 (and s390x, of course). +if [ "$(uname -s)" = "Linux" ]; then + model=$(uname -m) + if [ ${model%x} != "s390" ]; then + update-rc.d -f hwclock.sh remove 2>/dev/null > /dev/null + update-rc.d hwclock.sh start 50 S . stop 25 0 6 . > /dev/null + update-rc.d -f hwclockfirst.sh remove 2>/dev/null > /dev/null + update-rc.d hwclockfirst.sh start 18 S . > /dev/null + fi +fi + +if [ -x /usr/sbin/update-mime ]; then + update-mime +fi diff -puN debian/postrm~CITI_NFS4_ALL debian/postrm --- util-linux-2.12/debian/postrm~CITI_NFS4_ALL 2004-12-13 17:42:04.000000000 -0500 +++ util-linux-2.12-bfields/debian/postrm 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,17 @@ +#!/bin/sh + +case "$1" in + remove) + ;; + purge) + update-rc.d hwclock.sh remove >/dev/null + update-rc.d hwclockfirst.sh remove >/dev/null + ;; + *) + ;; +esac + +if [ -x /usr/sbin/update-mime ]; then + update-mime +fi + diff -puN debian/preinst~CITI_NFS4_ALL debian/preinst --- util-linux-2.12/debian/preinst~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/debian/preinst 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,13 @@ +#!/bin/sh +set -e +dpkg --assert-support-predepends || + ( echo -e "\nPlease upgrade to a newer version of dpkg\n"; exit 1 ) + +#cat < Wed, 9 Dec 1998 13:32:49 +0000 diff -puN debian/rejected-upstream~CITI_NFS4_ALL debian/rejected-upstream --- util-linux-2.12/debian/rejected-upstream~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/debian/rejected-upstream 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,76 @@ +Date: Sun, 1 Jul 2001 18:19:00 +0200 (CEST) +From: Adrian Bunk +To: util-linux@math.uio.no +Subject: [patch] setterm -{dump,append} don't work on current virtual console + +Hi Andries, + +Colin Watson reported the following Problem: + +<-- snip --> + +When 'setterm -dump' or 'setterm -append' is called without further +arguments, it tries to dump the current virtual console, using +/dev/vcsa0. Unfortunately, according to the Linux Device List, the +current virtual console text/attribute contents are on /dev/vcsa. + +<-- snip --> + +He sent the following patch: + +--- util-linux-2.11g.orig/misc-utils/setterm.c ++++ util-linux-2.11g/misc-utils/setterm.c +@@ -1115,7 +1115,10 @@ + int fd, i, j; + char *inbuf, *outbuf, *p, *q; + +- sprintf(infile, "/dev/vcsa%d", vcnum); ++ if (vcnum > 0) ++ sprintf(infile, "/dev/vcsa%d", vcnum); ++ else ++ sprintf(infile, "/dev/vcsa"); + fd = open(infile, 0); + if (fd < 0 || read(fd, header, 4) != 4) + goto try_ioctl; + +cu +Adrian + +-- +A "No" uttered from deepest conviction is better and greater than a +"Yes" merely uttered to please, or what is worse, to avoid trouble. + -- Mahatma Ghandi + + + + +Date: Sun, 1 Jul 2001 20:31:21 +0200 (MET DST) +From: Andries.Brouwer@cwi.nl +To: bunk@fs.tum.de, util-linux@math.uio.no +Cc: cjw44@cam.ac.uk, hpa@transmeta.com +Subject: Re: [util-linux] [patch] setterm -{dump, + append} don't work on current virtual console + + From: Adrian Bunk + + Colin Watson reported the following Problem: + + When 'setterm -dump' or 'setterm -append' is called without further + arguments, it tries to dump the current virtual console, using + /dev/vcsa0. Unfortunately, according to the Linux Device List, the + current virtual console text/attribute contents are on /dev/vcsa. + +I don't think I'll make this change. + +There are several machines here with /dev/vcsa0 and without /dev/vcsa. +So making this change would certainly give slight problems. + +One could test both, but I prefer to leave the code as it is. +I consider the Linux Device List broken in this respect - +the vcs naming is exactly analogous to the tty naming, with tty0 +on the same major as tty1, and there was no need to change anything. + +Andries + +[Let me cc hpa] +[A distribution should make both nodes, just to be on the safe side.] diff -puN debian/rules~CITI_NFS4_ALL debian/rules --- util-linux-2.12/debian/rules~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/debian/rules 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,344 @@ +#! /usr/bin/make -f + +SHELL = bash +package = util-linux + +ifndef DEB_HOST_ARCH +DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) +DEB_HOST_ARCH = $(DEB_BUILD_ARCH) +endif + +ifndef DEB_HOST_GNU_SYSTEM +DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +endif + +export arch = $(DEB_HOST_ARCH) +version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog) + +fdisk_arch = $(findstring $(arch),alpha i386 powerpc arm mips mipsel hppa ia64 hurd-i386) +sparc = $(findstring $(arch),sparc) +nohwclock = $(findstring $(arch),s390) + +SUBDIRS=po lib getopt disk-utils login-utils misc-utils mount sys-utils text-utils +ifeq ($(arch),$(fdisk_arch)) +SUBDIRS += fdisk +endif +ifeq ($(arch),$(sparc)) +SUBDIRS += fdisk +endif +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +ifneq ($(arch),$(nohwclock)) +SUBDIRS += hwclock +endif +endif + +ifneq ($(DEB_HOST_GNU_SYSTEM),linux) +util-linux_Conflicts = getty +endif + +CFDISK_PO_DIR=cfdisk-po +CFDISK_POT=$(CFDISK_PO_DIR)/cfdisk.pot + +build: + $(checkdir) + ./configure + $(MAKE) all arch=$(arch) SUBDIRS="${SUBDIRS}" + # $(MAKE) disk-utils/raw - this is done above if linux/raw.h exists + touch build + +clean: + $(checkdir) + rm -f build sys-utils/rdev + touch make_include + $(MAKE) distclean + find . -name '*~' -print0 | xargs -0r rm + find . -name '*.orig' -print0 | xargs -0r rm + find . -name '*.rej' -print0 | xargs -0r rm + rm -rf debian/tmp* debian/files* debian/substvars po/messages + rm -rf $(CFDISK_PO_DIR) + +# Architecture independant stuff + +SUIDFILES = debian/tmp-mount/bin/{u,}mount +BINFILES = sys-utils/arch text-utils/more +UBINFILES = sys-utils/{ipcs,ipcrm,setsid} \ + misc-utils/{namei,setterm,mcookie,whereis,ddate} \ + getopt/getopt text-utils/{rev,line,pg} +SBINFILES = disk-utils/mkswap + +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +ifneq ($(arch),$(nohwclock)) +INITFILES = debian/hwclock.sh debian/hwclockfirst.sh +SBINFILES += hwclock/hwclock +endif +BINFILES += sys-utils/dmesg +SBINFILES += disk-utils/{blockdev,raw} mount/pivot_root login-utils/agetty +UBINFILES += disk-utils/fdformat +USBINFILES = sys-utils/readprofile disk-utils/elvtune # disk-utils/setfdprm +endif + +UBINFILES2= misc-utils/chkdupexe # debian/fdformat # don't strip these + +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +MOUNTBINFILES = mount/mount mount/umount +MOUNTSBINFILES = mount/swapon mount/losetup +endif + +#BSDBINFILES = # misc-utils/kill +BSDUBINFILES = misc-utils/script misc-utils/logger sys-utils/renice \ + login-utils/wall + # misc-utils/replay is handled seperately +BSDMAN1FILES = login-utils/wall.1 misc-utils/script.1 \ + misc-utils/logger.1 misc-utils/replay.1 # misc-utils/kill.1 +BSDMAN8FILES = sys-utils/renice.8 +BSDDOCFILES = debian/README.script + +# Architecture independant docs + +MAN1FILES = text-utils/{pg,more,line,rev}.1 misc-utils/{namei.1,mcookie.1} \ + misc-utils/{chkdupexe.1,setterm.1,whereis.1,ddate.1} \ + sys-utils/arch.1 getopt/getopt.1 +MAN8FILES = sys-utils/{ipcrm.8,ipcs.8,setsid.8} disk-utils/mkswap.8 +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +ifneq ($(arch),$(nohwclock)) +MAN8FILES += hwclock/hwclock.8 +endif +MAN1FILES += sys-utils/readprofile.1 +MAN8FILES += login-utils/agetty.8 disk-utils/{blockdev.8,elvtune.8} \ + sys-utils/dmesg.8 mount/pivot_root.8 \ + disk-utils/fdformat.8 disk-utils/raw.8 # disk-utils/setfdprm.8 +endif + + +EXAMPLES = fdisk/sfdisk.examples getopt/getopt-{test,parse}.{ba,tc}sh +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +EXAMPLES += debian/fstab.example2 +endif + +INFOFILES = sys-utils/ipc.info +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +DOCFILES = login-utils/{README.getty,README.modems-with-agetty,README.poeigl} +ifneq ($(arch),$(nohwclock)) +DOCFILES += debian/README.Debian.hwclock +endif +endif + +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +MOUNTMAN5FILES = mount/fstab.5 mount/nfs.5 +MOUNTMAN8FILES = mount/losetup.8 mount/swapoff.8 mount/umount.8 \ + mount/mount.8 mount/swapon.8 +MOUNTDOCFILES = mount/README.mount +endif + +ifneq ($(arch),$(sparc)) +SBINFILES := $(SBINFILES) disk-utils/{{fsck,mkfs}.{minix,cramfs},mkfs} +MAN8FILES := $(MAN8FILES) disk-utils/{{fsck,mkfs}.minix.8,mkfs.8} # no cramfs man +endif +ifeq ($(arch),$(fdisk_arch)) +SBINFILES := $(SBINFILES) fdisk/{cfdisk,fdisk,sfdisk} +MAN8FILES := $(MAN8FILES) fdisk/{cfdisk.8,fdisk.8,sfdisk.8} +DOCFILES := $(DOCFILES) fdisk/README.{c,}fdisk +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +USBINFILES:= $(USBINFILES) sys-utils/{tunelp,cytune} +MAN8FILES := $(MAN8FILES) sys-utils/{tunelp.8,cytune.8} +endif +endif +ifeq ($(arch),$(sparc)) +SBINFILES := $(SBINFILES) fdisk/fdisk +MAN8FILES := $(MAN8FILES) fdisk/fdisk.8 +DOCFILES := $(DOCFILES) fdisk/README.fdisk +endif +ifeq ($(arch),i386) +USBINFILES:= $(USBINFILES) sys-utils/rdev +MAN8FILES := $(MAN8FILES) sys-utils/{rdev.8,vidmode.8} \ + sys-utils/{ramsize.8,rootflags.8} +endif + +install: + +binary-indep: checkroot build binary-arch + $(checkdir) + # This assumes non-native, and only one hyphen in the version number. + dpkg-gencontrol -isp -putil-linux-locales -Pdebian/tmp-util-linux-locales -VUpstream=$$(sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog) + dpkg --build debian/tmp-util-linux-locales .. + +binary-arch: checkroot build + rm -rf debian/tmp* + install -d debian/tmp/{DEBIAN,bin,sbin,etc/init.d,usr/{bin,sbin,lib/mime/packages,share/{locale/{ca,cs,da,de,es,et,fi,fr,it,ja,nl,pt_BR,sl,sv,tr}/LC_MESSAGES,man/{man1,man8},info,$(package),doc/$(package)/examples,lintian/overrides}}} + + install -s $(BINFILES) debian/tmp/bin + install -s $(SBINFILES) debian/tmp/sbin + install -s $(UBINFILES) debian/tmp/usr/bin + install $(UBINFILES2) debian/tmp/usr/bin +ifneq ($(USBINFILES),) + install -s $(USBINFILES) debian/tmp/usr/sbin +ifeq ($(arch), i386) + ln -s rdev debian/tmp/usr/sbin/ramsize + ln -s rdev debian/tmp/usr/sbin/vidmode + ln -s rdev debian/tmp/usr/sbin/rootflags +endif +endif +ifneq ($(INITFILES),) + install -m 755 $(INITFILES) debian/tmp/etc/init.d +endif + install -m 644 $(MAN1FILES) debian/tmp/usr/share/man/man1 + install -m 644 $(MAN8FILES) debian/tmp/usr/share/man/man8 + install -m 644 $(INFOFILES) debian/tmp/usr/share/info + install -m 644 debian/lintian-override debian/tmp/usr/share/lintian/overrides/$(package) + cd po && make install DESTDIR=../debian/tmp +ifneq ($(DOCFILES),) + install -m 644 $(DOCFILES) debian/tmp/usr/share/doc/$(package) +endif + install -m 644 $(EXAMPLES) debian/tmp/usr/share/doc/$(package)/examples +ifeq ($(arch), powerpc) + mv -f debian/tmp/sbin/fdisk debian/tmp/sbin/ddisk + mv -f debian/tmp/usr/share/man/man8/fdisk.8 debian/tmp/usr/share/man/man8/ddisk.8 +endif +ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) + (cd debian/tmp/sbin ; mv mkswap mkswap.linux) + (cd debian/tmp/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8) +endif +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) + (cd debian/tmp/sbin ; mv agetty getty) + (cd debian/tmp/usr/share/man/man8 ; mv agetty.8 getty.8) +ifneq ($(arch), $(nohwclock)) +ifneq ($(arch), powerpc) + (cd debian/tmp/usr/share/man/man8 && ln -s hwclock.8.gz clock.8.gz) +endif +endif + (cd debian/tmp/usr/share/doc/$(package) ; mv README.modems-with-agetty README.modems-with-getty ) + perl -pi.bak -e 's/agetty/getty/g' debian/tmp/usr/share/man/man8/getty.8 \ + debian/tmp/usr/share/doc/$(package)/README.getty \ + debian/tmp/usr/share/doc/$(package)/README.modems-with-getty + rm `find debian/tmp/usr -name \*.bak` +endif + install -m 644 debian/changelog \ + debian/tmp/usr/share/doc/$(package)/changelog.Debian + install -m 644 HISTORY debian/tmp/usr/share/doc/$(package)/changelog + find debian/tmp/usr/share/{info,doc,man} -type f | xargs gzip -9 + install -m 644 debian/mime.$(package) debian/tmp/usr/lib/mime/packages/$(package) + install -m 644 debian/copyright debian/tmp/usr/share/doc/$(package)/copyright + install debian/{preinst,postinst,prerm,postrm} debian/tmp/DEBIAN/ +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) +ifneq ($(arch),$(nohwclock)) + install -m 644 debian/conffiles debian/tmp/DEBIAN/ +endif +endif + ls debian/tmp/{bin,sbin,usr/{bin,sbin}}/* | xargs dpkg-shlibdeps -putil-linux + install -d debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales + install -d debian/tmp-util-linux-locales/DEBIAN + install -m 755 debian/util-linux-locales.postinst debian/tmp-util-linux-locales/DEBIAN/postinst + install -m 755 debian/util-linux-locales.prerm debian/tmp-util-linux-locales/DEBIAN/prerm + mv debian/tmp/usr/share/locale debian/tmp-util-linux-locales/usr/share/ + install -m 644 HISTORY debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/changelog + install -m 644 debian/changelog debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/changelog.Debian + find debian/tmp-util-linux-locales/usr/share/doc -type f | xargs gzip -9 + install -m 644 debian/copyright debian/tmp-util-linux-locales/usr/share/doc/util-linux-locales/copyright + dpkg-gencontrol -isp -putil-linux -Vutil-linux:Conflicts="$(util-linux_Conflicts)" + dpkg --build debian/tmp .. + +ifeq ($(arch),$(fdisk_arch)) +# Do the udeb + install -d debian/tmp-fdisk-udeb/usr/sbin + install -d debian/tmp-fdisk-udeb/DEBIAN + install -m 755 fdisk/cfdisk fdisk/fdisk fdisk/sfdisk \ + debian/tmp-fdisk-udeb/usr/sbin + strip --remove-section=.comment --remove-section=.note \ + debian/tmp-fdisk-udeb/usr/sbin/* + + # Generate a po translations needed for cfdisk + mkdir $(CFDISK_PO_DIR) + xgettext --default-domain=util-linux -C --keyword=_ --keyword=N_ -o $(CFDISK_POT) fdisk/*.c + for po in po/*.po ; do \ + LANG=`basename $$po | cut -f1 -d.` ; \ + msgmerge $$po $(CFDISK_POT) > $(CFDISK_PO_DIR)/$$LANG.po ; \ + msgfmt $(CFDISK_PO_DIR)/$$LANG.po -o $(CFDISK_PO_DIR)/$$LANG.gmo ; \ + mkdir -p debian/tmp-fdisk-udeb/usr/share/locale/$$LANG/LC_MESSAGES ; \ + cp $(CFDISK_PO_DIR)/$$LANG.gmo debian/tmp-fdisk-udeb/usr/share/locale/$$LANG/LC_MESSAGES/util-linux.mo ; \ + done + + ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb + dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~ + dpkg-distaddfile fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra + dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb +endif +ifeq ($(arch),$(sparc)) +# Do the udeb + install -d debian/tmp-fdisk-udeb/usr/sbin + install -d debian/tmp-fdisk-udeb/DEBIAN + install -m 755 fdisk/fdisk debian/tmp-fdisk-udeb/usr/sbin + strip --remove-section=.comment --remove-section=.note \ + debian/tmp-fdisk-udeb/usr/sbin/* + + ls debian/tmp-fdisk-udeb/usr/sbin/* | xargs dpkg-shlibdeps -pfdisk-udeb + dpkg-gencontrol -isp -pfdisk-udeb -Pdebian/tmp-fdisk-udeb -fdebian/files~ + dpkg-distaddfile fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb debian-installer extra + dpkg --build debian/tmp-fdisk-udeb ../fdisk-udeb_$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)_$(arch).udeb +endif + +ifeq ($(DEB_HOST_GNU_SYSTEM),linux) + # Mount + install -d debian/tmp-mount/{DEBIAN,bin,sbin,usr/share/{man/{man8,man5},doc/mount/examples}} + install -m 4755 -o root -s $(MOUNTBINFILES) debian/tmp-mount/bin/. + install -m 755 -s $(MOUNTSBINFILES) debian/tmp-mount/sbin/. + install -m 644 $(MOUNTMAN8FILES) debian/tmp-mount/usr/share/man/man8 + install -m 644 $(MOUNTMAN5FILES) debian/tmp-mount/usr/share/man/man5 + install -m 644 $(MOUNTDOCFILES) debian/tmp-mount/usr/share/doc/mount + (cd debian/tmp-mount/sbin ; ln -s swapon swapoff) + install -m 644 debian/mount.fstab \ + debian/tmp-mount/usr/share/doc/mount/examples/fstab + install -m 644 debian/changelog \ + debian/tmp-mount/usr/share/doc/mount/changelog.Debian + install -m 644 debian/changelog.Debian-mount.old \ + debian/tmp-mount/usr/share/doc/mount/changelog.Debian-mount.old + install -m 644 HISTORY debian/tmp-mount/usr/share/doc/mount/changelog + find debian/tmp-mount/usr/share/{doc,man} -type f | xargs gzip -9 + install -m 644 debian/copyright debian/tmp-mount/usr/share/doc/mount/copyright + install debian/mount.postinst debian/tmp-mount/DEBIAN/postinst + install debian/mount.prerm debian/tmp-mount/DEBIAN/prerm + ls debian/tmp-mount/{bin,sbin}/* | xargs dpkg-shlibdeps -pmount + dpkg-gencontrol -isp -pmount -Pdebian/tmp-mount + dpkg --build debian/tmp-mount .. +endif + + # Bsdutils + install -d debian/tmp-bsd/{DEBIAN,bin,usr/{bin,share/man/{man8,man1},share/doc/bsdutils}} + # install -m 755 -o root -s $(BSDBINFILES) debian/tmp-bsd/bin/. + install -m 755 -s $(BSDUBINFILES) debian/tmp-bsd/usr/bin/. + cp misc-utils/replay.pl debian/tmp-bsd/usr/bin/replay + chmod 755 debian/tmp-bsd/usr/bin/replay + install -m 644 $(BSDMAN8FILES) debian/tmp-bsd/usr/share/man/man8 + mv debian/tmp-bsd/usr/share/man/man8/renice.8 debian/tmp-bsd/usr/share/man/man1/renice.1 + install -m 644 $(BSDMAN1FILES) debian/tmp-bsd/usr/share/man/man1 + install -m 644 $(BSDDOCFILES) debian/tmp-bsd/usr/share/doc/bsdutils + chown root.tty debian/tmp-bsd/usr/bin/wall + chmod g+s debian/tmp-bsd/usr/bin/wall + install -m 644 debian/changelog \ + debian/tmp-bsd/usr/share/doc/bsdutils/changelog.Debian + install -m 644 HISTORY debian/tmp-bsd/usr/share/doc/bsdutils/changelog + find debian/tmp-bsd/usr/share/{doc,man} -type f | xargs gzip -9 + install -m 644 debian/copyright debian/tmp-bsd/usr/share/doc/bsdutils/copyright + install debian/bsdutils.postinst debian/tmp-bsd/DEBIAN/postinst + install debian/bsdutils.prerm debian/tmp-bsd/DEBIAN/prerm + ls debian/tmp-bsd/usr/bin/* | xargs dpkg-shlibdeps -pbsdutils + dpkg-gencontrol -isp -pbsdutils -Pdebian/tmp-bsd -v1:$(version) + dpkg --build debian/tmp-bsd .. + +define checkdir + test -f fdisk/fdisk.c -a -f debian/rules +endef + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot + +# Local Variables: +# mode:Makefile +# End: diff -puN debian/util-linux-locales.postinst~CITI_NFS4_ALL debian/util-linux-locales.postinst --- util-linux-2.12/debian/util-linux-locales.postinst~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/debian/util-linux-locales.postinst 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1 @@ +#! /bin/sh -e diff -puN debian/util-linux-locales.prerm~CITI_NFS4_ALL debian/util-linux-locales.prerm --- util-linux-2.12/debian/util-linux-locales.prerm~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/debian/util-linux-locales.prerm 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,15 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + update-alternatives --remove pager /bin/more + if [ -L /usr/doc/util-linux-locales ] ; then + rm -f /usr/doc/util-linux-locales + fi + ;; + upgrade|failed-upgrade|deconfigure) + ;; +esac + diff -puN disk-utils/blockdev.c~CITI_NFS4_ALL disk-utils/blockdev.c --- util-linux-2.12/disk-utils/blockdev.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/blockdev.c 2004-12-13 17:42:08.000000000 -0500 @@ -24,8 +24,8 @@ #define BLKRASET _IO(0x12,98) #define BLKRAGET _IO(0x12,99) #define BLKSSZGET _IO(0x12,104) -#define BLKBSZGET _IOR(0x12,112,sizeof(int)) -#define BLKBSZSET _IOW(0x12,113,sizeof(int)) +#define BLKBSZGET _IOR(0x12,112,size_t) +#define BLKBSZSET _IOW(0x12,113,size_t) #endif /* Maybe could be included */ diff -puN disk-utils/elvtune.c~CITI_NFS4_ALL disk-utils/elvtune.c --- util-linux-2.12/disk-utils/elvtune.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/elvtune.c 2004-12-13 17:42:08.000000000 -0500 @@ -37,8 +37,8 @@ typedef struct blkelv_ioctl_arg_s { int max_bomb_segments; } blkelv_ioctl_arg_t; -#define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t)) -#define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t)) +#define BLKELVGET _IOR(0x12,106,size_t) +#define BLKELVSET _IOW(0x12,107,size_t) static void usage(void) { diff -puN disk-utils/fsck.minix.c~CITI_NFS4_ALL disk-utils/fsck.minix.c --- util-linux-2.12/disk-utils/fsck.minix.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/fsck.minix.c 2004-12-13 17:42:08.000000000 -0500 @@ -103,10 +103,6 @@ #define HAVE_MINIX2 1 #endif -#ifndef __linux__ -#define volatile -#endif - #define ROOT_INO 1 #define UPPER(size,n) ((size+((n)-1))/(n)) diff -puN disk-utils/Makefile~CITI_NFS4_ALL disk-utils/Makefile --- util-linux-2.12/disk-utils/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -8,24 +8,34 @@ include ../MCONFIG # Where to put man pages? -MAN8= blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 elvtune.8 \ - fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 +MAN8= isosize.8 mkfs.8 mkswap.8 fsck.minix.8 mkfs.minix.8 mkfs.bfs.8 +ifeq "$(OS)" "linux" +MAN8:=$(MAN8) fdformat.8 blockdev.8 elvtune.8 +endif # Where to put binaries? # See the "install" rule for the links. . . -SBIN= mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs +SBIN= mkfs mkswap fsck.minix mkfs.minix mkfs.bfs +ifeq "$(OS)" "linux" +SBIN:=$(SBIN) blockdev elvtune +endif -USRBIN= fdformat isosize +USRBIN= isosize +ifeq "$(OS)" "linux" +USRBIN:=$(USRBIN) fdformat +endif ETC= fdprm MAYBE= setfdprm raw fsck.cramfs mkfs.cramfs +ifeq "$(OS)" "linux" ifneq "$(HAVE_FDUTILS)" "yes" USRBIN:=$(USRBIN) setfdprm MAN8:=$(MAN8) setfdprm.8 endif +endif ifeq "$(HAVE_RAW_H)" "yes" USRBIN:=$(USRBIN) raw @@ -50,13 +60,17 @@ fsck.cramfs.o mkfs.cramfs.o: cramfs.h fsck.minix.o mkfs.minix.o: bitops.h minix.h +mkfs.minix mkfs.bfs mkswap: $(LIB)/get_blocks.o + install: all $(INSTALLDIR) $(SBINDIR) $(USRBINDIR) $(ETCDIR) $(INSTALLBIN) $(SBIN) $(SBINDIR) $(INSTALLBIN) $(USRBIN) $(USRBINDIR) +ifeq "$(OS)" "linux" ifneq "$(HAVE_FDUTILS)" "yes" $(INSTALLDAT) $(ETC) $(ETCDIR) endif +endif $(INSTALLDIR) $(MAN8DIR) $(INSTALLMAN) $(MAN8) $(MAN8DIR) diff -puN disk-utils/mkfs.bfs.c~CITI_NFS4_ALL disk-utils/mkfs.bfs.c --- util-linux-2.12/disk-utils/mkfs.bfs.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/mkfs.bfs.c 2004-12-13 17:42:08.000000000 -0500 @@ -10,17 +10,12 @@ #include #include #include -#include #include #include #include #include #include "nls.h" - -/* cannot include */ -#ifndef BLKGETSIZE -#define BLKGETSIZE _IO(0x12,96) /* return device size */ -#endif +#include "get_blocks.h" #define BFS_ROOT_INO 2 #define BFS_NAMELEN 14 @@ -181,13 +176,9 @@ main(int argc, char *argv[]) { else if (optind != argc) usage(); - if (ioctl(fd, BLKGETSIZE, &total_blocks) == -1) { - if (!user_specified_total_blocks) { - perror("BLKGETSIZE"); - fatal(_("cannot get size of %s"), device); - } - total_blocks = user_specified_total_blocks; - } else if (user_specified_total_blocks) { + total_blocks = get_blocks(fd); + + if (user_specified_total_blocks) { if (user_specified_total_blocks > total_blocks) fatal(_("blocks argument too large, max is %lu"), total_blocks); diff -puN disk-utils/mkfs.c~CITI_NFS4_ALL disk-utils/mkfs.c --- util-linux-2.12/disk-utils/mkfs.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/mkfs.c 2004-12-13 17:42:08.000000000 -0500 @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { - char progname[NAME_MAX]; + char *progname; char *fstype = NULL; int i, more = 0, verbose = 0; char *oldpath, *newpath; @@ -92,7 +92,12 @@ int main(int argc, char *argv[]) } sprintf(newpath, "%s:%s\n", SEARCH_PATH, oldpath); putenv(newpath); - snprintf(progname, sizeof(progname), PROGNAME, fstype); + progname = (char *) malloc(sizeof(PROGNAME) + strlen(fstype) + 1); + if (!progname) { + fprintf(stderr, _("%s: Out of memory!\n"), "mkfs"); + exit(1); + } + sprintf(progname, PROGNAME, fstype); argv[--optind] = progname; if (verbose) { diff -puN disk-utils/mkfs.minix.c~CITI_NFS4_ALL disk-utils/mkfs.minix.c --- util-linux-2.12/disk-utils/mkfs.minix.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/mkfs.minix.c 2004-12-13 17:42:08.000000000 -0500 @@ -68,16 +68,12 @@ #include #include #include -#include #include #include #include "minix.h" #include "nls.h" - -#ifndef BLKGETSIZE -#define BLKGETSIZE _IO(0x12,96) /* return device size */ -#endif +#include "get_blocks.h" #ifdef MINIX2_SUPER_MAGIC2 #define HAVE_MINIX2 1 @@ -200,37 +196,6 @@ check_mount(void) { } static long -valid_offset (int fd, int offset) { - char ch; - - if (lseek (fd, offset, 0) < 0) - return 0; - if (read (fd, &ch, 1) < 1) - return 0; - return 1; -} - -static int -count_blocks (int fd) { - int high, low; - - low = 0; - for (high = 1; valid_offset (fd, high); high *= 2) - low = high; - while (low < high - 1) - { - const int mid = (low + high) / 2; - - if (valid_offset (fd, mid)) - low = mid; - else - high = mid; - } - valid_offset (fd, 0); - return (low + 1); -} - -static int get_size(const char *file) { int fd; long size; @@ -240,12 +205,8 @@ get_size(const char *file) { perror(file); exit(1); } - if (ioctl(fd, BLKGETSIZE, &size) >= 0) { - close(fd); - return (size * 512); - } - - size = count_blocks(fd); + size = get_blocks(fd); + close(fd); return size; } @@ -695,8 +656,10 @@ main(int argc, char ** argv) { } } - if (device_name && !BLOCKS) - BLOCKS = get_size (device_name) / 1024; + if (device_name && !BLOCKS) { + int sectors_per_block = 1024 / 512; + BLOCKS = get_size (device_name) / sectors_per_block; + } if (!device_name || BLOCKS<10) { usage(); } diff -puN disk-utils/mkswap.8~CITI_NFS4_ALL disk-utils/mkswap.8 --- util-linux-2.12/disk-utils/mkswap.8~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/mkswap.8 2004-12-13 17:42:08.000000000 -0500 @@ -109,7 +109,7 @@ e.g. using a command like Note that a swap file must not contain any holes (so, using .BR cp (1) -to create the file is not acceptable). +without specifying --sparse=never to create the file is not acceptable). .SH OPTIONS .TP diff -puN disk-utils/mkswap.c~CITI_NFS4_ALL disk-utils/mkswap.c --- util-linux-2.12/disk-utils/mkswap.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/disk-utils/mkswap.c 2004-12-13 17:42:08.000000000 -0500 @@ -36,10 +36,12 @@ #include #include #include -#include /* for _IO */ +#ifdef __linux__ #include +#endif /* __linux__ */ #include #include "nls.h" +#include "get_blocks.h" /* Try to get PAGE_SIZE from libc or kernel includes */ #ifdef HAVE_sys_user_h @@ -52,14 +54,6 @@ #endif #endif -#ifndef _IO -/* pre-1.3.45 */ -#define BLKGETSIZE 0x1260 -#else -/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */ -#define BLKGETSIZE _IO(0x12,96) -#endif - static char * program_name = "mkswap"; static char * device_name = NULL; static int DEV = -1; @@ -68,6 +62,7 @@ static int check = 0; static int badpages = 0; static int version = -1; +#ifdef __linux__ #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) static int @@ -83,6 +78,7 @@ linux_version_code(void) { } return 0; } +#endif /* __linux__ */ #ifdef __sparc__ # ifdef __arch64__ @@ -382,39 +378,11 @@ check_blocks(void) { printf(_("%d bad pages\n"), badpages); } -static long -valid_offset (int fd, off_t offset) { - char ch; - - if (lseek (fd, offset, 0) < 0) - return 0; - if (read (fd, &ch, 1) < 1) - return 0; - return 1; -} - -static off_t -find_size (int fd) { - off_t high, low; - - low = 0; - for (high = 1; high > 0 && valid_offset (fd, high); high *= 2) - low = high; - while (low < high - 1) { - const off_t mid = (low + high) / 2; - - if (valid_offset (fd, mid)) - low = mid; - else - high = mid; - } - return (low + 1); -} - /* return size in pages, to avoid integer overflow */ static long get_size(const char *file) { int fd; + int sectors_per_page = pagesize / 512; long size; fd = open(file, O_RDONLY); @@ -422,14 +390,10 @@ get_size(const char *file) { perror(file); exit(1); } - if (ioctl(fd, BLKGETSIZE, &size) >= 0) { - int sectors_per_page = pagesize/512; - size /= sectors_per_page; - } else { - size = find_size(fd) / pagesize; - } + size = get_blocks(fd); + close(fd); - return size; + return (size / sectors_per_page); } static int @@ -527,8 +491,10 @@ main(int argc, char ** argv) { /* use version 1 as default, if possible */ if (PAGES <= V0_MAX_PAGES && PAGES > V1_MAX_PAGES) version = 0; +#ifdef __linux__ else if (linux_version_code() < MAKE_VERSION(2,1,117)) version = 0; +#endif else if (pagesize < 2048) version = 0; else @@ -549,12 +515,17 @@ main(int argc, char ** argv) { if (version == 0) maxpages = V0_MAX_PAGES; +#ifdef __linux__ else if (linux_version_code() >= MAKE_VERSION(2,3,4)) maxpages = PAGES; else if (linux_version_code() >= MAKE_VERSION(2,2,1)) maxpages = V1_MAX_PAGES; - else +#endif + else { maxpages = V1_OLD_MAX_PAGES; + if (maxpages > V1_MAX_PAGES) + maxpages = V1_MAX_PAGES; + } if (PAGES > maxpages) { PAGES = maxpages; diff -puN fdisk/cfdisk.c~CITI_NFS4_ALL fdisk/cfdisk.c --- util-linux-2.12/fdisk/cfdisk.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/cfdisk.c 2004-12-13 17:42:08.000000000 -0500 @@ -75,11 +75,14 @@ #include #include #include +#ifdef __linux__ #include #include +#endif #include "nls.h" #include "xstrncpy.h" +#include "get_blocks.h" #include "common.h" extern long long ext2_llseek(unsigned int fd, long long offset, @@ -87,8 +90,16 @@ extern long long ext2_llseek(unsigned in #define VERSION UTIL_LINUX_VERSION +#ifdef __GNU__ +#define DEFAULT_DEVICE "/dev/hd0" +#define ALTERNATE_DEVICE "/dev/sd0" +#elif defined(__FreeBSD__) +#define DEFAULT_DEVICE "/dev/ad0" +#define ALTERNATE_DEVICE "/dev/da0" +#else #define DEFAULT_DEVICE "/dev/hda" #define ALTERNATE_DEVICE "/dev/sda" +#endif /* With K=1024 we have `binary' megabytes, gigabytes, etc. Some misguided hackers like that. @@ -1601,7 +1612,6 @@ static void fill_p_info(void) { int pn, i; long long bs, bsz; - unsigned long long bytes; struct partition *p; partition_table buffer; partition_info tmp_ext = { 0, 0, 0, 0, FREE_SPACE, PRIMARY }; @@ -1620,6 +1630,7 @@ fill_p_info(void) { opentype = O_RDWR; opened = TRUE; +#ifdef __linux__ /* Blocks are visible in more than one way: e.g. as block on /dev/hda and as block on /dev/hda3 By a bug in the Linux buffer cache, we will see the old @@ -1629,16 +1640,9 @@ fill_p_info(void) { so this only plays a role if we want to show volume labels. */ ioctl(fd, BLKFLSBUF); /* ignore errors */ /* e.g. Permission Denied */ +#endif - if (ioctl(fd, BLKGETSIZE64, &bytes) == 0) - actual_size = (bytes >> 9); - else { - unsigned long sz = 0; - - if (ioctl(fd, BLKGETSIZE, &sz)) - fatal(_("Cannot get disk size"), 3); - actual_size = sz; - } + actual_size = get_blocks(fd); read_sector(buffer.c.b, 0); @@ -1844,12 +1848,14 @@ write_part_table(void) { } if (is_bdev) { +#ifdef __linux__ sync(); sleep(2); if (!ioctl(fd,BLKRRPART)) changed = TRUE; sync(); sleep(4); +#endif clear_warning(); if (changed) @@ -2945,6 +2951,19 @@ main(int argc, char **argv) disk_device = ALTERNATE_DEVICE; else close(fd); +#ifndef __linux__ + /* XXX Temporal hack to force user or partition table to supply + * what the system cannot + */ + if (!use_partition_table_geometry + && (!user_cylinders || !user_heads || !user_sectors)) { + fprintf(stderr, "%s: %s\n", argv[0], + _("Geometry must be supplied, by the user (-c -h -s) or\n" + "by the existing partition table (-g)\n")); + exit(1); + } +#endif + if (print_only) { fill_p_info(); if (print_only & PRINT_RAW_TABLE) diff -puN fdisk/fdiskaixlabel.h~CITI_NFS4_ALL fdisk/fdiskaixlabel.h --- util-linux-2.12/fdisk/fdiskaixlabel.h~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdiskaixlabel.h 2004-12-13 17:42:08.000000000 -0500 @@ -1,4 +1,3 @@ -#include /* for __u32 etc */ /* * Copyright (C) Andreas Neuper, Sep 1998. * This file may be redistributed under diff -puN fdisk/fdiskbsdlabel.c~CITI_NFS4_ALL fdisk/fdiskbsdlabel.c --- util-linux-2.12/fdisk/fdiskbsdlabel.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdiskbsdlabel.c 2004-12-13 17:42:08.000000000 -0500 @@ -52,7 +52,6 @@ #include #include "nls.h" -#include #include #include "common.h" @@ -515,7 +514,7 @@ static void xbsd_write_bootstrap (void) { char *bootdir = BSD_LINUX_BOOTDIR; - char path[MAXPATHLEN]; + char *path; char *dkbasename; struct xbsd_disklabel dl; char *d, *p, *e; @@ -532,9 +531,15 @@ xbsd_write_bootstrap (void) line_ptr[strlen (line_ptr)-1] = '\0'; dkbasename = line_ptr; } - snprintf (path, sizeof(path), "%s/%sboot", bootdir, dkbasename); - if (!xbsd_get_bootstrap (path, disklabelbuffer, (int) xbsd_dlabel.d_secsize)) + path = (char *) malloc (sizeof("/boot") + 1 + strlen (bootdir) + + strlen (dkbasename)); + if (!path) + fatal (out_of_memory); + sprintf (path, "%s/%sboot", bootdir, dkbasename); + if (!xbsd_get_bootstrap (path, disklabelbuffer, (int) xbsd_dlabel.d_secsize)) { + free (path); return; + } /* We need a backup of the disklabel (xbsd_dlabel might have changed). */ d = &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE]; @@ -543,10 +548,13 @@ xbsd_write_bootstrap (void) /* The disklabel will be overwritten by 0's from bootxx anyway */ bzero (d, sizeof (struct xbsd_disklabel)); + sprintf (path, "%s/boot%s", bootdir, dkbasename); snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename); if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize], - (int) xbsd_dlabel.d_bbsize - xbsd_dlabel.d_secsize)) + (int) xbsd_dlabel.d_bbsize - xbsd_dlabel.d_secsize)) { + free(path); return; + } e = d + sizeof (struct xbsd_disklabel); for (p=d; p < e; p++) @@ -579,6 +587,8 @@ xbsd_write_bootstrap (void) #endif sync_disks (); + + free(path); } static void diff -puN fdisk/fdiskbsdlabel.h~CITI_NFS4_ALL fdisk/fdiskbsdlabel.h --- util-linux-2.12/fdisk/fdiskbsdlabel.h~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdiskbsdlabel.h 2004-12-13 17:42:08.000000000 -0500 @@ -31,10 +31,10 @@ * SUCH DAMAGE. */ -#include /* for __u32, __u16, __u8, __s16 */ +#include /* for uint32_t, uint16_t, uint8_t, int16_t */ #ifndef BSD_DISKMAGIC -#define BSD_DISKMAGIC ((__u32) 0x82564557) +#define BSD_DISKMAGIC ((uint32_t) 0x82564557) #endif #ifndef BSD_MAXPARTITIONS @@ -60,31 +60,31 @@ #define BSD_SBSIZE 8192 /* max size of fs superblock */ struct xbsd_disklabel { - __u32 d_magic; /* the magic number */ - __s16 d_type; /* drive type */ - __s16 d_subtype; /* controller/d_type specific */ - char d_typename[16]; /* type name, e.g. "eagle" */ - char d_packname[16]; /* pack identifier */ + uint32_t d_magic; /* the magic number */ + int16_t d_type; /* drive type */ + int16_t d_subtype; /* controller/d_type specific */ + char d_typename[16]; /* type name, e.g. "eagle" */ + char d_packname[16]; /* pack identifier */ /* disk geometry: */ - __u32 d_secsize; /* # of bytes per sector */ - __u32 d_nsectors; /* # of data sectors per track */ - __u32 d_ntracks; /* # of tracks per cylinder */ - __u32 d_ncylinders; /* # of data cylinders per unit */ - __u32 d_secpercyl; /* # of data sectors per cylinder */ - __u32 d_secperunit; /* # of data sectors per unit */ + uint32_t d_secsize; /* # of bytes per sector */ + uint32_t d_nsectors; /* # of data sectors per track */ + uint32_t d_ntracks; /* # of tracks per cylinder */ + uint32_t d_ncylinders; /* # of data cylinders per unit */ + uint32_t d_secpercyl; /* # of data sectors per cylinder */ + uint32_t d_secperunit; /* # of data sectors per unit */ /* * Spares (bad sector replacements) below * are not counted in d_nsectors or d_secpercyl. * Spare sectors are assumed to be physical sectors * which occupy space at the end of each track and/or cylinder. */ - __u16 d_sparespertrack; /* # of spare sectors per track */ - __u16 d_sparespercyl; /* # of spare sectors per cylinder */ + uint16_t d_sparespertrack; /* # of spare sectors per track */ + uint16_t d_sparespercyl; /* # of spare sectors per cylinder */ /* * Alternate cylinders include maintenance, replacement, * configuration description areas, etc. */ - __u32 d_acylinders; /* # of alt. cylinders per unit */ + uint32_t d_acylinders; /* # of alt. cylinders per unit */ /* hardware characteristics: */ /* @@ -103,30 +103,30 @@ struct xbsd_disklabel { * Finally, d_cylskew is the offset of sector 0 on cylinder N * relative to sector 0 on cylinder N-1. */ - __u16 d_rpm; /* rotational speed */ - __u16 d_interleave; /* hardware sector interleave */ - __u16 d_trackskew; /* sector 0 skew, per track */ - __u16 d_cylskew; /* sector 0 skew, per cylinder */ - __u32 d_headswitch; /* head switch time, usec */ - __u32 d_trkseek; /* track-to-track seek, usec */ - __u32 d_flags; /* generic flags */ + uint16_t d_rpm; /* rotational speed */ + uint16_t d_interleave; /* hardware sector interleave */ + uint16_t d_trackskew; /* sector 0 skew, per track */ + uint16_t d_cylskew; /* sector 0 skew, per cylinder */ + uint32_t d_headswitch; /* head switch time, usec */ + uint32_t d_trkseek; /* track-to-track seek, usec */ + uint32_t d_flags; /* generic flags */ #define NDDATA 5 - __u32 d_drivedata[NDDATA]; /* drive-type specific information */ + uint32_t d_drivedata[NDDATA]; /* drive-type specific information */ #define NSPARE 5 - __u32 d_spare[NSPARE]; /* reserved for future use */ - __u32 d_magic2; /* the magic number (again) */ - __u16 d_checksum; /* xor of data incl. partitions */ + uint32_t d_spare[NSPARE]; /* reserved for future use */ + uint32_t d_magic2; /* the magic number (again) */ + uint16_t d_checksum; /* xor of data incl. partitions */ /* filesystem and partition information: */ - __u16 d_npartitions; /* number of partitions in following */ - __u32 d_bbsize; /* size of boot area at sn0, bytes */ - __u32 d_sbsize; /* max size of fs superblock, bytes */ + uint16_t d_npartitions; /* number of partitions in following */ + uint32_t d_bbsize; /* size of boot area at sn0, bytes */ + uint32_t d_sbsize; /* max size of fs superblock, bytes */ struct xbsd_partition { /* the partition table */ - __u32 p_size; /* number of sectors in partition */ - __u32 p_offset; /* starting sector */ - __u32 p_fsize; /* filesystem basic fragment size */ - __u8 p_fstype; /* filesystem type, see below */ - __u8 p_frag; /* filesystem fragments per block */ - __u16 p_cpg; /* filesystem cylinders per group */ + uint32_t p_size; /* number of sectors in partition */ + uint32_t p_offset; /* starting sector */ + uint32_t p_fsize; /* filesystem basic fragment size */ + uint8_t p_fstype; /* filesystem type, see below */ + uint8_t p_frag; /* filesystem fragments per block */ + uint16_t p_cpg; /* filesystem cylinders per group */ } d_partitions[BSD_MAXPARTITIONS]; /* actually may be more */ }; diff -puN fdisk/fdisk.c~CITI_NFS4_ALL fdisk/fdisk.c --- util-linux-2.12/fdisk/fdisk.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdisk.c 2004-12-13 17:42:08.000000000 -0500 @@ -21,6 +21,7 @@ #include "nls.h" #include "common.h" +#include "get_blocks.h" #include "fdisk.h" #include "fdisksunlabel.h" @@ -717,6 +718,7 @@ create_doslabel(void) { get_boot(create_empty_dos); } +#ifdef __linux__ #include #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) @@ -734,10 +736,11 @@ linux_version_code(void) { } return kernel_version; } +#endif static void get_sectorsize(int fd) { -#if defined(BLKSSZGET) +#if defined(BLKSSZGET) && defined(__linux__) if (!user_set_sector_size && linux_version_code() >= MAKE_VERSION(2,3,3)) { int arg; @@ -820,17 +823,8 @@ get_geometry(int fd, struct geom *g) { pt_sectors ? pt_sectors : kern_sectors ? kern_sectors : 63; - if (ioctl(fd, BLKGETSIZE64, &bytes) == 0) { - /* got bytes */ - } else { - unsigned long longsectors; - - if (ioctl(fd, BLKGETSIZE, &longsectors)) - longsectors = 0; - bytes = ((unsigned long long) longsectors) << 9; - } - - total_number_of_sectors = (bytes >> 9); + total_number_of_sectors = get_blocks(fd); + bytes = ((unsigned long long) total_number_of_sectors) << 9; sector_offset = 1; if (dos_compatible_flag) @@ -2114,6 +2108,7 @@ reread_partition_table(int leave) { int error = 0; int i; +#ifdef __linux__ printf(_("Calling ioctl() to re-read partition table.\n")); sync(); sleep(2); @@ -2128,6 +2123,10 @@ reread_partition_table(int leave) { if ((i = ioctl(fd, BLKRRPART)) != 0) error = errno; } +#else + error = ENOSYS; + i = 1; +#endif if (i) { printf(_("\nWARNING: Re-reading the partition table " @@ -2519,8 +2518,7 @@ main(int argc, char **argv) { disk_device = argv[j]; if ((fd = open(disk_device, type_open)) < 0) fatal(unable_to_open); - if (ioctl(fd, BLKGETSIZE, &size)) - fatal(ioctl_error); + size = get_blocks(fd); close(fd); if (opts == 1) printf("%ld\n", size/2); diff -puN fdisk/fdisksgilabel.c~CITI_NFS4_ALL fdisk/fdisksgilabel.c --- util-linux-2.12/fdisk/fdisksgilabel.c~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdisksgilabel.c 2004-12-13 17:42:08.000000000 -0500 @@ -16,13 +16,11 @@ #include /* exit */ #include /* strstr */ #include /* write */ -#include /* ioctl */ #include /* stat */ #include /* assert */ #include #include "nls.h" -#include /* FLOPPY_MAJOR */ #include "common.h" #include "fdisk.h" @@ -100,11 +98,11 @@ struct systypes sgi_sys_types[] = { static inline unsigned short __swap16(unsigned short x) { - return (((__u16)(x) & 0xFF) << 8) | (((__u16)(x) & 0xFF00) >> 8); + return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); } -static inline __u32 -__swap32(__u32 x) { +static inline uint32_t +__swap32(uint32_t x) { return (((x & 0xFF) << 24) | ((x & 0xFF00) << 8) | ((x & 0xFF0000) >> 8) | @@ -224,8 +222,8 @@ sgi_list_table(int xtra) { w + 2, _("Device")); for (i = 0 ; i < partitions; i++) { if (sgi_get_num_sectors(i) || debug) { - __u32 start = sgi_get_start_sector(i); - __u32 len = sgi_get_num_sectors(i); + uint32_t start = sgi_get_start_sector(i); + uint32_t len = sgi_get_num_sectors(i); kpi++; /* only count nonempty partitions */ printf( "%2d: %s %4s %9ld %9ld %9ld %2x %s\n", @@ -246,8 +244,8 @@ sgi_list_table(int xtra) { sgilabel->boot_file); for (i = 0 ; i < volumes; i++) { if (sgilabel->directory[i].vol_file_size) { - __u32 start = SSWAP32(sgilabel->directory[i].vol_file_start); - __u32 len = SSWAP32(sgilabel->directory[i].vol_file_size); + uint32_t start = SSWAP32(sgilabel->directory[i].vol_file_start); + uint32_t len = SSWAP32(sgilabel->directory[i].vol_file_size); char *name = sgilabel->directory[i].vol_file_name; printf(_("%2d: %-10s sector%5u size%8u\n"), i, name, (unsigned int) start, diff -puN fdisk/fdisksgilabel.h~CITI_NFS4_ALL fdisk/fdisksgilabel.h --- util-linux-2.12/fdisk/fdisksgilabel.h~CITI_NFS4_ALL 2004-12-13 17:42:05.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdisksgilabel.h 2004-12-13 17:42:08.000000000 -0500 @@ -1,4 +1,4 @@ -#include /* for __u32 etc */ +#include /* for uint32_t, uint16_t, uint8_t, int16_t */ /* * Copyright (C) Andreas Neuper, Sep 1998. * This file may be modified and redistributed under @@ -96,9 +96,9 @@ typedef struct { #define SGI_INFO_MAGIC 0x00072959 #define SGI_INFO_MAGIC_SWAPPED 0x59290700 #define SSWAP16(x) (other_endian ? __swap16(x) \ - : (__u16)(x)) + : (uint16_t)(x)) #define SSWAP32(x) (other_endian ? __swap32(x) \ - : (__u32)(x)) + : (uint32_t)(x)) /* fdisk.c */ #define sgilabel ((sgi_partition *)MBRbuffer) diff -puN fdisk/fdisksunlabel.c~CITI_NFS4_ALL fdisk/fdisksunlabel.c --- util-linux-2.12/fdisk/fdisksunlabel.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdisksunlabel.c 2004-12-13 17:42:08.000000000 -0500 @@ -27,7 +27,9 @@ #include /* SCSI_IOCTL_GET_IDLUN */ #undef u_char #endif +#ifdef __linux__ #include /* FLOPPY_MAJOR */ +#endif #include "common.h" #include "fdisk.h" @@ -60,10 +62,10 @@ struct systypes sun_sys_types[] = { }; static inline unsigned short __swap16(unsigned short x) { - return (((__u16)(x) & 0xFF) << 8) | (((__u16)(x) & 0xFF00) >> 8); + return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); } -static inline __u32 __swap32(__u32 x) { - return (((__u32)(x) & 0xFF) << 24) | (((__u32)(x) & 0xFF00) << 8) | (((__u32)(x) & 0xFF0000) >> 8) | (((__u32)(x) & 0xFF000000) >> 24); +static inline uint32_t __swap32(uint32_t x) { + return (((uint32_t)(x) & 0xFF) << 24) | (((uint32_t)(x) & 0xFF00) << 8) | (((uint32_t)(x) & 0xFF0000) >> 8) | (((uint32_t)(x) & 0xFF000000) >> 24); } int @@ -71,18 +73,21 @@ get_num_sectors(struct sun_partition p) return SSWAP32(p.num_sectors); } +#ifdef __linux__ #ifndef IDE0_MAJOR #define IDE0_MAJOR 3 #endif #ifndef IDE1_MAJOR #define IDE1_MAJOR 22 #endif +#endif void guess_device_type(int fd) { struct stat bootstat; if (fstat (fd, &bootstat) < 0) { scsi_disk = 0; floppy = 0; +#ifdef __linux__ } else if (S_ISBLK(bootstat.st_mode) && (major(bootstat.st_rdev) == IDE0_MAJOR || major(bootstat.st_rdev) == IDE1_MAJOR)) { @@ -92,6 +97,7 @@ void guess_device_type(int fd) { && major(bootstat.st_rdev) == FLOPPY_MAJOR) { scsi_disk = 0; floppy = 1; +#endif } else { scsi_disk = 1; floppy = 0; @@ -674,8 +680,8 @@ sun_list_table(int xtra) { w + 1, _("Device")); for (i = 0 ; i < partitions; i++) { if (sunlabel->partitions[i].num_sectors) { - __u32 start = SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; - __u32 len = SSWAP32(sunlabel->partitions[i].num_sectors); + uint32_t start = SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; + uint32_t len = SSWAP32(sunlabel->partitions[i].num_sectors); printf( "%s %c%c %9ld %9ld %9ld%c %2x %s\n", /* device */ partname(disk_device, i+1, w), diff -puN fdisk/fdisksunlabel.h~CITI_NFS4_ALL fdisk/fdisksunlabel.h --- util-linux-2.12/fdisk/fdisksunlabel.h~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/fdisksunlabel.h 2004-12-13 17:42:08.000000000 -0500 @@ -1,4 +1,4 @@ -#include /* for __u16, __u32 */ +#include /* for uint32_t, uint16_t, uint8_t, int16_t */ typedef struct { unsigned char info[128]; /* Informative text string */ @@ -21,8 +21,8 @@ typedef struct { unsigned short nsect; /* Sectors per track */ unsigned char spare3[4]; /* Even more magic... */ struct sun_partition { - __u32 start_cylinder; - __u32 num_sectors; + uint32_t start_cylinder; + uint32_t num_sectors; } partitions[8]; unsigned short magic; /* Magic number */ unsigned short csum; /* Label xor'd checksum */ @@ -32,9 +32,9 @@ typedef struct { #define SUN_LABEL_MAGIC_SWAPPED 0xBEDA #define sunlabel ((sun_partition *)MBRbuffer) #define SSWAP16(x) (other_endian ? __swap16(x) \ - : (__u16)(x)) + : (uint16_t)(x)) #define SSWAP32(x) (other_endian ? __swap32(x) \ - : (__u32)(x)) + : (uint32_t)(x)) /* fdisk.c */ extern char MBRbuffer[MAX_SECTOR_SIZE]; diff -puN fdisk/Makefile~CITI_NFS4_ALL fdisk/Makefile --- util-linux-2.12/fdisk/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -39,7 +39,7 @@ else endif endif -cfdisk: cfdisk.o llseek.o i386_sys_types.o $(LIB)/xstrncpy.o +cfdisk: cfdisk.o llseek.o i386_sys_types.o $(LIB)/xstrncpy.o $(LIB)/get_blocks.o ifeq "$(HAVE_SLANG)" "yes" $(CC) $(LDFLAGS) $^ -o $@ $(LIBSLANG) else @@ -56,14 +56,14 @@ activate: sfdisk ln -s sfdisk activate fdisk: fdisk.o llseek.o fdiskbsdlabel.o fdisksgilabel.o fdisksunlabel.o \ - fdiskaixlabel.o i386_sys_types.o partname.o + fdiskaixlabel.o i386_sys_types.o partname.o $(LIB)/get_blocks.o fdisk.o: fdisk.c fdisk.h fdiskbsdlabel.o: fdiskbsdlabel.c fdisk.h fdiskbsdlabel.h fdisksunlabel.o: fdisksunlabel.c fdisksunlabel.h fdisk.h fdiskaixlabel.o: fdiskaixlabel.c fdiskaixlabel.h fdisk.h fdisk.o cfdisk.o sfdisk.o fdiskbsdlabel.o fdisksunlabel.o \ fdisksgilabel.o fdiskaixlabel.o i386_sys_types.o partname.o: common.h -sfdisk: sfdisk.o i386_sys_types.o partname.o +sfdisk: sfdisk.o i386_sys_types.o partname.o $(LIB)/get_blocks.o install: all $(INSTALLDIR) $(SBINDIR) diff -puN fdisk/sfdisk.c~CITI_NFS4_ALL fdisk/sfdisk.c --- util-linux-2.12/fdisk/sfdisk.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/fdisk/sfdisk.c 2004-12-13 17:42:08.000000000 -0500 @@ -46,9 +46,12 @@ #include #include #include +#ifdef __linux__ #include /* _syscall */ +#endif #include "nls.h" #include "common.h" +#include "get_blocks.h" #define SIZE(a) (sizeof(a)/sizeof(a[0])) @@ -130,7 +133,7 @@ fatal(char *s, ...) { * * Note: we use 512-byte sectors here, irrespective of the hardware ss. */ -#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) +#if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) static _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, loff_t *, res, unsigned int, wh); @@ -142,7 +145,7 @@ sseek(char *dev, unsigned int fd, unsign in = ((loff_t) s << 9); out = 1; -#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) +#if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { #else if ((out = lseek(fd, in, SEEK_SET)) != in) { @@ -395,25 +398,31 @@ struct geometry { static struct geometry get_geometry(char *dev, int fd, int silent) { +#ifdef __linux__ struct hd_geometry g; +#endif long size; struct geometry R; - if (ioctl(fd, BLKGETSIZE, &size)) { - size = 0; + size = get_blocks(fd); + if (!size) { if (!silent) printf(_("Disk %s: cannot get size\n"), dev); } - if (ioctl(fd, HDIO_GETGEO, &g)) { - g.heads = g.sectors = g.cylinders = g.start = 0; +#ifdef __linux__ + if (ioctl(fd, HDIO_GETGEO, &g) >= 0) { + R.heads = g.heads; + R.sectors = g.sectors; + R.cylindersize = R.heads * R.sectors; + R.cylinders = (R.cylindersize ? size / R.cylindersize : 0); + R.start = g.start; + } else +#endif + { + R.heads = R.sectors = R.cylindersize = R.cylinders = R.start = 0; if (!silent) printf(_("Disk %s: cannot get geometry\n"), dev); } - R.heads = g.heads; - R.sectors = g.sectors; - R.cylindersize = R.heads * R.sectors; - R.cylinders = (R.cylindersize ? size / R.cylindersize : 0); - R.start = g.start; return R; } @@ -721,11 +730,12 @@ add_sector_and_offset(struct disk_desc * /* tell the kernel to reread the partition tables */ static int reread_ioctl(int fd) { - if(ioctl(fd, BLKRRPART)) { - perror("BLKRRPART"); - return -1; - } - return 0; +#ifdef __linux__ + if(!ioctl(fd, BLKRRPART)) + return 0; + perror("BLKRRPART"); +#endif + return -1; } static int @@ -1428,6 +1438,7 @@ bsd_partition(char *dev, int fd, struct z->partno = pno; } +#ifdef __linux__ #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) static int @@ -1443,6 +1454,7 @@ linux_version_code(void) { } return 0; } +#endif static int msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { @@ -1452,7 +1464,11 @@ msdos_partition(char *dev, int fd, unsig struct sector *s; struct part_desc *partitions = &(z->partitions[0]); int pno = z->partno; +#ifdef __linux__ int bsd_later = (linux_version_code() >= MAKE_VERSION(2,3,40)); +#else + int bsd_later = 0; +#endif if (!(s = get_sector(dev, fd, start))) return 0; @@ -2670,10 +2686,11 @@ do_size (char *dev, int silent) { if (fd < 0) return; - if(ioctl(fd, BLKGETSIZE, &size)) { + size = get_blocks(fd); + if (!size) { if(!silent) { perror(dev); - fatal(_("BLKGETSIZE ioctl failed for %s\n"), dev); + fatal(_("Disk %s: cannot get size\n"), dev); } return; } diff -puN getopt/getopt.1~CITI_NFS4_ALL getopt/getopt.1 --- util-linux-2.12/getopt/getopt.1~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/getopt/getopt.1 2004-12-13 17:42:08.000000000 -0500 @@ -403,9 +403,10 @@ if it is called with Example scripts for (ba)sh and (t)csh are provided with the .BR getopt (1) distribution, and are optionally installed in -.B /usr/local/lib/getopt +.BR /usr/lib/getopt or -.BR /usr/lib/getopt . +.B /usr/local/lib/getopt +(if you have created it). .SH ENVIRONMENT .IP POSIXLY_CORRECT This environment variable is examined by the diff -puN hwclock/cmos.c~CITI_NFS4_ALL hwclock/cmos.c --- util-linux-2.12/hwclock/cmos.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/hwclock/cmos.c 2004-12-13 17:42:08.000000000 -0500 @@ -46,6 +46,7 @@ #include /* for geteuid() */ #include /* for O_RDWR */ +#include #include "nls.h" diff -puN hwclock/hwclock.8~CITI_NFS4_ALL hwclock/hwclock.8 --- util-linux-2.12/hwclock/hwclock.8~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/hwclock/hwclock.8 2004-12-13 17:42:08.000000000 -0500 @@ -344,7 +344,7 @@ But don't be misled -- almost nobody car thinks it is in. Instead, programs that care about the timezone (perhaps because they want to display a local time for you) almost always use a more traditional method of determining the timezone: They -use the TZ environment variable and/or the /usr/local/timezone +use the TZ environment variable and/or the /usr/share/zoneinfo directory, as explained in the man page for tzset(3). However, some programs and fringe parts of the Linux kernel such as filesystems use the kernel timezone value. An example is the vfat filesystem. If the @@ -353,7 +353,7 @@ set the wrong timestamps on files. .PP .B hwclock sets the kernel timezone to the value indicated by TZ and/or -/usr/local/timezone when you set the System Time using the +/usr/share/zoneinfo when you set the System Time using the .B \-\-hctosys option. .PP @@ -574,8 +574,6 @@ ISA" method of accessing the Hardware Cl .SH FILES .I /etc/adjtime .I /usr/share/zoneinfo/ -.RI ( /usr/lib/zoneinfo -on old systems) .I /dev/rtc .I /dev/port .I /dev/tty1 @@ -588,6 +586,9 @@ on old systems) .BR settimeofday (2), .BR crontab (1), .BR tzset (3) +.BR /etc/init.d/hwclock.sh, +.BR /usr/share/doc/util-linux/README.Debian.hwclock + .SH AUTHORS Written by Bryan Henderson, September 1996 (bryanh@giraffe-data.com), diff -puN hwclock/kd.c~CITI_NFS4_ALL hwclock/kd.c --- util-linux-2.12/hwclock/kd.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/hwclock/kd.c 2004-12-13 17:42:08.000000000 -0500 @@ -3,6 +3,7 @@ #include /* for O_RDONLY */ #include #include +#include #include "../defines.h" /* for HAVE_nanosleep */ #include "clock.h" diff -puN hwclock/Makefile~CITI_NFS4_ALL hwclock/Makefile --- util-linux-2.12/hwclock/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/hwclock/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -3,6 +3,7 @@ include ../make_include include ../MCONFIG +ifeq "$(OS)" "linux" # Where to put man pages? MAN8= hwclock.8 @@ -11,6 +12,7 @@ MAN8= hwclock.8 # See the "install" rule for the links. . . SBIN= hwclock +endif all: $(SBIN) diff -puN hwclock/rtc.c~CITI_NFS4_ALL hwclock/rtc.c --- util-linux-2.12/hwclock/rtc.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/hwclock/rtc.c 2004-12-13 17:42:08.000000000 -0500 @@ -3,6 +3,7 @@ #include /* for O_RDONLY */ #include #include +#include #include "clock.h" #include "nls.h" diff -puN lib/get_blocks.c~CITI_NFS4_ALL lib/get_blocks.c --- util-linux-2.12/lib/get_blocks.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/get_blocks.c 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,98 @@ +/* + * unsigned long get_blocks(int fd) + * + * returns the number of 512-byte blocks of fd + * + * Most code ripped from: + * + * mkswap.c + * mkfs.bfs.c + * mkfs.minix.c + * + * by Guillem Jover + * + */ + +#include "../defines.h" +#include "get_blocks.h" +#include +#include +#include + +#ifdef __linux__ +#include + +/* can't #include , because it uses u64... */ +#ifndef BLKGETSIZE +/* return device size */ +#ifndef _IO +/* pre-1.3.45 */ +#define BLKGETSIZE 0x1260 +#else +/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */ +#define BLKGETSIZE _IO(0x12,96) +#define BLKGETSIZE64 _IOR(0x12,114,long long) +#endif +#endif +#endif /* __linux__ */ + +static int +valid_offset (int fd, off_t offset) +{ + char ch; + + if (lseek (fd, offset, 0) < 0) + return 0; + if (read (fd, &ch, 1) < 1) + return 0; + return 1; +} + +static off_t +count_blocks (int fd) +{ + off_t high, low, blocks; + + low = 0; + for (high = 1; high > 0 && valid_offset (fd, high); high *= 2) + low = high; + while (low < high - 1) + { + const off_t mid = (low + high) / 2; + + if (valid_offset (fd, mid)) + low = mid; + else + high = mid; + } + blocks = (low + 1) / 512; + return blocks; +} + +unsigned long +get_blocks (int fd) +{ + struct stat st; + +#ifdef __linux__ + { + unsigned long blocks; + unsigned long long bytes; + if (ioctl(fd, BLKGETSIZE64, &bytes) == 0) { + blocks = (bytes >> 9); + return blocks; + } else { + blocks = 0; + + if (ioctl(fd, BLKGETSIZE, &blocks) >=0) + return blocks; + } + } +#endif /* __linux__ */ + + if (fstat(fd, &st) == 0) + return st.st_size / 512; + + return count_blocks(fd); +} + diff -puN lib/get_blocks.h~CITI_NFS4_ALL lib/get_blocks.h --- util-linux-2.12/lib/get_blocks.h~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/get_blocks.h 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,7 @@ +#ifndef GET_BLOCKS_H +#define GET_BLOCKS_H + +extern unsigned long get_blocks (int fd); + +#endif + diff -puN lib/Makefile~CITI_NFS4_ALL lib/Makefile --- util-linux-2.12/lib/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -1,8 +1,9 @@ include ../make_include include ../MCONFIG -all: err.o my_reboot.o setproctitle.o env.o carefulputc.o xstrncpy.o md5.o - +all: err.o my_reboot.o setproctitle.o env.o carefulputc.o md5.o \ + xgethostname.o xstrncpy.o get_blocks.o + err.o: err.c my_reboot.o: my_reboot.c linux_reboot.h @@ -15,6 +16,10 @@ carefulputc.o: carefulputc.h xstrncpy.o: xstrncpy.h +xgethostname.o: xgethostname.h + +get_blocks.o: get_blocks.h + md5.o: md5.c md5.h .PHONY: clean diff -puN lib/README.xgethostname~CITI_NFS4_ALL lib/README.xgethostname --- util-linux-2.12/lib/README.xgethostname~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/README.xgethostname 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,76 @@ +A wrapper for gethostname that automatically checks system limitations. + +Latest version can always be found at: +ftp://walfield.org/pub/people/neal/xgethostname/xgethostname-latest.tar.gz + +Author: +Neal H Walfield + +Version: +April 13, 2002 + +ChangeLog: +2002-04-13 Neal H Walfield + + * VERSION: Update to 20010413. + * Release version 20010413. + +2002-04-13 Neal H Walfield + + * xgethostname.c (xgethostname): gethostname returns -1 on error, + not the error code. There is no need to use realloc as it copies + the unused buffer. + +2001-08-03 Neal H Walfield + + * VERSION: Update to 20010803. + * Release version 20010803. + +2001-08-03 Neal H Walfield + + * Makefile: Make no assumptions about the make that the user + will be using. + * xgethostname.c (xgethostname): Be explicitly sure that the + returned buffer is NULL terminated. + Always compile in the while (err = ENAMETOOLONG) loop; this + may help to catch a very exotic implementation and does not + hurt anyone. + +2001-08-02 Neal H Walfield + + * Release version 20010802. + +2001-08-01 Neal H Walfield + + * Makefile: New file. + * README: New file. + * xgethostname.c (xgethostname) [!_SC_HOST_NAME_MAX]: Should + not be subject to this condition. + (xgethostname): If the system defines a limit < 256 and > 0, + do not artificially inflate it, rather, respect it. + +2001-07-30 Neal H Walfield + + * REAMME: Move from here . . . + * xgethostname.2: to here. + Format it for man. + +2001-07-30 Neal H Walfield + + * README: Fix grammer error. + * xgethostname.c: Likewise. + * xgethostname.h: Likewise. + + * Makefile: New file. + +2001-07-29 Neal H Walfield + + * Release version 20010729. + + * AUTHOR: New file. + * ChangeLog: New file. + * COPYING: New file. + * README: New file. + * VERSION: New file. + * xgethostname.c: New file. + * xgethostname.h: New file. diff -puN lib/xgethostname.2~CITI_NFS4_ALL lib/xgethostname.2 --- util-linux-2.12/lib/xgethostname.2~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/xgethostname.2 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,37 @@ +.TH XGETHOSTNAME 2 "30 July 2001" "xgethostname" +.SH NAME +xgethostname \- get the host name. +.SH +SYNOPSIS +.BI "char *xgethostname (void);" +.SH DESCRIPTION +The xhostname function is intended to replace +.BR gethostname(2), +a function used to access the host name. The old interface is +inflexable given that it assumes the existance of the +.BR MAXHOSTNAMELEN +macro, which neither +.BR POSIX +nor the proposed +.BR "Single Unix Specification version 3" +guarantee to be defined. +.SH RETURN VALUE +On success, a malloced, null terminated (possibly truncated) +string containing the host name is returned. On failure, +.I NULL +is returned and errno is set. +.SH ERRORS +.TP +.BR ENOMEM +Failed to allocate memory. +.LP +As +.BR xgethostname +is really just a wrapper around your systems +.BR gethostname (2), +see that man page for additional details. +.SH "SEE ALSO" +.BR gethostname (2) +.SH AUTHOR +.BR xgethostname +was written by Neal H Walfield . diff -puN lib/xgethostname.c~CITI_NFS4_ALL lib/xgethostname.c --- util-linux-2.12/lib/xgethostname.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/xgethostname.c 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,126 @@ +/* Copyright (c) 2001 Neal H Walfield . + + This file is placed into the public domain. Its distribution + is unlimited. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* NAME + + xgethostname - get the host name. + + SYNOPSIS + + char *xgethostname (void); + + DESCRIPTION + + The xhostname function is intended to replace gethostname(2), a + function used to access the host name. The old interface is + inflexable given that it assumes the existance of the + MAXHOSTNAMELEN macro, which neither POSIX nor the proposed + Single Unix Specification version 3 guarantee to be defined. + + RETURN VALUE + + On success, a malloced, null terminated (possibly truncated) + string containing the host name is returned. On failure, + NULL is returned and errno is set. + */ + +#include /* For MAXHOSTNAMELEN */ +#include +#include +#include +#include "xgethostname.h" + +char * +xgethostname (void) +{ + int size = 0; + int addnull = 0; + char *buf; + int err; + +#ifdef MAXHOSTNAMELEN + size = MAXHOSTNAMELEN; + addnull = 1; +#else /* MAXHOSTNAMELEN */ +#ifdef _SC_HOST_NAME_MAX + size = sysconf (_SC_HOST_NAME_MAX); + addnull = 1; +#endif /* _SC_HOST_NAME_MAX */ + if (size <= 0) + size = 256; +#endif /* MAXHOSTNAMELEN */ + + buf = malloc (size + addnull); + if (! buf) + { + errno = ENOMEM; + return NULL; + } + + err = gethostname (buf, size); + while (err == -1 && errno == ENAMETOOLONG) + { + free (buf); + + size *= 2; + buf = malloc (size + addnull); + if (! buf) + { + errno = ENOMEM; + return NULL; + } + + err = gethostname (buf, size); + } + + if (err) + { + if (buf) + free (buf); + errno = err; + return NULL; + } + + if (addnull) + buf[size] = '\0'; + + return buf; +} + +#ifdef WANT_TO_TEST_XGETHOSTNAME +#include +#include + +int +main (int argc, char *argv[]) +{ + char *hostname; + + hostname = xgethostname (); + if (! hostname) + { + perror ("xgethostname"); + return 1; + } + + printf ("%s\n", hostname); + free (hostname); + + return 0; +} +#endif /* WANT_TO_TEST_XGETHOSTNAME */ diff -puN lib/xgethostname.h~CITI_NFS4_ALL lib/xgethostname.h --- util-linux-2.12/lib/xgethostname.h~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/lib/xgethostname.h 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,48 @@ +/* Copyright (c) 2001 Neal H Walfield . + + This file is placed into the public domain. Its distribution + is unlimited. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* NAME + + xgethostname - get the host name. + + SYNOPSIS + + char *xgethostname (void); + + DESCRIPTION + + The xhostname function is intended to replace gethostname(2), a + function used to access the host name. The old interface is + inflexable given that it assumes the existance of the + MAXHOSTNAMELEN macro, which neither POSIX nor the proposed + Single Unix Specification version 3 guarantee to be defined. + + RETURN VALUE + + On success, a malloced, null terminated (possibly truncated) + string containing the host name is returned. On failure, + NULL is returned and errno is set. + */ + +#ifndef XGETHOSTNAME +#define XGETHOSTNAME + +char * xgethostname (void); + +#endif /* XGETHOSTNAME */ + diff -puN login-utils/agetty.c~CITI_NFS4_ALL login-utils/agetty.c --- util-linux-2.12/login-utils/agetty.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/agetty.c 2004-12-13 17:42:08.000000000 -0500 @@ -17,8 +17,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -30,10 +29,14 @@ #include #include #include +#include +#include +#include +#include "xgethostname.h" #include "xstrncpy.h" #include "nls.h" -#ifdef __linux__ +#if defined(unix) #include "pathnames.h" #include #define USE_SYSLOG @@ -93,27 +96,6 @@ #define DEF_SWITCH 0 /* default switch char */ /* - * SunOS 4.1.1 termio is broken. We must use the termios stuff instead, - * because the termio -> termios translation does not clear the termios - * CIBAUD bits. Therefore, the tty driver would sometimes report that input - * baud rate != output baud rate. I did not notice that problem with SunOS - * 4.1. We will use termios where available, and termio otherwise. - */ - -/* linux 0.12 termio is broken too, if we use it c_cc[VERASE] isn't set - properly, but all is well if we use termios?! */ - -#ifdef TCGETS -#undef TCGETA -#undef TCSETA -#undef TCSETAW -#define termio termios -#define TCGETA TCGETS -#define TCSETA TCSETS -#define TCSETAW TCSETSW -#endif - - /* * This program tries to not use the standard-i/o library. This keeps the * executable small on systems that do not have shared libraries (System V * Release <3). @@ -221,13 +203,13 @@ int main P_((int argc, char **argv)); void parse_args P_((int argc, char **argv, struct options *op)); void parse_speeds P_((struct options *op, char *arg)); void update_utmp P_((char *line)); -void open_tty P_((char *tty, struct termio *tp, int local)); -void termio_init P_((struct termio *tp, int speed, struct options *op)); -void auto_baud P_((struct termio *tp)); -void do_prompt P_((struct options *op, struct termio *tp)); -void next_speed P_((struct termio *tp, struct options *op)); -char *get_logname P_((struct options *op, struct chardata *cp, struct termio *tp)); -void termio_final P_((struct options *op, struct termio *tp, struct chardata *cp)); +void open_tty P_((char *tty, struct termios *tp, int local)); +void termios_init P_((struct termios *tp, int speed, struct options *op)); +void auto_baud P_((struct termios *tp)); +void do_prompt P_((struct options *op, struct termios *tp)); +void next_speed P_((struct termios *tp, struct options *op)); +char *get_logname P_((struct options *op, struct chardata *cp, struct termios *tp)); +void termios_final P_((struct options *op, struct termios *tp, struct chardata *cp)); int caps_lock P_((char *s)); int bcode P_((char *s)); void usage P_((void)); @@ -256,7 +238,7 @@ main(argc, argv) { char *logname = NULL; /* login name, given to /bin/login */ struct chardata chardata; /* set by get_logname() */ - struct termio termio; /* terminal mode bits */ + struct termios termios; /* terminal mode bits */ static struct options options = { F_ISSUE, /* show /etc/issue (SYSV_STYLE) */ 0, /* no timeout */ @@ -299,7 +281,7 @@ main(argc, argv) parse_args(argc, argv, &options); -#ifdef __linux__ +#if defined(unix) setsid(); #endif @@ -311,19 +293,19 @@ main(argc, argv) debug(_("calling open_tty\n")); /* Open the tty as standard { input, output, error }. */ - open_tty(options.tty, &termio, options.flags & F_LOCAL); + open_tty(options.tty, &termios, options.flags & F_LOCAL); -#ifdef __linux__ +#if defined(unix) { int iv; iv = getpid(); - (void) ioctl(0, TIOCSPGRP, &iv); + (void) tcsetpgrp(0, iv); } #endif - /* Initialize the termio settings (raw mode, eight-bit, blocking i/o). */ - debug(_("calling termio_init\n")); - termio_init(&termio, options.speeds[FIRST_SPEED], &options); + /* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */ + debug(_("calling termios_init\n")); + termios_init(&termios, options.speeds[FIRST_SPEED], &options); /* write the modem init string and DON'T flush the buffers */ if (options.flags & F_INITSTRING) { @@ -339,7 +321,7 @@ main(argc, argv) /* Optionally detect the baud rate from the modem status message. */ debug(_("before autobaud\n")); if (options.flags & F_PARSE) - auto_baud(&termio); + auto_baud(&termios); /* Set the optional timer. */ if (options.timeout) @@ -363,8 +345,8 @@ main(argc, argv) if (!(options.flags & F_NOPROMPT)) { /* Read the login name. */ debug(_("reading login name\n")); - while ((logname = get_logname(&options, &chardata, &termio)) == 0) - next_speed(&termio, &options); + while ((logname = get_logname(&options, &chardata, &termios)) == 0) + next_speed(&termios, &options); } /* Disable timer. */ @@ -372,9 +354,9 @@ main(argc, argv) if (options.timeout) (void) alarm(0); - /* Finalize the termio settings. */ + /* Finalize the termios settings. */ - termio_final(&options, &termio, &chardata); + termios_final(&options, &termios, &chardata); /* Now the newline character should be properly written. */ @@ -629,7 +611,7 @@ update_utmp(line) void open_tty(tty, tp, local) char *tty; - struct termio *tp; + struct termios *tp; int local; { /* Get rid of the present standard { output, error} if any. */ @@ -652,6 +634,91 @@ open_tty(tty, tp, local) if ((st.st_mode & S_IFMT) != S_IFCHR) error(_("/dev/%s: not a character device"), tty); + /* + * Try to avoid opening a vt that is already open, as this will + * mean that the keyboard will be unusable. + * + * Unfortunately, all the kernel gives us to find out is an ioctl + * for the next available vt. As the kernel doesn't open the vt for + * you with the ioctl, there is still a chance of both processes + * opening the same vt, but this check is far better than nothing at + * all. + * + * The kernel API sucks, and is unusable for this situation. What + * we really need is an ioctl that says 'does anyone _ELSE_ have + * this tty open', and that doesn't exist. Or better yet, the + * kernel really shouldn't allow two processes to have read access + * on the same tty at the same time (other than with dup...) Opens + * of the same tty device shouldn't be able to steal reads from + * each other. + * + * Similar to the check added to gdm. + * + * For now, just turn off this check, restoring the bug that ?dm + * (and the system) occasionally get their keyboard locked out by + * getty showing up after they've taken a vt that inittab says + * goes to a getty. + * Bummer. + * + */ +#if 0 + if (strncmp(tty,"tty",3) == 0) + { + char *end; + int vtno; + + vtno = strtol(tty+3,&end,10); + if (end != tty+3 && *end == '\0' && vtno > 1) + { + int fd; + int newvtno; + int fds[MAX_NR_CONSOLES]; + int vt_cnt = 0; + int i; + + for ( i = 0 ; i < MAX_NR_CONSOLES ; i++ ) + fds[i] = -1; + + if ((fd = open("/dev/tty0", O_WRONLY, 0) ) < 0 + && errno != ENOENT) + error(_("/dev/tty0: cannot open: %m")); + + if (fd >= 0) do + { + if ((ioctl(fd, VT_OPENQRY, &newvtno ) < 0)) + error(_("failed to query next available vt")); + + if (newvtno == -1) + error(_("all vts are in use")); + + if (newvtno > vtno) + error(_("/dev/%s: already in use"), tty); + + if (newvtno < vtno) + { + char vtname[TTY_NAME_MAX+3]; + + sprintf( vtname, "tty%d", newvtno ); + + if ((fds[vt_cnt++] = + open(vtname, O_RDWR|O_NONBLOCK, 0)) < 0) + { + error(_("/dev/%s: cannot open: %m"), tty); + } + } + } while (newvtno != vtno); + + close(fd); + for ( i = 0 ; i < MAX_NR_CONSOLES ; i++ ) + { + if (fds[i] == -1) + break; + close(fds[i]); + } + } + } +#endif + /* Open the tty as standard input. */ (void) close(0); @@ -678,7 +745,7 @@ open_tty(tty, tp, local) error(_("%s: dup problem: %m"), tty); /* we have a problem */ /* - * The following ioctl will fail if stdin is not a tty, but also when + * The following function will fail if stdin is not a tty, but also when * there is noise on the modem control lines. In the latter case, the * common course of action is (1) fix your cables (2) give the modem more * time to properly reset after hanging up. SunOS users can achieve (2) @@ -686,8 +753,8 @@ open_tty(tty, tp, local) * 5 seconds seems to be a good value. */ - if (ioctl(0, TCGETA, tp) < 0) - error("%s: ioctl: %m", tty); + if (tcgetattr(0, tp) < 0) + error("%s: tcgetattr: %m", tty); /* * It seems to be a terminal. Set proper protections and ownership. Mode @@ -705,27 +772,27 @@ open_tty(tty, tp, local) errno = 0; /* ignore above errors */ } -/* termio_init - initialize termio settings */ +/* termios_init - initialize termios settings */ char gbuf[1024]; char area[1024]; void -termio_init(tp, speed, op) - struct termio *tp; +termios_init(tp, speed, op) + struct termios *tp; int speed; struct options *op; { /* - * Initial termio settings: 8-bit characters, raw-mode, blocking i/o. + * Initial termios settings: 8-bit characters, raw-mode, blocking i/o. * Special characters are set after we have read the login name; all * reads will be done in raw mode anyway. Errors will be dealt with * lateron. */ -#ifdef __linux__ +#if defined(unix) /* flush input and output queues, important for modems! */ - (void) ioctl(0, TCFLSH, TCIOFLUSH); + (void) tcflush(0, TCIOFLUSH); #endif tp->c_cflag = CS8 | HUPCL | CREAD | speed; @@ -733,7 +800,10 @@ termio_init(tp, speed, op) tp->c_cflag |= CLOCAL; } - tp->c_iflag = tp->c_lflag = tp->c_oflag = tp->c_line = 0; + tp->c_iflag = tp->c_lflag = tp->c_oflag = 0; +#if defined(__linux__) + tp->c_line = 0; +#endif tp->c_cc[VMIN] = 1; tp->c_cc[VTIME] = 0; @@ -744,7 +814,7 @@ termio_init(tp, speed, op) tp->c_cflag |= CRTSCTS; #endif - (void) ioctl(0, TCSETA, tp); + (void) tcsetattr(0, TCSANOW, tp); /* go to blocking input even in local mode */ fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~O_NONBLOCK); @@ -755,7 +825,7 @@ termio_init(tp, speed, op) /* auto_baud - extract baud rate from modem status message */ void auto_baud(tp) - struct termio *tp; + struct termios *tp; { int speed; int vmin; @@ -788,7 +858,7 @@ auto_baud(tp) tp->c_iflag |= ISTRIP; /* enable 8th-bit stripping */ vmin = tp->c_cc[VMIN]; tp->c_cc[VMIN] = 0; /* don't block if queue empty */ - (void) ioctl(0, TCSETA, tp); + (void) tcsetattr(0, TCSANOW, tp); /* * Wait for a while, then read everything the modem has said so far and @@ -801,8 +871,7 @@ auto_baud(tp) for (bp = buf; bp < buf + nread; bp++) { if (isascii(*bp) && isdigit(*bp)) { if ((speed = bcode(bp))) { - tp->c_cflag &= ~CBAUD; - tp->c_cflag |= speed; + (void) cfsetospeed(tp, speed); } break; } @@ -812,14 +881,14 @@ auto_baud(tp) tp->c_iflag = iflag; tp->c_cc[VMIN] = vmin; - (void) ioctl(0, TCSETA, tp); + (void) tcsetattr(0, TCSANOW, tp); } /* do_prompt - show login prompt, optionally preceded by /etc/issue contents */ void do_prompt(op, tp) struct options *op; - struct termio *tp; + struct termios *tp; { #ifdef ISSUE FILE *fd; @@ -835,7 +904,7 @@ do_prompt(op, tp) if ((op->flags & F_ISSUE) && (fd = fopen(op->issue, "r"))) { oflag = tp->c_oflag; /* save current setting */ tp->c_oflag |= (ONLCR | OPOST); /* map NL in output to CR-NL */ - (void) ioctl(0, TCSETAW, tp); + (void) tcsetattr(0, TCSADRAIN, tp); while ((c = getc(fd)) != EOF) @@ -915,7 +984,7 @@ do_prompt(op, tp) int i; for (i = 0; speedtab[i].speed; i++) { - if (speedtab[i].code == (tp->c_cflag & CBAUD)) { + if (speedtab[i].code == cfgetospeed(tp)) { printf("%ld", speedtab[i].speed); break; } @@ -947,16 +1016,18 @@ do_prompt(op, tp) fflush(stdout); tp->c_oflag = oflag; /* restore settings */ - (void) ioctl(0, TCSETAW, tp); /* wait till output is gone */ + (void) tcsetattr(0, TCSADRAIN, tp); /* wait till output is gone */ (void) fclose(fd); } #endif -#ifdef __linux__ +#ifdef unix { - char hn[MAXHOSTNAMELEN+1]; + char *hn; - (void) gethostname(hn, MAXHOSTNAMELEN); + if (!(hn = xgethostname())) + error(_("can't get hostname")); write(1, hn, strlen(hn)); + free(hn); } #endif (void) write(1, LOGIN, sizeof(LOGIN) - 1); /* always show login prompt */ @@ -965,15 +1036,14 @@ do_prompt(op, tp) /* next_speed - select next baud rate */ void next_speed(tp, op) - struct termio *tp; + struct termios *tp; struct options *op; { static int baud_index = FIRST_SPEED;/* current speed index */ baud_index = (baud_index + 1) % op->numspeed; - tp->c_cflag &= ~CBAUD; - tp->c_cflag |= op->speeds[baud_index]; - (void) ioctl(0, TCSETA, tp); + (void) cfsetospeed(0, op->speeds[baud_index]); + (void) tcsetattr(0, TCSANOW, tp); } /* get_logname - get user name, establish parity, speed, erase, kill, eol */ @@ -981,7 +1051,7 @@ next_speed(tp, op) char *get_logname(op, cp, tp) struct options *op; struct chardata *cp; - struct termio *tp; + struct termios *tp; { static char logname[BUFSIZ]; char *bp; @@ -1003,7 +1073,7 @@ char *get_logname(op, cp, tp) /* Flush pending input (esp. after parsing or switching the baud rate). */ (void) sleep(1); - (void) ioctl(0, TCFLSH, TCIFLUSH); + (void) tcflush(0, TCIFLUSH); /* Prompt for and read a login name. */ @@ -1087,11 +1157,11 @@ char *get_logname(op, cp, tp) return (logname); } -/* termio_final - set the final tty mode bits */ +/* termios_final - set the final tty mode bits */ void -termio_final(op, tp, cp) +termios_final(op, tp, cp) struct options *op; - struct termio *tp; + struct termios *tp; struct chardata *cp; { /* General terminal-independent stuff. */ @@ -1107,7 +1177,7 @@ termio_final(op, tp, cp) tp->c_cc[VEOL] = DEF_EOL; #ifdef __linux__ tp->c_cc[VSWTC] = DEF_SWITCH; /* default switch character */ -#else +#elif defined(VSWTCH) tp->c_cc[VSWTCH] = DEF_SWITCH; /* default switch character */ #endif @@ -1139,11 +1209,13 @@ termio_final(op, tp, cp) } /* Account for upper case without lower case. */ +#if defined(IUCLC) && defined(XCASE) && defined(OLCUC) if (cp->capslock) { tp->c_iflag |= IUCLC; tp->c_lflag |= XCASE; tp->c_oflag |= OLCUC; } +#endif /* Optionally enable hardware flow control */ #ifdef CRTSCTS @@ -1153,8 +1225,8 @@ termio_final(op, tp, cp) /* Finally, make the new settings effective */ - if (ioctl(0, TCSETA, tp) < 0) - error("%s: ioctl: TCSETA: %m", op->tty); + if (tcsetattr(0, TCSADRAIN, tp) < 0) + error("%s: tcsetattr: %m", op->tty); } /* caps_lock - string contains upper case without lower case */ diff -puN login-utils/checktty.c~CITI_NFS4_ALL login-utils/checktty.c --- util-linux-2.12/login-utils/checktty.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/checktty.c 2004-12-13 17:42:08.000000000 -0500 @@ -138,7 +138,9 @@ static int isapty(const char *tty) { char devname[100]; +#if defined(__linux__) struct stat stb; +#endif /* avoid snprintf - old systems do not have it */ if (strlen(tty) + 6 > sizeof(devname)) diff -puN login-utils/last.c~CITI_NFS4_ALL login-utils/last.c --- util-linux-2.12/login-utils/last.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/last.c 2004-12-13 17:42:08.000000000 -0500 @@ -49,6 +49,7 @@ #include "pathnames.h" #include "nls.h" +#include "xgethostname.h" #define SECDAY (24*60*60) /* seconds in a day */ #define NO 0 /* false/no */ @@ -430,15 +431,15 @@ static void hostconv(char *arg) { static int first = 1; static char *hostdot, - name[MAXHOSTNAMELEN]; + *name; char *argdot; if (!(argdot = strchr(arg, '.'))) return; if (first) { first = 0; - if (gethostname(name, sizeof(name))) { - perror(_("last: gethostname")); + if (!(name = xgethostname())) { + perror(_("last: can't get hostname")); exit(1); } hostdot = strchr(name, '.'); diff -puN login-utils/login.c~CITI_NFS4_ALL login-utils/login.c --- util-linux-2.12/login-utils/login.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/login.c 2004-12-13 17:42:08.000000000 -0500 @@ -116,6 +116,7 @@ #include "my_crypt.h" #include "login.h" #include "xstrncpy.h" +#include "xgethostname.h" #include "nls.h" #ifdef __linux__ @@ -149,7 +150,7 @@ } #endif -#ifndef __linux__ +#if !defined(__linux__) && !defined(__GNU__) # include #endif #include @@ -202,18 +203,14 @@ int kerror = KSUCCESS, notickets = 1; #define TTYGRPNAME "tty" /* name of group to own ttys */ -#ifndef MAXPATHLEN -# define MAXPATHLEN 1024 -#endif - /* * This bounds the time given to login. Not a define so it can * be patched on machines where it's too small. */ -#ifndef __linux__ -int timeout = 300; +#if defined(__linux__) || defined(__GNU__) +int timeout = 60; /* used in cryptocard.c */ #else -int timeout = 60; /* used in cryptocard.c */ +int timeout = 300; #endif struct passwd *pwd; /* used in cryptocard.c */ @@ -223,7 +220,7 @@ static struct passwd pwdcopy; char hostaddress[4]; /* used in checktty.c */ char *hostname; /* idem */ static char *username, *tty_name, *tty_number; -static char thishost[100]; +static char *thishost; static int failures = 1; static pid_t pid; @@ -288,6 +285,7 @@ check_ttyname(char *ttyn) { } } +#ifdef CHOWNVCS /* true if the filedescriptor fd is a console tty, very Linux specific */ static int consoletty(int fd) { @@ -302,6 +300,7 @@ consoletty(int fd) { #endif return 0; } +#endif #if USE_PAM /* @@ -356,7 +355,7 @@ main(int argc, char **argv) int ask, fflag, hflag, pflag, cnt, errsv; int quietlog, passwd_req; char *domain, *ttyn; - char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10]; + char tname[sizeof(_PATH_TTY) + 10]; char *termenv; char *childArgv[10]; char *buff; @@ -398,9 +397,11 @@ main(int argc, char **argv) * -h is used by other servers to pass the name of the remote * host to login so that it may be placed in utmp and wtmp */ - gethostname(tbuf, sizeof(tbuf)); - xstrncpy(thishost, tbuf, sizeof(thishost)); - domain = index(tbuf, '.'); + if (!(thishost = xgethostname())) { + fprintf(stderr, _("login: can't get hostname\n")); + exit(1); + } + domain = index(thishost, '.'); username = tty_name = hostname = NULL; fflag = hflag = pflag = 0; @@ -861,23 +862,21 @@ main(int argc, char **argv) having the BSD setreuid() */ { - char tmpstr[MAXPATHLEN]; + char *tmpstr; uid_t ruid = getuid(); gid_t egid = getegid(); /* avoid snprintf - old systems do not have it, or worse, have a libc in which snprintf is the same as sprintf */ - if (strlen(pwd->pw_dir) + sizeof(_PATH_HUSHLOGIN) + 2 > MAXPATHLEN) - quietlog = 0; - else { - sprintf(tmpstr, "%s/%s", pwd->pw_dir, _PATH_HUSHLOGIN); - setregid(-1, pwd->pw_gid); - setreuid(0, pwd->pw_uid); - quietlog = (access(tmpstr, R_OK) == 0); - setuid(0); /* setreuid doesn't do it alone! */ - setreuid(ruid, 0); - setregid(-1, egid); - } + tmpstr = malloc(strlen(pwd->pw_dir) + sizeof(_PATH_HUSHLOGIN) + 2); + sprintf(tmpstr, "%s/%s", pwd->pw_dir, _PATH_HUSHLOGIN); + setregid(-1, pwd->pw_gid); + setreuid(0, pwd->pw_uid); + quietlog = (access(tmpstr, R_OK) == 0); + setuid(0); /* setreuid doesn't do it alone! */ + setreuid(ruid, 0); + setregid(-1, egid); + free(tmpstr); } /* for linux, write entries in utmp and wtmp */ @@ -1029,12 +1028,13 @@ Michael Riepe pw_name) + 1 < MAXPATHLEN) { - sprintf(tmp, "%s/%s", _PATH_MAILDIR, pwd->pw_name); - setenv("MAIL",tmp,0); - } + tmp = malloc(sizeof(_PATH_MAILDIR) + strlen(pwd->pw_name) + 2); + sprintf(tmp, "%s/%s", _PATH_MAILDIR, pwd->pw_name); + setenv("MAIL", tmp, 0); + free(tmp); } /* LOGNAME is not documented in login(1) but @@ -1181,13 +1181,15 @@ Michael Riepe pw_shell, '/')) ? - p + 1 : pwd->pw_shell), - sizeof(tbuf)-1); + char *tbuf, *shell_cmd; + + tbuf = ((p = rindex(pwd->pw_shell, '/')) ? p + 1 : pwd->pw_shell); + shell_cmd = malloc(strlen(tbuf)); + shell_cmd[0] = '-'; + xstrncpy(shell_cmd + 1, tbuf, strlen(tbuf)-1); childArgv[childArgc++] = pwd->pw_shell; - childArgv[childArgc++] = tbuf; + childArgv[childArgc++] = shell_cmd; } childArgv[childArgc++] = NULL; diff -puN login-utils/Makefile~CITI_NFS4_ALL login-utils/Makefile --- util-linux-2.12/login-utils/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -18,8 +18,10 @@ MAN1.PASSWD= passwd.1 MAN8.GETTY= agetty.8 -MAN8.INIT= fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \ - initctl.8 +MAN8.INIT= simpleinit.8 initctl.8 +ifeq "$(OS)" "linux" +MAN8.INIT:= $(MAN8.INIT) fastboot.8 fasthalt.8 halt.8 reboot.8 shutdown.8 +endif MAN8.PUTILS= vipw.8 vigr.8 @@ -28,7 +30,10 @@ MAN8.PUTILS= vipw.8 vigr.8 SBIN.GETTY= agetty -SBIN.INIT= simpleinit shutdown initctl +SBIN.INIT= simpleinit initctl +ifeq "$(OS)" "linux" +SBIN.INIT:= $(SBIN.INIT) shutdown +endif BIN.PUTILS= login @@ -95,18 +100,19 @@ agetty.o islocal.o last.o setpwnam.o shu shutdown.o simpleinit.o: $(LIB)/linux_reboot.h wall.o: ttymsg.h $(LIB)/carefulputc.h -agetty: agetty.o $(LIB)/xstrncpy.o +agetty: agetty.o $(LIB)/xstrncpy.o $(LIB)/xgethostname.o chfn: chfn.o islocal.o setpwnam.o $(LIB)/env.o $(LIB)/xstrncpy.o $(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) chsh: chsh.o islocal.o setpwnam.o $(LIB)/env.o $(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) -last: last.o +last: last.o $(LIB)/xgethostname.o ifeq "$(HAVE_PAM)" "yes" -login: login.o $(LIB)/setproctitle.o $(LIB)/xstrncpy.o +login: login.o $(LIB)/setproctitle.o $(LIB)/xstrncpy.o $(LIB)/xgethostname.o $(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM) else -login: login.o $(LIB)/xstrncpy.o $(LIB)/setproctitle.o checktty.o +login: login.o $(LIB)/xstrncpy.o $(LIB)/xgethostname.o \ + $(LIB)/setproctitle.o checktty.o $(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) endif @@ -128,17 +134,21 @@ vipw: vipw.o $(LIB)/xstrncpy.o newgrp.o: $(LIB)/pathnames.h $(CC) -c $(CFLAGS) $(PAMFL) newgrp.c -wall: wall.o ttymsg.o $(LIB)/carefulputc.o $(LIB)/xstrncpy.o +wall: wall.o ttymsg.o $(LIB)/carefulputc.o $(LIB)/xstrncpy.o \ + $(LIB)/xgethostname.o LOGINFLAGS= ifeq "$(USE_TTY_GROUP)" "yes" LOGINFLAGS += -DUSE_TTY_GROUP endif +ifeq "$(OS)" "linux" ifeq "$(ALLOW_VCS_USE)" "yes" LOGINFLAGS += -DCHOWNVCS endif +endif -login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h +login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h \ + $(LIB)/xgethostname.h $(CC) -c $(CFLAGS) $(PAMFL) $(LOGINFLAGS) login.c # LOGINFLAGS here only for -DUSE_TTY_GROUP @@ -186,10 +196,12 @@ install-init: $(SBIN.INIT) $(INSTALLDIR) $(MAN8DIR) $(INSTALLMAN) $(MAN8.INIT) $(MAN8DIR) # Make *relative* links for these +ifeq "$(OS)" "linux" (cd $(SHUTDOWNDIR); ln -sf shutdown reboot) (cd $(SHUTDOWNDIR); ln -sf shutdown fastboot) (cd $(SHUTDOWNDIR); ln -sf shutdown halt) (cd $(SHUTDOWNDIR); ln -sf shutdown fasthalt) +endif (cd $(SHUTDOWNDIR); ln -sf initctl need) (cd $(SHUTDOWNDIR); ln -sf initctl display-services) (cd $(SHUTDOWNDIR); ln -sf initctl provide) diff -puN login-utils/simpleinit.c~CITI_NFS4_ALL login-utils/simpleinit.c --- util-linux-2.12/login-utils/simpleinit.c~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/simpleinit.c 2004-12-13 17:42:08.000000000 -0500 @@ -22,7 +22,9 @@ #include #include #include +#include #include +#include #include #include #include diff -puN login-utils/simpleinit.h~CITI_NFS4_ALL login-utils/simpleinit.h --- util-linux-2.12/login-utils/simpleinit.h~CITI_NFS4_ALL 2004-12-13 17:42:06.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/simpleinit.h 2004-12-13 17:42:08.000000000 -0500 @@ -3,7 +3,7 @@ #define ERRSTRING strerror (errno) -#define COMMAND_SIZE (PIPE_BUF - 4) +#define COMMAND_SIZE (_POSIX_PIPE_BUF - 4) #define COMMAND_TEST 0 /* No wait, signal */ diff -puN login-utils/wall.1~CITI_NFS4_ALL login-utils/wall.1 --- util-linux-2.12/login-utils/wall.1~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/wall.1 2004-12-13 17:42:08.000000000 -0500 @@ -9,11 +9,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff -puN login-utils/wall.c~CITI_NFS4_ALL login-utils/wall.c --- util-linux-2.12/login-utils/wall.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/login-utils/wall.c 2004-12-13 17:42:08.000000000 -0500 @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -58,6 +54,7 @@ #include #include "nls.h" +#include "xgethostname.h" #include "xstrncpy.h" #include "ttymsg.h" #include "pathnames.h" @@ -150,8 +147,7 @@ makemsg(fname) time_t now; FILE *fp; int fd; - char *p, *whom, *where, hostname[MAXHOSTNAMELEN], - lbuf[MAXHOSTNAMELEN + 320], + char *p, *whom, *where, *hostname, lbuf[1024], tmpname[sizeof(_PATH_TMP) + 20]; (void)sprintf(tmpname, "%s/wall.XXXXXX", _PATH_TMP); @@ -162,6 +158,9 @@ makemsg(fname) (void)unlink(tmpname); if (!nobanner) { + char *mesg, *mesg_notice; + int mesg_size, size; + if (!(whom = getlogin()) || !*whom) whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???"; if (!whom || strlen(whom) > 100) @@ -169,7 +168,11 @@ makemsg(fname) where = ttyname(2); if (!where || strlen(where) > 100) where = "somewhere"; - (void)gethostname(hostname, sizeof(hostname)); + if (!(hostname = xgethostname())) { + (void)fprintf(stderr, _("%s: can't get hostname.\n"), + progname); + exit(1); + } (void)time(&now); lt = localtime(&now); @@ -182,13 +185,35 @@ makemsg(fname) */ /* snprintf is not always available, but the sprintf's here will not overflow as long as %d takes at most 100 chars */ + + mesg_notice = _("Broadcast Message from %s@%s"); + mesg_size = strlen(whom) + strlen(hostname) + + strlen(mesg_notice); + if (!(mesg = malloc(mesg_size))) { + (void)fprintf(stderr, _("%s: Out of memory!\n"), + progname); + exit(1); + } + (void)fprintf(fp, "\r%79s\r\n", " "); - (void)sprintf(lbuf, _("Broadcast Message from %s@%s"), - whom, hostname); - (void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf); - (void)sprintf(lbuf, " (%s) at %d:%02d ...", - where, lt->tm_hour, lt->tm_min); - (void)fprintf(fp, "%-79.79s\r\n", lbuf); + (void)sprintf(mesg, mesg_notice, whom, hostname); + (void)fprintf(fp, "%-79.79s\007\007\r\n", mesg); + + mesg_notice = " (%s) at %d:%02d ..."; + size = strlen(mesg_notice) + strlen(where); + if (mesg_size < size) { + if (!realloc(mesg, size)) { + (void)fprintf(stderr, _("%s: Out of memory!\n"), + progname); + exit(1); + } + } + + (void)sprintf(mesg, mesg_notice, where, + lt->tm_hour, lt->tm_min); + (void)fprintf(fp, "%-79.79s\r\n", mesg); + + free(mesg); } (void)fprintf(fp, "%79s\r\n", " "); diff -puN MCONFIG~CITI_NFS4_ALL MCONFIG --- util-linux-2.12/MCONFIG~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/MCONFIG 2004-12-13 17:42:08.000000000 -0500 @@ -11,12 +11,13 @@ # Select for CPU i386 if the binaries must be able to run on an intel 386 # (by default i486 code is generated, see below) CPU=$(shell uname -m) -ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/') +ARCH=$(shell echo $(CPU) | sed 's/i.86.*/intel/;s/arm.*/arm/') +OS=$(shell uname -s | tr '[:upper:]' '[:lower:]') # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp # will use PAM for authentication. Additionally, passwd will not be # installed as it is not PAM aware. -HAVE_PAM=no +HAVE_PAM=yes # If HAVE_SHADOW is set to "yes", then login, chfn, chsh, newgrp, passwd, # and vipw will not be built or installed from the login-utils @@ -50,7 +51,7 @@ HAVE_SYSVINIT=yes # not be built or installed from the login-utils subdirectory. (The # shutdown and init from the SysVinit package do not depend on the last, # mesg, and wall from that package.) -HAVE_SYSVINIT_UTILS=yes +HAVE_SYSVINIT_UTILS=no # If HAVE_WRITE is set to "yes", then write will not be built or # installed from the misc-utils subdirectory. @@ -133,7 +134,7 @@ ERR_O=$(LIB)/err.o # Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk) # (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.) -# HAVE_SLANG=yes +HAVE_SLANG=yes # There is a subdirectory /usr/include/slang containing slcurses.h # SLANGFLAGS=-I/usr/include/slang # No such subdirectory - slcurses.h lives in /usr/include @@ -150,7 +151,7 @@ USRSBIN_DIR= /usr/sbin USRLIB_DIR= /usr/lib USRBIN_DIR= /usr/bin USRGAMES_DIR= /usr/games -USRSHAREMISC_DIR=/usr/share/misc +USRSHAREMISC_DIR=/usr/share/util-linux LOCALE_DIR= /usr/share/locale BIN_DIR= /bin VAR_PATH= /var diff -puN misc-utils/cal.c~CITI_NFS4_ALL misc-utils/cal.c --- util-linux-2.12/misc-utils/cal.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/cal.c 2004-12-13 17:42:08.000000000 -0500 @@ -300,8 +300,9 @@ void headers_init(void) { int i, wd; #ifdef ENABLE_WIDECHAR + int j; wchar_t day_headings_wc[22],j_day_headings_wc[29]; - wchar_t wd_wc[10]; + wchar_t wd_wc[10], tmp_wd_wc[10]; #endif strcpy(day_headings,""); @@ -320,15 +321,32 @@ void headers_init(void) for(i = 0 ; i < 7 ; i++ ) { wd = (i + week1stday) % 7; #ifdef ENABLE_WIDECHAR - mbstowcs(wd_wc,weekday(wd),10); - if (wcswidth(wd_wc,10) < 3) - wcscat(j_day_headings_wc,L" "); - if (wcswidth(wd_wc,10) < 2) { - wcscat(day_headings_wc, L" "); - wcscat(j_day_headings_wc, L" "); + mbstowcs(tmp_wd_wc,weekday(wd),10); + + wmemset(wd_wc, L'\0', 10); + for (j = 0; j < wcslen(tmp_wd_wc); j++) { + wd_wc[j] = tmp_wd_wc[j]; + if (wcswidth(wd_wc,10) > 2) { + wd_wc[j] = L'\0'; + break; + } + } + for (j = wcswidth(wd_wc,10); j < 2; j++) + wcscat(day_headings_wc,L" "); + wcscat(day_headings_wc,wd_wc); + + wmemset(wd_wc, L'\0', 10); + for (j = 0; j < wcslen(tmp_wd_wc); j++) { + wd_wc[j] = tmp_wd_wc[j]; + if (wcswidth(wd_wc,10) > 3) { + wd_wc[j] = L'\0'; + break; + } } - wcsncat(day_headings_wc,wd_wc,2); - wcsncat(j_day_headings_wc,wd_wc,3); + for (j = wcswidth(wd_wc,10); j < 3; j++) + wcscat(j_day_headings_wc,L" "); + wcscat(j_day_headings_wc,wd_wc); + wcscat(day_headings_wc, L" "); wcscat(j_day_headings_wc, L" "); #else @@ -362,6 +380,7 @@ do_monthly(month, year, out) char *p, lineout[300]; #ifdef ENABLE_WIDECHAR wchar_t lineout_wc[300]; + size_t wcs_len; #endif day_array(month, year, days); @@ -372,8 +391,9 @@ do_monthly(month, year, out) */ len = sprintf(lineout, _("%s %d"), full_month[month - 1], year); #ifdef ENABLE_WIDECHAR - if (mbstowcs(lineout_wc,lineout,len) > 0) { - len = wcswidth(lineout_wc,len); + wcs_len = mbstowcs(lineout_wc,lineout,len); + if (wcs_len != (size_t)-1 && wcs_len != 0) { + len = wcswidth(lineout_wc,wcs_len); } else { len = strlen(lineout); } @@ -653,10 +673,11 @@ center(str, len, separate) { #ifdef ENABLE_WIDECHAR wchar_t str_wc[300]; - int str_len; + size_t str_len, wcs_len; - if (mbstowcs(str_wc,str,300) > 0) { - str_len = wcswidth(str_wc,300); + wcs_len = mbstowcs (str_wc,str,300); + if (wcs_len != (size_t)-1 && wcs_len != 0) { + str_len = wcswidth(str_wc,wcs_len); } else { str_len = strlen(str); } diff -puN misc-utils/ddate.1~CITI_NFS4_ALL misc-utils/ddate.1 --- util-linux-2.12/misc-utils/ddate.1~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/ddate.1 2004-12-13 17:42:08.000000000 -0500 @@ -68,7 +68,7 @@ It's Prickle-Prickle, the 50th of Bureau .br Celebrate Bureflux .PP -% ddate +'Today's %{%A, the %e of %B%}, %Y. %N%nCelebrate %H' 29 2 1996 +% ddate +"Today's %{%A, the %e of %B%}, %Y. %N%nCelebrate %H" 29 2 1996 .br Today's St. Tib's Day, 3162. .br diff -puN misc-utils/Makefile~CITI_NFS4_ALL misc-utils/Makefile --- util-linux-2.12/misc-utils/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -87,8 +87,8 @@ mcookie: mcookie.o $(LIB)/md5.o mcookie.o: mcookie.c $(LIB)/md5.h reset: reset.sh script: script.o -write.o: $(LIB)/carefulputc.h -write: write.o $(LIB)/carefulputc.o +write.o: $(LIB)/carefulputc.h $(LIB)/xgethostname.h +write: write.o $(LIB)/carefulputc.o $(LIB)/xgethostname.o ifeq "$(HAVE_NCURSES)" "yes" setterm: setterm.o diff -puN misc-utils/mcookie.c~CITI_NFS4_ALL misc-utils/mcookie.c --- util-linux-2.12/misc-utils/mcookie.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/mcookie.c 2004-12-13 17:42:08.000000000 -0500 @@ -20,18 +20,16 @@ * */ -#ifdef __linux__ -#define HAVE_GETTIMEOFDAY 1 -#endif - #include #include #include #include "md5.h" -#if HAVE_GETTIMEOFDAY +#include "../defines.h" +#ifdef HAVE_gettimeofday #include -#include #endif +#include +#include #include "nls.h" #define BUFFERSIZE 4096 @@ -79,7 +77,7 @@ int main( int argc, char **argv ) pid_t pid; char *file = NULL; int r; -#if HAVE_GETTIMEOFDAY +#ifdef HAVE_gettimeofday struct timeval tv; struct timezone tz; #else @@ -98,7 +96,7 @@ int main( int argc, char **argv ) MD5Init( &ctx ); -#if HAVE_GETTIMEOFDAY +#ifdef HAVE_gettimeofday gettimeofday( &tv, &tz ); MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) ); #else diff -puN misc-utils/namei.c~CITI_NFS4_ALL misc-utils/namei.c --- util-linux-2.12/misc-utils/namei.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/namei.c 2004-12-13 17:42:08.000000000 -0500 @@ -72,7 +72,8 @@ int main(int argc, char **argv) { extern int optind; int c; - char curdir[MAXPATHLEN]; + int curdir_size; + char *curdir; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -97,13 +98,28 @@ main(int argc, char **argv) { } } - if(getcwd(curdir, sizeof(curdir)) == NULL){ - (void)fprintf(stderr, - _("namei: unable to get current directory - %s\n"), - curdir); + curdir_size = 1024; + curdir = malloc(curdir_size); + if (curdir==NULL){ + (void)fprintf(stderr, _("namei: out of memory\n")); exit(1); } + while (getcwd(curdir, curdir_size) == NULL){ + if (errno!=ERANGE){ + (void)fprintf(stderr, + _("namei: unable to get current directory - %s\n"), + curdir); + exit(1); + } + curdir_size *= 2; + realloc(curdir, curdir_size); + if (curdir==NULL){ + (void)fprintf(stderr, _("namei: out of memory\n")); + exit(1); + } + } + for(; optind < argc; optind++){ (void)printf("f: %s\n", argv[optind]); diff -puN misc-utils/script.c~CITI_NFS4_ALL misc-utils/script.c --- util-linux-2.12/misc-utils/script.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/script.c 2004-12-13 17:42:08.000000000 -0500 @@ -54,10 +54,8 @@ #include #include "nls.h" -#ifdef __linux__ #include #include -#endif #include "../defines.h" #ifdef HAVE_openpty diff -puN misc-utils/setterm.c~CITI_NFS4_ALL misc-utils/setterm.c --- util-linux-2.12/misc-utils/setterm.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/setterm.c 2004-12-13 17:42:08.000000000 -0500 @@ -107,16 +107,14 @@ #else #include #endif +#ifdef __linux__ #include /* for MAXPATHLEN */ +#endif #include #include #include "nls.h" -#ifndef TCGETS -/* TCGETS is either defined in termios.h, or here: */ -#include -#endif - +#ifdef __linux__ #if __GNU_LIBRARY__ < 5 #ifndef __alpha__ # include @@ -127,6 +125,7 @@ _syscall3(int, klogctl, int, type, char* #endif #endif extern int klogctl(int type, char *buf, int len); +#endif /* __linux__ */ /* Constants. */ @@ -165,19 +164,24 @@ extern int klogctl(int type, char *buf, int opt_term, opt_reset, opt_initialize, opt_cursor; int opt_linewrap, opt_snow, opt_softscroll, opt_default, opt_foreground; int opt_background, opt_bold, opt_blink, opt_reverse, opt_underline; -int opt_store, opt_clear, opt_blank, opt_snap, opt_snapfile, opt_standout; -int opt_append, opt_ulcolor, opt_hbcolor, opt_halfbright, opt_repeat; +int opt_store, opt_clear, opt_blank, opt_standout; +int opt_ulcolor, opt_hbcolor, opt_halfbright, opt_repeat; int opt_tabs, opt_clrtabs, opt_regtabs, opt_appcursorkeys, opt_inversescreen; -int opt_msg, opt_msglevel, opt_powersave, opt_powerdown; +int opt_powerdown; int opt_blength, opt_bfreq; +#ifdef __linux__ +int opt_append, opt_snap, opt_snapfile; +int opt_powersave; +int opt_msg, opt_msglevel; +#endif /* __linux__ */ /* Option controls. The variable names have been contracted to ensure * uniqueness. */ char *opt_te_terminal_name; /* Terminal name. */ -int opt_cu_on, opt_li_on, opt_sn_on, opt_so_on, opt_bo_on, opt_hb_on, opt_bl_on; -int opt_re_on, opt_un_on, opt_rep_on, opt_appck_on, opt_invsc_on; -int opt_msg_on; /* Boolean switches. */ +int opt_cu_on, opt_li_on, opt_sn_on, opt_so_on, opt_bo_on, opt_hb_on; +int opt_bl_on, opt_re_on, opt_un_on, opt_rep_on, opt_appck_on; +int opt_invsc_on; /* Boolean switches. */ int opt_ke_type; /* Keyboard type. */ int opt_fo_color, opt_ba_color; /* Colors. */ int opt_ul_color, opt_hb_color; @@ -185,16 +189,20 @@ int opt_cl_all; /* Clear all or rest. int opt_bl_min; /* Blank screen. */ int opt_blength_l; int opt_bfreq_f; -int opt_sn_num; /* Snap screen. */ int opt_st_attr; int opt_rt_len; /* regular tab length */ int opt_tb_array[161]; /* Array for tab list */ -int opt_msglevel_num; int opt_ps_mode, opt_pd_min; /* powersave mode/powerdown time */ +#ifdef __linux__ +int opt_msg_on; +int opt_msglevel_num; + +int opt_sn_num; /* Snap screen. */ char opt_sn_name[200] = "screen.dump"; static void screendump(int vcnum, FILE *F); +#endif /* __linux__ */ /* Command line parsing routines. * @@ -402,6 +410,7 @@ parse_blank(int argc, char **argv, int * } } +#ifdef __linux__ static void parse_powersave(int argc, char **argv, int *option, int *opt_mode, int *bad_arg) { /* argc: Number of arguments for this option. */ @@ -432,6 +441,7 @@ parse_powersave(int argc, char **argv, i *opt_mode = 0; } } +#endif /* __linux__ */ #if 0 static void @@ -454,6 +464,7 @@ parse_standout(int argc, char *argv, int } #endif +#ifdef __linux__ static void parse_msglevel(int argc, char **argv, int *option, int *opt_all, int *bad_arg) { /* argc: Number of arguments for this option. */ @@ -512,6 +523,7 @@ parse_snapfile(int argc, char **argv, in if (argc == 1) strcpy((char *)opt_all, argv[0]); } +#endif /* __linux__ */ static void parse_tabs(int argc, char **argv, int *option, int *tab_array, int *bad_arg) { @@ -709,6 +721,7 @@ parse_option(char *option, int argc, cha parse_regtabs(argc, argv, &opt_regtabs, &opt_rt_len, bad_arg); else if (STRCMP(option, "blank") == 0) parse_blank(argc, argv, &opt_blank, &opt_bl_min, bad_arg); +#ifdef __linux__ else if (STRCMP(option, "dump") == 0) parse_snap(argc, argv, &opt_snap, &opt_sn_num, bad_arg); else if (STRCMP(option, "append") == 0) @@ -721,6 +734,7 @@ parse_option(char *option, int argc, cha parse_msglevel(argc, argv, &opt_msglevel, &opt_msglevel_num, bad_arg); else if (STRCMP(option, "powersave") == 0) parse_powersave(argc, argv, &opt_powersave, &opt_ps_mode, bad_arg); +#endif /* __linux__ */ else if (STRCMP(option, "powerdown") == 0) parse_blank(argc, argv, &opt_powerdown, &opt_pd_min, bad_arg); else if (STRCMP(option, "blength") == 0) @@ -783,12 +797,14 @@ usage(char *prog_name) { fprintf(stderr, _(" [ -clrtabs [ tab1 tab2 tab3 ... ] ] (tabn = 1-160)\n")); fprintf(stderr, _(" [ -regtabs [1-160] ]\n")); fprintf(stderr, _(" [ -blank [0-60] ]\n")); +#ifdef __linux__ fprintf(stderr, _(" [ -dump [1-NR_CONSOLES] ]\n")); fprintf(stderr, _(" [ -append [1-NR_CONSOLES] ]\n")); fprintf(stderr, _(" [ -file dumpfilename ]\n")); fprintf(stderr, _(" [ -msg [on|off] ]\n")); fprintf(stderr, _(" [ -msglevel [0-8] ]\n")); fprintf(stderr, _(" [ -powersave [on|vsync|hsync|powerdown|off] ]\n")); +#endif /* __linux__ */ fprintf(stderr, _(" [ -powerdown [0-60] ]\n")); fprintf(stderr, _(" [ -blength [0-2000] ]\n")); fprintf(stderr, _(" [ -bfreq freqnumber ]\n")); @@ -811,8 +827,9 @@ static char *ti_entry(const char *name) static void perform_sequence(int vcterm) { /* vcterm: Set if terminal is a virtual console. */ - +#ifdef __linux__ int result; +#endif /* Perform the selected options. */ /* -reset. */ @@ -1039,7 +1056,8 @@ perform_sequence(int vcterm) { /* -blank [0-60]. */ if (opt_blank && vcterm) printf("\033[9;%d]", opt_bl_min); - + +#ifdef __linux__ /* -powersave [on|vsync|hsync|powerdown|off] (console) */ if (opt_powersave) { char ioctlarg[2]; @@ -1048,6 +1066,7 @@ perform_sequence(int vcterm) { if (ioctl(0,TIOCLINUX,ioctlarg)) fprintf(stderr,_("cannot (un)set powersave mode\n")); } +#endif /* __linux__ */ /* -powerdown [0-60]. */ if (opt_powerdown) { @@ -1060,6 +1079,7 @@ perform_sequence(int vcterm) { /* nothing */; #endif +#ifdef __linux__ /* -snap [1-NR_CONS]. */ if (opt_snap || opt_append) { FILE *F; @@ -1095,6 +1115,7 @@ perform_sequence(int vcterm) { if (result != 0) printf(_("klogctl error: %s\n"), strerror(result)); } +#endif /* __linux__ */ /* -blength [0-2000] */ if (opt_blength && vcterm) { @@ -1108,6 +1129,7 @@ perform_sequence(int vcterm) { } +#ifdef __linux__ static void screendump(int vcnum, FILE *F) { char infile[MAXPATHLEN]; @@ -1193,6 +1215,7 @@ try_ioctl: } } } +#endif /* __linux__ */ int main(int argc, char **argv) { diff -puN misc-utils/write.c~CITI_NFS4_ALL misc-utils/write.c --- util-linux-2.12/misc-utils/write.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/misc-utils/write.c 2004-12-13 17:42:08.000000000 -0500 @@ -64,9 +64,10 @@ #include #include "pathnames.h" #include "carefulputc.h" +#include "xgethostname.h" #include "nls.h" -void search_utmp(char *, char *, char *, uid_t); +void search_utmp(char *, char **, char *, uid_t); void do_write(char *, char *, uid_t); void wr_fputs(char *); static void done(int); @@ -78,7 +79,7 @@ main(int argc, char **argv) { time_t atime; uid_t myuid; int msgsok, myttyfd; - char tty[MAXPATHLEN], *mytty; + char *tty, *mytty; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -120,7 +121,7 @@ main(int argc, char **argv) { /* check args */ switch (argc) { case 2: - search_utmp(argv[1], tty, mytty, myuid); + search_utmp(argv[1], &tty, mytty, myuid); do_write(tty, mytty, myuid); break; case 3: @@ -189,8 +190,10 @@ int utmp_chk(char *user, char *tty) * * Special case for writing to yourself - ignore the terminal you're * writing from, unless that's the only terminal with messages enabled. + * + * Returns tty as an allocated string. */ -void search_utmp(char *user, char *tty, char *mytty, uid_t myuid) +void search_utmp(char *user, char **tty, char *mytty, uid_t myuid) { struct utmp u; @@ -224,7 +227,11 @@ void search_utmp(char *user, char *tty, ++nttys; if (atime > bestatime) { bestatime = atime; - (void)strcpy(tty, atty); + if ((*tty = strdup(atty)) == NULL) { + (void)fprintf(stderr, + _("write: out of memory\n")); + exit(1); + } } } } @@ -236,7 +243,12 @@ void search_utmp(char *user, char *tty, } if (nttys == 0) { if (user_is_me) { /* ok, so write to yourself! */ - (void)strcpy(tty, mytty); + if ((*tty = strdup(mytty)) == NULL) { + (void)fprintf(stderr, + _("write: out of memory\n")); + exit(1); + } + return; } (void)fprintf(stderr, @@ -245,7 +257,7 @@ void search_utmp(char *user, char *tty, } else if (nttys > 1) { (void)fprintf(stderr, _("write: %s is logged in more than once; writing to %s\n"), - user, tty); + user, *tty); } } @@ -257,19 +269,23 @@ int term_chk(char *tty, int *msgsokP, ti { struct stat s; - char path[MAXPATHLEN]; + char *path; - if (strlen(tty) + 6 > sizeof(path)) - return(1); + if ((path = malloc(strlen(tty) + sizeof("/dev/") + 1)) == NULL){ + (void)fprintf(stderr,_("write: out of memory\n")); + exit(1); + } (void)sprintf(path, "/dev/%s", tty); if (stat(path, &s) < 0) { if (showerror) (void)fprintf(stderr, "write: %s: %s\n", path, strerror(errno)); + free(path); return(1); } *msgsokP = (s.st_mode & (S_IWRITE >> 3)) != 0; /* group write bit */ *atimeP = s.st_atime; + free(path); return(0); } @@ -280,7 +296,7 @@ void do_write(char *tty, char *mytty, ui char *login, *pwuid, *nows; struct passwd *pwd; time_t now; - char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512]; + char *path, *host, *host_tmp, line[512]; /* Determine our login name(s) before the we reopen() stdout */ if ((pwd = getpwuid(myuid)) != NULL) @@ -290,8 +306,10 @@ void do_write(char *tty, char *mytty, ui if ((login = getlogin()) == NULL) login = pwuid; - if (strlen(tty) + 6 > sizeof(path)) + if ((path = malloc(strlen(tty) + sizeof("/dev/") + 1)) == NULL) { + (void)fprintf(stderr, _("write: out of memory\n")); exit(1); + } (void)sprintf(path, "/dev/%s", tty); if ((freopen(path, "w", stdout)) == NULL) { (void)fprintf(stderr, "write: %s: %s\n", @@ -299,12 +317,16 @@ void do_write(char *tty, char *mytty, ui exit(1); } + free(path); + (void)signal(SIGINT, done); (void)signal(SIGHUP, done); /* print greeting */ - if (gethostname(host, sizeof(host)) < 0) - (void)strcpy(host, "???"); + if ((host_tmp = xgethostname()) != NULL) + host = host_tmp; + else + host = "???"; now = time((time_t *)NULL); nows = ctime(&now); nows[16] = '\0'; @@ -317,6 +339,8 @@ void do_write(char *tty, char *mytty, ui login, host, mytty, nows + 11); printf("\r\n"); + free(host_tmp); + while (fgets(line, sizeof(line), stdin) != NULL) wr_fputs(line); } diff -puN mount/fstab.c~CITI_NFS4_ALL mount/fstab.c --- util-linux-2.12/mount/fstab.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/fstab.c 2004-12-13 17:42:08.000000000 -0500 @@ -437,7 +437,7 @@ lock_mtab (void) { struct flock flock; int errsv, fd, i, j; - i = open (linktargetfile, O_WRONLY|O_CREAT, 0); + i = open (linktargetfile, O_WRONLY|O_CREAT, 0600); if (i < 0) { int errsv = errno; /* linktargetfile does not exist (as a file) diff -puN mount/lomount.c~CITI_NFS4_ALL mount/lomount.c --- util-linux-2.12/mount/lomount.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/lomount.c 2004-12-13 17:42:08.000000000 -0500 @@ -33,15 +33,80 @@ #include "loop.h" #include "lomount.h" +#include "rmd160.h" #include "xstrncpy.h" #include "nls.h" extern int verbose; -extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ +extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ extern void error (const char *fmt, ...); /* idem */ #ifdef LOOP_SET_FD +#include +#include + +struct crypt_type_struct { + int id; + char *name; + int keylength; +} crypt_type_tbl[] = { + { LO_CRYPT_NONE, "none", 0 }, + { LO_CRYPT_XOR, "xor", 0 }, + { LO_CRYPT_DES, "des", 8 }, + { LO_CRYPT_FISH2, "twofish", 20 }, + { LO_CRYPT_BLOW, "blowfish", 20 }, + { LO_CRYPT_CAST128, "cast", 16 }, + { LO_CRYPT_SERPENT, "serpent", 16 }, + { LO_CRYPT_MARS, "mars", 16 }, + { LO_CRYPT_RC6, "rc6", 16 }, + { LO_CRYPT_3DES, "des-ede3", 24 }, + { LO_CRYPT_DFC, "dfc", 16 }, + { LO_CRYPT_IDEA, "idea", 16 }, + { LO_CRYPT_RIJNDAEL, "rijndael", 16 }, + { -1, NULL,0 } +}; + +static struct option longopts[] = { + { "delete", 0, 0, 'd' }, + { "detach", 0, 0, 'd' }, + { "encryption", 1, 0, 'e' }, + { "help", 0, 0, 'h' }, + { "nopasshash", 1, 0, 'N' }, + { "offset", 1, 0, 'o' }, + { "pass-fd", 1, 0, 'p' }, + { "verbose", 0, 0, 'v' }, + { "keybits", 1, 0, 'k' }, + { NULL, 0, 0, 0 } +}; + +static int +name_to_id(const char *name) +{ + int i; + + if (name) { + for (i = 0; crypt_type_tbl[i].id != -1; i++) + if (!strcasecmp (name, crypt_type_tbl[i].name)) + return crypt_type_tbl[i].id; + } else + return LO_CRYPT_NONE; + return LO_CRYPT_CRYPTOAPI; +} + +#ifdef MAIN +static char * +id_to_name(int id) { + int i; + + for (i = 0; crypt_type_tbl[i].id != -1; i++) + if (id == crypt_type_tbl[i].id) + return crypt_type_tbl[i].name; + return "undefined"; +} +#endif + + static int loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info) { @@ -135,6 +200,10 @@ show_loop(char *device) { } errsv = errno; + printf (_("%s: [%04x]:%ld (%s) offset %d, %s encryption\n"), + device, loopinfo.lo_device, loopinfo.lo_inode, + loopinfo.lo_name, loopinfo.lo_offset, + id_to_name(loopinfo.lo_encrypt_type)); fprintf(stderr, _("loop: can't get info on device %s: %s\n"), device, strerror (errsv)); close (fd); @@ -189,10 +258,9 @@ find_unused_loop_device (void) { error(_("mount: could not find any device /dev/loop#")); else if (!someloop) { error(_( - "mount: Could not find any loop device. Maybe this kernel " - "does not know\n" - " about the loop device? (If so, recompile or " - "`modprobe loop'.)")); + "mount: Could not find any loop device. Maybe this kernel does not know\n" + " about the loop device? (If so, recompile or `modprobe loop'), or\n" + " maybe /dev/loop# has the wrong major number?")); } else error(_("mount: could not find any free loop device")); return 0; @@ -247,10 +315,20 @@ digits_only(const char *s) { int set_loop(const char *device, const char *file, int offset, - const char *encryption, int pfd, int *loopro) { + const char *encryption, int pfd, int keysz, int *loopro, int hash_password) { struct loop_info64 loopinfo64; int fd, ffd, mode; char *pass; + int tried_old; + + int kerneli=open("/proc/crypto/cipher",O_RDONLY); + + if (kerneli>=0) { + close(kerneli); + kerneli=1; + } else { + kerneli=0; + } mode = (*loopro ? O_RDONLY : O_RDWR); if ((ffd = open(file, mode)) < 0) { @@ -276,8 +354,13 @@ set_loop(const char *device, const char loopinfo64.lo_encrypt_type = atoi(encryption); } else { loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI; - snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, + if (kerneli) + snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, + "%s-cbc", encryption); + else + snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, "%s", encryption); + loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0; } } @@ -296,29 +379,98 @@ set_loop(const char *device, const char } #endif + if (keysz==0) + keysz=LO_KEY_SIZE*8; + tried_old=0; +again: switch (loopinfo64.lo_encrypt_type) { case LO_CRYPT_NONE: loopinfo64.lo_encrypt_key_size = 0; break; case LO_CRYPT_XOR: pass = getpass(_("Password: ")); - xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); + xstrncpy(loopinfo64.lo_encrypt_key, pass, keysz/8); loopinfo64.lo_encrypt_key_size = strlen(loopinfo64.lo_encrypt_key); break; - default: + case LO_CRYPT_FISH2: + case LO_CRYPT_BLOW: + case LO_CRYPT_IDEA: + case LO_CRYPT_CAST128: + case LO_CRYPT_SERPENT: + case LO_CRYPT_MARS: + case LO_CRYPT_RC6: + case LO_CRYPT_3DES: + case LO_CRYPT_DFC: + case LO_CRYPT_RIJNDAEL: + { +#define HASHLENGTH 20 +#define PASSWDBUFFLEN 130 /* getpass returns only max. 128 bytes, see man getpass */ + char keybits[2*HASHLENGTH]; + char passwdbuff[PASSWDBUFFLEN]; + int keylength; + int i; + pass = xgetpass(pfd, _("Password: ")); - xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); - loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; + strncpy(passwdbuff+1,pass,PASSWDBUFFLEN-1); + passwdbuff[PASSWDBUFFLEN-1] = '\0'; + passwdbuff[0] = 'A'; + rmd160_hash_buffer(keybits,pass,strlen(pass)); + rmd160_hash_buffer(keybits+HASHLENGTH,passwdbuff,strlen(pass)+1); + memcpy((char*)loopinfo64.lo_encrypt_key,keybits,2*HASHLENGTH); + keylength=0; + for(i=0; crypt_type_tbl[i].id != -1; i++){ + if(loopinfo64.lo_encrypt_type == crypt_type_tbl[i].id){ + keylength = crypt_type_tbl[i].keylength; + break; + } + } + loopinfo64.lo_encrypt_key_size=keylength; + break; + } + default: + if (hash_password) { + char keybits[2*HASHLENGTH]; + char passwdbuff[PASSWDBUFFLEN]; + + pass = xgetpass(pfd, _("Password: ")); + strncpy(passwdbuff+1,pass,PASSWDBUFFLEN-1); + passwdbuff[PASSWDBUFFLEN-1] = '\0'; + passwdbuff[0] = 'A'; + rmd160_hash_buffer(keybits,pass,strlen(pass)); + rmd160_hash_buffer(keybits+HASHLENGTH,passwdbuff,strlen(pass)+1); + memcpy((char*)loopinfo64.lo_encrypt_key,keybits,keysz/8); + } else { + pass = xgetpass(pfd, _("Password: ")); + xstrncpy(loopinfo64.lo_encrypt_key, pass, keysz/8); + } + loopinfo64.lo_encrypt_key_size = keysz/8; } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { perror("ioctl: LOOP_SET_FD"); return 1; } - close (ffd); - - if (ioctl(fd, LOOP_SET_STATUS64, &loopinfo64) < 0) { + if (kerneli) { + struct loop_info loopinfo; + loop_info64_to_old(&loopinfo64,&loopinfo); + if (ioctl (fd, LOOP_SET_STATUS, &loopinfo) < 0) { + /* Try again with old-style LO_CRYPT_XX if + new-style LO_CRYPT_CRYPTOAPI ioctl didn't work */ + if (tried_old) { + error("The cipher does not exist, or a cipher module " + "needs to be loaded into the kernel"); + perror ("ioctl: LOOP_SET_STATUS"); + goto fail; + } + strncpy (loopinfo64.lo_file_name, file, LO_NAME_SIZE); + loopinfo64.lo_file_name[LO_NAME_SIZE - 1] = 0; + loopinfo64.lo_encrypt_type = name_to_id (encryption); + tried_old = 1; + goto again; + } + } else { + if (ioctl(fd, LOOP_SET_STATUS64, &loopinfo64) < 0) { struct loop_info loopinfo; int errsv = errno; @@ -333,8 +485,10 @@ set_loop(const char *device, const char perror("ioctl: LOOP_SET_STATUS"); goto fail; } + } } + close (ffd); close (fd); if (verbose > 1) printf(_("set_loop(%s,%s,%d): success\n"), @@ -343,6 +497,7 @@ set_loop(const char *device, const char fail: (void) ioctl (fd, LOOP_CLR_FD, 0); + close (ffd); close (fd); return 1; } @@ -411,8 +566,24 @@ usage(void) { fprintf(stderr, _("usage:\n\ %s loop_device # give info\n\ %s -d loop_device # delete\n\ - %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"), - progname, progname, progname); + %s [ options ] loop_device file # setup\n\ + where options include\n\ + --offset , -o \n\ + start at offset into file.\n\ + --pass-fd , -p \n\ + read passphrase from file descriptor \n\ + instead of the terminal.\n\ + --encryption , -e \n\ + encrypt with .\n\ + Check /proc/crypto or /proc/crypto/cipher for available ciphers.\n\ + --nohashpass, -N\n\ + Don't hash the password given. (previous versions hash, non-debian doesn't.\n\ + --keybits , -k \n\ + specify number of bits in the hashed key given\n\ + to the cipher. Some ciphers support several key\n\ + sizes and might be more efficient with a smaller\n\ + key size. Key sizes < 128 are generally not\n\ + recommended\n"), progname, progname, progname); exit(1); } @@ -445,20 +616,23 @@ error (const char *fmt, ...) { int main(int argc, char **argv) { - char *offset, *encryption, *passfd; + char *offset, *encryption, *passfd, *keysize; int delete, off, c; int res = 0; int ro = 0; int pfd = -1; + int keysz = 0; + int hash_password = 1; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); delete = off = 0; - offset = encryption = passfd = NULL; + offset = encryption = passfd = keysize = NULL; progname = argv[0]; - while ((c = getopt(argc,argv,"de:E:o:p:v")) != -1) { + while ((c = getopt_long(argc,argv,"de:E:hk:No:p:v", + longopts, NULL)) != EOF) { switch (c) { case 'd': delete = 1; @@ -467,6 +641,12 @@ main(int argc, char **argv) { case 'e': encryption = optarg; break; + case 'N': + hash_password=0; + break; + case 'k': + keysize = optarg; + break; case 'o': offset = optarg; break; @@ -494,8 +674,10 @@ main(int argc, char **argv) { usage(); if (passfd && sscanf(passfd,"%d",&pfd) != 1) usage(); + if (keysize && sscanf(keysize,"%d",&keysz) != 1) + usage(); res = set_loop(argv[optind], argv[optind+1], off, - encryption, pfd, &ro); + encryption, pfd, keysz, &ro, hash_password); } return res; } diff -puN mount/lomount.h~CITI_NFS4_ALL mount/lomount.h --- util-linux-2.12/mount/lomount.h~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/lomount.h 2004-12-13 17:42:08.000000000 -0500 @@ -1,6 +1,6 @@ extern int verbose; extern int set_loop(const char *, const char *, int, const char *, - int, int *); + int, int, int *, int); extern int del_loop(const char *); extern int is_loop_device(const char *); extern char * find_unused_loop_device(void); diff -puN mount/loop.h~CITI_NFS4_ALL mount/loop.h --- util-linux-2.12/mount/loop.h~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/loop.h 2004-12-13 17:42:08.000000000 -0500 @@ -1,8 +1,39 @@ -#define LO_CRYPT_NONE 0 -#define LO_CRYPT_XOR 1 -#define LO_CRYPT_DES 2 +#define LO_CRYPT_NONE 0 +#define LO_CRYPT_XOR 1 +#define LO_CRYPT_DES 2 #define LO_CRYPT_CRYPTOAPI 18 +#ifndef LO_CRYPT_FISH2 +#define LO_CRYPT_FISH2 3 +#endif +#ifndef LO_CRYPT_BLOW +#define LO_CRYPT_BLOW 4 +#endif +#ifndef LO_CRYPT_CAST128 +#define LO_CRYPT_CAST128 5 +#endif +#ifndef LO_CRYPT_IDEA +#define LO_CRYPT_IDEA 6 +#endif +#ifndef LO_CRYPT_SERPENT +#define LO_CRYPT_SERPENT 7 +#endif +#ifndef LO_CRYPT_MARS +#define LO_CRYPT_MARS 8 +#endif +#ifndef LO_CRYPT_RC6 +#define LO_CRYPT_RC6 11 +#endif +#ifndef LO_CRYPT_3DES +#define LO_CRYPT_3DES 12 +#endif +#ifndef LO_CRYPT_DFC +#define LO_CRYPT_DFC 15 +#endif +#ifndef LO_CRYPT_RIJNDAEL +#define LO_CRYPT_RIJNDAEL 16 +#endif + #define LOOP_SET_FD 0x4C00 #define LOOP_CLR_FD 0x4C01 #define LOOP_SET_STATUS 0x4C02 diff -puN mount/losetup.8~CITI_NFS4_ALL mount/losetup.8 --- util-linux-2.12/mount/losetup.8~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/losetup.8 2004-12-13 17:42:08.000000000 -0500 @@ -50,19 +50,24 @@ option, or one uses a name with the .B \-e option.) .SH OPTIONS -.IP \fB\-d\fP -Detach the file or device associated with the specified loop device. +.IP "\fB\-\-delete, \-\-detach, \-d\fP" +detach the file or device associated with the specified loop device. .IP "\fB\-E \fIencryption_type\fP" Enable data encryption with specified number. -.IP "\fB\-e \fIencryption_name\fP" +.IP "\fB\-\-encryption, \-e \fIencryption\fP" Enable data encryption with specified name. -.IP "\fB\-o \fIoffset\fP" +.IP "\fB\-\-nohashpass, \-N\fP" +Do not hash the password. Many previous Debian releases run the password through a +hash function, non-Debian systems appear to. +.IP "\fB\-\-offset, \-o \fIoffset\fP" The data start is moved \fIoffset\fP bytes into the specified file or device. -.IP "\fB\-p \fInum\fP" +.IP "\fB\-\-pass-fd, \-p \fInum\fP" Read the passphrase from file descriptor with number .I num instead of from the terminal. +.IP "\fB\-\-keybits, \-k \fInum\fP" +set the number of bits to use in key to \fInum\fP. .SH RETURN VALUE .B losetup returns 0 on success, nonzero on failure. When @@ -109,6 +114,9 @@ the command .fi .SH RESTRICTION DES encryption is painfully slow. On the other hand, XOR is terribly weak. +Both are insecure nowadays. Some ciphers may require a licence for you to be +allowed to use them. +.fi .\" .SH AUTHORS .\" .nf .\" Original version: Theodore Ts'o diff -puN mount/my_dev_t.h~CITI_NFS4_ALL mount/my_dev_t.h --- util-linux-2.12/mount/my_dev_t.h~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/my_dev_t.h 2004-12-13 17:42:08.000000000 -0500 @@ -4,4 +4,4 @@ /* for ancient systems use "unsigned short" */ #include -#define my_dev_t __kernel_dev_t +#define my_dev_t __kernel_old_dev_t diff -puN mount/README.mount~CITI_NFS4_ALL mount/README.mount --- util-linux-2.12/mount/README.mount~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/README.mount 2004-12-13 17:42:08.000000000 -0500 @@ -8,3 +8,4 @@ Stephen Tweedie . Presently maintained by Andries Brouwer . Ftp site: ftp.win.tue.nl:/pub/linux/utils/util-linux +http://freshmeat.net/projects/util-linux/ tends to be current as well. diff -puN mount/rmd160.c~CITI_NFS4_ALL mount/rmd160.c --- util-linux-2.12/mount/rmd160.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/rmd160.c 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. + */ + +/* This file was part of GnuPG. Modified for use within the Linux + * mount utility by Marc Mutz . None of this code is + * by myself. I just removed everything that you don't need when all + * you want to do is to use rmd160_hash_buffer(). + * My comments are marked with (mm). */ + +/* GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ + +#include /* (mm) for memcpy */ +#include /* (mm) for BIG_ENDIAN and BYTE_ORDER */ +#include "rmd160.h" + +/* (mm) these are used by the original GnuPG file. In order to modify + * that file not too much, we keep the notations. maybe it would be + * better to include linux/types.h and typedef __u32 to u32 and __u8 + * to byte? */ +typedef unsigned int u32; /* taken from e.g. util-linux's minix.h */ +typedef unsigned char byte; + +typedef struct { + u32 h0,h1,h2,h3,h4; + u32 nblocks; + byte buf[64]; + int count; +} RMD160_CONTEXT; + +/**************** + * Rotate a 32 bit integer by n bytes + */ +#if defined(__GNUC__) && defined(__i386__) +static inline u32 +rol( u32 x, int n) +{ + __asm__("roll %%cl,%0" + :"=r" (x) + :"0" (x),"c" (n)); + return x; +} +#else + #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) +#endif + +/********************************* + * RIPEMD-160 is not patented, see (as of 25.10.97) + * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html + * Note that the code uses Little Endian byteorder, which is good for + * 386 etc, but we must add some conversion when used on a big endian box. + * + * + * Pseudo-code for RIPEMD-160 + * + * RIPEMD-160 is an iterative hash function that operates on 32-bit words. + * The round function takes as input a 5-word chaining variable and a 16-word + * message block and maps this to a new chaining variable. All operations are + * defined on 32-bit words. Padding is identical to that of MD4. + * + * + * RIPEMD-160: definitions + * + * + * nonlinear functions at bit level: exor, mux, -, mux, - + * + * f(j, x, y, z) = x XOR y XOR z (0 <= j <= 15) + * f(j, x, y, z) = (x AND y) OR (NOT(x) AND z) (16 <= j <= 31) + * f(j, x, y, z) = (x OR NOT(y)) XOR z (32 <= j <= 47) + * f(j, x, y, z) = (x AND z) OR (y AND NOT(z)) (48 <= j <= 63) + * f(j, x, y, z) = x XOR (y OR NOT(z)) (64 <= j <= 79) + * + * + * added constants (hexadecimal) + * + * K(j) = 0x00000000 (0 <= j <= 15) + * K(j) = 0x5A827999 (16 <= j <= 31) int(2**30 x sqrt(2)) + * K(j) = 0x6ED9EBA1 (32 <= j <= 47) int(2**30 x sqrt(3)) + * K(j) = 0x8F1BBCDC (48 <= j <= 63) int(2**30 x sqrt(5)) + * K(j) = 0xA953FD4E (64 <= j <= 79) int(2**30 x sqrt(7)) + * K'(j) = 0x50A28BE6 (0 <= j <= 15) int(2**30 x cbrt(2)) + * K'(j) = 0x5C4DD124 (16 <= j <= 31) int(2**30 x cbrt(3)) + * K'(j) = 0x6D703EF3 (32 <= j <= 47) int(2**30 x cbrt(5)) + * K'(j) = 0x7A6D76E9 (48 <= j <= 63) int(2**30 x cbrt(7)) + * K'(j) = 0x00000000 (64 <= j <= 79) + * + * + * selection of message word + * + * r(j) = j (0 <= j <= 15) + * r(16..31) = 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8 + * r(32..47) = 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12 + * r(48..63) = 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2 + * r(64..79) = 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13 + * r0(0..15) = 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12 + * r0(16..31)= 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2 + * r0(32..47)= 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13 + * r0(48..63)= 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14 + * r0(64..79)= 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11 + * + * + * amount for rotate left (rol) + * + * s(0..15) = 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8 + * s(16..31) = 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12 + * s(32..47) = 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5 + * s(48..63) = 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12 + * s(64..79) = 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 + * s'(0..15) = 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6 + * s'(16..31)= 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11 + * s'(32..47)= 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5 + * s'(48..63)= 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8 + * s'(64..79)= 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 + * + * + * initial value (hexadecimal) + * + * h0 = 0x67452301; h1 = 0xEFCDAB89; h2 = 0x98BADCFE; h3 = 0x10325476; + * h4 = 0xC3D2E1F0; + * + * + * RIPEMD-160: pseudo-code + * + * It is assumed that the message after padding consists of t 16-word blocks + * that will be denoted with X[i][j], with 0 <= i <= t-1 and 0 <= j <= 15. + * The symbol [+] denotes addition modulo 2**32 and rol_s denotes cyclic left + * shift (rotate) over s positions. + * + * + * for i := 0 to t-1 { + * A := h0; B := h1; C := h2; D = h3; E = h4; + * A' := h0; B' := h1; C' := h2; D' = h3; E' = h4; + * for j := 0 to 79 { + * T := rol_s(j)(A [+] f(j, B, C, D) [+] X[i][r(j)] [+] K(j)) [+] E; + * A := E; E := D; D := rol_10(C); C := B; B := T; + * T := rol_s'(j)(A' [+] f(79-j, B', C', D') [+] X[i][r'(j)] + [+] K'(j)) [+] E'; + * A' := E'; E' := D'; D' := rol_10(C'); C' := B'; B' := T; + * } + * T := h1 [+] C [+] D'; h1 := h2 [+] D [+] E'; h2 := h3 [+] E [+] A'; + * h3 := h4 [+] A [+] B'; h4 := h0 [+] B [+] C'; h0 := T; + * } + */ + +/* Some examples: + * "" 9c1185a5c5e9fc54612808977ee8f548b2258d31 + * "a" 0bdc9d2d256b3ee9daae347be6f4dc835a467ffe + * "abc" 8eb208f7e05d987a9b044a8e98c6b087f15a0bfc + * "message digest" 5d0689ef49d2fae572b881b123a85ffa21595f36 + * "a...z" f71c27109c692c1b56bbdceb5b9d2865b3708dbc + * "abcdbcde...nopq" 12a053384a9c0c88e405a06c27dcf49ada62eb2b + * "A...Za...z0...9" b0e20b6e3116640286ed3a87a5713079b21f5189 + * 8 times "1234567890" 9b752e45573d4b39f4dbd3323cab82bf63326bfb + * 1 million times "a" 52783243c1697bdbe16d37f97f68f08325dc1528 + */ + + +static void +rmd160_init( RMD160_CONTEXT *hd ) +{ + hd->h0 = 0x67452301; + hd->h1 = 0xEFCDAB89; + hd->h2 = 0x98BADCFE; + hd->h3 = 0x10325476; + hd->h4 = 0xC3D2E1F0; + hd->nblocks = 0; + hd->count = 0; +} + + + +/**************** + * Transform the message X which consists of 16 32-bit-words + */ +static void +transform( RMD160_CONTEXT *hd, byte *data ) +{ + u32 a,b,c,d,e,aa,bb,cc,dd,ee,t; + #if BYTE_ORDER == BIG_ENDIAN + u32 x[16]; + { int i; + byte *p2, *p1; + for(i=0, p1=data, p2=(byte*)x; i < 16; i++, p2 += 4 ) { + p2[3] = *p1++; + p2[2] = *p1++; + p2[1] = *p1++; + p2[0] = *p1++; + } + } + #else + #if 0 + u32 *x =(u32*)data; + #else + /* this version is better because it is always aligned; + * The performance penalty on a 586-100 is about 6% which + * is acceptable - because the data is more local it might + * also be possible that this is faster on some machines. + * This function (when compiled with -02 on gcc 2.7.2) + * executes on a 586-100 (39.73 bogomips) at about 1900kb/sec; + * [measured with a 4MB data and "gpgm --print-md rmd160"] */ + u32 x[16]; + memcpy( x, data, 64 ); + #endif + #endif + + +#define K0 0x00000000 +#define K1 0x5A827999 +#define K2 0x6ED9EBA1 +#define K3 0x8F1BBCDC +#define K4 0xA953FD4E +#define KK0 0x50A28BE6 +#define KK1 0x5C4DD124 +#define KK2 0x6D703EF3 +#define KK3 0x7A6D76E9 +#define KK4 0x00000000 +#define F0(x,y,z) ( (x) ^ (y) ^ (z) ) +#define F1(x,y,z) ( ((x) & (y)) | (~(x) & (z)) ) +#define F2(x,y,z) ( ((x) | ~(y)) ^ (z) ) +#define F3(x,y,z) ( ((x) & (z)) | ((y) & ~(z)) ) +#define F4(x,y,z) ( (x) ^ ((y) | ~(z)) ) +#define R(a,b,c,d,e,f,k,r,s) do { t = a + f(b,c,d) + k + x[r]; \ + a = rol(t,s) + e; \ + c = rol(c,10); \ + } while(0) + + /* left lane */ + a = hd->h0; + b = hd->h1; + c = hd->h2; + d = hd->h3; + e = hd->h4; + R( a, b, c, d, e, F0, K0, 0, 11 ); + R( e, a, b, c, d, F0, K0, 1, 14 ); + R( d, e, a, b, c, F0, K0, 2, 15 ); + R( c, d, e, a, b, F0, K0, 3, 12 ); + R( b, c, d, e, a, F0, K0, 4, 5 ); + R( a, b, c, d, e, F0, K0, 5, 8 ); + R( e, a, b, c, d, F0, K0, 6, 7 ); + R( d, e, a, b, c, F0, K0, 7, 9 ); + R( c, d, e, a, b, F0, K0, 8, 11 ); + R( b, c, d, e, a, F0, K0, 9, 13 ); + R( a, b, c, d, e, F0, K0, 10, 14 ); + R( e, a, b, c, d, F0, K0, 11, 15 ); + R( d, e, a, b, c, F0, K0, 12, 6 ); + R( c, d, e, a, b, F0, K0, 13, 7 ); + R( b, c, d, e, a, F0, K0, 14, 9 ); + R( a, b, c, d, e, F0, K0, 15, 8 ); + R( e, a, b, c, d, F1, K1, 7, 7 ); + R( d, e, a, b, c, F1, K1, 4, 6 ); + R( c, d, e, a, b, F1, K1, 13, 8 ); + R( b, c, d, e, a, F1, K1, 1, 13 ); + R( a, b, c, d, e, F1, K1, 10, 11 ); + R( e, a, b, c, d, F1, K1, 6, 9 ); + R( d, e, a, b, c, F1, K1, 15, 7 ); + R( c, d, e, a, b, F1, K1, 3, 15 ); + R( b, c, d, e, a, F1, K1, 12, 7 ); + R( a, b, c, d, e, F1, K1, 0, 12 ); + R( e, a, b, c, d, F1, K1, 9, 15 ); + R( d, e, a, b, c, F1, K1, 5, 9 ); + R( c, d, e, a, b, F1, K1, 2, 11 ); + R( b, c, d, e, a, F1, K1, 14, 7 ); + R( a, b, c, d, e, F1, K1, 11, 13 ); + R( e, a, b, c, d, F1, K1, 8, 12 ); + R( d, e, a, b, c, F2, K2, 3, 11 ); + R( c, d, e, a, b, F2, K2, 10, 13 ); + R( b, c, d, e, a, F2, K2, 14, 6 ); + R( a, b, c, d, e, F2, K2, 4, 7 ); + R( e, a, b, c, d, F2, K2, 9, 14 ); + R( d, e, a, b, c, F2, K2, 15, 9 ); + R( c, d, e, a, b, F2, K2, 8, 13 ); + R( b, c, d, e, a, F2, K2, 1, 15 ); + R( a, b, c, d, e, F2, K2, 2, 14 ); + R( e, a, b, c, d, F2, K2, 7, 8 ); + R( d, e, a, b, c, F2, K2, 0, 13 ); + R( c, d, e, a, b, F2, K2, 6, 6 ); + R( b, c, d, e, a, F2, K2, 13, 5 ); + R( a, b, c, d, e, F2, K2, 11, 12 ); + R( e, a, b, c, d, F2, K2, 5, 7 ); + R( d, e, a, b, c, F2, K2, 12, 5 ); + R( c, d, e, a, b, F3, K3, 1, 11 ); + R( b, c, d, e, a, F3, K3, 9, 12 ); + R( a, b, c, d, e, F3, K3, 11, 14 ); + R( e, a, b, c, d, F3, K3, 10, 15 ); + R( d, e, a, b, c, F3, K3, 0, 14 ); + R( c, d, e, a, b, F3, K3, 8, 15 ); + R( b, c, d, e, a, F3, K3, 12, 9 ); + R( a, b, c, d, e, F3, K3, 4, 8 ); + R( e, a, b, c, d, F3, K3, 13, 9 ); + R( d, e, a, b, c, F3, K3, 3, 14 ); + R( c, d, e, a, b, F3, K3, 7, 5 ); + R( b, c, d, e, a, F3, K3, 15, 6 ); + R( a, b, c, d, e, F3, K3, 14, 8 ); + R( e, a, b, c, d, F3, K3, 5, 6 ); + R( d, e, a, b, c, F3, K3, 6, 5 ); + R( c, d, e, a, b, F3, K3, 2, 12 ); + R( b, c, d, e, a, F4, K4, 4, 9 ); + R( a, b, c, d, e, F4, K4, 0, 15 ); + R( e, a, b, c, d, F4, K4, 5, 5 ); + R( d, e, a, b, c, F4, K4, 9, 11 ); + R( c, d, e, a, b, F4, K4, 7, 6 ); + R( b, c, d, e, a, F4, K4, 12, 8 ); + R( a, b, c, d, e, F4, K4, 2, 13 ); + R( e, a, b, c, d, F4, K4, 10, 12 ); + R( d, e, a, b, c, F4, K4, 14, 5 ); + R( c, d, e, a, b, F4, K4, 1, 12 ); + R( b, c, d, e, a, F4, K4, 3, 13 ); + R( a, b, c, d, e, F4, K4, 8, 14 ); + R( e, a, b, c, d, F4, K4, 11, 11 ); + R( d, e, a, b, c, F4, K4, 6, 8 ); + R( c, d, e, a, b, F4, K4, 15, 5 ); + R( b, c, d, e, a, F4, K4, 13, 6 ); + + aa = a; bb = b; cc = c; dd = d; ee = e; + + /* right lane */ + a = hd->h0; + b = hd->h1; + c = hd->h2; + d = hd->h3; + e = hd->h4; + R( a, b, c, d, e, F4, KK0, 5, 8); + R( e, a, b, c, d, F4, KK0, 14, 9); + R( d, e, a, b, c, F4, KK0, 7, 9); + R( c, d, e, a, b, F4, KK0, 0, 11); + R( b, c, d, e, a, F4, KK0, 9, 13); + R( a, b, c, d, e, F4, KK0, 2, 15); + R( e, a, b, c, d, F4, KK0, 11, 15); + R( d, e, a, b, c, F4, KK0, 4, 5); + R( c, d, e, a, b, F4, KK0, 13, 7); + R( b, c, d, e, a, F4, KK0, 6, 7); + R( a, b, c, d, e, F4, KK0, 15, 8); + R( e, a, b, c, d, F4, KK0, 8, 11); + R( d, e, a, b, c, F4, KK0, 1, 14); + R( c, d, e, a, b, F4, KK0, 10, 14); + R( b, c, d, e, a, F4, KK0, 3, 12); + R( a, b, c, d, e, F4, KK0, 12, 6); + R( e, a, b, c, d, F3, KK1, 6, 9); + R( d, e, a, b, c, F3, KK1, 11, 13); + R( c, d, e, a, b, F3, KK1, 3, 15); + R( b, c, d, e, a, F3, KK1, 7, 7); + R( a, b, c, d, e, F3, KK1, 0, 12); + R( e, a, b, c, d, F3, KK1, 13, 8); + R( d, e, a, b, c, F3, KK1, 5, 9); + R( c, d, e, a, b, F3, KK1, 10, 11); + R( b, c, d, e, a, F3, KK1, 14, 7); + R( a, b, c, d, e, F3, KK1, 15, 7); + R( e, a, b, c, d, F3, KK1, 8, 12); + R( d, e, a, b, c, F3, KK1, 12, 7); + R( c, d, e, a, b, F3, KK1, 4, 6); + R( b, c, d, e, a, F3, KK1, 9, 15); + R( a, b, c, d, e, F3, KK1, 1, 13); + R( e, a, b, c, d, F3, KK1, 2, 11); + R( d, e, a, b, c, F2, KK2, 15, 9); + R( c, d, e, a, b, F2, KK2, 5, 7); + R( b, c, d, e, a, F2, KK2, 1, 15); + R( a, b, c, d, e, F2, KK2, 3, 11); + R( e, a, b, c, d, F2, KK2, 7, 8); + R( d, e, a, b, c, F2, KK2, 14, 6); + R( c, d, e, a, b, F2, KK2, 6, 6); + R( b, c, d, e, a, F2, KK2, 9, 14); + R( a, b, c, d, e, F2, KK2, 11, 12); + R( e, a, b, c, d, F2, KK2, 8, 13); + R( d, e, a, b, c, F2, KK2, 12, 5); + R( c, d, e, a, b, F2, KK2, 2, 14); + R( b, c, d, e, a, F2, KK2, 10, 13); + R( a, b, c, d, e, F2, KK2, 0, 13); + R( e, a, b, c, d, F2, KK2, 4, 7); + R( d, e, a, b, c, F2, KK2, 13, 5); + R( c, d, e, a, b, F1, KK3, 8, 15); + R( b, c, d, e, a, F1, KK3, 6, 5); + R( a, b, c, d, e, F1, KK3, 4, 8); + R( e, a, b, c, d, F1, KK3, 1, 11); + R( d, e, a, b, c, F1, KK3, 3, 14); + R( c, d, e, a, b, F1, KK3, 11, 14); + R( b, c, d, e, a, F1, KK3, 15, 6); + R( a, b, c, d, e, F1, KK3, 0, 14); + R( e, a, b, c, d, F1, KK3, 5, 6); + R( d, e, a, b, c, F1, KK3, 12, 9); + R( c, d, e, a, b, F1, KK3, 2, 12); + R( b, c, d, e, a, F1, KK3, 13, 9); + R( a, b, c, d, e, F1, KK3, 9, 12); + R( e, a, b, c, d, F1, KK3, 7, 5); + R( d, e, a, b, c, F1, KK3, 10, 15); + R( c, d, e, a, b, F1, KK3, 14, 8); + R( b, c, d, e, a, F0, KK4, 12, 8); + R( a, b, c, d, e, F0, KK4, 15, 5); + R( e, a, b, c, d, F0, KK4, 10, 12); + R( d, e, a, b, c, F0, KK4, 4, 9); + R( c, d, e, a, b, F0, KK4, 1, 12); + R( b, c, d, e, a, F0, KK4, 5, 5); + R( a, b, c, d, e, F0, KK4, 8, 14); + R( e, a, b, c, d, F0, KK4, 7, 6); + R( d, e, a, b, c, F0, KK4, 6, 8); + R( c, d, e, a, b, F0, KK4, 2, 13); + R( b, c, d, e, a, F0, KK4, 13, 6); + R( a, b, c, d, e, F0, KK4, 14, 5); + R( e, a, b, c, d, F0, KK4, 0, 15); + R( d, e, a, b, c, F0, KK4, 3, 13); + R( c, d, e, a, b, F0, KK4, 9, 11); + R( b, c, d, e, a, F0, KK4, 11, 11); + + + t = hd->h1 + d + cc; + hd->h1 = hd->h2 + e + dd; + hd->h2 = hd->h3 + a + ee; + hd->h3 = hd->h4 + b + aa; + hd->h4 = hd->h0 + c + bb; + hd->h0 = t; +} + + +/* Update the message digest with the contents + * of INBUF with length INLEN. + */ +static void +rmd160_write( RMD160_CONTEXT *hd, byte *inbuf, size_t inlen) +{ + if( hd->count == 64 ) { /* flush the buffer */ + transform( hd, hd->buf ); + hd->count = 0; + hd->nblocks++; + } + if( !inbuf ) + return; + if( hd->count ) { + for( ; inlen && hd->count < 64; inlen-- ) + hd->buf[hd->count++] = *inbuf++; + rmd160_write( hd, NULL, 0 ); + if( !inlen ) + return; + } + + while( inlen >= 64 ) { + transform( hd, inbuf ); + hd->count = 0; + hd->nblocks++; + inlen -= 64; + inbuf += 64; + } + for( ; inlen && hd->count < 64; inlen-- ) + hd->buf[hd->count++] = *inbuf++; +} + +/* The routine terminates the computation + */ + +static void +rmd160_final( RMD160_CONTEXT *hd ) +{ + u32 t, msb, lsb; + byte *p; + + rmd160_write(hd, NULL, 0); /* flush */; + + msb = 0; + t = hd->nblocks; + if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */ + msb++; + msb += t >> 26; + t = lsb; + if( (lsb = t + hd->count) < t ) /* add the count */ + msb++; + t = lsb; + if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */ + msb++; + msb += t >> 29; + + if( hd->count < 56 ) { /* enough room */ + hd->buf[hd->count++] = 0x80; /* pad */ + while( hd->count < 56 ) + hd->buf[hd->count++] = 0; /* pad */ + } + else { /* need one extra block */ + hd->buf[hd->count++] = 0x80; /* pad character */ + while( hd->count < 64 ) + hd->buf[hd->count++] = 0; + rmd160_write(hd, NULL, 0); /* flush */; + memset(hd->buf, 0, 56 ); /* fill next block with zeroes */ + } + /* append the 64 bit count */ + hd->buf[56] = lsb ; + hd->buf[57] = lsb >> 8; + hd->buf[58] = lsb >> 16; + hd->buf[59] = lsb >> 24; + hd->buf[60] = msb ; + hd->buf[61] = msb >> 8; + hd->buf[62] = msb >> 16; + hd->buf[63] = msb >> 24; + transform( hd, hd->buf ); + + p = hd->buf; + #if BYTE_ORDER == BIG_ENDIAN + #define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \ + *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0) + #else /* little endian */ + #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) + #endif + X(0); + X(1); + X(2); + X(3); + X(4); + #undef X +} + +/**************** + * Shortcut functions which puts the hash value of the supplied buffer + * into outbuf which must have a size of 20 bytes. + */ +void +rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length ) +{ + RMD160_CONTEXT hd; + + rmd160_init( &hd ); + rmd160_write( &hd, (byte*)buffer, length ); + rmd160_final( &hd ); + memcpy( outbuf, hd.buf, 20 ); +} diff -puN mount/rmd160.h~CITI_NFS4_ALL mount/rmd160.h --- util-linux-2.12/mount/rmd160.h~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/rmd160.h 2004-12-13 17:42:08.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef RMD160_H +#define RMD160_H + +void +rmd160_hash_buffer( char *outbuf, const char *buffer, size_t length ); + +#endif /*RMD160_H*/ + + diff -puN mount/swapon.c~CITI_NFS4_ALL mount/swapon.c --- util-linux-2.12/mount/swapon.c~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/mount/swapon.c 2004-12-13 17:42:08.000000000 -0500 @@ -321,12 +321,13 @@ main_swapon(int argc, char *argv[]) { && (!ifexists || !access(special, R_OK))) { /* parse mount options; */ char *opt, *opts = strdup(fstab->mnt_opts); + int pri=priority; for (opt = strtok(opts, ","); opt != NULL; opt = strtok(NULL, ",")) if (strncmp(opt, "pri=", 4) == 0) - priority = atoi(opt+4); - status |= do_swapon(special, priority); + pri = atoi(opt+4); + status |= do_swapon(special, pri); } } } diff -puN po/es.po~CITI_NFS4_ALL po/es.po --- util-linux-2.12/po/es.po~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/po/es.po 2004-12-13 17:42:08.000000000 -0500 @@ -1528,7 +1528,7 @@ msgstr "¡Atención!: esta operación puede msgid "Are you sure you want write the partition table to disk? (yes or no): " msgstr "" "¿Está seguro de que desea escribir la tabla de particiones en el disco?\n" -" (sí o no): " +" (si o no): " #: fdisk/cfdisk.c:1814 msgid "no" @@ -1540,11 +1540,11 @@ msgstr "No se ha escrito la tabla de par #: fdisk/cfdisk.c:1817 msgid "yes" -msgstr "sí" +msgstr "si" #: fdisk/cfdisk.c:1820 msgid "Please enter `yes' or `no'" -msgstr "Por favor escriba `sí' (con acento) o `no'" +msgstr "Por favor escriba `si' o `no'" #: fdisk/cfdisk.c:1824 msgid "Writing partition table to disk..." @@ -1831,7 +1831,7 @@ msgstr "" #: fdisk/cfdisk.c:2245 msgid " `no'" -msgstr " escribiendo `sí' o `no'" +msgstr " escribiendo `si' o `no'" #: fdisk/cfdisk.c:2246 msgid "Up Arrow Move cursor to the previous partition" diff -puN po/Makefile~CITI_NFS4_ALL po/Makefile --- util-linux-2.12/po/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:07.000000000 -0500 +++ util-linux-2.12-bfields/po/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -125,7 +125,7 @@ uninstall: cat-id-tbl.o: $(INTL)/libgettext.h clean: - rm -f core core.* *~ *.o util-linux.pot cat-id-tbl.tmp + rm -f core core.* *~ *.o util-linux.pot cat-id-tbl.tmp cat-id-tbl.c distclean: clean rm -f POTFILES *.gmo *.mo *.msg *.cat *.cat.m diff -puN sys-utils/dmesg.8~CITI_NFS4_ALL sys-utils/dmesg.8 --- util-linux-2.12/sys-utils/dmesg.8~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/sys-utils/dmesg.8 2004-12-13 17:42:08.000000000 -0500 @@ -55,4 +55,4 @@ have an effect. .SH SEE ALSO .BR syslogd (8) .SH AUTHOR -Theodore Ts'o (tytso@athena.mit.edu) +Theodore Ts'o (tytso@mit.edu) diff -puN sys-utils/ipcrm.c~CITI_NFS4_ALL sys-utils/ipcrm.c --- util-linux-2.12/sys-utils/ipcrm.c~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/sys-utils/ipcrm.c 2004-12-13 17:42:08.000000000 -0500 @@ -26,7 +26,7 @@ /* for tolower and isupper */ #include -#if defined (__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) +#if defined (__GLIBC__) && !defined(_SEM_SEMUN_UNDEFINED) /* union semun is defined by including */ #else /* according to X/OPEN we have to define it ourselves */ diff -puN sys-utils/ipcs.c~CITI_NFS4_ALL sys-utils/ipcs.c --- util-linux-2.12/sys-utils/ipcs.c~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/sys-utils/ipcs.c 2004-12-13 17:42:08.000000000 -0500 @@ -78,7 +78,7 @@ struct shm_info { /* The last arg of semctl is a union semun, but where is it defined? X/OPEN tells us to define it ourselves, but until recently Linux include files would also define it. */ -#if defined (__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) +#if defined (__GLIBC__) && !defined(_SEM_SEMUN_UNDEFINED) /* union semun is defined by including */ #else /* according to X/OPEN we have to define it ourselves */ @@ -95,7 +95,7 @@ union semun { , which defines a struct ipc_perm with such fields. glibc-1.09 has no support for sysv ipc. glibc 2 uses __key, __seq */ -#if defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +#if defined (__GLIBC__) && __GLIBC__ > 1 #define KEY __key #else #define KEY key diff -puN sys-utils/Makefile~CITI_NFS4_ALL sys-utils/Makefile --- util-linux-2.12/sys-utils/Makefile~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/sys-utils/Makefile 2004-12-13 17:42:08.000000000 -0500 @@ -8,22 +8,32 @@ include ../MCONFIG # Where to put man pages? -MAN1= arch.1 readprofile.1 +MAN1= arch.1 -MAN8= ctrlaltdel.8 cytune.8 dmesg.8 \ - ipcrm.8 ipcs.8 renice.8 \ - setsid.8 sln.8 tunelp.8 +MAN8= ipcrm.8 ipcs.8 renice.8 \ + setsid.8 sln.8 + +ifeq "$(OS)" "linux" +MAN1:= $(MAN1) readprofile.1 +MAN8:= $(MAN8) ctrlaltdel.8 cytune.8 dmesg.8 tunelp.8 +endif # Where to put binaries? # See the "install" rule for the links. . . -BIN= arch dmesg +BIN= arch -USRBIN= cytune ipcrm ipcs renice setsid +ifeq "$(OS)" "linux" +BIN:= $(BIN) dmesg +endif -USRSBIN= readprofile tunelp +USRBIN= ipcrm ipcs renice setsid +ifeq "$(OS)" "linux" +USRBIN:= $(USRBIN) cytune +USRSBIN= readprofile tunelp SBIN= ctrlaltdel +endif NOTMADE= @@ -37,10 +47,12 @@ SBIN:=$(SBIN) sln endif endif +ifeq "$(OS)" "linux" ifeq "$(ARCH)" "intel" MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8 USRSBIN:=$(USRSBIN) rdev endif +endif # Where to put datebase files? @@ -86,11 +98,13 @@ install: all $(INSTALLBIN) $(BIN) $(BINDIR) $(INSTALLBIN) $(USRBIN) $(USRBINDIR) $(INSTALLBIN) $(USRSBIN) $(USRSBINDIR) +ifeq "$(OS)" "linux" ifeq "$(ARCH)" "intel" (cd $(USRSBINDIR); ln -sf rdev ramsize) (cd $(USRSBINDIR); ln -sf rdev vidmode) (cd $(USRSBINDIR); ln -sf rdev rootflags) endif +endif $(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR) $(INSTALLMAN) $(MAN1) $(MAN1DIR) $(INSTALLMAN) $(MAN8) $(MAN8DIR) diff -puN sys-utils/readprofile.c~CITI_NFS4_ALL sys-utils/readprofile.c --- util-linux-2.12/sys-utils/readprofile.c~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/sys-utils/readprofile.c 2004-12-13 17:42:08.000000000 -0500 @@ -102,7 +102,7 @@ boot_uname_r_str(void) { if (uname(&uname_info)) return ""; - len = strlen(BOOT_SYSTEM_MAP) + strlen(uname_info.release) + 1; + len = strlen(BOOT_SYSTEM_MAP) + strlen(uname_info.release) + 2; s = xmalloc(len); strcpy(s, BOOT_SYSTEM_MAP); strcat(s, uname_info.release); diff -puN text-utils/more.c~CITI_NFS4_ALL text-utils/more.c --- util-linux-2.12/text-utils/more.c~CITI_NFS4_ALL 2004-12-13 17:42:08.000000000 -0500 +++ util-linux-2.12-bfields/text-utils/more.c 2004-12-13 17:42:08.000000000 -0500 @@ -73,6 +73,14 @@ #define stty(fd,argp) tcsetattr(fd,TCSANOW,argp) +/* TAB3 and TABDLY are in XPG3 and up */ +#if !defined(TABDLY) && defined(TBDELAY) +#define TABDLY TBDELAY +#endif +#if !defined(TAB3) && defined(XTABS) +#define TAB3 XTABS +#endif + /* some function declarations */ void initterm(void); void kill_line(void); @@ -1673,7 +1681,7 @@ void search(char buf[], FILE *file, regi } if (feof (file)) { if (!no_intty) { -#ifndef __linux__ +#ifdef STDIO_S_EOF_SEEN /* No longer in libc 4.5.8. . . */ file->_flags &= ~STDIO_S_EOF_SEEN; /* why doesn't fseek do this ??!!??! */ #endif @@ -1919,8 +1927,8 @@ retry: no_intty = tcgetattr(fileno(stdin), &otty); tcgetattr(fileno(stderr), &otty); savetty0 = otty; - slow_tty = (otty.c_cflag & CBAUD) < B1200; - hardtabs = (otty.c_oflag & TABDLY) != XTABS; + slow_tty = cfgetospeed(&otty) < B1200; + hardtabs = (otty.c_oflag & TABDLY) != TAB3; if (!no_tty) { otty.c_lflag &= ~(ICANON|ECHO); otty.c_cc[VMIN] = 1; _