From: LaMont Jones Date: Sun, 8 Jul 2007 23:06:03 +0000 (-0600) Subject: v2.12r-3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d928c2ec0d7e92e0cc5d8d3ca50ef77f42351e32;p=util-linux v2.12r-3 --- diff --git a/debian/changelog b/debian/changelog index 0bf4c1bb..73e9e3e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +util-linux (2.12r-3) unstable; urgency=low + + * Add ppc64 support. Closes: #322130 + * Update sections to match the overrides file. + * hwclockfirst.sh may not exit, since it gets sourced. + Closes: #343447 + * make the start messages from hwclock{first,}.sh slightly + different, for clarity. + * Build sparc binaries on sparc64 + * Actually cleanup pager alternatives. Closes: #348235 + * Deal better with long passwords. Based on patch from YAEGASHI Takeshi + . Closes: #315660 + + -- LaMont Jones Mon, 16 Jan 2006 14:35:42 -0700 + util-linux (2.12r-2) unstable; urgency=low * Add back in dropped cramfs-udebsize patch. diff --git a/debian/control b/debian/control index c0d6de81..a875f538 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,6 @@ Source: util-linux Section: base Priority: required -Depends: lsb-base (>= 3.0-6) Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpatch Maintainer: LaMont Jones Standards-Version: 3.5.6.0 @@ -9,9 +8,10 @@ Standards-Version: 3.5.6.0 Package: util-linux Architecture: any Pre-Depends: ${util-linux:Depends} -Section: base +Section: utils Priority: required Essential: yes +Depends: lsb-base (>= 3.0-6) 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} @@ -35,8 +35,9 @@ Description: Locales files for util-linux messages in other languages than English. Package: mount -Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sh s390 sparc sparc64 +Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64 Essential: yes +Section: admin Pre-Depends: ${mount:Depends} Description: Tools for mounting and manipulating filesystems This package provides the mount(8), umount(8), swapon(8), @@ -45,6 +46,7 @@ Description: Tools for mounting and manipulating filesystems Package: bsdutils Architecture: any Essential: yes +Section: utils Pre-Depends: ${bsdutils:Depends} Recommends: bsdmainutils Description: Basic utilities from 4.4BSD-Lite @@ -55,7 +57,7 @@ Description: Basic utilities from 4.4BSD-Lite Included are: logger, renice, replay, script, wall Package: fdisk-udeb -Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc hurd-i386 sparc s390 +Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 sparc s390 Priority: extra Section: debian-installer Depends: ${fdisk-udeb:Depends} @@ -63,7 +65,7 @@ Description: Partition a hard drive (manual) fdisk package Package: cfdisk-udeb -Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc hurd-i386 s390 +Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 hurd-i386 s390 Priority: extra Section: debian-installer Depends: ${cfdisk-udeb:Depends} diff --git a/debian/hwclock.sh b/debian/hwclock.sh index aab50423..a6027621 100644 --- a/debian/hwclock.sh +++ b/debian/hwclock.sh @@ -18,131 +18,141 @@ FIRST=no # debian/rules sets this to 'yes' when creating hwclockfirst.sh +[ "X$FIRST" = "Xyes" ] && AGAIN="" || AGAIN=" again" + # 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 +hwclock_sh() +{ + [ ! -x /sbin/hwclock ] && return 0 + . /etc/default/rcS -. /lib/lsb/init-functions -verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; } + . /lib/lsb/init-functions + verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; } -[ "$GMT" = "-u" ] && UTC="yes" -case "$UTC" in + [ "$GMT" = "-u" ] && UTC="yes" + case "$UTC" in no|"") GMT="--localtime" UTC="" if [ "X$FIRST" = "Xyes" ] && [ ! -r /etc/localtime ]; then if [ -z "$TZ" ]; then log_action_msg "System clock was not updated at this time" - exit 1 + return 1 fi fi ;; yes) GMT="--utc" UTC="--utc" ;; - *) log_action_msg "Unknown UTC setting: \"$UTC\""; exit 1 ;; -esac + *) log_action_msg "Unknown UTC setting: \"$UTC\""; return 1 ;; + esac -case "$BADYEAR" in + case "$BADYEAR" in no|"") BADYEAR="" ;; yes) BADYEAR="--badyear" ;; - *) log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; exit 1 ;; -esac + *) log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; return 1 ;; + esac -case "$1" in + case "$1" in start) - if [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then - echo "0.0 0 0.0" > /etc/adjtime - fi + if [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then + echo "0.0 0 0.0" > /etc/adjtime + fi - if [ "$FIRST" != yes ]; then - # 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 - : - fi + if [ "$FIRST" != yes ]; then + # 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 + : + fi + + if [ "$HWCLOCKACCESS" != no ]; then + log_daemon_msg "Setting the system clock$AGAIN" - if [ "$HWCLOCKACCESS" != no ]; then - log_daemon_msg "Setting the system clock" + # Copies Hardware Clock time to System Clock using the correct + # timezone for hardware clocks in local time, and sets kernel + # timezone. DO NOT REMOVE. + /sbin/hwclock --hctosys $GMT $HWCLOCKPARS $BADYEAR + if [ "$FIRST" = yes ]; then # Copies Hardware Clock time to System Clock using the correct # timezone for hardware clocks in local time, and sets kernel # timezone. DO NOT REMOVE. - /sbin/hwclock --hctosys $GMT $HWCLOCKPARS $BADYEAR - - if [ "$FIRST" = yes ]; then - # 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 - /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR - else - TZ="$TZ" /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR - fi - - if /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR 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" - /sbin/hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS $BADYEAR - fi + if [ -z "$TZ" ]; then + /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR + else + TZ="$TZ" /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR fi - # Announce the local time. - verbose_log_action_msg "System Clock set. Local time: `date $UTC`" - else - verbose_log_action_msg "Not setting System Clock" + if /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR 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" + /sbin/hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS $BADYEAR + fi fi - log_end_msg 0 - ;; + + # Announce the local time. + verbose_log_action_msg "System Clock set. Local time: `date $UTC`" + else + verbose_log_action_msg "Not setting System Clock" + fi + log_end_msg 0 + ;; 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 - log_daemon_msg "Saving the system clock" - if [ "$GMT" = "-u" ]; then - GMT="--utc" - fi - /sbin/hwclock --systohc $GMT $HWCLOCKPARS $BADYEAR - verbose_log_action_msg "Hardware Clock updated to `date`" - else - verbose_log_action_msg "Not saving System Clock" + if [ "X$FIRST" = "Xyes" ]; then + return 0 + fi + # + # 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 + log_daemon_msg "Saving the system clock" + if [ "$GMT" = "-u" ]; then + GMT="--utc" fi - log_end_msg 0 - ;; + /sbin/hwclock --systohc $GMT $HWCLOCKPARS $BADYEAR + verbose_log_action_msg "Hardware Clock updated to `date`" + else + verbose_log_action_msg "Not saving System Clock" + fi + log_end_msg 0 + ;; show) - if [ "$HWCLOCKACCESS" != no ]; then - /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR - fi - ;; + if [ "$HWCLOCKACCESS" != no ]; then + /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR + fi + ;; *) - log_success_msg "Usage: hwclock.sh {start|stop|reload|force-reload|show}" - log_success_msg " start sets kernel (system) clock from hardware (RTC) clock" - log_success_msg " stop and reload set hardware (RTC) clock from kernel (system) clock" - exit 1 - ;; -esac + log_success_msg "Usage: hwclock.sh {start|stop|reload|force-reload|show}" + log_success_msg " start sets kernel (system) clock from hardware (RTC) clock" + log_success_msg " stop and reload set hardware (RTC) clock from kernel (system) clock" + return 1 + ;; + esac +} + +hwclock_sh diff --git a/debian/patches/00list b/debian/patches/00list index 512d9949..0dfbd807 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,6 +8,7 @@ 10misc 10mount 10sparcumount +10warnings 20guesshelper #20xgethostname #50hurd diff --git a/debian/patches/10mount.dpatch b/debian/patches/10mount.dpatch index 3d23e6c8..fbda5503 100644 --- a/debian/patches/10mount.dpatch +++ b/debian/patches/10mount.dpatch @@ -9,9 +9,9 @@ ## DP: - Extra options to take keysize, etc. @DPATCH@ -diff -urNad util-linux/mount/Makefile /tmp/dpep.iuZnRq/util-linux/mount/Makefile ---- util-linux/mount/Makefile 2004-12-22 09:01:56.172327518 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/Makefile 2004-12-22 09:02:09.065556018 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/Makefile /tmp/dpep-work.31redI/util-linux/mount/Makefile +--- ./mount/Makefile 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/Makefile 2006-01-16 11:09:51.000000000 -0700 @@ -29,7 +29,7 @@ MAYBE = pivot_root swapoff @@ -30,9 +30,9 @@ diff -urNad util-linux/mount/Makefile /tmp/dpep.iuZnRq/util-linux/mount/Makefile $(LINK) $^ -o $@ mount.o umount.o nfsmount.o losetup.o fstab.o realpath.o sundries.o: sundries.h -diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount.c ---- util-linux/mount/lomount.c 2004-12-22 09:01:56.173327303 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/lomount.c 2004-12-22 09:06:40.163281442 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/lomount.c /tmp/dpep-work.31redI/util-linux/mount/lomount.c +--- ./mount/lomount.c 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/lomount.c 2006-01-16 11:20:45.000000000 -0700 @@ -20,6 +20,7 @@ #include "loop.h" @@ -157,7 +157,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount } } -@@ -289,30 +370,105 @@ +@@ -289,30 +370,114 @@ } #endif @@ -192,19 +192,23 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount + 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]; ++ char *pass2; ++ int passwdlen; + int keylength; + int i; + + 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); ++ passwdlen=strlen(pass); ++ pass2=malloc(passwdlen+2); ++ pass2[0]='A'; ++ strcpy(pass2+1,pass); ++ rmd160_hash_buffer(keybits,pass,passwdlen); ++ rmd160_hash_buffer(keybits+HASHLENGTH,pass2,passwdlen+1); + memcpy((char*)loopinfo64.lo_encrypt_key,keybits,2*HASHLENGTH); ++ memset(pass, 0, passwdlen); ++ memset(pass2, 0, passwdlen+1); ++ free(pass2); + keylength=0; + for(i=0; crypt_type_tbl[i].id != -1; i++){ + if(loopinfo64.lo_encrypt_type == crypt_type_tbl[i].id){ @@ -218,15 +222,20 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount + default: + if (hash_password) { + char keybits[2*HASHLENGTH]; -+ char passwdbuff[PASSWDBUFFLEN]; ++ char *pass2; ++ int passwdlen; + + 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); -+ memset(pass, 0, strlen(pass)); ++ passwdlen=strlen(pass); ++ pass2=malloc(passwdlen+2); ++ pass2[0]='A'; ++ strcpy(pass2+1,pass); ++ rmd160_hash_buffer(keybits,pass,passwdlen); ++ rmd160_hash_buffer(keybits+HASHLENGTH,pass2,passwdlen+1); ++ memset(pass, 0, passwdlen); ++ memset(pass2, 0, passwdlen+1); ++ free(pass2); ++ + memcpy((char*)loopinfo64.lo_encrypt_key,keybits,keysz/8); + loopinfo64.lo_encrypt_key_size = keysz/8; + } else { @@ -271,7 +280,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount struct loop_info loopinfo; int errsv = errno; -@@ -326,6 +482,7 @@ +@@ -326,6 +491,7 @@ perror("ioctl: LOOP_SET_STATUS"); } memset(&loopinfo, 0, sizeof(loopinfo)); @@ -279,7 +288,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount } memset(&loopinfo64, 0, sizeof(loopinfo64)); -@@ -334,12 +491,19 @@ +@@ -334,12 +500,19 @@ close (fd); return 1; } @@ -299,7 +308,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount } int -@@ -404,10 +568,27 @@ +@@ -404,10 +577,27 @@ static void usage(void) { fprintf(stderr, _("usage:\n\ @@ -331,7 +340,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount progname, progname, progname, progname); exit(1); } -@@ -442,10 +623,13 @@ +@@ -442,10 +632,13 @@ int main(int argc, char **argv) { char *p, *offset, *encryption, *passfd, *device, *file; @@ -345,7 +354,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount unsigned long long off; setlocale(LC_ALL, ""); -@@ -455,12 +639,14 @@ +@@ -455,12 +648,14 @@ delete = find = 0; off = 0; offset = encryption = passfd = NULL; @@ -361,7 +370,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount switch (c) { case 'd': delete = 1; -@@ -472,6 +658,12 @@ +@@ -472,6 +667,12 @@ case 'f': find = 1; break; @@ -374,7 +383,7 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount case 'o': offset = optarg; break; -@@ -527,7 +719,10 @@ +@@ -527,7 +728,10 @@ usage(); if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(); @@ -386,9 +395,9 @@ diff -urNad util-linux/mount/lomount.c /tmp/dpep.iuZnRq/util-linux/mount/lomount } return res; } -diff -urNad util-linux/mount/lomount.h /tmp/dpep.iuZnRq/util-linux/mount/lomount.h ---- util-linux/mount/lomount.h 2004-12-22 09:01:56.174327088 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/lomount.h 2004-12-22 09:02:09.066555803 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/lomount.h /tmp/dpep-work.31redI/util-linux/mount/lomount.h +--- ./mount/lomount.h 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/lomount.h 2006-01-16 11:09:51.000000000 -0700 @@ -1,6 +1,6 @@ extern int verbose; extern int set_loop(const char *, const char *, unsigned long long, @@ -397,9 +406,9 @@ diff -urNad util-linux/mount/lomount.h /tmp/dpep.iuZnRq/util-linux/mount/lomount extern int del_loop(const char *); extern int is_loop_device(const char *); extern char * find_unused_loop_device(void); -diff -urNad util-linux/mount/loop.h /tmp/dpep.iuZnRq/util-linux/mount/loop.h ---- util-linux/mount/loop.h 2004-12-22 09:01:56.174327088 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/loop.h 2004-12-22 09:02:09.066555803 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/loop.h /tmp/dpep-work.31redI/util-linux/mount/loop.h +--- ./mount/loop.h 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/loop.h 2006-01-16 11:09:51.000000000 -0700 @@ -1,8 +1,39 @@ -#define LO_CRYPT_NONE 0 -#define LO_CRYPT_XOR 1 @@ -443,9 +452,9 @@ diff -urNad util-linux/mount/loop.h /tmp/dpep.iuZnRq/util-linux/mount/loop.h #define LOOP_SET_FD 0x4C00 #define LOOP_CLR_FD 0x4C01 #define LOOP_SET_STATUS 0x4C02 -diff -urNad util-linux/mount/losetup.8 /tmp/dpep.iuZnRq/util-linux/mount/losetup.8 ---- util-linux/mount/losetup.8 2004-12-22 09:01:56.174327088 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/losetup.8 2004-12-22 09:02:09.066555803 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/losetup.8 /tmp/dpep-work.31redI/util-linux/mount/losetup.8 +--- ./mount/losetup.8 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/losetup.8 2006-01-16 11:09:51.000000000 -0700 @@ -66,23 +66,29 @@ .B \-e option.) @@ -490,9 +499,9 @@ diff -urNad util-linux/mount/losetup.8 /tmp/dpep.iuZnRq/util-linux/mount/losetup .\" .SH AUTHORS .\" .nf .\" Original version: Theodore Ts'o -diff -urNad util-linux/mount/mount.8 /tmp/dpep.iuZnRq/util-linux/mount/mount.8 ---- util-linux/mount/mount.8 2004-12-22 09:01:56.175326873 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/mount.8 2004-12-22 09:02:09.067555588 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/mount.8 /tmp/dpep-work.31redI/util-linux/mount/mount.8 +--- ./mount/mount.8 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/mount.8 2006-01-16 11:09:51.000000000 -0700 @@ -281,6 +281,12 @@ .B \-v Verbose mode. @@ -542,9 +551,9 @@ diff -urNad util-linux/mount/mount.8 /tmp/dpep.iuZnRq/util-linux/mount/mount.8 .BR mke2fs (8), .BR tune2fs (8), .BR losetup (8) -diff -urNad util-linux/mount/mount.c /tmp/dpep.iuZnRq/util-linux/mount/mount.c ---- util-linux/mount/mount.c 2004-12-22 09:01:56.177326443 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/mount.c 2004-12-22 09:02:09.068555373 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/mount.c /tmp/dpep-work.31redI/util-linux/mount/mount.c +--- ./mount/mount.c 2005-08-16 11:50:21.000000000 -0600 ++++ /tmp/dpep-work.31redI/util-linux/mount/mount.c 2006-01-16 11:09:51.000000000 -0700 @@ -59,6 +59,9 @@ /* Nonzero for chatty (-v). */ int verbose = 0; @@ -656,9 +665,9 @@ diff -urNad util-linux/mount/mount.c /tmp/dpep.iuZnRq/util-linux/mount/mount.c switch (argc+specseen) { case 0: /* mount -a */ -diff -urNad util-linux/mount/rmd160.c /tmp/dpep.iuZnRq/util-linux/mount/rmd160.c ---- util-linux/mount/rmd160.c 1969-12-31 17:00:00.000000000 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/rmd160.c 2004-12-22 09:02:09.069555158 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/rmd160.c /tmp/dpep-work.31redI/util-linux/mount/rmd160.c +--- ./mount/rmd160.c 1969-12-31 17:00:00.000000000 -0700 ++++ /tmp/dpep-work.31redI/util-linux/mount/rmd160.c 2006-01-16 11:09:51.000000000 -0700 @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. @@ -1192,9 +1201,9 @@ diff -urNad util-linux/mount/rmd160.c /tmp/dpep.iuZnRq/util-linux/mount/rmd160.c + rmd160_final( &hd ); + memcpy( outbuf, hd.buf, 20 ); +} -diff -urNad util-linux/mount/rmd160.h /tmp/dpep.iuZnRq/util-linux/mount/rmd160.h ---- util-linux/mount/rmd160.h 1969-12-31 17:00:00.000000000 -0700 -+++ /tmp/dpep.iuZnRq/util-linux/mount/rmd160.h 2004-12-22 09:02:09.069555158 -0700 +diff -urNad --exclude=CVS --exclude=.svn ./mount/rmd160.h /tmp/dpep-work.31redI/util-linux/mount/rmd160.h +--- ./mount/rmd160.h 1969-12-31 17:00:00.000000000 -0700 ++++ /tmp/dpep-work.31redI/util-linux/mount/rmd160.h 2006-01-16 11:09:51.000000000 -0700 @@ -0,0 +1,9 @@ +#ifndef RMD160_H +#define RMD160_H diff --git a/debian/patches/10warnings.dpatch b/debian/patches/10warnings.dpatch new file mode 100644 index 00000000..fe738e4f --- /dev/null +++ b/debian/patches/10warnings.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10warnings.dpatch by LaMont Jones +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compiler warnings + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./misc-utils/ddate.c /tmp/dpep-work.BBs5Mx/util-linux/misc-utils/ddate.c +--- ./misc-utils/ddate.c 2004-09-06 15:12:40.000000000 -0600 ++++ /tmp/dpep-work.BBs5Mx/util-linux/misc-utils/ddate.c 2006-01-15 18:25:14.000000000 -0700 +@@ -296,6 +296,7 @@ + int cal[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 }; + int dayspast=0; + ++ memset(&funkychickens,0,sizeof(funkychickens)); + /* basic range checks */ + if (imonth < 1 || imonth > 12) { + funkychickens.season = -1; +diff -urNad --exclude=CVS --exclude=.svn ./misc-utils/script.c /tmp/dpep-work.BBs5Mx/util-linux/misc-utils/script.c +--- ./misc-utils/script.c 2004-12-15 08:32:52.000000000 -0700 ++++ /tmp/dpep-work.BBs5Mx/util-linux/misc-utils/script.c 2006-01-15 18:25:57.000000000 -0700 +@@ -325,9 +325,9 @@ + shname = shell; + + if (cflg) +- execl(shell, shname, "-c", cflg, 0); ++ execl(shell, shname, "-c", cflg, NULL); + else +- execl(shell, shname, "-i", 0); ++ execl(shell, shname, "-i", NULL); + + perror(shell); + fail(); diff --git a/debian/prerm b/debian/prerm index 687ad4ab..c4b35071 100644 --- a/debian/prerm +++ b/debian/prerm @@ -7,6 +7,7 @@ install-info --quiet --remove ipc case "$1" in remove) update-alternatives --remove pager /bin/more + update-alternatives --remove pager /usr/bin/pg ;; upgrade|failed-upgrade|deconfigure) ;; diff --git a/debian/rules b/debian/rules index b19dad67..48353d67 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,8 @@ 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 amd64 s390) -sparc = $(findstring $(arch),sparc) +fdisk_arch = $(findstring $(arch),alpha i386 powerpc ppc64 arm mips mipsel hppa ia64 hurd-i386 amd64 s390) +sparc = $(findstring $(arch),sparc sparc64) nohwclock = $(findstring $(arch),s390) SUBDIRS=po lib getopt disk-utils login-utils misc-utils mount sys-utils text-utils @@ -200,7 +200,7 @@ 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) +ifeq ($(arch),$(findstring $(arch),powerpc ppc64)) 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 @@ -212,7 +212,7 @@ ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu) (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) +ifneq ($(arch),$(findstring $(arch),powerpc ppc64)) (cd debian/tmp/usr/share/man/man8 && ln -s hwclock.8.gz clock.8.gz) endif endif diff --git a/debian/util-linux-locales.prerm b/debian/util-linux-locales.prerm index 02ace5bd..1f1b756a 100644 --- a/debian/util-linux-locales.prerm +++ b/debian/util-linux-locales.prerm @@ -4,7 +4,6 @@ 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