--- util-linux-2.13.1.orig/login-utils/Makefile.in +++ util-linux-2.13.1/login-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -181,7 +181,7 @@ @BUILD_WALL_TRUE@am_wall_OBJECTS = wall.$(OBJEXT) ttymsg.$(OBJEXT) wall_OBJECTS = $(am_wall_OBJECTS) wall_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -856,8 +856,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -869,8 +869,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -880,13 +880,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/login-utils/agetty.c +++ util-linux-2.13.1/login-utils/agetty.c @@ -165,6 +165,7 @@ #define F_WAITCRLF (1<<5) /* wait for CR or LF */ #define F_CUSTISSUE (1<<6) /* give alternative issue file */ #define F_NOPROMPT (1<<7) /* don't ask for login name! */ +#define F_LCUC (1<<8) /* Support for *LCUC stty modes */ /* Storage for things detected while the login name was read. */ @@ -412,7 +413,7 @@ extern int optind; /* getopt */ int c; - while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mt:wn"))) { + while (isascii(c = getopt(argc, argv, "8I:LH:f:hil:mt:wUn"))) { switch (c) { case '8': op->eightbits = 1; @@ -489,6 +490,9 @@ case 'w': op->flags |= F_WAITCRLF; break; + case 'U': + op->flags |= F_LCUC; + break; default: usage(); } @@ -1116,8 +1120,7 @@ } } /* Handle names with upper case and no lower case. */ - - if ((cp->capslock = caps_lock(logname))) { + if ((op->flags & F_LCUC) && (cp->capslock = caps_lock(logname))) { for (bp = logname; *bp; bp++) if (isupper(*bp)) *bp = tolower(*bp); /* map name to lower case */ @@ -1230,7 +1233,7 @@ void usage() { - fprintf(stderr, _("Usage: %s [-8hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); + fprintf(stderr, _("Usage: %s [-8hiLmUw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\nor\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"), progname); exit(1); } --- util-linux-2.13.1.orig/login-utils/agetty.8 +++ util-linux-2.13.1/login-utils/agetty.8 @@ -3,7 +3,7 @@ agetty \- alternative Linux getty .SH SYNOPSIS -.BR "agetty " [\-8ihLmnw] +.BR "agetty " [\-8ihLmnUw] .RI "[-f " issue_file ] .RI "[-l " login_program ] .RI "[-I " init ] @@ -163,6 +163,12 @@ be useful when you have a locally attached terminal where the serial line does not set the carrier detect signal. .TP +\-U +Turn on support for detecting an uppercase only terminal. This setting will +detect a login name containing only capitals as indicating an uppercase +only terminal and turn on some upper to lower case conversions. Note that +this has no support for any unicode characters. +.TP \-w Wait for the user or the modem to send a carriage-return or a linefeed character before sending the \fI/etc/issue\fP (or other) file --- util-linux-2.13.1.orig/m4/intmax.m4 +++ util-linux-2.13.1/m4/intmax.m4 @@ -0,0 +1,32 @@ +# intmax.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the system has the 'intmax_t' type, but don't attempt to +dnl find a replacement if it is lacking. + +AC_DEFUN([gt_TYPE_INTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, + [AC_TRY_COMPILE([ +#include <stddef.h> +#include <stdlib.h> +#if HAVE_STDINT_H_WITH_UINTMAX +#include <stdint.h> +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include <inttypes.h> +#endif +], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) + if test $gt_cv_c_intmax_t = yes; then + AC_DEFINE(HAVE_INTMAX_T, 1, + [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) + fi +]) --- util-linux-2.13.1.orig/m4/stdint_h.m4 +++ util-linux-2.13.1/m4/stdint_h.m4 @@ -0,0 +1,28 @@ +# stdint_h.m4 serial 3 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, +# doesn't clash with <sys/types.h>, and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_STDINT_H], +[ + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + [AC_TRY_COMPILE( + [#include <sys/types.h> +#include <stdint.h>], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_stdint_h=yes, + jm_ac_cv_header_stdint_h=no)]) + if test $jm_ac_cv_header_stdint_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, + [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) + fi +]) --- util-linux-2.13.1.orig/m4/printf-posix.m4 +++ util-linux-2.13.1/m4/printf-posix.m4 @@ -0,0 +1,46 @@ +# printf-posix.m4 serial 2 (gettext-0.13.1) +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the printf() function supports POSIX/XSI format strings with +dnl positions. + +AC_DEFUN([gt_PRINTF_POSIX], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], + gt_cv_func_printf_posix, + [ + AC_TRY_RUN([ +#include <stdio.h> +#include <string.h> +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, + [ + AC_EGREP_CPP(notposix, [ +#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ + notposix +#endif + ], gt_cv_func_printf_posix="guessing no", + gt_cv_func_printf_posix="guessing yes") + ]) + ]) + case $gt_cv_func_printf_posix in + *yes) + AC_DEFINE(HAVE_POSIX_PRINTF, 1, + [Define if your printf() function supports format strings with positions.]) + ;; + esac +]) --- util-linux-2.13.1.orig/m4/xsize.m4 +++ util-linux-2.13.1/m4/xsize.m4 @@ -0,0 +1,14 @@ +# xsize.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_XSIZE], +[ + dnl Prerequisites of lib/xsize.h. + AC_REQUIRE([gl_SIZE_MAX]) + AC_CHECK_HEADERS(stdint.h) +]) --- util-linux-2.13.1.orig/m4/uintmax_t.m4 +++ util-linux-2.13.1/m4/uintmax_t.m4 @@ -0,0 +1,32 @@ +# uintmax_t.m4 serial 7 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +AC_PREREQ(2.13) + +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in <stdint.h> or <inttypes.h>. + +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + test $ac_cv_type_unsigned_long_long = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, + [Define to unsigned long or unsigned long long + if <stdint.h> and <inttypes.h> don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) + fi +]) --- util-linux-2.13.1.orig/m4/codeset.m4 +++ util-linux-2.13.1/m4/codeset.m4 @@ -0,0 +1,23 @@ +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include <langinfo.h>], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) + fi +]) --- util-linux-2.13.1.orig/m4/signed.m4 +++ util-linux-2.13.1/m4/signed.m4 @@ -0,0 +1,19 @@ +# signed.m4 serial 1 (gettext-0.10.40) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([bh_C_SIGNED], +[ + AC_CACHE_CHECK([for signed], bh_cv_c_signed, + [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) + if test $bh_cv_c_signed = no; then + AC_DEFINE(signed, , + [Define to empty if the C compiler doesn't support this keyword.]) + fi +]) --- util-linux-2.13.1.orig/m4/inttypes_h.m4 +++ util-linux-2.13.1/m4/inttypes_h.m4 @@ -0,0 +1,28 @@ +# inttypes_h.m4 serial 5 (gettext-0.12) +dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, +# doesn't clash with <sys/types.h>, and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + [AC_TRY_COMPILE( + [#include <sys/types.h> +#include <inttypes.h>], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + jm_ac_cv_header_inttypes_h=no)]) + if test $jm_ac_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, + [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) + fi +]) --- util-linux-2.13.1.orig/m4/size_max.m4 +++ util-linux-2.13.1/m4/size_max.m4 @@ -0,0 +1,61 @@ +# size_max.m4 serial 2 +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gl_SIZE_MAX], +[ + AC_CHECK_HEADERS(stdint.h) + dnl First test whether the system already has SIZE_MAX. + AC_MSG_CHECKING([for SIZE_MAX]) + result= + AC_EGREP_CPP([Found it], [ +#include <limits.h> +#if HAVE_STDINT_H +#include <stdint.h> +#endif +#ifdef SIZE_MAX +Found it +#endif +], result=yes) + if test -z "$result"; then + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider + dnl than the type 'unsigned long'. + dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', + dnl which is guaranteed to work from LONG_MIN to LONG_MAX. + _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, + [#include <stddef.h>], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include <stddef.h>], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include <stddef.h>], result=?) + if test "$fits_in_uint" = 1; then + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. + AC_TRY_COMPILE([#include <stddef.h> + extern size_t foo; + extern unsigned long foo; + ], [], fits_in_uint=0) + fi + if test -z "$result"; then + if test "$fits_in_uint" = 1; then + result="$res_hi$res_lo"U + else + result="$res_hi$res_lo"UL + fi + else + dnl Shouldn't happen, but who knows... + result='~(size_t)0' + fi + fi + AC_MSG_RESULT([$result]) + if test "$result" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + fi +]) --- util-linux-2.13.1.orig/m4/inttypes-pri.m4 +++ util-linux-2.13.1/m4/inttypes-pri.m4 @@ -0,0 +1,32 @@ +# inttypes-pri.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* +# macros to non-string values. This is the case on AIX 4.3.3. + +AC_DEFUN([gt_INTTYPES_PRI], +[ + AC_REQUIRE([gt_HEADER_INTTYPES_H]) + if test $gt_cv_header_inttypes_h = yes; then + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], + gt_cv_inttypes_pri_broken, + [ + AC_TRY_COMPILE([#include <inttypes.h> +#ifdef PRId32 +char *p = PRId32; +#endif +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) + ]) + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + [Define if <inttypes.h> exists and defines unusable PRI* macros.]) + fi +]) --- util-linux-2.13.1.orig/m4/lcmessage.m4 +++ util-linux-2.13.1/m4/lcmessage.m4 @@ -0,0 +1,32 @@ +# lcmessage.m4 serial 3 (gettext-0.11.3) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995. + +# Check whether LC_MESSAGES is available in <locale.h>. + +AC_DEFUN([AM_LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your <locale.h> file defines LC_MESSAGES.]) + fi +]) --- util-linux-2.13.1.orig/m4/inttypes.m4 +++ util-linux-2.13.1/m4/inttypes.m4 @@ -0,0 +1,27 @@ +# inttypes.m4 serial 1 (gettext-0.11.4) +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with +# <sys/types.h>. + +AC_DEFUN([gt_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, + [ + AC_TRY_COMPILE( + [#include <sys/types.h> +#include <inttypes.h>], + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) + ]) + if test $gt_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, + [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) + fi +]) --- util-linux-2.13.1.orig/m4/wchar_t.m4 +++ util-linux-2.13.1/m4/wchar_t.m4 @@ -0,0 +1,22 @@ +# wchar_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether <stddef.h> has the 'wchar_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WCHAR_T], +[ + AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, + [AC_TRY_COMPILE([#include <stddef.h> + wchar_t foo = (wchar_t)'\0';], , + gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) + if test $gt_cv_c_wchar_t = yes; then + AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) + fi +]) --- util-linux-2.13.1.orig/m4/intdiv0.m4 +++ util-linux-2.13.1/m4/intdiv0.m4 @@ -0,0 +1,72 @@ +# intdiv0.m4 serial 1 (gettext-0.11.3) +dnl Copyright (C) 2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([gt_INTDIV0], +[ + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], + gt_cv_int_divbyzero_sigfpe, + [ + AC_TRY_RUN([ +#include <stdlib.h> +#include <signal.h> + +static void +#ifdef __cplusplus +sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, + [ + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + ]) + ]) + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, + [Define if integer division by zero raises signal SIGFPE.]) +]) --- util-linux-2.13.1.orig/m4/longlong.m4 +++ util-linux-2.13.1/m4/longlong.m4 @@ -0,0 +1,25 @@ +# longlong.m4 serial 4 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_LONG_LONG if 'long long' works. + +AC_DEFUN([jm_AC_TYPE_LONG_LONG], +[ + AC_CACHE_CHECK([for long long], ac_cv_type_long_long, + [AC_TRY_LINK([long long ll = 1LL; int i = 63;], + [long long llmax = (long long) -1; + return ll << i | ll >> i | llmax / ll | llmax % ll;], + ac_cv_type_long_long=yes, + ac_cv_type_long_long=no)]) + if test $ac_cv_type_long_long = yes; then + AC_DEFINE(HAVE_LONG_LONG, 1, + [Define if you have the 'long long' type.]) + fi +]) --- util-linux-2.13.1.orig/m4/longdouble.m4 +++ util-linux-2.13.1/m4/longdouble.m4 @@ -0,0 +1,30 @@ +# longdouble.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether the compiler supports the 'long double' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_LONGDOUBLE], +[ + AC_CACHE_CHECK([for long double], gt_cv_c_long_double, + [if test "$GCC" = yes; then + gt_cv_c_long_double=yes + else + AC_TRY_COMPILE([ + /* The Stardent Vistra knows sizeof(long double), but does not support it. */ + long double foo = 0.0; + /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + int array [2*(sizeof(long double) >= sizeof(double)) - 1]; + ], , + gt_cv_c_long_double=yes, gt_cv_c_long_double=no) + fi]) + if test $gt_cv_c_long_double = yes; then + AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) + fi +]) --- util-linux-2.13.1.orig/m4/ulonglong.m4 +++ util-linux-2.13.1/m4/ulonglong.m4 @@ -0,0 +1,25 @@ +# ulonglong.m4 serial 3 +dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Paul Eggert. + +# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. + +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +[ + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, + [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], + [unsigned long long ullmax = (unsigned long long) -1; + return ull << i | ull >> i | ullmax / ull | ullmax % ull;], + ac_cv_type_unsigned_long_long=yes, + ac_cv_type_unsigned_long_long=no)]) + if test $ac_cv_type_unsigned_long_long = yes; then + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, + [Define if you have the 'unsigned long long' type.]) + fi +]) --- util-linux-2.13.1.orig/m4/glibc21.m4 +++ util-linux-2.13.1/m4/glibc21.m4 @@ -0,0 +1,32 @@ +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) --- util-linux-2.13.1.orig/m4/wint_t.m4 +++ util-linux-2.13.1/m4/wint_t.m4 @@ -0,0 +1,22 @@ +# wint_t.m4 serial 1 (gettext-0.12) +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether <wchar.h> has the 'wint_t' type. +dnl Prerequisite: AC_PROG_CC + +AC_DEFUN([gt_TYPE_WINT_T], +[ + AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, + [AC_TRY_COMPILE([#include <wchar.h> + wint_t foo = (wchar_t)'\0';], , + gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) + if test $gt_cv_c_wint_t = yes; then + AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) + fi +]) --- util-linux-2.13.1.orig/m4/isc-posix.m4 +++ util-linux-2.13.1/m4/isc-posix.m4 @@ -0,0 +1,26 @@ +# isc-posix.m4 serial 2 (gettext-0.11.2) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) --- util-linux-2.13.1.orig/partx/Makefile.in +++ util-linux-2.13.1/partx/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,7 +66,7 @@ @BUILD_PARTX_TRUE@ crc32.$(OBJEXT) partx_OBJECTS = $(am_partx_OBJECTS) partx_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -356,8 +356,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -369,8 +369,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -380,13 +380,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/po/Makevars.template +++ util-linux-2.13.1/po/Makevars.template @@ -0,0 +1,41 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Free Software Foundation, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = --- util-linux-2.13.1.orig/include/Makefile.in +++ util-linux-2.13.1/include/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -219,8 +219,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -232,8 +232,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -243,13 +243,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/hwclock/hwclock.8 +++ util-linux-2.13.1/hwclock/hwclock.8 @@ -602,8 +602,6 @@ .SH FILES .I /etc/adjtime .I /usr/share/zoneinfo/ -.RI ( /usr/lib/zoneinfo -on old systems) .I /dev/rtc .I /dev/rtc0 .I /dev/port @@ -617,6 +615,8 @@ .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), --- util-linux-2.13.1.orig/hwclock/Makefile.in +++ util-linux-2.13.1/hwclock/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,7 +57,7 @@ hwclock_OBJECTS = $(am_hwclock_OBJECTS) am__DEPENDENCIES_1 = hwclock_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -335,8 +335,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -348,8 +348,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -359,13 +359,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/config/config.sub +++ util-linux-2.13.1/config/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -475,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -925,6 +929,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1226,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1421,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- util-linux-2.13.1.orig/config/install-sh +++ util-linux-2.13.1/config/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi --- util-linux-2.13.1.orig/config/depcomp +++ util-linux-2.13.1/config/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile --- util-linux-2.13.1.orig/config/config.guess +++ util-linux-2.13.1/config/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -329,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -780,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- util-linux-2.13.1.orig/Makefile.in +++ util-linux-2.13.1/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -365,8 +365,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -391,8 +391,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -402,13 +402,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -484,6 +483,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -511,6 +514,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -662,7 +667,7 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-local distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ --- util-linux-2.13.1.orig/docs/v2.13.1-ReleaseNotes +++ util-linux-2.13.1/docs/v2.13.1-ReleaseNotes @@ -1,6 +1,6 @@ -Util-linux-ng 2.13.1 Release Notes -================================== +Util-linux-ng 2.13.1 Release Notes (16-Jan-2008) +================================================ Fixed security issues: --------------------- --- util-linux-2.13.1.orig/sys-utils/renice.c +++ util-linux-2.13.1/sys-utils/renice.c @@ -48,6 +48,12 @@ int donice(int,int,int); +void usage(void) +{ + fprintf(stderr, _("usage: renice priority [ [ -p ] pids ] " + "[ [ -g ] pgrps ] [ [ -u ] users ]\n")); + exit(1); +} /* * Change the priority (nice) of processes * or groups of processes which are already @@ -58,6 +64,7 @@ { int which = PRIO_PROCESS; int who = 0, prio, errs = 0; + char *endptr=NULL; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -65,11 +72,12 @@ argc--, argv++; if (argc < 2) { - fprintf(stderr, _("usage: renice priority [ [ -p ] pids ] " - "[ [ -g ] pgrps ] [ [ -u ] users ]\n")); - exit(1); + usage(); + } + prio = strtol(*argv,&endptr,10); + if (*endptr) { + usage(); } - prio = atoi(*argv); argc--, argv++; #if 0 if (prio > PRIO_MAX) @@ -100,8 +108,8 @@ } who = pwd->pw_uid; } else { - who = atoi(*argv); - if (who < 0) { + who = strtol(*argv,&endptr,10); + if (who < 0 || *endptr) { fprintf(stderr, _("renice: %s: bad value\n"), *argv); continue; --- util-linux-2.13.1.orig/sys-utils/Makefile.in +++ util-linux-2.13.1/sys-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -122,7 +122,7 @@ am_tunelp_OBJECTS = tunelp.$(OBJEXT) tunelp_OBJECTS = $(am_tunelp_OBJECTS) tunelp_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -741,8 +741,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -754,8 +754,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -765,13 +765,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/sys-utils/setarch.c +++ util-linux-2.13.1/sys-utils/setarch.c @@ -192,6 +192,10 @@ p = argv[0]; if (!strcmp(p, "-h") || !strcmp(p, "--help")) show_help(); + #if defined(__sparc64__) || defined(__sparc__) + } else if (!strcmp(p,"sparc64")) { + options |= ADDR_LIMIT_32BIT; + #endif } #if defined(__sparc64__) || defined(__sparc__) if (!strcmp(p, "sparc32bash")) { --- util-linux-2.13.1.orig/tests/Makefile.in +++ util-linux-2.13.1/tests/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -338,8 +338,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -364,8 +364,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -375,13 +375,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/tests/helpers/Makefile.in +++ util-linux-2.13.1/tests/helpers/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,7 +52,7 @@ am_mnt_test_sysinfo_OBJECTS = mnt_test_sysinfo.$(OBJEXT) mnt_test_sysinfo_OBJECTS = $(am_mnt_test_sysinfo_OBJECTS) mnt_test_sysinfo_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -256,8 +256,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -269,8 +269,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -280,13 +280,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/getopt/Makefile.in +++ util-linux-2.13.1/getopt/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,7 +56,7 @@ getopt_SOURCES = getopt.c getopt_OBJECTS = getopt-getopt.$(OBJEXT) getopt_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -372,8 +372,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -385,8 +385,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -396,13 +396,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/getopt/getopt.1 +++ util-linux-2.13.1/getopt/getopt.1 @@ -402,9 +402,8 @@ .SH EXAMPLES Example scripts for (ba)sh and (t)csh are provided with the .BR getopt (1) -distribution, and are optionally installed in -.B /usr/share/getopt . - +distribution, and are installed in +.BR /usr/share/doc/util-linux/examples . .SH ENVIRONMENT .IP POSIXLY_CORRECT This environment variable is examined by the --- util-linux-2.13.1.orig/fdisk/Makefile.in +++ util-linux-2.13.1/fdisk/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -93,7 +93,7 @@ @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@ $(am__objects_1) sfdisk_OBJECTS = $(am_sfdisk_OBJECTS) sfdisk_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -397,8 +397,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -410,8 +410,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -421,13 +421,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/fdisk/cfdisk.8 +++ util-linux-2.13.1/fdisk/cfdisk.8 @@ -13,13 +13,13 @@ .\" " for hilit mode .TH CFDISK 8 "3 June 1995" "The BOGUS Linux Release" "Linux Programmer's Manual" .SH NAME -cfdisk \- Curses based disk partition table manipulator for Linux +cfdisk \- Curses/slang based disk partition table manipulator for Linux .SH SYNOPSIS .BI "cfdisk [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]" .BI "[ \-s " sectors-per-track " ] [ -P " opt " ] [ " device " ]" .SH DESCRIPTION .B cfdisk -is a curses based program for partitioning any hard disk drive. +is a curses/slang based program for partitioning any hard disk drive. Typical values of the .I device argument are: --- util-linux-2.13.1.orig/mount/my_dev_t.h +++ util-linux-2.13.1/mount/my_dev_t.h @@ -2,19 +2,4 @@ /* glibc uses a different dev_t */ #include <linux/posix_types.h> -#include <linux/version.h> - -#ifndef KERNEL_VERSION -#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(1,3,78) -/* for i386 - alpha uses unsigned int */ -#define my_dev_t unsigned short -#else -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68) -#define my_dev_t __kernel_dev_t -#else #define my_dev_t __kernel_old_dev_t -#endif -#endif --- util-linux-2.13.1.orig/mount/Makefile.am +++ util-linux-2.13.1/mount/Makefile.am @@ -12,7 +12,7 @@ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ getusername.h loop.h sundries.h -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \ +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c \ $(utils_common) $(headers_common) ../lib/env.c mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c @@ -25,7 +25,7 @@ swapon_SOURCES = swapon.c swap_constants.h $(utils_common) -losetup_SOURCES = lomount.c loop.h lomount.h +losetup_SOURCES = lomount.c loop.h lomount.h rmd160.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_LDADD = $(LDADD_common) --- util-linux-2.13.1.orig/mount/rmd160.h +++ util-linux-2.13.1/mount/rmd160.h @@ -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*/ + + --- util-linux-2.13.1.orig/mount/lomount.c +++ util-linux-2.13.1/mount/lomount.c @@ -20,6 +20,7 @@ #include "loop.h" #include "lomount.h" +#include "rmd160.h" #include "xstrncpy.h" #include "nls.h" @@ -275,7 +276,7 @@ int set_loop(const char *device, const char *file, unsigned long long offset, - const char *encryption, int pfd, int *loopro) { + const char *encryption, int pfd, int *loopro, int keysz, int hash_pass) { struct loop_info64 loopinfo64; int fd, ffd, mode, i; char *pass; @@ -326,20 +327,87 @@ } #endif + + if (keysz==0) + keysz=LO_KEY_SIZE*8; switch (loopinfo64.lo_encrypt_type) { case LO_CRYPT_NONE: loopinfo64.lo_encrypt_key_size = 0; break; case LO_CRYPT_XOR: pass = getpass(_("Password: ")); - goto gotpass; - default: - pass = xgetpass(pfd, _("Password: ")); - gotpass: memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE); xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); memset(pass, 0, strlen(pass)); loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; + break; +#define HASHLENGTH 20 +#if 0 + 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: + { + char keybits[2*HASHLENGTH]; + char *pass2; + int passwdlen; + int keylength; + int i; + + pass = xgetpass(pfd, _("Password: ")); + 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){ + keylength = crypt_type_tbl[i].keylength; + break; + } + } + loopinfo64.lo_encrypt_key_size=keylength; + break; + } +#endif + default: + if (hash_pass) { + char keybits[2*HASHLENGTH]; + char *pass2; + int passwdlen; + + pass = xgetpass(pfd, _("Password: ")); + 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 { + pass = xgetpass(pfd, _("Password: ")); + memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE); + xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); + memset(pass, 0, strlen(pass)); + loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; + } } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { @@ -465,6 +533,12 @@ " -p | --pass-fd <num> read passphrase from file descriptor <num>\n" " -r | --read-only setup read-only loop device\n" " -s | --show print device name (with -f <file>)\n" + " -N | --nohashpass Do not hash the given password (Debian hashes)\n" + " -k | --keybits <num> 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" " -v | --verbose verbose mode\n\n"), progname); exit(1); @@ -501,11 +575,14 @@ int main(int argc, char **argv) { char *p, *offset, *encryption, *passfd, *device, *file; + char *keysize; int delete, find, c, all; int res = 0; int showdev = 0; int ro = 0; int pfd = -1; + int keysz = 0; + int hash_pass = 1; unsigned long long off; struct option longopts[] = { { "all", 0, 0, 'a' }, @@ -513,6 +590,9 @@ { "encryption", 1, 0, 'e' }, { "find", 0, 0, 'f' }, { "help", 0, 0, 'h' }, + { "keybits", 1, 0, 'k' }, + { "nopasshash", 0, 0, 'N' }, + { "nohashpass", 0, 0, 'N' }, { "offset", 1, 0, 'o' }, { "pass-fd", 1, 0, 'p' }, { "read-only", 0, 0, 'r' }, @@ -528,12 +608,13 @@ delete = find = all = 0; off = 0; offset = encryption = passfd = NULL; + keysize = NULL; progname = argv[0]; if ((p = strrchr(progname, '/')) != NULL) progname = p+1; - while ((c = getopt_long(argc, argv, "ade:E:fho:p:rsv", + while ((c = getopt_long(argc, argv, "ade:E:fhk:No:p:rsv", longopts, NULL)) != -1) { switch (c) { case 'a': @@ -552,6 +633,12 @@ case 'f': find = 1; break; + case 'k': + keysize = optarg; + break; + case 'N': + hash_pass = 0; + break; case 'o': offset = optarg; break; @@ -615,8 +702,10 @@ usage(); if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(); + if (keysize && sscanf(keysize,"%d",&keysz) != 1) + usage(); do { - res = set_loop(device, file, off, encryption, pfd, &ro); + res = set_loop(device, file, off, encryption, pfd, &ro, keysz, hash_pass); if (res == 2 && find) { if (verbose) printf("stolen loop=%s...trying again\n", --- util-linux-2.13.1.orig/mount/mount.c +++ util-linux-2.13.1/mount/mount.c @@ -67,6 +67,9 @@ /* Nonzero for chatty (-v). */ int verbose = 0; +/* Do we hash the password or not */ +int hash_pass = 1; + /* Nonzero for sloppy (-s). */ int sloppy = 0; @@ -93,6 +96,9 @@ /* 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 */ @@ -187,6 +193,7 @@ static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper; +static const char *opt_keybits, *opt_nohashpass; static int mounted (const char *spec0, const char *node0); static int check_special_mountprog(const char *spec, const char *node, @@ -201,6 +208,8 @@ { "vfs=", 1, &opt_vfstype }, { "offset=", 0, &opt_offset }, { "encryption=", 0, &opt_encryption }, + { "keybits=", 0, &opt_keybits }, + { "nohashpass", 0, &opt_nohashpass }, { "speed=", 0, &opt_speed }, { "comment=", 1, &opt_comment }, { "uhelper=", 0, &opt_uhelper }, @@ -857,7 +866,7 @@ *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) { @@ -878,9 +887,12 @@ return EX_SYSERR; /* no more loop devices */ if (verbose) printf(_("mount: going to use the loop device %s\n"), *loopdev); - + if (!keysz && opt_keybits) + keysz = strtoul(opt_keybits, NULL, 0); + if (opt_nohashpass) + hash_pass=0; if ((res = set_loop(*loopdev, *loopfile, offset, - opt_encryption, pfd, &loopro))) { + opt_encryption, pfd, &loopro, keysz, hash_pass))) { if (res == 2) { /* loop dev has been grabbed by some other process, try again, if not given explicitly */ @@ -1184,8 +1196,14 @@ " missing codepage or helper program, or other error"), spec); - if (stat(spec, &statbuf) == 0 && S_ISBLK(statbuf.st_mode) - && (fd = open(spec, O_RDONLY | O_NONBLOCK)) >= 0) { + if (stat(spec, &statbuf) < 0) { + if (errno == ENOENT) /* network FS? */ + error(_( + " (for several filesystems (e.g. nfs, cifs) you might\n" + " need a /sbin/mount.<type> helper program)")); + + } else if (S_ISBLK(statbuf.st_mode) + && (fd = open(spec, O_RDONLY | O_NONBLOCK)) >= 0) { if (ioctl(fd, BLKGETSIZE, &size) == 0) { if (size == 0 && !loop) { warned++; @@ -1628,6 +1646,7 @@ { "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 }, @@ -1783,6 +1802,7 @@ char *options = NULL, *test_opts = NULL, *node; const char *spec = NULL; char *label = NULL; + char *keysize = NULL; char *uuid = NULL; char *types = NULL; char *p; @@ -1813,7 +1833,7 @@ initproctitle(argc, argv); #endif - while ((c = getopt_long (argc, argv, "afFhilL:no:O:p:rsU:vVwt:", + while ((c = getopt_long (argc, argv, "afFhik:lL:no:O:p:rsU:vVwt:", longopts, NULL)) != -1) { switch (c) { case 'a': /* mount everything in fstab */ @@ -1831,6 +1851,9 @@ case 'i': external_allowed = 0; break; + case 'k': + keysize = optarg; + break; case 'l': list_with_volumelabel = 1; break; @@ -1977,6 +2000,9 @@ create_mtab (); } + 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 */ --- util-linux-2.13.1.orig/mount/Makefile.in +++ util-linux-2.13.1/mount/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,11 +63,12 @@ @HAVE_PIVOT_ROOT_TRUE@am__EXEEXT_1 = pivot_root$(EXEEXT) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) +am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) \ + losetup-rmd160.$(OBJEXT) losetup_OBJECTS = $(am_losetup_OBJECTS) losetup_LDADD = $(LDADD) am__mount_SOURCES_DIST = mount.c fstab.c mount_mntent.c getusername.c \ - lomount.c sundries.c xmalloc.c realpath.c fsprobe.c \ + lomount.c rmd160.c sundries.c xmalloc.c realpath.c fsprobe.c \ fsprobe_blkid.c fsprobe_volumeid.c fstab.h linux_fs.h \ mount_mntent.h mount_constants.h my_dev_t.h mount_paths.h \ lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \ @@ -80,7 +81,8 @@ am__objects_4 = am__objects_5 = mount-fstab.$(OBJEXT) mount-mount_mntent.$(OBJEXT) \ mount-getusername.$(OBJEXT) mount-lomount.$(OBJEXT) \ - $(am__objects_3) $(am__objects_4) mount-env.$(OBJEXT) + mount-rmd160.$(OBJEXT) $(am__objects_3) $(am__objects_4) \ + mount-env.$(OBJEXT) am_mount_OBJECTS = mount-mount.$(OBJEXT) $(am__objects_5) \ mount-setproctitle.$(OBJEXT) mount_OBJECTS = $(am_mount_OBJECTS) @@ -109,9 +111,9 @@ swapon_OBJECTS = $(am_swapon_OBJECTS) swapon_DEPENDENCIES = $(am__DEPENDENCIES_2) am__umount_SOURCES_DIST = umount.c fstab.c mount_mntent.c \ - getusername.c lomount.c sundries.c xmalloc.c realpath.c \ - fsprobe.c fsprobe_blkid.c fsprobe_volumeid.c fstab.h \ - linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \ + getusername.c lomount.c rmd160.c sundries.c xmalloc.c \ + realpath.c fsprobe.c fsprobe_blkid.c fsprobe_volumeid.c \ + fstab.h linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ getusername.h loop.h sundries.h ../lib/env.c @HAVE_BLKID_TRUE@am__objects_9 = umount-fsprobe_blkid.$(OBJEXT) @@ -122,13 +124,14 @@ $(am__objects_9) $(am__objects_10) am__objects_12 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \ umount-getusername.$(OBJEXT) umount-lomount.$(OBJEXT) \ - $(am__objects_11) $(am__objects_4) umount-env.$(OBJEXT) + umount-rmd160.$(OBJEXT) $(am__objects_11) $(am__objects_4) \ + umount-env.$(OBJEXT) am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_12) umount_OBJECTS = $(am_umount_OBJECTS) umount_DEPENDENCIES = $(am__DEPENDENCIES_2) umount_LINK = $(CCLD) $(umount_CFLAGS) $(CFLAGS) $(umount_LDFLAGS) \ $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -283,7 +286,7 @@ mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ getusername.h loop.h sundries.h -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \ +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c \ $(utils_common) $(headers_common) ../lib/env.c mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c @@ -293,7 +296,7 @@ umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) swapon_SOURCES = swapon.c swap_constants.h $(utils_common) -losetup_SOURCES = lomount.c loop.h lomount.h +losetup_SOURCES = lomount.c loop.h lomount.h rmd160.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_LDADD = $(LDADD_common) $(am__append_3) umount_LDADD = $(LDADD_common) @@ -412,6 +415,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsprobe_blkid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsprobe_volumeid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-lomount.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losetup-rmd160.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-env.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-fsprobe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-fsprobe_blkid.Po@am__quote@ @@ -422,6 +426,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-mount_mntent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-realpath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-rmd160.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-setproctitle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-sundries.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mount-xmalloc.Po@am__quote@ @@ -441,6 +446,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-lomount.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-mount_mntent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-realpath.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-rmd160.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-sundries.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-umount.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umount-xmalloc.Po@am__quote@ @@ -474,6 +480,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi` +losetup-rmd160.o: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.o -MD -MP -MF $(DEPDIR)/losetup-rmd160.Tpo -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-rmd160.Tpo $(DEPDIR)/losetup-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c + +losetup-rmd160.obj: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-rmd160.obj -MD -MP -MF $(DEPDIR)/losetup-rmd160.Tpo -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/losetup-rmd160.Tpo $(DEPDIR)/losetup-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='losetup-rmd160.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o losetup-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` + mount-mount.o: mount.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.o -MD -MP -MF $(DEPDIR)/mount-mount.Tpo -c -o mount-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po @@ -544,6 +564,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi` +mount-rmd160.o: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.o -MD -MP -MF $(DEPDIR)/mount-rmd160.Tpo -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-rmd160.Tpo $(DEPDIR)/mount-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c + +mount-rmd160.obj: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-rmd160.obj -MD -MP -MF $(DEPDIR)/mount-rmd160.Tpo -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-rmd160.Tpo $(DEPDIR)/mount-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='mount-rmd160.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` + mount-sundries.o: sundries.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.o -MD -MP -MF $(DEPDIR)/mount-sundries.Tpo -c -o mount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po @@ -768,6 +802,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi` +umount-rmd160.o: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-rmd160.o -MD -MP -MF $(DEPDIR)/umount-rmd160.Tpo -c -o umount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-rmd160.Tpo $(DEPDIR)/umount-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='umount-rmd160.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-rmd160.o `test -f 'rmd160.c' || echo '$(srcdir)/'`rmd160.c + +umount-rmd160.obj: rmd160.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-rmd160.obj -MD -MP -MF $(DEPDIR)/umount-rmd160.Tpo -c -o umount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-rmd160.Tpo $(DEPDIR)/umount-rmd160.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rmd160.c' object='umount-rmd160.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-rmd160.obj `if test -f 'rmd160.c'; then $(CYGPATH_W) 'rmd160.c'; else $(CYGPATH_W) '$(srcdir)/rmd160.c'; fi` + umount-sundries.o: sundries.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.o -MD -MP -MF $(DEPDIR)/umount-sundries.Tpo -c -o umount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po @@ -961,8 +1009,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -974,8 +1022,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -985,13 +1033,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/mount/swapon.c +++ util-linux-2.13.1/mount/swapon.c @@ -10,6 +10,9 @@ #include <errno.h> #include <sys/stat.h> #include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <fcntl.h> #include "xmalloc.h" #include "swap_constants.h" #include "nls.h" @@ -17,6 +20,8 @@ #include "realpath.h" #include "mount_paths.h" +#define PATH_MKSWAP "/sbin/mkswap" + #ifdef HAVE_SYS_SWAP_H # include <sys/swap.h> #endif @@ -158,6 +163,64 @@ } static int +swap_is_suspend(const char *device) { + const char *type = fsprobe_get_fstype_by_devname(device); + + return (type && strcmp(type, "suspend") == 0) ? 1 : 0; +} + +/* calls mkswap */ +static int +swap_reinitialize(const char *device) { + const char *label = fsprobe_get_label_by_devname(device); + const char *uuid = fsprobe_get_uuid_by_devname(device); + pid_t pid; + int status, ret; + char *cmd[7]; + int idx=0; + + switch((pid=fork())) { + case -1: /* fork error */ + fprintf(stderr, _("%s: cannot fork: %s\n"), + progname, strerror(errno)); + return -1; + + case 0: /* child */ + cmd[idx++] = PATH_MKSWAP; + if (label && *label) { + cmd[idx++] = "-L"; + cmd[idx++] = (char *) label; + } + if (uuid && *uuid) { + cmd[idx++] = "-U"; + cmd[idx++] = (char *) uuid; + } + cmd[idx++] = (char *) device; + cmd[idx++] = NULL; + execv(cmd[0], cmd); + perror("execv"); + exit(1); /* error */ + + default: /* parent */ + do { + if ((ret = waitpid(pid, &status, 0)) < 0 + && errno == EINTR) + continue; + else if (ret < 0) { + fprintf(stderr, _("%s: waitpid: %s\n"), + progname, strerror(errno)); + return -1; + } + } while (0); + + /* mkswap returns: 0=suss, 1=error */ + if (WIFEXITED(status) && WEXITSTATUS(status)==0) + return 0; /* ok */ + } + return -1; /* error */ +} + +static int do_swapon(const char *orig_special, int prio, int canonic) { int status; struct stat st; @@ -179,6 +242,18 @@ return -1; } + /* We have to reinitialize swap with old (=useless) software suspend + * data. The problem is that if we don't do it, then we get data + * corruption the next time an attempt at unsuspending is made. + */ + if (swap_is_suspend(special)) { + fprintf(stdout, _("%s: %s: software suspend data detected. " + "Reinitializing the swap.\n"), + progname, special); + if (swap_reinitialize(special) < 0) + return -1; + } + /* people generally dislike this warning - now it is printed only when `verbose' is set */ if (verbose) { --- util-linux-2.13.1.orig/mount/lomount.h +++ util-linux-2.13.1/mount/lomount.h @@ -1,6 +1,6 @@ extern int verbose; extern int set_loop(const char *, const char *, unsigned long long, - const char *, int, int *); + const char *, int, int *, int, int); extern int del_loop(const char *); extern int is_loop_device(const char *); extern char * find_unused_loop_device(void); --- util-linux-2.13.1.orig/mount/mount.8 +++ util-linux-2.13.1/mount/mount.8 @@ -610,6 +610,15 @@ (unless overridden by subsequent options, as in the option line .BR group,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." +.TP .B mand Allow mandatory locks on this filesystem. See .BR fcntl (2). @@ -833,7 +842,7 @@ .SH "Mount options for cifs" See the options section of the .BR mount.cifs (8) -man page (cifs-mount package must be installed). +man page (smbfs package must be installed). .SH "Mount options for coherent" None. @@ -1397,7 +1406,7 @@ .SH "Mount options for nfs and nfs4" See the options section of the .BR nfs (5) -man page (nfs-utils package must be installed). +man page (nfs-common package must be installed). The .IR nfs " and " nfs4 @@ -2003,6 +2012,10 @@ .BR loop ", " offset " and " encryption , that are really options to .BR \%losetup (8). +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. (These options can be used in addition to those specific to the filesystem type.) --- util-linux-2.13.1.orig/mount/losetup.8 +++ util-linux-2.13.1/mount/losetup.8 @@ -76,6 +76,11 @@ argument is present, use this device. Otherwise, print its name. .IP "\fB\-h, \-\-help\fP" print help +.IP "\fB\-k, \-\-keybits \fInum\fP" +set the number of bits to use in key to \fInum\fP. +.IP "\fB\-N, \-\-nohashpass\fP" +Do not hash the password. By default, Debian systems run the password through a +hash function, non-Debian systems tend not to. .IP "\fB\-o, \-\-offset \fIoffset\fP" The data start is moved \fIoffset\fP bytes into the specified file or device. @@ -140,6 +145,8 @@ .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. Cryptoloop is deprecated in favor of dm-crypt. For more details see .B cryptsetup(8). --- util-linux-2.13.1.orig/mount/rmd160.c +++ util-linux-2.13.1/mount/rmd160.c @@ -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 <Marc@Mutz.com>. 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 <string.h> /* (mm) for memcpy */ +#include <endian.h> /* (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 ); +} --- util-linux-2.13.1.orig/disk-utils/Makefile.in +++ util-linux-2.13.1/disk-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -107,7 +107,7 @@ raw_SOURCES = raw.c raw_OBJECTS = raw.$(OBJEXT) raw_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -481,8 +481,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -494,8 +494,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -505,13 +505,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/disk-utils/mkswap.c +++ util-linux-2.13.1/disk-utils/mkswap.c @@ -351,7 +351,7 @@ static void usage(void) { fprintf(stderr, - _("Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n"), + _("Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"), program_name); exit(1); } @@ -488,6 +488,22 @@ return 1; } + +static int +write_all(int fd, const void *buf, size_t count) { + while(count) { + ssize_t tmp = write(fd, buf, count); + + if (tmp > 0) { + count -= tmp; + if (count) + buf += tmp; + } else if (errno != EINTR && errno != EAGAIN) + return -1; + } + return 0; +} + int main(int argc, char ** argv) { struct stat statbuf; @@ -501,6 +517,8 @@ char *pp; char *opt_label = NULL; unsigned char *uuid = NULL; + unsigned char *uuid_input = NULL; + int set_uuid = 0; // User Defined UUID, o: False, 1: True #ifdef HAVE_LIBUUID uuid_t uuid_dat; #endif @@ -546,6 +564,12 @@ case 'v': version = atoi(argv[i]+2); break; + case 'U': + set_uuid = 1; + uuid_input = argv[i]+2; + if (!*uuid_input && i+1 < argc) + uuid_input = argv[++i]; + break; default: usage(); } @@ -558,7 +582,10 @@ } #ifdef HAVE_LIBUUID - uuid_generate(uuid_dat); + if(!set_uuid) + uuid_generate(uuid_dat); + else + uuid_parse(uuid_input, uuid_dat); uuid = uuid_dat; #endif @@ -719,9 +746,12 @@ offset = ((version == 0) ? 0 : 1024); if (lseek(DEV, offset, SEEK_SET) != offset) die(_("unable to rewind swap-device")); - if (write(DEV,(char*)signature_page+offset, pagesize-offset) - != pagesize-offset) - die(_("unable to write signature page")); + if (write_all(DEV, (char *) signature_page + offset, + pagesize - offset) == -1) { + fprintf(stderr, _("%s: %s: unable to write signature page: %s"), + program_name, device_name, strerror(errno)); + exit(1); + } /* * A subsequent swapon() will fail if the signature --- util-linux-2.13.1.orig/disk-utils/mkswap.8 +++ util-linux-2.13.1/disk-utils/mkswap.8 @@ -7,7 +7,7 @@ .SH NAME mkswap \- set up a Linux swap area .SH SYNOPSIS -.BI "mkswap [\-c] [\-v" N "] [\-f] [\-p " PSZ "] [\-L " label "] " device " [" size "]" +.BI "mkswap [\-c] [\-v" N "] [\-f] [\-p " PSZ "] [\-L " label "] [\-U " uuid "] " device " [" size "]" .SH DESCRIPTION .B mkswap sets up a Linux swap area on a device or in a file. @@ -156,6 +156,10 @@ Version 0 (-v0) swap space format is no longer supported in 2.5+ kernels. +.TP +.B \-U uuid +Specify the uuid to use. + .SH "SEE ALSO" .BR fdisk (8), .BR swapon (8) --- util-linux-2.13.1.orig/text-utils/Makefile.in +++ util-linux-2.13.1/text-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -96,7 +96,7 @@ ul_SOURCES = ul.c ul_OBJECTS = ul.$(OBJEXT) ul_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -452,8 +452,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -465,8 +465,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -476,13 +476,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/aclocal.m4 +++ util-linux-2.13.1/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,12 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -47,8 +50,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -320,7 +325,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -368,13 +373,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -479,16 +484,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -760,7 +766,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) --- util-linux-2.13.1.orig/configure +++ util-linux-2.13.1/configure @@ -5455,11 +5455,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> +#include <sys/types.h> /* for off_t */ + #include <stdio.h> int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -5499,11 +5501,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <stdio.h> +#include <sys/types.h> /* for off_t */ + #include <stdio.h> int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -11590,21 +11594,22 @@ fi rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11641,7 +11646,7 @@ # each Makefile.in and add a new line on top of each file to say so. # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ --- util-linux-2.13.1.orig/misc-utils/whereis.c +++ util-linux-2.13.1/misc-utils/whereis.c @@ -76,10 +76,8 @@ "/usr/TeX/bin", "/usr/tex/bin", "/usr/interviews/bin/LINUX", - - "/usr/X11R6/bin", + "/usr/X386/bin", - "/usr/bin/X11", "/usr/X11/bin", "/usr/X11R5/bin", --- util-linux-2.13.1.orig/misc-utils/Makefile.in +++ util-linux-2.13.1/misc-utils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -123,7 +123,7 @@ dist_usrbinexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) usrbinexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(dist_usrbinexec_SCRIPTS) $(usrbinexec_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -583,8 +583,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -596,8 +596,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -607,13 +607,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/NEWS +++ util-linux-2.13.1/NEWS @@ -13,7 +13,7 @@ * see docs/v2.13.1-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-rc1-ChangeLog -util-linux-ng 2.13 [27-Aug-2007] +util-linux-ng 2.13 [28-Aug-2007] * see docs/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog --- util-linux-2.13.1.orig/schedutils/Makefile.in +++ util-linux-2.13.1/schedutils/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -64,7 +64,7 @@ taskset_SOURCES = taskset.c taskset_OBJECTS = taskset.$(OBJEXT) taskset_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -345,8 +345,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -358,8 +358,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -369,13 +369,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique --- util-linux-2.13.1.orig/debian/mount.docs +++ util-linux-2.13.1/debian/mount.docs @@ -0,0 +1 @@ +mount/README.mount --- util-linux-2.13.1.orig/debian/fstab.example2 +++ util-linux-2.13.1/debian/fstab.example2 @@ -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: +# <file system> <mount point> <type> <options> <dump> <pass> +# +# dump(8) uses the <dump> field to determine which file systems need +# to be dumped. fsck(8) uses the <pass> 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 --- util-linux-2.13.1.orig/debian/mount.fstab +++ util-linux-2.13.1/debian/mount.fstab @@ -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: +# <file system> <mount point> <type> <options> <dump> <pass> +# +# dump(8) uses the <dump> field to determine which file systems need +# to be dumped. fsck(8) uses the <pass> 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 --- util-linux-2.13.1.orig/debian/bsdutils.files +++ util-linux-2.13.1/debian/bsdutils.files @@ -0,0 +1,26 @@ +usr/bin/cal +usr/bin/col +usr/bin/colcrt +usr/bin/colrm +usr/bin/column +usr/bin/hexdump +usr/bin/logger +usr/bin/look +usr/bin/renice +usr/bin/script +usr/bin/scriptreplay +usr/bin/ul +usr/bin/wall +usr/share/man/man1/cal.1 +usr/share/man/man1/col.1 +usr/share/man/man1/colcrt.1 +usr/share/man/man1/colrm.1 +usr/share/man/man1/column.1 +usr/share/man/man1/hexdump.1 +usr/share/man/man1/logger.1 +usr/share/man/man1/look.1 +usr/share/man/man1/renice.1 +usr/share/man/man1/script.1 +usr/share/man/man1/scriptreplay.1 +usr/share/man/man1/ul.1 +usr/share/man/man1/wall.1 --- util-linux-2.13.1.orig/debian/util-linux-locales.files +++ util-linux-2.13.1/debian/util-linux-locales.files @@ -0,0 +1,19 @@ +usr/share/locale/ca/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/cs/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/da/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/de/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/es/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/et/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/fi/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/fr/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/it/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/ja/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/nl/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/pt_BR/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/sl/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/sv/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/tr/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/id/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/ru/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/uk/LC_MESSAGES/util-linux-ng.mo +usr/share/locale/vi/LC_MESSAGES/util-linux-ng.mo --- util-linux-2.13.1.orig/debian/mount.preinst +++ util-linux-2.13.1/debian/mount.preinst @@ -0,0 +1,52 @@ +#!/bin/sh -e + +# Debian mount preinst +# LaMont Jones <lamont@debian.org> + +chrooted() { + if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then + # the devicenumber/inode pair of / is the same as that of /sbin/init's + # root, so we're *not* in a chroot and hence return false. + return 1 + fi + return 0 +} + +case "$1" in + install) + ;; + + upgrade) + version=$2 + DISTRO=$(lsb_release -is 2>/dev/null || echo Debian); + + if [ Debian = "$DISTRO" ]; then + if [ -f /proc/mounts ] && ! chrooted; then + NFS_IN_USE=$(sed -n '/^[^ ]* [^ ]* nfs /p' /proc/mounts) + else + NFS_IN_USE="" + fi + if [ -n "$NFS_IN_USE" ] && [ ! -x /sbin/mount.nfs ] ; then + cat << EOF +You have NFS mount points currently mounted, and this version of mount +requires that nfs-common be upgraded before NFS mounts will work. + +Aborting install. +EOF + exit 1 + fi + fi + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/changelog +++ util-linux-2.13.1/debian/changelog @@ -0,0 +1,2459 @@ +util-linux (2.13.1-5ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Fri, 11 Apr 2008 21:03:50 -0600 + +util-linux (2.13.1-5) unstable; urgency=low + + * Switch to upstream's more-correct fix for LP#206113 + * mkswap: when writing the signature page, handle EINTR returns. LP: #206113 + + -- LaMont Jones <lamont@debian.org> Mon, 14 Apr 2008 18:18:30 -0600 + +util-linux (2.13.1-4ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Fri, 11 Apr 2008 21:03:50 -0600 + +util-linux (2.13.1-4) unstable; urgency=low + + * meta: Drop bashism in preinst. Closes: #472248 + * mkswap: when writing the signature page, handle EINTR returns. LP: #206113 + + -- LaMont Jones <lamont@debian.org> Fri, 11 Apr 2008 21:01:29 -0600 + +util-linux (2.13.1-3ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Fri, 21 Mar 2008 10:20:36 -0600 + +util-linux (2.13.1-3) unstable; urgency=low + + [Kees Cook] + + * swapon: Reinitialize software suspend areas to avoid future corruption. + LP: #66637 + + -- LaMont Jones <lamont@debian.org> Fri, 21 Mar 2008 10:11:57 -0600 + +util-linux (2.13.1-2ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Thu, 06 Mar 2008 20:36:42 -0700 + +util-linux (2.13.1-2) unstable; urgency=low + + [Frans Pop] + + * Add menu item numbers for *fdisk udebs. Closes: #466831 + + [Hamish Coleman] + + * agetty: make username-in-uppercase feature optional (off by default.). Closes: #156242 + + [Neil Williams] + + * debian/rules: allow cross-building. Closes: #465123 + + [glandux] + + * hwclock.sh: fix typo. LP: #103680 + + [LaMont Jones] + + * mkswap: Set UUID for swap space. Closes: #462662 LP: #66637 + * mkswap: -U UUID cleanup + + -- LaMont Jones <lamont@debian.org> Thu, 06 Mar 2008 20:33:38 -0700 + +util-linux (2.13.1-1ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Sat, 19 Jan 2008 09:39:15 -0700 + +util-linux (2.13.1-1) unstable; urgency=low + + * New Upstream Release [Karel Zak] + - docs: update AUTHORS file + - docs: update ReleseNotes + - build-sys: release++ (2.13.1) + - po: merge files + - po: update uk.po (from translationproject.org) (Maxim V. Dziumanenko) + - po: update it.po (from translationproject.org) (Marco Colombo) + - po: update sl.po (from translationproject.org) (Simon Mihevc) + - po: update ru.po (from translationproject.org) (Pavel Maryanov) + - po: update cs.po (from translationproject.org) (Petr Pisar) + - po: update pt_BR.po (from translationproject.org) (Rodrigo Stulzer Lopes) + - po: update id.po (from translationproject.org) (Arif E. Nugroho) + - po: update es.po (from translationproject.org) (Santiago Vila Doncel) + - po: update hu.po (from translationproject.org) (Gabor Kelemen) + - po: update eu.po (from translationproject.org) (Mikel Olasagasti) + - po: update ca.po (from translationproject.org) (Josep Puigdemont) + - po: update sv.po (from translationproject.org) (Daniel Nylander) + - po: update fr.po (from translationproject.org) (Michel Robitaille) + - po: update tr.po (from translationproject.org) (Nilgün Belma Bugüner) + - po: update ja.po (from translationproject.org) (Daisuke Yamashita) + - po: update nl.po (from translationproject.org) (Benno Schulenberg) + - po: update pl.po (from translationproject.org) (Andrzej Krzysztofowicz) + - po: update da.po (from translationproject.org) (Claus Hindsgaul) + - po: update vi.po (from translationproject.org) (Clytie Siddall) + - po: update et.po (from translationproject.org) (Meelis Roos) + - po: update de.po (from translationproject.org) (Michael Piefel) + - po: update fi.po (from translationproject.org) (Lauri Nurmi) + + -- LaMont Jones <lamont@debian.org> Sat, 19 Jan 2008 08:48:31 -0700 + +util-linux (2.13.1~rc2-2ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Fri, 11 Jan 2008 22:34:38 -0700 + +util-linux (2.13.1~rc2-2) unstable; urgency=low + + * hwclockfirst.sh: yet more tweaks for LSB init. Closes: #459760 + + -- LaMont Jones <lamont@debian.org> Fri, 11 Jan 2008 22:32:15 -0700 + +util-linux (2.13.1~rc2-1ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Sun, 06 Jan 2008 20:34:47 -0700 + +util-linux (2.13.1~rc2-1) unstable; urgency=low + + [LaMont Jones] + + * meta: mount should pre-depend on its libs + * hwclock.sh: add full path to comment. Closes: #418107 + * renice: correctly detect errors in arguments. Closes: #385245 + + [Karel Zak] + + * docs: update AUTHORS file, add all translators + * docs: update ReleaseNotes + * po: update po files + - po: update uk.po [Maxim V. Dziumanenko] + - po: update id.po [Arif E. Nugroho] + - po: update es.po [Santiago Vila Doncel] + - po: update hu.po [Gabor Kelemen] + - po: update it.po [Marco Colombo] + - po: update sl.po [Simon Mihevc] + - po: update ru.po [Pavel Maryanov] + - po: update cs.po [Petr Pisar] + - po: update pt_BR.po [Rodrigo Stulzer Lopes] + - po: add eu.po [Mikel Olasagasti] + - po: update ca.po [Josep Puigdemont] + - po: update sv.po [Daniel Nylander] + - po: update fr.po [Michel Robitaille] + - po: update tr.po [Nilgün Belma Bugüner] + - po: update ja.po [Daisuke Yamashita] + - po: update nl.po [Benno Schulenberg] + - po: add pl.po [Andrzej Krzysztofowicz] + - po: update da.po [Claus Hindsgaul] + - po: update vi.po [Clytie Siddall] + - po: update et.po [Meelis Roos] + - po: update de.po [Michael Piefel] + - po: update fi.po [Lauri Nurmi] + * build-sys: release++ (-rc2) + + -- LaMont Jones <lamont@debian.org> Sun, 06 Jan 2008 20:20:48 -0700 + +util-linux (2.13-14ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Sun, 06 Jan 2008 12:58:31 -0700 + +util-linux (2.13-14) unstable; urgency=low + + [Karel Zak] + * mount: hint about helper program if device doesn't exist. Closes: #452330 + + [LaMont Jones] + + * rules: correct LSB init data for hwclockfirst.sh. Closes: #458346 + + -- LaMont Jones <lamont@debian.org> Sun, 06 Jan 2008 12:50:08 -0700 + +util-linux (2.13-13ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Wed, 05 Dec 2007 22:37:11 -0700 + +util-linux (2.13-13) unstable; urgency=low + + [David Woodhouse] + + * hwclock: check for ENODEV + + [Matthias Koenig] + + * mount: fix fd leak + + [LaMont Jones] + + * sys-utils: Drop duplicate install of setarch manpage links. + * agetty: drop useless and unused diff from upstream + * hwclock.sh: drop redundant file pointer. Closes: #453333 + + [Frédéric Bothamy] + + * sys-utils: correct setarch.8 manpage link creation. Closes: #453245 + + [Karel Zak] + + * build-sys: remove hardcoded _GNU_SOURCE + * mount: don't call canonicalize(SPEC) for cifs, smbfs and nfs. + Closes: #446175 + * blockdev: add --getsz to blockdev.8 + + -- LaMont Jones <lamont@debian.org> Wed, 05 Dec 2007 21:34:36 -0700 + +util-linux (2.13-12ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Mon, 19 Nov 2007 19:33:50 -0700 + +util-linux (2.13-12) unstable; urgency=low + + * meta: drop Conflicts: bsdmainutils too + + -- LaMont Jones <lamont@debian.org> Mon, 19 Nov 2007 19:30:23 -0700 + +util-linux (2.13-11) unstable; urgency=low + + [LaMont Jones] + + * cal comes from bsdmainutils as well. Drops Replaces: completely. + + [Pascal Terjan] + + * docs: fix ChangeLog URL + + [Gabor Kelemen] + + * po: update hu.po (from translationproject.org) + + [Karel Zak] + + * losetup: fix errno usage + * po: update po files + + [Lauri Nurmi] + + * po: update fi.po (from translationproject.org) + + -- LaMont Jones <lamont@debian.org> Wed, 14 Nov 2007 22:24:36 -0700 + +util-linux (2.13-10ubuntu1) hardy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + - deliver hwclockfirst.sh on ubuntu as well. LP: #63175 + + -- LaMont Jones <lamont@ubuntu.com> Mon, 29 Oct 2007 15:13:58 -0600 + +util-linux (2.13-10) unstable; urgency=low + + [KaiGai Kohei] + + * mkswap: possible to crash with SELinux relabeling support + + [Karel Zak] + + * docs: add info about .bugfix releases and branches + + [LaMont Jones] + + * build: don't deliver col* and ul as part of bsdutils for now. Closes: #446939 + + -- LaMont Jones <lamont@debian.org> Mon, 29 Oct 2007 14:29:49 -0600 + +util-linux (2.13-9) unstable; urgency=low + + [LaMont Jones] + + * deliver hwclockfirst.sh on ubuntu as well. LP: #63175 + * build: don't deliver (emtpy) /usr/share/util-linux. Closes: #445908 + * mount.8: Make package references be the actual binary package name + in the distro. LP: #154399 + + [Michael Piefel] + + * po: update de.po (from translationproject.org) + + [Yu Zhiguo] + + * chsh: should use pam_end function to terminate the PAM transaction + + [Benno Schulenberg] + + * po: update nl.po (from translationproject.org) + + [Rajeev V. Pillai] + + * pg: fix segfault on search + + [Karel Zak] + + * mount: -L|-U segfault when label or uuid doesn't exist + * tests: fix blkid cache usage + * script: dies on SIGWINCH. Closes: #445956 + * chfn: add pam_end() call and cleanup PAM code + * ionice: add a note about permissions to ionice.1 + * script: dies on SIGWINCH + * po: fix typo in de.po + * po: update po files + * setarch: generate groff links in a better way + + -- LaMont Jones <lamont@debian.org> Sat, 20 Oct 2007 20:59:12 -0600 + +util-linux (2.13-8ubuntu1) gutsy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + - deliver hwclockfirst.sh on ubuntu as well. LP: #63175 + + -- LaMont Jones <lamont@ubuntu.com> Fri, 21 Sep 2007 10:39:12 -0600 + +util-linux (2.13-8) unstable; urgency=low + + * Upstream git: + - po: update sv.po (from translationproject.org) + - mount: doesn't drop privileges properly when calling helpers + CVE-2007-5191 + - hwclock: fix --rtc option. Closes: #444924 + - setarch: fix compiler warning + - login: login segfaults on EOF (rh#298461) + - build-sys: nls/locale handling in util-linux-ng general + - blockdev: add missing description about option --report in manpage + * fix messages in "hwclock.sh start". Closes: #436873 + * Honor DEB_BUILD_OPTIONS=nostrip. Closes: #443853 + + -- LaMont Jones <lamont@debian.org> Mon, 01 Oct 2007 21:57:41 -0600 + +util-linux (2.13-7) unstable; urgency=low + + * cfdisk.8: mention slang next to curses. Closes: #295487 + * util-linux.postrm: remove /etc/adjtime on purge. Closes: #245236 + * hwclock: Reintroduce hwclockfirst.sh on Debian machines. Closes: #443487 + * mount.preinst: chroot-check was broken. Closes: #443466 + + -- LaMont Jones <lamont@debian.org> Fri, 21 Sep 2007 22:10:20 -0600 + +util-linux (2.13-6ubuntu1) gutsy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Fri, 21 Sep 2007 10:39:12 -0600 + +util-linux (2.13-6) unstable; urgency=low + + * sparc-utils 'sparc64' binary sets ADDR_LIMIT_32BIT. Closes: LP#141524 + + -- LaMont Jones <lamont@debian.org> Fri, 21 Sep 2007 10:36:39 -0600 + +util-linux (2.13-5ubuntu1) gutsy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@debian.org> Wed, 12 Sep 2007 10:36:46 -0600 + +util-linux (2.13-5) unstable; urgency=low + + * build: cfdisk doesn't exist on some architectures. + + -- LaMont Jones <lamont@debian.org> Wed, 12 Sep 2007 10:33:06 -0600 + +util-linux (2.13-4ubuntu1) gutsy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Wed, 12 Sep 2007 06:46:59 -0600 + +util-linux (2.13-4) unstable; urgency=low + + * build: look for fdisk in the right place. Closes: LP#138040 + + -- LaMont Jones <lamont@debian.org> Wed, 12 Sep 2007 06:30:18 -0600 + +util-linux (2.13-3ubuntu1) gutsy; urgency=low + + * New Debian version: remaining ubuntu changes: + - use libvolume-id instead of libblkid + - udev hooks + + -- LaMont Jones <lamont@ubuntu.com> Thu, 06 Sep 2007 14:38:14 -0600 + +util-linux (2.13-3) unstable; urgency=low + + * flock.1: typo in man page. Closes: #440011 + * mount: chain of symlinks to fstab causes use of pointer after free + Closes: #440562 + * Replaces: sparc-utils (for sparc{32,64}. Closes: #440966 + + -- LaMont Jones <lamont@debian.org> Wed, 29 Aug 2007 07:09:06 -0600 + +util-linux (2.13-2) unstable; urgency=low + + * Don't make rename.ul an alternative for rename. Closes: #439935. + * Don't deliver hexdump (bsdmainutils is newer). Closes: #439905 + * Update bsdutils description. Closes: #439907 + + -- LaMont Jones <lamont@debian.org> Tue, 28 Aug 2007 17:12:29 -0600 + +util-linux (2.13-1) unstable; urgency=low + + * Changes from upstream: + - docs: update AUTHORS file + - Revert "mount: improve error message when helper program not present" + for translation freeze (reopens LP #131367) Will be fixed in 2.13.1 + and 2.14. + - taskset: check for existence of sched_getaffinity + - setarch: add parisc/parisc64 support + - mount: free loop device on failure + - mount: avoid duplicates for root fs in mtab + - build-sys: release++ + - docs: update ReleaseNotes, update and sort AUTHORS file + - po: update po/ stuff + - ionice: clean up error handling + - cytune: make the oneliner more specific the cyclades hw in question + - docs: update TODO + - setarch: add --3gb option for compatibility with Debian linux{32,64} command + * Revert "umount: only call update_mtab if mtab_is_writable().", since the + fix is already present in a different way. + * Have debian/rules deal with architectures that don't get packages. + Closes: #439830 + + -- LaMont Jones <lamont@debian.org> Mon, 27 Aug 2007 21:59:00 -0600 + +util-linux (2.13~rc3-9) unstable; urgency=low + + * debian/rules: cleanup and support nostrip option + * build: fdisk (and therefore the udebs) do not get built on m68k. + * build: /usr/bin/rename needs to be an alternative. + Closes: #439647, #439712 + + -- LaMont Jones <lamont@debian.org> Mon, 27 Aug 2007 02:36:50 -0600 + +util-linux (2.13~rc3-8ubuntu1) gutsy; urgency=low + + * Ubuntu uses udev, not libblkid. + + -- LaMont Jones <lamont@ubuntu.com> Sat, 25 Aug 2007 21:44:40 -0600 + +util-linux (2.13~rc3-8) unstable; urgency=low + + * taskset: Don't deliver taskset on m68k. + * umount: only call update_mtab if mtab_is_writable(). Closes: #338803 + * build: switch back to libblkid-dev for Debian. Closes: #439617 + + -- LaMont Jones <lamont@debian.org> Sat, 25 Aug 2007 21:38:17 -0600 + +util-linux (2.13~rc3-7) unstable; urgency=low + + * Document git repository location + * cytune.8: make the oneliner more specific the cyclades hw in question + Closes: #375150 + * control: Extend package descriptions. Closes: #384072 + * Switch to debhelper, clean up delivery of binaries. + * bsdutils: deliver more stuff that we build. Now partly + Replaces: bsdmainutils and completely Replaces: linux32. + + -- LaMont Jones <lamont@debian.org> Fri, 24 Aug 2007 23:27:19 -0600 + +util-linux (2.13~rc3-6) unstable; urgency=low + + * more upstream changes + - docs: add DEPRECATED to EXTRA_DIST + - docs: update AUTHORS file + - docs: add note about http://translationproject.org + - man-pages: cleanup of chrt.1 and taskset.1 + - mount: improve error message when helper program not present + - setarch: cleanup licensing note + - setarch: add sparc32bash alias to keep compatibility with sparc32 + - setarch: add __alpha__ support + - po: update de.po, vi.po, nl.po (from translationproject.org) + * drop arch.1 man page. Closes: #438668 + * deliver the right file for scriptreplay. Closes: #438771 + * sfdisk: Allow drives over 2^31 sectors in size. Closes: #314413 + * Deliver flock and flock.1. Closes: #435272 + * hwclock.sh: Correct message. Closes: #424682 + * cfdisk: switch back to slang2 + * setarch: add parisc/parisc64 support + * deliver setarch + + -- LaMont Jones <lamont@debian.org> Tue, 21 Aug 2007 11:10:51 -0600 + +util-linux (2.13~rc3-5) unstable; urgency=low + + * Fix distro check in debian/rules + * Use Breaks: on distros that support that in the previous release. + + -- LaMont Jones <lamont@debian.org> Wed, 15 Aug 2007 00:32:12 -0600 + +util-linux (2.13~rc3-4) unstable; urgency=low + + * Changes from upstream: + - po: gettextizing some overlooked messages. + - build-sys: add --disable-makeinstall-chown + - docs: add README.licensing + - tests: fix ULONG_MAX usage on 32bit machines + - chsh: don't use empty shell field in /etc/passwd + - more: fix underlining for multibyte chars + - login: replace /usr/spool/mail with /var/spool/main in man page + * mount: make the error message a little more clear when a helper + program is missing. (LP #131367) + * manpages: cleanup of chrt.1 and taskset.1. Closes: #427267, #265479 + * hwclock.sh: only report hwclock updated if we did that. Closes: #436873 + * update copyright to reflect README.licensing + * Merge ubuntu changes, do the right thing at build time. + * Go back to Depends: for the various packages, since the switch to libc5 is + long, long over. + + -- LaMont Jones <lamont@debian.org> Tue, 14 Aug 2007 14:01:11 -0600 + +util-linux (2.13~rc3-3) unstable; urgency=low + + * Merge lpia support from ubuntu. + + -- LaMont Jones <lamont@debian.org> Thu, 9 Aug 2007 08:50:42 -0600 + +util-linux (2.13~rc3-2ubuntu2) gutsy; urgency=low + + * Add lpia support back in. sorry. + + -- LaMont Jones <lamont@ubuntu.com> Thu, 9 Aug 2007 08:48:21 -0600 + +util-linux (2.13~rc3-2ubuntu1) gutsy; urgency=low + + * New debian version. Remaining ubuntu changes: + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + + -- LaMont Jones <lamont@ubuntu.com> Wed, 8 Aug 2007 13:22:04 -0600 + +util-linux (2.13~rc3-2) unstable; urgency=low + + * mount should Suggest nfs-common, not Recommend it. + * Fix build-depends for hurd-i386. Closes: #333147 + + -- LaMont Jones <lamont@debian.org> Wed, 8 Aug 2007 13:34:42 -0600 + +util-linux (2.13~rc3-1ubuntu1) gutsy; urgency=low + + * Merge ubuntu changes into a new Debian version. Remaining: + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + + -- LaMont Jones <lamont@ubuntu.com> Wed, 8 Aug 2007 11:57:03 -0600 + +util-linux (2.13~rc3-1) unstable; urgency=low + + * New upstream version + + -- LaMont Jones <lamont@debian.org> Wed, 8 Aug 2007 11:51:16 -0600 + +util-linux (2.13~rc2-7) unstable; urgency=low + + * If nfs-common is not installed, skip nfs check + * More fixes from upstream: + - swapon: cleanup fsprobe_*() usage + - swapoff: correctly handle UUID= and LABEL= identifiers + - mount: fix incorrect behavior when more than one fs type is + - tests: add script(1) race condition test + - script: fix race conditions + - mkfs: remove nonsense from man page + - blockdev: use LU and LLU for BLKGETSIZE and BLKGETSIZE64 + - blockdev: fix "blockdev --getsz" for large devices + + -- LaMont Jones <lamont@debian.org> Tue, 7 Aug 2007 10:42:56 -0600 + +util-linux (2.13~rc2-6ubuntu1) gutsy; urgency=low + + * Merge ubuntu fixes into new Debian version. + + -- LaMont Jones <lamont@ubuntu.com> Sat, 4 Aug 2007 12:33:57 -0600 + +util-linux (2.13~rc2-6) unstable; urgency=low + + * More fixes from upstream + * mount.preinst: deal with no /proc/mounts. Closes: #436003 + * swapoff: handle UUID= and LABEL=. Closes: #435555 + + -- LaMont Jones <lamont@debian.org> Sat, 4 Aug 2007 18:22:19 -0600 + +util-linux (2.13~rc2-5) unstable; urgency=low + + * mount.preinst: + - check the right directory for mount.nfs. + Closes: #435307, #435414, #435223 + - look for ' nfs ' mounts. Closes: #435305 + + -- LaMont Jones <lamont@debian.org> Tue, 31 Jul 2007 22:34:08 -0600 + +util-linux (2.13~rc2-4) unstable; urgency=low + + * switch to using libvolume-id-dev + * Recommend: nfs-common so that portmap doesn't become defacto-Required. + NFS mounts will not work unless nfs-common is upgraded to at least the + Recommended version, so now mount.preinst will fail if there are NFS + mounts and no /usr/sbin/mount.nfs. Closes: #435204, #435223, #435125 + + -- LaMont Jones <lamont@debian.org> Mon, 30 Jul 2007 08:07:37 -0600 + +util-linux (2.13~rc2-3ubuntu1) gutsy; urgency=low + + * Merge ubuntu changes: + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + - use libvolume-id instead of blkid. This will be true for debian once a + current enough udev is available. + + -- LaMont Jones <lamont@ubuntu.com> Sun, 29 Jul 2007 11:31:21 -0600 + +util-linux (2.13~rc2-3) unstable; urgency=low + + * add option for 8-bit chars in agetty. Closes: #221290 + * Merge upstream fixes (rc2+git) + + -- LaMont Jones <lamont@debian.org> Sat, 28 Jul 2007 22:34:53 -0600 + +util-linux (2.13~rc2-2) experimental; urgency=low + + * arch is dealt with upstream now. + * Mention hfsplus in mount.8. Closes: #345106 + * Add m32r. Closes: #413074 + * use snprintf in logger.c. Closes: #118784 + * Various typos in cfdisk.8. Closes: #360896 + * cleanup copyright. Closes: #290077 + * manpage typos. Closes: #360279, #395442 + + -- LaMont Jones <lamont@debian.org> Tue, 17 Jul 2007 23:28:54 -0600 + +util-linux (2.13~rc2-1) experimental; urgency=low + + * New upstream version + * drop libselinux-dev build-dep on kfreebsd-amd64 + + -- LaMont Jones <lamont@debian.org> Tue, 17 Jul 2007 16:41:11 -0600 + +util-linux (2.13~rc1-2) experimental; urgency=low + + * A little more kfreebsd cleanup + * Fix nfs-common dependency + + -- LaMont Jones <lamont@debian.org> Fri, 13 Jul 2007 08:22:01 -0600 + +util-linux (2.13~rc1-1) experimental; urgency=low + + * fix ionice build errors on several architectures. Closes: #432603 + * no libselinux on kfreebsd-i386 + + -- LaMont Jones <lamont@debian.org> Tue, 10 Jul 2007 22:30:59 -0600 + +util-linux (2.13~rc1-0) experimental; urgency=low + + * New upstream (util-linux-ng). Closes: #431817, #355536 + - several patches were not ported forward from 2.12-19 + - no kerneli support in crypto loop, since it is not in 2.6 kernels. + - 20guesshelper: filesystem detection has been dropped. Mount is built + with filesystem probing + - 20xgethostname: does anyone care? + - 30nfs*: NFS support has moved to nfs-utils, and removed from + util-linux. Add Depends: nfs-common until Lenny ships. + Closes: #417996 + - umounting usb sticks as a user no longer segfaults. Closes: #410031 + * Add LSB formatted dependency info in hwclock.sh. Closes: #330227 + * Reflect Debian locations in getopt manpage. Closes: #352221 + * Conflict/Replaces/Provides: schedutils. Closes: #322883, #384045 + * README.Debian.hwclock needs a .gz in hwclock.sh. Closes: #393539 + * Deliver tailf. Closes: #327906 + * Deliver partx. Closes: #296615 + + -- LaMont Jones <lamont@debian.org> Tue, 10 Jul 2007 00:05:29 -0600 + +util-linux (2.12r-20) unstable-UNRELEASED; urgency=low + + * USB unmounting dereferenced a null pointer. Closes: #410031 + - Files: 70fstab.dpatch + + -- LaMont Jones <lamont@debian.org> Sun, 17 Jun 2007 06:01:46 -0600 + +util-linux (2.12r-19ubuntu2) gutsy; urgency=low + + * Fix sparc disk label generation. This is required for LDOM + and parallel installations with Solaris 10. + Add patch: 80sparc-new-label + + Many thanks to David S. Miller for the patch. + + NOTE: users upgrading from older versions should re-run fdisk to + update the disk label. + + -- Fabio M. Di Nitto <fabbione@ubuntu.com> Mon, 02 Jul 2007 07:55:46 +0200 + +util-linux (2.12r-19ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Use volumeid instead of blkid to be able to access (mount/umount/swapon) + volumes by UUID and/or label: + + debian/control: libblkid-dev -> libvolume-id-dev build dependency + + debian/patches/70libvolume_id-support.dpatch: SuSE patch for using + libvolume-id. + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 14 May 2007 21:48:06 +0200 + +util-linux (2.12r-19) unstable; urgency=low + + * mips/mipsel buildds use sudo. Fix install target so that mount.deb + builds. Closes: #411893 + + -- LaMont Jones <lamont@debian.org> Wed, 21 Feb 2007 10:39:26 -0700 + +util-linux (2.12r-18) unstable; urgency=low + + * Stop printing erroneous "rpc.idmapd appears to not be running" message. + Files: 30nfs4.dpatch. Closes: #385879 + + -- LaMont Jones <lamont@debian.org> Mon, 5 Feb 2007 13:47:10 -0700 + +util-linux (2.12r-17ubuntu2) feisty; urgency=low + + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 12 Mar 2007 14:58:14 +0000 + +util-linux (2.12r-17ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - libvolume_id support patch from SuSE + - single ubuntuized hwclock script + + -- LaMont Jones <lamont@ubuntu.com> Fri, 2 Feb 2007 11:14:19 -0700 + +util-linux (2.12r-17) unstable; urgency=low + + * Userspace software suspend fix. Closes: #409365 + * armel support. Closes: #408816 + + -- LaMont Jones <lamont@debian.org> Fri, 2 Feb 2007 11:08:04 -0700 + +util-linux (2.12r-16) unstable; urgency=low + + * actually apply 30swsusp-resume. And support userspace sw susp too. + Closes: #406204 + * Fix off-by-one issue in agetty -I. Closes: #392445 + * Drop extraneous "again" from hwclock.sh and remove references to + hwclockfirst.sh. Closes: #396755 + * Drop PAGE_SIZE usage completely, use sysconf(_SC_PAGESIZE). + * Make intr the default for NFS v2 & v3 mounts in addition to being the + default for NFS v4. Thanks to Tollef Fog Heen for the idea. + + -- LaMont Jones <lamont@debian.org> Wed, 17 Jan 2007 11:57:35 -0700 + +util-linux (2.12r-15) unstable; urgency=low + + * New amd64 rdev patch. Closes: #396842 + + -- LaMont Jones <lamont@debian.org> Fri, 3 Nov 2006 20:44:05 -0700 + +util-linux (2.12r-14) unstable; urgency=low + + * Make that 11 for hwclock.sh, since we need / to be writable for the + adjfile. + + -- LaMont Jones <lamont@debian.org> Tue, 31 Oct 2006 15:01:01 -0700 + +util-linux (2.12r-13) unstable; urgency=low + + * NFS seems to not like 127.0.0.1 as a client ID for everyone. + Closes: #394941 + - 30nfs4-setclientid.dpatch by Steinar H. Gunderson <sesse@debian.org> + * Move hwclock.sh to 8 since localtime is now a file, not a symlink. + Adds Depends: tzdata (>=2006c-2) + Closes: #342887 + * ship rdev on amd64. Closes: #297789 + + -- LaMont Jones <lamont@debian.org> Tue, 31 Oct 2006 13:51:50 -0700 + +util-linux (2.12r-12) unstable; urgency=low + + * drop hwclockfirst.sh, and put hwclock.sh back at 50. See #50572 and + Closes: #342887 + * Deal with _syscall5 going away. Patch imported from Ubuntu. + Closes: #392236 + + -- LaMont Jones <lamont@debian.org> Thu, 19 Oct 2006 19:01:33 -0600 + +util-linux (2.12r-11) unstable; urgency=low + + * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest + nfs-common no longer creates the file at all.) Closes: #376931 + - modified 30nfs4-fix.dpatch + + -- LaMont Jones <lamont@debian.org> Tue, 19 Sep 2006 09:33:31 -0600 + +util-linux (2.12r-10) unstable; urgency=low + + * NFSv4 patch fixes for cfs. Closes: #367049 + Thanks to Trond Myklebust for the quick fix. + - modified 30nfs4-fix.dpatch + + -- LaMont Jones <lamont@debian.org> Mon, 15 May 2006 18:12:24 -0600 + +util-linux (2.12r-9) unstable; urgency=low + + * Release NFSv4 support. Closes: #302420, #239031, #290873 + * Deliver isosize. Closes: #354960 + * Fix udeb dependencies. Closes: #360352 + + -- LaMont Jones <lamont@debian.org> Sat, 6 May 2006 21:53:12 -0600 + +util-linux (2.12r-8.2nfs4) experimental; urgency=low + + * Turn on fixed nfsv4 patch. Closes: #302420, #239031 + Thanks to Steinar H. Gunderson <sgunderson@bigfoot.com> + + -- LaMont Jones <lamont@debian.org> Fri, 28 Apr 2006 11:04:39 -0600 + +util-linux (2.12r-8) unstable; urgency=high + + * Drop NFS v4 patch, since it breaks mounting things exported by + nfs-user-server. It will be happily reapplied once someone fixes + the patch. Closes: #354075. Reopens: #302420, #239031 + - fix compiler warnings in said patch. + - Apply nfs4mount.c fix to (dropped) nfsv4 patch. Closes: #354193 + + -- LaMont Jones <lamont@debian.org> Fri, 24 Feb 2006 10:57:29 -0700 + +util-linux (2.12r-7) unstable; urgency=low + + * Add nfsv4 patch. Closes: #302420, #239031 + + -- LaMont Jones <lamont@debian.org> Tue, 21 Feb 2006 11:01:21 -0700 + +util-linux (2.12r-6) unstable; urgency=low + + * make hwclock even more policy compilant. + + -- LaMont Jones <lamont@debian.org> Sat, 28 Jan 2006 08:57:45 -0700 + +util-linux (2.12r-5) unstable; urgency=low + + * make hwclock prettier. Closes: #348718 + + -- LaMont Jones <lamont@debian.org> Wed, 18 Jan 2006 11:44:06 -0700 + +util-linux (2.12r-4) unstable; urgency=low + + * Stupid fat-fingers typo. Closes: #348483 + + -- LaMont Jones <lamont@debian.org> Tue, 17 Jan 2006 07:40:56 -0700 + +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 + <yaegashi@debian.org>. Closes: #315660 + + -- LaMont Jones <lamont@debian.org> Mon, 16 Jan 2006 14:35:42 -0700 + +util-linux (2.12r-2) unstable; urgency=low + + * Add back in dropped cramfs-udebsize patch. + + -- LaMont Jones <lamont@debian.org> Fri, 9 Dec 2005 12:25:19 -0700 + +util-linux (2.12r-1) unstable; urgency=low + + * New upstream verison and maintainer. + - cfdisk: fix a segfault with ReiserFS partitions + - umount: disallow -r option for non-root users (CAN-2005-2876) + - sfdisk: document -G option in --help output + - updated translations: ca, et, fr + - sfdisk: add -G option (Andries Brouwer) + - updated translations: de, es, ru, sv, tr, nl + * split cfdisk into its own udeb. Closes: #243094, #314368 + * Really move hwclockfirst.sh back to S18 where it belongs. + Put hwclock.sh at S22. See #50572. + * Missing line break in hwclock.sh. Closes: #337955 + * Include swap-suspend patch from Ubuntu. + * Fix variable name typo in hwclock.sh. Closes: #340232 + * Add CPU=$(arch) to make call for building on amd64/i386 mixed systems. + Closes: #305907 + * Cleanup lsb_init function usage. + + -- LaMont Jones <lamont@debian.org> Wed, 7 Dec 2005 08:52:21 -0700 + +util-linux (2.12p-8) unstable; urgency=high + + * if /etc/adjtime is a dangling symlink, don't use it in hwclock*.sh + * Applited patch by Max Vozeler to fix a local privilege escalation + vulnerability in umount -r [debian/patches/51security_CAN-2005-2876.dpatch] + Closes: #328141, #329063 + + -- LaMont Jones <lamont@debian.org> Wed, 21 Sep 2005 08:36:17 -0600 + +util-linux (2.12p-7) unstable; urgency=low + + * Fix non-posix typo in hwclock.sh. Closes: #323872 + + -- LaMont Jones <lamont@debian.org> Thu, 18 Aug 2005 19:27:51 -0600 + +util-linux (2.12p-6) unstable; urgency=low + + * Use helper program in mount for guessed FS types too. Thanks to Manish + Singh and Fabio Massimo Di Nitto. Adds: 20guesshelper.dpatch + * Remove /usr/doc links on install. Closes: #322806, #322816 + * Fix /usr/bin/pg pager alternative. Closes: #323204 + * Overhaul hwclock.sh and hwclockfirst.sh. Closes: #286948, #251479 + * Resync with Ubuntu, changes by Martin.Pitt@ubuntu.com: Closes: #323463 + debian/patches/60_opt_O1.dpatch: + - MCONFIG, configure: Build with -O1 instead of -O2 to work around cfdisk + segfault. + - Yay for upstream build systems which do not support specifying CFLAGS or + OPT without breaking. + + -- LaMont Jones <lamont@debian.org> Wed, 17 Aug 2005 16:14:29 -0600 + +util-linux (2.12p-5) unstable; urgency=low + + * Merge changes from ubuntu + - closes #319143 + * Build-Depend: libslang2-dev. Closes: #315634 + + -- LaMont Jones <lamont@debian.org> Thu, 21 Jul 2005 12:08:23 -0600 + +util-linux (2.12p-4ubuntu4) breezy; urgency=low + + * dpkg-architecture says DEB_HOST_GNU_SYSTEM is "linux-gnu" now, not + "linux". Take account of this, and add compatibility code for old + dpkg-architecture (closes: Ubuntu #11012). + + -- Colin Watson <cjwatson@ubuntu.com> Sat, 21 May 2005 12:03:36 +0100 + +util-linux (2.12p-4ubuntu3) breezy; urgency=low + + * Don't special case sparc, it has umount2. + + -- Jeff Bailey <jbailey@ubuntu.com> Fri, 20 May 2005 11:48:24 +0000 + +util-linux (2.12p-4ubuntu2) breezy; urgency=low + + * Run hwclockfirst.sh after modules load, so that rtc is loaded. + + -- LaMont Jones <lamont@ubuntu.com> Thu, 12 May 2005 10:24:42 -0600 + +util-linux (2.12p-4ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * correct shutdown message from hwclock.sh + + -- LaMont Jones <lamont@ubuntu.com> Fri, 15 Apr 2005 18:01:57 -0600 + +util-linux (2.12p-4) unstable; urgency=low + + * Depend on newer libblkid1. + + -- LaMont Jones <lamont@debian.org> Thu, 17 Mar 2005 11:50:49 -0700 + +util-linux (2.12p-3) unstable; urgency=low + + * Add an alternative for pager pointing at pg (at pref 10). Closes: #294218 + * enable fdisk on s390. Closes: #238151 + + -- LaMont Jones <lamont@debian.org> Tue, 8 Feb 2005 13:45:34 -0700 + +util-linux (2.12p-2ubuntu2) hoary; urgency=low + + * Update dependencies for new libblkid1 + + -- LaMont Jones <lamont@ubuntu.com> Thu, 17 Mar 2005 11:12:42 -0700 + +util-linux (2.12p-2ubuntu1) hoary; urgency=low + + * Resync with Debian. + + -- LaMont Jones <lamont@canonical.com> Sat, 25 Dec 2004 08:12:38 -0700 + +util-linux (2.12p-2) unstable; urgency=low + + * Really fix man page in alternatives. Closes: #145647 + * more typos in hwclockfirst.sh. Closes: #276372 + + -- LaMont Jones <lamont@debian.org> Sat, 25 Dec 2004 08:08:12 -0700 + +util-linux (2.12p-1ubuntu1) hoary; urgency=low + + * Resync with Debian. Closes warty #3366, 4784 + + -- LaMont Jones <lamont@canonical.com> Fri, 24 Dec 2004 15:27:32 -0700 + +util-linux (2.12p-1) unstable; urgency=low + + * New upstream version. (2.12p) + Closes: #182325, #270173, #192751, #229875, #230859, #214144, #254317, #272580 + - cfdisk: fix number of new partition when partitions not in disk order + - fdisk: fix Sun label handling in sector mode + - mkfs: never truncate filename (not that that ever happened) + - more: fix redraw flaw. Closes: #146678 + * New upstream version. (2.12o) Closes: #286519, #132998, #207236 + - lomount: revert patch from 2.12j + - lptune.8: -T option is obsolete + - mkswap, mkswap.8, swapon: support labels + (use HAVE_BLKID=no as long as the blkid library doesnt support this) + - umount: allow user unmounting repeatedly mounted nfs mounts + * Build-Depend on uuid-dev. Closes: #282668 + * correct chown args in debian/rules. Closes: #254780 + * include man page in update-alternatives for pager. Closes: #145647 + * fix typos in howclockfirst.sh. Closes: #276372 + * fix losetup -N documentation. Closes: #239475 + * cleanup some narrow window sprintf issues in cfdisk. + + -- LaMont Jones <lamont@mmjgroup.com> Fri, 24 Dec 2004 14:38:23 -0700 + +util-linux (2.12m-1ubuntu1) hoary; urgency=low + + * Resync with Debian. + + -- LaMont Jones <lamont@canonical.com> Mon, 20 Dec 2004 10:55:20 -0700 + +util-linux (2.12m-1) unstable; urgency=low + + * New upstream version + - cfdisk: recognize JFS, support reiserfs labels (flavio.stanchina@tin.it) + - mount: fix option parsing bug + - mount.8: several updates + - swapon.8: document -v option + + -- LaMont Jones <lamont@debian.org> Mon, 20 Dec 2004 10:46:16 -0700 + +util-linux (2.12l-1ubuntu1) hoary; urgency=low + + * Resync with debian + + -- LaMont Jones <lamont@canonical.com> Wed, 15 Dec 2004 17:22:52 -0700 + +util-linux (2.12l-1) unstable; urgency=low + + * New upstream version, shrinking the size of the Debian diff. + - Makefile: remove cat-id-tbl.c upon make clean + - fdisk: fixed a bug that would cause a non-update of a sun disklabel + - fdisk: use sectorsize instead of 512 for SGI (Eric Y. Theriault) + - fdisk: use __attribute__((packed)) for alpha, ARM: avoid unaligned accesses + - hwclock: actually use HAVE_tm_gmtoff + - swapon: fix priority handling + - umount: refuse to unmount an empty string + * Jetisoning the (broken) hurd patch for now. + + -- LaMont Jones <lamont@debian.org> Wed, 15 Dec 2004 17:27:44 -0700 + +util-linux (2.12k-2ubuntu1) hoary; urgency=low + + * Resync with Debian + + -- LaMont Jones <lamont@canonical.com> Wed, 15 Dec 2004 11:32:45 -0700 + +util-linux (2.12k-2) unstable; urgency=low + + * Switch to dpatch. + * Clean up --nohashpass in losetup. Closes: #285639 + * Use stat instead of open in losetup. (From #285353) + + -- LaMont Jones <lamont@debian.org> Wed, 15 Dec 2004 10:43:29 -0700 + +util-linux (2.12k-1ubuntu1) hoary; urgency=low + + * Resync with Debian + + -- LaMont Jones <lamont@canonical.com> Mon, 13 Dec 2004 16:55:15 -0700 + +util-linux (2.12k-1) unstable; urgency=low + + * New upstream version. + * various translation updates + * gcc-3.4 support help + + -- LaMont Jones <lamont@debian.org> Mon, 13 Dec 2004 16:50:57 -0700 + +util-linux (2.12j-3ubuntu1) hoary; urgency=low + + * Resync with Debian + + -- LaMont Jones <lamont@canonical.com> Fri, 10 Dec 2004 07:23:03 -0700 + +util-linux (2.12j-3) unstable; urgency=low + + * umount -l "" does bad things. Don't do let the user do that. + * remove non-utf8 characters from changelog. sorry. + + -- LaMont Jones <lamont@debian.org> Fri, 10 Dec 2004 07:11:02 -0700 + +util-linux (2.12j-2ubuntu1) hoary; urgency=low + + * resync with Debian + + -- LaMont Jones <lamont@canonical.com> Tue, 7 Dec 2004 11:01:29 -0700 + +util-linux (2.12j-2) unstable; urgency=low + + * uninitialized variable. Closes: #284597 + + -- LaMont Jones <lamont@debian.org> Tue, 7 Dec 2004 10:52:55 -0700 + +util-linux (2.12j-1ubuntu1) hoary; urgency=low + + * resync with Debian + + -- LaMont Jones <lamont@canonical.com> Mon, 6 Dec 2004 03:55:55 -0700 + +util-linux (2.12j-1) unstable; urgency=low + + * New upstream version + + -- LaMont Jones <lamont@debian.org> Mon, 6 Dec 2004 03:29:45 -0700 + +util-linux (2.12h-4ubuntu1) hoary; urgency=low + + * resync with debian. + + -- LaMont Jones <lamont@canonical.com> Thu, 2 Dec 2004 22:37:16 -0700 + +util-linux (2.12h-4) unstable; urgency=low + + * mkswap on a file was broken. Thanks to Bas Zoetekouw <bas@debian.org> + for the patch. Closes: #280032, #282678 + * add libblkid-dev to Build-Depends. Closes: #282668 + + -- LaMont Jones <lamont@debian.org> Thu, 2 Dec 2004 10:42:04 -0700 + +util-linux (2.12h-3ubuntu1) hoary; urgency=low + + * Resync with debian. + Fix mount segv. Closes: Warty#3153 + + -- LaMont Jones <lamont@canonical.com> Wed, 3 Nov 2004 10:44:22 -0700 + +util-linux (2.12h-3) unstable; urgency=low + + * Fix mount segv's. Closes: #279306 + + -- LaMont Jones <lamont@debian.org> Wed, 3 Nov 2004 10:09:43 -0700 + +util-linux (2.12h-2ubuntu2) hoary; urgency=medium + + * Fix unterminated string in hwclock.sh (thanks, Jones Lee). + + -- Colin Watson <cjwatson@canonical.com> Tue, 2 Nov 2004 22:29:24 +0000 + +util-linux (2.12h-2ubuntu1) hoary; urgency=low + + * Re-sync with Debian. + + -- LaMont Jones <lamont@canonical.com> Sat, 30 Oct 2004 21:14:51 -0600 + +util-linux (2.12h-2) unstable; urgency=low + + * Cleanup the changelog entry in the uploaded package, to reduce panic. + + -- LaMont Jones <lamont@debian.org> Sat, 30 Oct 2004 15:38:18 -0600 + +util-linux (2.12h-1) unstable; urgency=low + + * Even newer upstream... sigh. + * Fix copyright file. Closes: #278925 + + -- LaMont Jones <lamont@debian.org> Sat, 30 Oct 2004 12:56:19 -0600 + +util-linux (2.12b-1) unstable; urgency=low + + * New upstream. + + -- LaMont Jones <lamont@debian.org> Fri, 29 Oct 2004 15:40:10 -0600 + +util-linux (2.12-11) unstable; urgency=low + + * Add amd64 to fdisk. + * use absolute path to hwclock in scripts. Closes: #277780 + * deal with unaligned partition table entries in fdisk. Closes: #268119 + + -- LaMont Jones <lamont@debian.org> Fri, 29 Oct 2004 15:05:15 -0600 + +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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <jfs@computer.org> + - 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <name> refers to kerneli). Closes: #65068, #131044, #163639, #211534. + + -- LaMont Jones <lamont@debian.org> Fri, 19 Sep 2003 20:42:08 -0600 + +util-linux (2.12-2) unstable; urgency=low + + * release to unstable. Closes: #206396,#180353 + + -- LaMont Jones <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <pere@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> Fri, 21 Mar 2003 14:02:39 -0700 + +util-linux (2.11y-2) unstable; urgency=low + + * Fix sparc build. sigh. + + -- LaMont Jones <lamont@debian.org> 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 <lamont@debian.org> 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 <lamont@debian.org> Sun, 24 Nov 2002 12:12:23 -0700 + +util-linux (2.11u-2) unstable; urgency=low + + * Fix changelog. + + -- LaMont Jones <lamont@debian.org> 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 <lamont@debian.org> 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 <tfheen@debian.org> 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 <lamont@debian.org> Sat, 26 Jan 2002 11:21:41 -0700 + +util-linux (2.11n-3) unstable; urgency=low + + * Orphaned this package. + + -- Adrian Bunk <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <joeyh@debian.org>. (closes: #68556) + * Added a hwclockfirst.sh script that runs before S20modutils. + (closes: #50572) + + -- Adrian Bunk <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> Wed, 9 May 2001 15:54:51 +0200 + +util-linux (2.11b-5) unstable; urgency=low + + * Made util-linux-locales binary-all. + + -- Adrian Bunk <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> 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 <bunk@fs.tum.de> Fri, 9 Mar 2001 19:40:53 +0100 + +util-linux (2.10s-2) unstable; urgency=low + + * New maintainer. (closes: #86872) + + -- Adrian Bunk <bunk@fs.tum.de> 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 <shaleh@debian.org> 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 <shaleh@debian.org> 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 "Numero 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 <shaleh@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <sgore@debian.org> Sun, 25 Jun 2000 22:18:47 +0500 + +util-linux (2.10f-5) frozen unstable; urgency=low + + * Patch from David Huggins-Daines <dhd@linuxcare.com> + which is required to get a working fdisk on alpha. + + -- Vincent Renardias <vincent@debian.org> Mon, 1 May 2000 22:40:17 +0200 + +util-linux (2.10f-4) unstable; urgency=low + + * Patch for mips support from Florian Lohoff <flo@rfc822.org>. + closes: #62247: patch for mips/mipsel and bsddisklabel. + + -- Vincent Renardias <vincent@debian.org> Wed, 12 Apr 2000 17:26:24 +0200 + +util-linux (2.10f-3) frozen unstable; urgency=low + + * included patch from David Huggins-Daines <dhuggins@linuxcare.com> so + that fdisk behaves correctly with OSF/1 disklabels. + closes: #59385: Fixes for BSD disklabel support (for Alpha) + (Important bug) + + -- Vincent Renardias <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <hmh+debianml@rcm.org.br> + for the patch). + When this package is installed, I'll examine one by one which BR can + be closed. + + -- Vincent Renardias <vincent@debian.org> 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 <vincent@debian.org> Fri, 28 Jan 2000 16:52:27 +0100 + +util-linux (2.10d-5) unstable; urgency=low + + * Included patch from "J.H.M. Dassen (Ray)" <jhm@cistron.nl>: + - 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> Fri, 10 Dec 1999 11:21:36 +0100 + +util-linux (2.10-6) unstable; urgency=low + + * Patch by Topi Miettinen <Topi.Miettinen@nic.fi> to a longstanding + bug in logger. closes: #19666. + + -- Vincent Renardias <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <torsten@debian.org>: + * 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> Tue, 21 Sep 1999 17:54:47 +0200 + +util-linux (2.9w-3) unstable; urgency=low + + * Include PowerPC patch from Matt Porter <mporter@phx.mcd.mot.com>. + * Should be 100% PAMified(tm). Please report anomalies. + + -- Vincent Renardias <vincent@debian.org> 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)" <jdassen@wi.LeidenUniv.nl>. + + -- Vincent Renardias <vincent@debian.org> 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 (Jii Pavlovsky) + * 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <vincent@debian.org> 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 <linux/loop.h> and <linux/crypto.h> in the source, so as not to + rely on source outside main. + * Updated the losetup(8) manpage. + + -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> 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 (Jii Pavlovsky) + * 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 <vincent@debian.org> 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 <vincent@debian.org> Wed, 19 May 1999 12:45:09 +0200 + +util-linux (2.9r-2) unstable; urgency=low + + * Fix stupid bug #37916. + + -- Vincent Renardias <vincent@debian.org> 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 <vincent@debian.org> 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 <errno.h> (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 <vincent@debian.org> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <espy@debian.org> 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 <tom@medialab.sonera.net> + (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 <vincent@waw.com> 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 <jk@espy.org> + (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 <delaunay@lix.polytechnique.fr> (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 <chris@classnet.med.miami.edu> + (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 <tom@medialab.sonera.net>: + 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 <vincent@waw.com> 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 <james@nocrew.org> 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 <kundrat@gic.sk>] hwclock startup script + #20728: util-linux: hwlock: GMT status lost? + #19248: util-linux should install /etc/init.d/hwclock.sh + + -- Miquel van Smoorenburg <miquels@cistron.nl> 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 <tor@slett.net> 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 <bridgett@debian.org> 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 <knghtbrd@debian.org> Sun, 25 Oct 1998 21:48:16 -0800 + +util-linux (2.7.1-3) unstable; urgency=low + + * Another m68k patch from Roman Hodek + <rnhodek@faui22c.informatik.uni-erlangen.de> + * fdisk patch from Russell Coker <rjc@snoopy.virtual.net.au> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <volker@fsing.uni-sb.de> + to set owner of root directory to invoker (like mkfs.ext2). (#6902) + * Fix dpkg-shlibddeps rules line for m68k (#5818) + + -- Guy Maor <maor@ece.utexas.edu> 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 <bruce@pixar.com> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 + <miquels@Q.cistron.nl> to let fdisk and cfdisk support Linux + extended partitions. + * Applied patch from Frank Neumann + <Frank.Neumann@Informatik.Uni-Oldenburg.DE> for Linux/m68k + support. + * Install mkcookie. + * disk-utils/mkfs.minix: fixed bug 3777 re parsing oddities. + + -- Guy Maor <maor@ece.utexas.edu> 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 <mrn20@hermes.cam.ac.uk> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> 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 <maor@ece.utexas.edu> Fri, 19 Apr 1996 05:13:09 -0500 + +util-linux (2.5-1) unstable; urgency=low + + * Initial release + + -- Guy Maor <maor@ece.utexas.edu> Thu, 18 Apr 1996 04:32:22 -0500 --- util-linux-2.13.1.orig/debian/mount.dirs +++ util-linux-2.13.1/debian/mount.dirs @@ -0,0 +1,10 @@ +bin/ +sbin/ +usr/ +usr/share/ +usr/share/man/ +usr/share/man/man8/ +usr/share/man/man5/ +usr/share/doc/ +usr/share/doc/mount/ +usr/share/doc/mount/examples/ --- util-linux-2.13.1.orig/debian/control +++ util-linux-2.13.1/debian/control @@ -0,0 +1,82 @@ +Source: util-linux +Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>>113-0), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release +Section: base +Priority: required +Standards-Version: 3.7.2.0 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: LaMont Jones <lamont@debian.org> +XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/util-linux.git +XS-Vcs-Git: git://git.debian.org/~lamont/util-linux.git + +Package: util-linux +Architecture: any +Section: utils +Priority: required +Essential: yes +Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2) +Pre-Depends: ${shlibs:Depends} +Suggests: util-linux-locales, kbd | console-tools, dosfstools +Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, ${util-linux:Conflicts} +Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts} +Provides: schedutils, linux32 +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 armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh s390 sparc sparc64 +Essential: yes +Section: admin +Pre-Depends: ${shlibs:Depends} +Suggests: nfs-common (>=1:1.1.0-13) +Breaks: nfs-common (<<1:1.1.0-7) +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 +Section: utils +Depends: ${shlibs: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: cal, col, colcrt, colrm, column, logger, renice, + script, scriptreplay, ul, wall + +Package: fdisk-udeb +Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sparc s390 +Priority: extra +Section: debian-installer +Depends: ${shlibs:Depends} +XC-Package-Type: udeb +XB-Installer-Menu-Item: 99900 +Description: Manually partition a hard drive (fdisk) + +Package: cfdisk-udeb +Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 s390 +Priority: extra +Section: debian-installer +Depends: ${shlibs:Depends} +XC-Package-Type: udeb +XB-Installer-Menu-Item: 99900 +Description: Manually partition a hard drive (cfdisk) --- util-linux-2.13.1.orig/debian/README.Debian.hwclock +++ util-linux-2.13.1/debian/README.Debian.hwclock @@ -0,0 +1,65 @@ +hwclock and Debian: + +A Debian installation will, by default, call hwclock --hctosys during system +startup and hwclock --systohc during system shutdown. + +To set the date/time of the system, just use the standard UNIX date facilities +(such as date) or any of the advanced timekeeping utilities (ntp, ntpdate, +chrony). Other methods of setting the clock (such as hwclock) are likely to +cause trouble, do not use them. + +Please note that because the shutdown scripts call hwclock --systohc, you +cannot set the clock using hwclock only, as your adjustment will be lost on +the next reboot. THIS MEANS YOU MUST *NOT* FOLLOW THE PROCEDURES IN THE +hwclock(8) MAN PAGE TO SET THE CLOCK DATE/TIME USING A REBOOT UNLESS YOU +EDIT THE SHUTDOWN SCRIPTS. + + +The full story: + +A Linux system actually has two clocks: + + - The System Clock, kept by the kernel. This is the clock that Linux uses for + day-to-day activities, and this is also the clock you set using date. + + - The Hardware Clock, also called RTC, which is used as a backup to keep time + while the computer is turned off, or in APM suspended state. This is the + clock you set using hwclock --set. + +(you can get more information about these two clocks in the hwclock(8) man +page). + +hwclock is used to copy time between these two clocks. For the Debian +standard install, the system clock is initialized with the value of the +hardware clock during startup, and the value of the system clock is copied +back to the hardware clock during system shutdown/reboot. + +So, in a Debian default install, you can keep the illusion that there's a +single clock. Unless you use a program that modifies the hardware clock +directly and does not set the system clock as well, that is. + + +Issues with hwclock --adjust: + +hwclock has a facility to try to correct for systematic drift in the +hardware clock, accessed by hwclock --adjust. This facility is *dangerous* +because it has a severe drawback: it assumes that no program other than +hwclock --systohc will ever be used to change the hardware clock. + +This assumption is often false, as many common utilities such as ntp, +chrony, as well as your computer's System Setup BIOS program, and +any other OS you have in your machine will change the clock. + +Also, if hwclock --adjust is used, one must make sure the drift file +(/etc/adjtime) is deleted every time the system clock is set to a very +different value (even if you're using hwclock itself to do it!), or the +drift computation might become invalid and cause the hardware clock to be +incorrectly set the next time hwclock --adjust is used. + +hwclock currently does not perform any sort of sanity checks in the values +it uses to compute the drift file, and will corrupt your clock time by +potentially very large amounts if anything goes wrong. + +Don't use the hwclock --adjust facility, refer to alternate (and much safer) +programs such as ntp or chrony if you need precision timekeeping. + --- util-linux-2.13.1.orig/debian/hwclock.udev +++ util-linux-2.13.1/debian/hwclock.udev @@ -0,0 +1,29 @@ +#!/bin/sh +# udev helper for hwclock +# +# This is based on the hwclock.sh init script, but somewhat simplified. + +[ ! -x /sbin/hwclock ] && exit 0 +. /etc/default/rcS + +[ "$GMT" = "-u" ] && UTC="yes" +case "$UTC" in + no|"") GMT="--localtime" + UTC="" + ;; + yes) GMT="--utc" + UTC="--utc" + ;; + *) exit 1 ;; +esac + +case "$BADYEAR" in + no|"") BADYEAR="" ;; + yes) BADYEAR="--badyear" ;; + *) exit 1 ;; +esac + +# 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 --- util-linux-2.13.1.orig/debian/util-linux-locales.dirs +++ util-linux-2.13.1/debian/util-linux-locales.dirs @@ -0,0 +1,43 @@ +usr/ +usr/share/ +usr/share/doc/ +usr/share/doc/util-linux-locales/ +usr/share/locale/ +usr/share/locale/ca/ +usr/share/locale/ca/LC_MESSAGES/ +usr/share/locale/cs/ +usr/share/locale/cs/LC_MESSAGES/ +usr/share/locale/da/ +usr/share/locale/da/LC_MESSAGES/ +usr/share/locale/de/ +usr/share/locale/de/LC_MESSAGES/ +usr/share/locale/es/ +usr/share/locale/es/LC_MESSAGES/ +usr/share/locale/et/ +usr/share/locale/et/LC_MESSAGES/ +usr/share/locale/fi/ +usr/share/locale/fi/LC_MESSAGES/ +usr/share/locale/fr/ +usr/share/locale/fr/LC_MESSAGES/ +usr/share/locale/it/ +usr/share/locale/it/LC_MESSAGES/ +usr/share/locale/ja/ +usr/share/locale/ja/LC_MESSAGES/ +usr/share/locale/nl/ +usr/share/locale/nl/LC_MESSAGES/ +usr/share/locale/pt_BR/ +usr/share/locale/pt_BR/LC_MESSAGES/ +usr/share/locale/sl/ +usr/share/locale/sl/LC_MESSAGES/ +usr/share/locale/sv/ +usr/share/locale/sv/LC_MESSAGES/ +usr/share/locale/tr/ +usr/share/locale/tr/LC_MESSAGES/ +usr/share/locale/id/ +usr/share/locale/id/LC_MESSAGES/ +usr/share/locale/ru/ +usr/share/locale/ru/LC_MESSAGES/ +usr/share/locale/uk/ +usr/share/locale/uk/LC_MESSAGES/ +usr/share/locale/vi/ +usr/share/locale/vi/LC_MESSAGES/ --- util-linux-2.13.1.orig/debian/mount.prerm +++ util-linux-2.13.1/debian/mount.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ -L /usr/doc/mount ] ; then + rm -f /usr/doc/mount +fi + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/rules +++ util-linux-2.13.1/debian/rules @@ -0,0 +1,181 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DISTRO :=$(shell lsb_release -is 2>/dev/null || echo Debian) + +DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --cache-file=$(DEB_HOST_GNU_TYPE).cache +else +CROSS= +endif + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +STRIP=y +endif + +ifndef DEB_HOST_ARCH +DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture) +DEB_HOST_ARCH = $(DEB_BUILD_ARCH) +endif + +ifndef DEB_HOST_ARCH_OS +DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +endif + +export arch = $(DEB_HOST_ARCH) +version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog) +Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog) + +CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang +ifeq ($(DEB_HOST_ARCH_OS),linux) +CONFOPTS += --with-selinux +endif +ifneq ($(DISTRO),Debian) +CONFOPTS += --with-fsprobe=volume_id +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure $(CONFOPTS) $(CROSS) + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) all CPU=$(arch) arch=$(arch) + touch build-stamp + +autofiles: + AM_OPTS=--copy ./autogen.sh + rm -rf autom4te.cache + +clean-preunpatch: + dh_testdir + dh_testroot + dh_clean + test ! -d ${base} || rm -rf ${base} + -$(MAKE) distclean + +clean: clean-preunpatch + find . -name \*.o -exec rm {} \; + rm -f build-stamp configure-stamp + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=`pwd`/debian/util-linux INSTALL_STRIP_FLAG="" + dh_installdocs -i -s + install -m 644 login-utils/README.modems-with-agetty debian/util-linux/usr/share/doc/util-linux/README.modems-with-getty +ifeq ($(DEB_HOST_ARCH_OS),linux) + perl -pi.bak -e 's/agetty/getty/g' debian/util-linux/usr/share/man/man8/getty.8 \ + debian/util-linux/usr/share/doc/util-linux/README.* + rm `find debian/util-linux/usr -name \*.bak` +endif + dh_installexamples -i -s + dh_installmenu -i -s + dh_installcron -i -s + dh_installinfo -i -s + dh_installchangelogs docs/v*-ReleaseNotes -i -s + dh_movefiles --sourcedir=debian/util-linux -i -s + # + # XXX - push things to where debian has always(?) had them... + mv debian/util-linux/usr/sbin/*part* debian/util-linux/usr/bin + mv debian/util-linux/usr/bin/tailf debian/util-linux/bin + mv debian/util-linux/usr/bin/isosize debian/util-linux/sbin + mv debian/util-linux/usr/bin/cytune debian/util-linux/usr/sbin + mv debian/util-linux/usr/share/man/man8/linux32.8 debian/util-linux/usr/share/man/man1/linux32.1 + mv debian/util-linux/usr/share/man/man8/linux64.8 debian/util-linux/usr/share/man/man1/linux64.1 + # the version in bsdmainutils seems newer. + rm -f debian/bsdutils/usr/bin/look debian/bsdutils/usr/share/man/man1/look.1 + rm -f debian/bsdutils/usr/bin/hexdump debian/bsdutils/usr/share/man/man1/hexdump.1 + # and it's less pain to just let bsmainutils deliver col for now. + rm -f debian/bsdutils/usr/bin/col* debian/bsdutils/usr/share/man/man1/col*.1 + rm -f debian/bsdutils/usr/bin/ul debian/bsdutils/usr/share/man/man1/ul*.1 + rm -f debian/bsdutils/usr/bin/cal debian/bsdutils/usr/share/man/man1/cal.1 + # perl gets to do rename, not us. + mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul + mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1 + # + # + mv debian/util-linux/usr/share/getopt/* debian/util-linux/usr/share/doc/util-linux/examples + rmdir debian/util-linux/usr/share/getopt + install -m 644 debian/lintian-override debian/util-linux/usr/share/lintian/overrides/util-linux + install -m 644 debian/mime.util-linux debian/util-linux/usr/lib/mime/packages/util-linux + if [ -f debian/util-linux/sbin/hwclock ] ; then \ + install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclock.sh; \ + install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclockfirst.sh; \ + sed -i -e '/^FIRST=/s/no/yes/' -e '/Provides:/s/ck/ckfirst/' \ + -e '/Required-Stop:/s/.local_fs/umountroot/' \ + debian/util-linux/etc/init.d/hwclockfirst.sh; \ + fi +ifneq ($(DISTRO),Debian) + if [ -f debian/util-linux/sbin/hwclock ] ; then \ + install -m 755 debian/hwclock.udev debian/util-linux/lib/udev/set_hwclock && \ + install -m 644 debian/hwclock.rules debian/util-linux/etc/udev/rules.d/85-hwclock.rules; \ + fi +endif + cd debian; if [ -f util-linux/sbin/fdisk ]; then \ + ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin; \ + S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin; fi; \ + fi + cd debian/util-linux-locales && find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done +ifeq ($(DEB_HOST_ARCH_OS),linux) +ifeq ($(arch),$(findstring $(arch),powerpc ppc64)) + mv -f debian/util-linux/sbin/fdisk debian/util-linux/sbin/ddisk + mv -f debian/util-linux/usr/share/man/man8/fdisk.8 debian/util-linux/usr/share/man/man8/ddisk.8 +else + cd debian/util-linux && if [ -f sbin/hwclock ] ; then ln -sf hwclock.8.gz usr/share/man/man8/clock.8.gz; fi +endif + cd debian/util-linux/sbin ; mv agetty getty + cd debian/util-linux/usr/share/man/man8 ; mv agetty.8 getty.8 + install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab +endif +ifeq ($(DEB_HOST_GNU_SYSTEM),gnu) + cd debian/util-linux/sbin ; mv mkswap mkswap.linux + cd debian/util-linux/usr/share/man/man8 ; mv mkswap.8 mkswap.linux.8 +endif + dh_compress -i -s + dh_fixperms -i -s -Xusr/bin/wall -Xbin/mount -Xbin/umount + rm -rf debian/*-udeb/usr/share/doc + dh_link -i -s + + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdeb -i + dh_gencontrol -i -- -VUpstream=$(Upstream) + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -s + dh_testroot -s + dh_installinit -s -- defaults 15 85 + [ -n "$(STRIP)" ] || dh_strip -s + dh_makeshlibs -s + dh_installdeb -s + dh_shlibdeps -s +ifneq ($(DEB_HOST_ARCH_OS),linux) + echo util-linux:Conflicts=getty >> debian/util-linux.substvars +endif + dh_gencontrol -s -Xbsdutils + dh_gencontrol -pbsdutils -u-v1:$(version) + dh_md5sums -s + rm -f debian/*-udeb/DEBIAN/md5sums + dh_builddeb -s + + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- util-linux-2.13.1.orig/debian/util-linux.prerm +++ util-linux-2.13.1/debian/util-linux.prerm @@ -0,0 +1,17 @@ +#! /bin/sh + +set -e + +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) + ;; +esac + + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/copyright +++ util-linux-2.13.1/debian/copyright @@ -0,0 +1,41 @@ +This is the Debian GNU/Linux prepackaged version of util-linux. + +This package was put together by Guy Maor <maor@debian.org> and later +maintained by Sean 'Shaleh' Perry <shaleh@debian.org>, and Adrian Bunk +<bunk@stusta.de>. + +The current maintainer is LaMont Jones <lamont@debian.org>. +See also: git://git.debian.org/~lamont/util-linux.git + +It was downloaded from: + ftp://ftp.us.kernel.org/pub/linux/utils/util-linux-ng/ + +Upstream maintainers include: + Maintainer: Karel Zak <kzak@redhat.com> + Past Maintainer: Adrian Bunk <bunk@fs.tum.de> + Past Maintainer: Andries Brouwer <aeb@cwi.nl> + See also /usr/share/doc/util-linux/AUTHORS + +Copyright: + + A variety of people and entities, as befits the nature of the package. + See the individual sources for exact copyright holder information. + +License: + + The project doesn't use same license for all code. There is code with: + + * GPLv2+ (GNU General Public License version 2, or any later version) + + * GPLv2 (GNU General Public License version 2) + + * BSD with advertising + + * Public Domain + + Please, check source code for more details. A license is usually at the start + of each source file. + + Anything lacking an explicit license 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 --- util-linux-2.13.1.orig/debian/util-linux.postinst +++ util-linux-2.13.1/debian/util-linux.postinst @@ -0,0 +1,45 @@ +#! /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 \ + --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/more.1.gz +update-alternatives --install /usr/bin/pager pager /usr/bin/pg 10 \ + --slave /usr/share/man/man1/pager.1.gz pager.1.gz /usr/share/man/man1/pg.1.gz + +# +# 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 11 S . stop 25 0 6 . > /dev/null + update-rc.d -f hwclockfirst.sh remove 2>/dev/null > /dev/null + if [ -f /etc/init.d/hwclockfirst.sh ]; then + update-rc.d hwclockfirst.sh start 8 S . > /dev/null + fi + fi +fi + +if [ -x /usr/sbin/update-mime ]; then + update-mime +fi + +if [ -L /usr/doc/util-linux ] ; then + rm -f /usr/doc/util-linux +fi + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/bsdutils.docs +++ util-linux-2.13.1/debian/bsdutils.docs @@ -0,0 +1 @@ +debian/README.script --- util-linux-2.13.1.orig/debian/fdisk-udeb.dirs +++ util-linux-2.13.1/debian/fdisk-udeb.dirs @@ -0,0 +1,2 @@ +usr/ +usr/sbin/ --- util-linux-2.13.1.orig/debian/README.script +++ util-linux-2.13.1/debian/README.script @@ -0,0 +1,38 @@ +Security hole in `script' +------------------------- + +The BSD `script' utility included in the `bsdutils' package is not +installed setuid root, and was not written to be. Sometimes the tty +`script' allocates is already owned by the appropriate user, in which +case there will be no problem. In other cases, `script' will not be +able to set the ownership or mode of the pty/tty pair it allocates, +and so it cannot prevent other processes reading or writing to the tty. + +The result of this is a security hole: during such a `script' session, +other users can read keystrokes from your tty, or write to your terminal, +without any warning or explicit authorisation. This means that any +password(s) or other sensitive data you enter during such a `script' +session are not secure against snooping, even if they are (properly) +not echoed to the screen. + +To protect against this, `script' tries to detect whether the tty +allocated for it by the C library's openpty() function is secure +against snooping. If it detects that there is a problem, `script' +issues a warning. If you see this warning, you should not enter any +sensitive data during the script session, and you should not trust the +output displayed, or that recorded in the `typescript' file, to be free +from tampering. + +This bug is due to a long-standing design flaw in UNIX, and is to be cured +shortly by the introduction of the UNIX98-style pty system supported +by GLIBC 2.1 and Linux 2.2. The UNIX98-style pty system makes use of +kernel support to create slave devices on the fly, with the correct +ownership and permissions already in place. This allows unprivileged +user programs to allocate pty/tty pairs securely, and eliminates the +race conditions currently present in pty allocation. + +When `script' is used on a system with UNIX98-style pty support in +the kernel and in libc, `script' will detect that its tty is secure, +and will not display the warning. + +Charles Briscoe-Smith <cpbs@debian.org> Wed, 9 Dec 1998 13:32:49 +0000 --- util-linux-2.13.1.orig/debian/changelog.Debian-mount.old +++ util-linux-2.13.1/debian/changelog.Debian-mount.old @@ -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 <ajt@debian.org> 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 <reiter@netspace.net.au (fixes: + Bug#27421) + * Applied patch by James Troup <james@nocrew.org> that prevents mount + from crashing when an empty argument list is used with `-t'. (fixes: + Bug#27130) + + -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 14 Oct 1998 23:11:14 +0200 + +mount (2.8a-1) unstable; urgency=low + + * New upstream version (Bug #26686). + + -- Vincent Renardias <vincent@waw.com> 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 <vincent@waw.com> 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 <delaunay@lix.polytechnique.fr>) + + -- Vincent Renardias <vincent@waw.com> Thu, 23 Apr 1998 20:26:49 +0200 + +mount (2.7l-3) unstable; urgency=low + + * updated swapon(8) manpage. + + -- Vincent Renardias <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> Sun, 9 Nov 1997 03:50:27 +0100 + +mount (2.6g-2) unstable; urgency=low + + * Rebuilt with libc6. + + -- Vincent Renardias <vincent@waw.com> Sat, 21 Jun 1997 17:26:47 +0200 + +mount (2.6g-1) unstable; urgency=low + + * Upstream upgrade. + + -- Vincent Renardias <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> Tue, 18 Feb 1997 02:22:11 +0100 + +mount (2.6b-0.1) unstable; urgency=low + + * Added 'Essential: yes' into debian/control. + + -- Vincent Renardias <vincent@waw.com> 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 <vincent@waw.com> 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 <vincent@waw.com> 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 <rob@mars.org> + * 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 <vincent@waw.com> Sun, 9 Feb 1997 22:08:56 +0100 + +Local variables: +mode: debian-changelog +End: --- util-linux-2.13.1.orig/debian/hwclock.sh +++ util-linux-2.13.1/debian/hwclock.sh @@ -0,0 +1,151 @@ +#!/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 <hmh@rcm.org.br> +# - 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. + +### BEGIN INIT INFO +# Provides: hwclock +# Required-Start: mountdevsubfs +# Required-Stop: $local_fs +# Default-Start: S +# Default-Stop: 0 6 +### END INIT INFO + +FIRST=no # debian/rules sets this to 'yes' when creating hwclockfirst.sh + +# Set this to any options you might need to give to hwclock, such +# as machine hardware clock type for Alphas. +HWCLOCKPARS= + +hwclocksh() +{ + [ ! -x /sbin/hwclock ] && return 0 + . /etc/default/rcS + + . /lib/lsb/init-functions + verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; } + + [ "$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" + return 1 + fi + fi + ;; + yes) GMT="--utc" + UTC="--utc" + ;; + *) log_action_msg "Unknown UTC setting: \"$UTC\""; return 1 ;; + esac + + case "$BADYEAR" in + no|"") BADYEAR="" ;; + yes) BADYEAR="--badyear" ;; + *) log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; return 1 ;; + esac + + case "$1" in + start) + if [ -w /etc ] && [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then + echo "0.0 0 0.0" > /etc/adjtime + fi + + if [ ! -w /etc/adjtime ]; then + NOADJ="--noadjfile" + else + NOADJ="" + 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 enabling hwclock --adjust. + + #/sbin/hwclock --adjust $GMT $BADYEAR + : + fi + + if [ "$HWCLOCKACCESS" != no ]; then + log_action_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. + if /sbin/hwclock --hctosys $GMT $HWCLOCKPARS $BADYEAR $NOADJ; then + # Announce the local time. + verbose_log_action_msg "System Clock set to: `date $UTC`" + else + log_warning_msg "Unable to set System Clock to: `date $UTC`" + fi + else + verbose_log_action_msg "Not setting System Clock" + 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 + log_action_msg "Saving the system clock" + if [ "$GMT" = "-u" ]; then + GMT="--utc" + fi + if /sbin/hwclock --systohc $GMT $HWCLOCKPARS $BADYEAR; then + verbose_log_action_msg "Hardware Clock updated to `date`" + fi + else + verbose_log_action_msg "Not saving System Clock" + fi + ;; + show) + 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" + return 1 + ;; + esac +} + +hwclocksh "$@" --- util-linux-2.13.1.orig/debian/mount.files +++ util-linux-2.13.1/debian/mount.files @@ -0,0 +1,11 @@ +bin/mount +bin/umount +sbin/swapon +sbin/losetup +usr/share/man/man8/swapoff.8 +usr/share/man/man8/umount.8 +usr/share/man/man8/swapon.8 +usr/share/man/man8/losetup.8 +usr/share/man/man8/mount.8 +usr/share/man/man5/fstab.5 +sbin/swapoff --- util-linux-2.13.1.orig/debian/util-linux.docs +++ util-linux-2.13.1/debian/util-linux.docs @@ -0,0 +1,6 @@ +login-utils/README.getty +login-utils/README.poeigl +debian/README.Debian.hwclock +fdisk/README.cfdisk +fdisk/README.fdisk +AUTHORS --- util-linux-2.13.1.orig/debian/bsdutils.dirs +++ util-linux-2.13.1/debian/bsdutils.dirs @@ -0,0 +1,9 @@ +bin/ +usr/ +usr/bin/ +usr/share/ +usr/share/man/ +usr/share/man/man8/ +usr/share/man/man1/ +usr/share/doc/ +usr/share/doc/bsdutils/ --- util-linux-2.13.1.orig/debian/cfdisk-udeb.dirs +++ util-linux-2.13.1/debian/cfdisk-udeb.dirs @@ -0,0 +1,43 @@ +usr/ +usr/sbin/ +usr/share/ +usr/share/locale/ +usr/share/locale/ +usr/share/locale/ca/ +usr/share/locale/ca/LC_MESSAGES/ +usr/share/locale/cs/ +usr/share/locale/cs/LC_MESSAGES/ +usr/share/locale/da/ +usr/share/locale/da/LC_MESSAGES/ +usr/share/locale/de/ +usr/share/locale/de/LC_MESSAGES/ +usr/share/locale/es/ +usr/share/locale/es/LC_MESSAGES/ +usr/share/locale/et/ +usr/share/locale/et/LC_MESSAGES/ +usr/share/locale/fi/ +usr/share/locale/fi/LC_MESSAGES/ +usr/share/locale/fr/ +usr/share/locale/fr/LC_MESSAGES/ +usr/share/locale/it/ +usr/share/locale/it/LC_MESSAGES/ +usr/share/locale/ja/ +usr/share/locale/ja/LC_MESSAGES/ +usr/share/locale/nl/ +usr/share/locale/nl/LC_MESSAGES/ +usr/share/locale/pt_BR/ +usr/share/locale/pt_BR/LC_MESSAGES/ +usr/share/locale/sl/ +usr/share/locale/sl/LC_MESSAGES/ +usr/share/locale/sv/ +usr/share/locale/sv/LC_MESSAGES/ +usr/share/locale/tr/ +usr/share/locale/tr/LC_MESSAGES/ +usr/share/locale/id/ +usr/share/locale/id/LC_MESSAGES/ +usr/share/locale/ru/ +usr/share/locale/ru/LC_MESSAGES/ +usr/share/locale/uk/ +usr/share/locale/uk/LC_MESSAGES/ +usr/share/locale/vi/ +usr/share/locale/vi/LC_MESSAGES/ --- util-linux-2.13.1.orig/debian/compat +++ util-linux-2.13.1/debian/compat @@ -0,0 +1 @@ +5 --- util-linux-2.13.1.orig/debian/bsdutils.prerm +++ util-linux-2.13.1/debian/bsdutils.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ -L /usr/doc/bsdutils ] ; then + rm -f /usr/doc/bsdutils +fi + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/util-linux-locales.prerm +++ util-linux-2.13.1/debian/util-linux-locales.prerm @@ -0,0 +1,16 @@ +#! /bin/sh + +set -e + +case "$1" in + remove) + if [ -L /usr/doc/util-linux-locales ] ; then + rm -f /usr/doc/util-linux-locales + fi + ;; + upgrade|failed-upgrade|deconfigure) + ;; +esac + + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/util-linux.conffiles +++ util-linux-2.13.1/debian/util-linux.conffiles @@ -0,0 +1 @@ +/etc/init.d/hwclock.sh --- util-linux-2.13.1.orig/debian/lintian-override +++ util-linux-2.13.1/debian/lintian-override @@ -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 --- util-linux-2.13.1.orig/debian/bsdutils.postinst +++ util-linux-2.13.1/debian/bsdutils.postinst @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ -L /usr/doc/bsdutils ] ; then + rm -f /usr/doc/bsdutils +fi + + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/util-linux-locales.postinst +++ util-linux-2.13.1/debian/util-linux-locales.postinst @@ -0,0 +1,7 @@ +#! /bin/sh -e + +if [ -L /usr/doc/util-linux-locales ] ; then + rm -f /usr/doc/util-linux-locales +fi + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/util-linux.examples +++ util-linux-2.13.1/debian/util-linux.examples @@ -0,0 +1,2 @@ +fdisk/sfdisk.examples +debian/fstab.example2 --- util-linux-2.13.1.orig/debian/mime.util-linux +++ util-linux-2.13.1/debian/mime.util-linux @@ -0,0 +1,2 @@ +text/plain; more %s; needsterminal; priority=5 +text/*; more %s; needsterminal; priority=1 --- util-linux-2.13.1.orig/debian/mount.postinst +++ util-linux-2.13.1/debian/mount.postinst @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ -L /usr/doc/mount ] ; then + rm -f /usr/doc/mount +fi + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/rejected-upstream +++ util-linux-2.13.1/debian/rejected-upstream @@ -0,0 +1,76 @@ +Date: Sun, 1 Jul 2001 18:19:00 +0200 (CEST) +From: Adrian Bunk <bunk@fs.tum.de> +To: util-linux@math.uio.no +Subject: [patch] setterm -{dump,append} don't work on current virtual console + +Hi Andries, + +Colin Watson <cjw44@cam.ac.uk> 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 <bunk@fs.tum.de> + + Colin Watson <cjw44@cam.ac.uk> 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.] --- util-linux-2.13.1.orig/debian/util-linux.dirs +++ util-linux-2.13.1/debian/util-linux.dirs @@ -0,0 +1,24 @@ +bin/ +sbin/ +etc/ +etc/init.d/ +etc/udev/ +etc/udev/rules.d/ +usr/ +usr/bin/ +usr/sbin/ +usr/lib/ +usr/lib/mime/ +usr/lib/mime/packages/ +usr/share/ +usr/share/man/ +usr/share/man/man1/ +usr/share/man/man8/ +usr/share/info/ +usr/share/doc/ +usr/share/doc/util-linux/ +usr/share/doc/util-linux/examples/ +usr/share/lintian/ +usr/share/lintian/overrides/ +lib/ +lib/udev/ --- util-linux-2.13.1.orig/debian/util-linux.postrm +++ util-linux-2.13.1/debian/util-linux.postrm @@ -0,0 +1,20 @@ +#!/bin/sh + +case "$1" in + remove) + ;; + purge) + update-rc.d hwclock.sh remove >/dev/null + update-rc.d hwclockfirst.sh remove >/dev/null + rm -f /etc/adjtime + ;; + *) + ;; +esac + +if [ -x /usr/sbin/update-mime ]; then + update-mime +fi + + +#DEBHELPER# --- util-linux-2.13.1.orig/debian/hwclock.rules +++ util-linux-2.13.1/debian/hwclock.rules @@ -0,0 +1,3 @@ +# This file causes the hardware clock to be set when /dev/rtc is available. + +KERNEL=="rtc", ACTION=="add", RUN+="set_hwclock" --- util-linux-2.13.1.orig/debian/shlibs.local +++ util-linux-2.13.1/debian/shlibs.local @@ -0,0 +1 @@ +libblkid 1 libblkid1 (>=1.37-1)