OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

75 lines
2.7 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../dietlibc/patches/pkg_util-linux.patch
  5. # Copyright (C) 2004 - 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. Some hackery, mostly even semi-valid fixes.
  17. - Rene Rebe <rene@exactcode.de>
  18. --- util-linux-2.12q/mount/mount_by_label.c.vanilla 2005-06-16 01:20:52.000000000 +0200
  19. +++ util-linux-2.12q/mount/mount_by_label.c 2005-06-16 01:21:59.000000000 +0200
  20. @@ -189,7 +189,7 @@
  21. if (!procpt) {
  22. static int warn = 0;
  23. if (!warn++)
  24. - error (_("%s: could not open %s, so UUID and LABEL "
  25. + fprintf (stderr, _("%s: could not open %s, so UUID and LABEL "
  26. "conversion cannot be done.\n"),
  27. progname, PROC_PARTITIONS);
  28. return;
  29. --- util-linux-2.12q/mount/fstab.c.vanilla 2005-06-16 01:19:50.000000000 +0200
  30. +++ util-linux-2.12q/mount/fstab.c 2005-06-16 01:20:00.000000000 +0200
  31. @@ -400,7 +400,7 @@
  32. static int signals_have_been_setup = 0;
  33. /* Ensure that the lock is released if we are interrupted. */
  34. -extern char *strsignal(int sig); /* not always in <string.h> */
  35. +//extern char *strsignal(int sig); /* not always in <string.h> */
  36. static void
  37. handler (int sig) {
  38. --- util-linux-2.12q/text-utils/column.c.vanilla 2005-06-16 01:23:44.000000000 +0200
  39. +++ util-linux-2.12q/text-utils/column.c 2005-06-16 01:24:00.000000000 +0200
  40. @@ -41,6 +41,8 @@
  41. #include <sys/types.h>
  42. #include <sys/ioctl.h>
  43. +#include <termios.h>
  44. +
  45. #include <ctype.h>
  46. #include <limits.h>
  47. #include <stdio.h>
  48. --- util-linux-2.12q/partx/solaris.c.vanilla 2005-06-16 01:34:09.000000000 +0200
  49. +++ util-linux-2.12q/partx/solaris.c 2005-06-16 01:34:15.000000000 +0200
  50. @@ -5,8 +5,6 @@
  51. #define SOLARIS_X86_NUMSLICE 8
  52. #define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL)
  53. -typedef int daddr_t; /* or long - check */
  54. -
  55. struct solaris_x86_slice {
  56. unsigned short s_tag; /* ID tag of partition */
  57. unsigned short s_flag; /* permision flags */
  58. --- util-linux-2.12q/text-utils/pg.c.vanilla 2006-01-01 10:40:13.000000000 +0000
  59. +++ util-linux-2.12q/text-utils/pg.c 2006-01-01 10:40:20.000000000 +0000
  60. @@ -46,7 +46,7 @@
  61. #ifndef TIOCGWINSZ
  62. #include <sys/ioctl.h>
  63. #endif
  64. -#include <sys/termios.h>
  65. +#include <termios.h>
  66. #include <fcntl.h>
  67. #include <regex.h>
  68. #include <stdio.h>