From 5b930a3e8feaa71f758ebe8030c9a0a76497ba22 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 18 Jul 2007 16:38:17 +0000 Subject: [PATCH] Removed dietlibc/util-linux patch in favor of a cleaner generic patch directly on util-linux package. --- base/dietlibc/patches/pkg_util-linux.patch | 75 ------------------ base/util-linux/dietlibc.patch | 89 ++++++++++++++++++++++ 2 files changed, 89 insertions(+), 75 deletions(-) delete mode 100644 base/dietlibc/patches/pkg_util-linux.patch create mode 100644 base/util-linux/dietlibc.patch diff --git a/base/dietlibc/patches/pkg_util-linux.patch b/base/dietlibc/patches/pkg_util-linux.patch deleted file mode 100644 index ba8c4b8a7..000000000 --- a/base/dietlibc/patches/pkg_util-linux.patch +++ /dev/null @@ -1,75 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dietlibc/patches/pkg_util-linux.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- T2-COPYRIGHT-NOTE-END --- - -Some hackery, mostly even semi-valid fixes. - - - Rene Rebe - ---- util-linux-2.12q/mount/mount_by_label.c.vanilla 2005-06-16 01:20:52.000000000 +0200 -+++ util-linux-2.12q/mount/mount_by_label.c 2005-06-16 01:21:59.000000000 +0200 -@@ -189,7 +189,7 @@ - if (!procpt) { - static int warn = 0; - if (!warn++) -- error (_("%s: could not open %s, so UUID and LABEL " -+ fprintf (stderr, _("%s: could not open %s, so UUID and LABEL " - "conversion cannot be done.\n"), - progname, PROC_PARTITIONS); - return; ---- util-linux-2.12q/mount/fstab.c.vanilla 2005-06-16 01:19:50.000000000 +0200 -+++ util-linux-2.12q/mount/fstab.c 2005-06-16 01:20:00.000000000 +0200 -@@ -400,7 +400,7 @@ - static int signals_have_been_setup = 0; - - /* Ensure that the lock is released if we are interrupted. */ --extern char *strsignal(int sig); /* not always in */ -+//extern char *strsignal(int sig); /* not always in */ - - static void - handler (int sig) { ---- util-linux-2.12q/text-utils/column.c.vanilla 2005-06-16 01:23:44.000000000 +0200 -+++ util-linux-2.12q/text-utils/column.c 2005-06-16 01:24:00.000000000 +0200 -@@ -41,6 +41,8 @@ - #include - #include - -+#include -+ - #include - #include - #include ---- util-linux-2.12q/partx/solaris.c.vanilla 2005-06-16 01:34:09.000000000 +0200 -+++ util-linux-2.12q/partx/solaris.c 2005-06-16 01:34:15.000000000 +0200 -@@ -5,8 +5,6 @@ - #define SOLARIS_X86_NUMSLICE 8 - #define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL) - --typedef int daddr_t; /* or long - check */ -- - struct solaris_x86_slice { - unsigned short s_tag; /* ID tag of partition */ - unsigned short s_flag; /* permision flags */ ---- util-linux-2.12q/text-utils/pg.c.vanilla 2006-01-01 10:40:13.000000000 +0000 -+++ util-linux-2.12q/text-utils/pg.c 2006-01-01 10:40:20.000000000 +0000 -@@ -46,7 +46,7 @@ - #ifndef TIOCGWINSZ - #include - #endif --#include -+#include - #include - #include - #include diff --git a/base/util-linux/dietlibc.patch b/base/util-linux/dietlibc.patch new file mode 100644 index 000000000..37287be57 --- /dev/null +++ b/base/util-linux/dietlibc.patch @@ -0,0 +1,89 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../util-linux/dietlibc.patch +# Copyright (C) 2007 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./login-utils/vipw.c.orig 2007-07-17 13:07:32.000000000 -0400 ++++ ./login-utils/vipw.c 2007-07-17 13:08:35.000000000 -0400 +@@ -73,6 +73,10 @@ + + #define FILENAMELEN 67 + ++#ifndef _PATH_VI ++#define _PATH_VI "/usr/bin/vi" ++#endif ++ + char *progname; + enum { VIPW, VIGR }; + int program; +--- ./login-utils/login.c.orig 2007-07-17 12:53:12.000000000 -0400 ++++ ./login-utils/login.c 2007-07-17 12:53:35.000000000 -0400 +@@ -152,7 +152,7 @@ + #ifndef __linux__ + # include + #endif +-#include ++#include + + #define SLEEP_EXIT_TIMEOUT 5 + +--- ./mount/fstab.c.orig 2007-07-17 13:17:38.000000000 -0400 ++++ ./mount/fstab.c 2007-07-17 13:17:59.000000000 -0400 +@@ -399,9 +399,6 @@ + /* Flag to indicate that signals have been set up. */ + static int signals_have_been_setup = 0; + +-/* Ensure that the lock is released if we are interrupted. */ +-extern char *strsignal(int sig); /* not always in */ +- + static void + handler (int sig) { + die(EX_USER, "%s", strsignal(sig)); +--- ./sys-utils/dmesg.c.orig 2007-07-18 16:09:10.000000000 -0400 ++++ ./sys-utils/dmesg.c 2007-07-18 16:10:01.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include "nls.h" + +-#if __GNU_LIBRARY__ < 5 ++#if (__GNU_LIBRARY__ < 5) && (! defined(__dietlibc__)) + + #ifndef __alpha__ + # define __NR_klogctl __NR_syslog +--- ./text-utils/column.c.orig 2007-07-18 16:24:58.000000000 -0400 ++++ ./text-utils/column.c 2007-07-18 16:25:19.000000000 -0400 +@@ -50,6 +50,7 @@ + #include "errs.h" + #include "nls.h" + ++#include + #include "widechar.h" + + #ifdef ENABLE_WIDECHAR +--- ./partx/solaris.c.orig 2007-07-18 16:31:07.000000000 -0400 ++++ ./partx/solaris.c 2007-07-18 16:31:37.000000000 -0400 +@@ -1,12 +1,11 @@ + #include + #include /* time_t */ ++#include /* daddr_t */ + #include "partx.h" + + #define SOLARIS_X86_NUMSLICE 8 + #define SOLARIS_X86_VTOC_SANE (0x600DDEEEUL) + +-typedef int daddr_t; /* or long - check */ +- + struct solaris_x86_slice { + unsigned short s_tag; /* ID tag of partition */ + unsigned short s_flag; /* permision flags */