Christian Wiese
13 years ago
11 changed files with 0 additions and 620 deletions
@ -1,32 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/arm-sparc.patch
|
|
||||||
# Copyright (C) 2008 The OpenSDE Project
|
|
||||||
# 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.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
Broken assumption ...
|
|
||||||
|
|
||||||
- Rene Rebe <rene@exactcode.de>
|
|
||||||
|
|
||||||
--- ./mount/umount.c.vanilla 2005-10-17 19:17:50.630000000 +0200
|
|
||||||
+++ ./mount/umount.c 2005-10-17 19:23:56.170000000 +0200
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
|
|
||||||
+#if defined(MNT_FORCE)
|
|
||||||
/* Interesting ... it seems libc knows about MNT_FORCE and presumably
|
|
||||||
about umount2 as well -- need not do anything */
|
|
||||||
#else /* MNT_FORCE */
|
|
||||||
@ -1,89 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/dietlibc.patch
|
|
||||||
# Copyright (C) 2007 - 2008 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 <tzfile.h>
|
|
||||||
#endif
|
|
||||||
-#include <lastlog.h>
|
|
||||||
+#include <utmp.h>
|
|
||||||
|
|
||||||
#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 <string.h> */
|
|
||||||
-
|
|
||||||
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 <stdlib.h>
|
|
||||||
#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 <termios.h>
|
|
||||||
#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 <stdio.h>
|
|
||||||
#include <time.h> /* time_t */
|
|
||||||
+#include <sys/types.h> /* 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 */
|
|
||||||
@ -1,56 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/disable_cramfs_tools.diff
|
|
||||||
# Copyright (C) 2008 The OpenSDE Project
|
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
||||||
# Copyright (C) 1998 - 2003 Clifford Wolf
|
|
||||||
#
|
|
||||||
# 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 ---
|
|
||||||
|
|
||||||
--- disk-utils/Makefile.orig 2004-12-21 18:14:16.000000000 +0100
|
|
||||||
+++ disk-utils/Makefile 2005-04-07 13:32:34.007568352 +0200
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
|
|
||||||
ETC= fdprm
|
|
||||||
|
|
||||||
-MAYBE= setfdprm raw fsck.cramfs mkfs.cramfs
|
|
||||||
+MAYBE= setfdprm raw
|
|
||||||
|
|
||||||
ifneq "$(HAVE_FDUTILS)" "yes"
|
|
||||||
USRBIN:=$(USRBIN) setfdprm
|
|
||||||
@@ -32,26 +32,12 @@
|
|
||||||
MAN8:=$(MAN8) raw.8
|
|
||||||
endif
|
|
||||||
|
|
||||||
-ifeq "$(HAVE_ZLIB)" "yes"
|
|
||||||
-SBIN:=$(SBIN) fsck.cramfs mkfs.cramfs
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
ifeq "$(HAVE_UUID)" "yes"
|
|
||||||
MKSWAP_LIBS=-luuid
|
|
||||||
endif
|
|
||||||
|
|
||||||
all: $(SBIN) $(USRBIN)
|
|
||||||
|
|
||||||
-fsck.cramfs: fsck.cramfs.o
|
|
||||||
- $(CC) $(LDFLAGS) -o fsck.cramfs fsck.cramfs.o -lz
|
|
||||||
-
|
|
||||||
-mkfs.cramfs: mkfs.cramfs.o $(LIB)/md5.o
|
|
||||||
- $(CC) $(LDFLAGS) -o mkfs.cramfs mkfs.cramfs.o $(LIB)/md5.o -lz
|
|
||||||
-
|
|
||||||
-mkfs.cramfs.o: $(LIB)/md5.h
|
|
||||||
-
|
|
||||||
-fsck.cramfs.o mkfs.cramfs.o: cramfs.h
|
|
||||||
-
|
|
||||||
fsck.minix.o mkfs.minix.o: bitops.h minix.h
|
|
||||||
|
|
||||||
mkswap: mkswap.o $(LIB)/xstrncpy.o
|
|
||||||
@ -1,110 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/fdisk-devfs.patch
|
|
||||||
# Copyright (C) 2008 The OpenSDE Project
|
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
||||||
# Copyright (C) 1998 - 2003 Clifford Wolf
|
|
||||||
#
|
|
||||||
# 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 ---
|
|
||||||
|
|
||||||
--- ./fdisk/fdisk.c.orig 2002-10-11 22:50:24.000000000 +0200
|
|
||||||
+++ ./fdisk/fdisk.c 2002-10-11 22:55:30.000000000 +0200
|
|
||||||
@@ -198,8 +198,8 @@
|
|
||||||
" fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n"
|
|
||||||
" fdisk -s PARTITION Give partition size(s) in blocks\n"
|
|
||||||
" fdisk -v Give fdisk version\n"
|
|
||||||
-"Here DISK is something like /dev/hdb or /dev/sda\n"
|
|
||||||
-"and PARTITION is something like /dev/hda7\n"
|
|
||||||
+"Here DISK is something like /dev/discs/disc0/disc\n"
|
|
||||||
+"and PARTITION is something like /dev/discs/disc0/part1\n"
|
|
||||||
"-u: give Start and End in sector (instead of cylinder) units\n"
|
|
||||||
"-b 2048: (for certain MO disks) use 2048-byte sectors\n");
|
|
||||||
break;
|
|
||||||
@@ -207,10 +207,7 @@
|
|
||||||
/* msg in cases where fdisk used to probe */
|
|
||||||
message = _(
|
|
||||||
"Usage: fdisk [-l] [-b SSZ] [-u] device\n"
|
|
||||||
-"E.g.: fdisk /dev/hda (for the first IDE disk)\n"
|
|
||||||
-" or: fdisk /dev/sdc (for the third SCSI disk)\n"
|
|
||||||
-" or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n"
|
|
||||||
-" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n"
|
|
||||||
+"E.g.: fdisk /dev/discs/disc0/disc (for the first disk)\n"
|
|
||||||
" ...\n");
|
|
||||||
break;
|
|
||||||
case unable_to_open:
|
|
||||||
@@ -1473,11 +1470,14 @@
|
|
||||||
long megabytes = bytes/1000000;
|
|
||||||
|
|
||||||
if (megabytes < 10000)
|
|
||||||
- printf(_("\nDisk %s: %ld MB, %lld bytes\n"),
|
|
||||||
- disk_device, megabytes, bytes);
|
|
||||||
+ printf(_("\nDisk %s:%c%ld MB, %lld bytes\n%s"),
|
|
||||||
+ disk_device, strlen(disk_device)>30 ? '\n' : ' ',
|
|
||||||
+ megabytes, bytes, strlen(disk_device)>30 ? "\n" : "");
|
|
||||||
else
|
|
||||||
- printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"),
|
|
||||||
- disk_device, megabytes/1000, (megabytes/100)%10, bytes);
|
|
||||||
+ printf(_("\nDisk %s:%c%ld.%ld GB, %lld bytes\n%s"),
|
|
||||||
+ disk_device, strlen(disk_device)>30 ? '\n' : ' ',
|
|
||||||
+ megabytes/1000, (megabytes/100)%10, bytes,
|
|
||||||
+ strlen(disk_device)>30 ? "\n" : "");
|
|
||||||
printf(_("%d heads, %d sectors/track, %d cylinders"),
|
|
||||||
heads, sectors, cylinders);
|
|
||||||
if (units_per_sector == 1)
|
|
||||||
--- ./fdisk/partname.c.orig 2002-07-07 14:16:43.000000000 +0200
|
|
||||||
+++ ./fdisk/partname.c 2002-10-11 22:50:24.000000000 +0200
|
|
||||||
@@ -3,6 +3,8 @@
|
|
||||||
#include <string.h>
|
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
+int partname_short_name = 0;
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* return partition name - uses static storage unless buf is supplied
|
|
||||||
*/
|
|
||||||
@@ -43,5 +45,11 @@
|
|
||||||
|
|
||||||
char *
|
|
||||||
partname(char *dev, int pno, int lth) {
|
|
||||||
- return partnamebf(dev, pno, lth, 0, NULL);
|
|
||||||
+ static char buf[20];
|
|
||||||
+ if ( ! partname_short_name ) {
|
|
||||||
+ return partnamebf(dev, pno, lth, 0, NULL);
|
|
||||||
+ } else {
|
|
||||||
+ sprintf(buf,"Partition %-2u",pno);
|
|
||||||
+ return buf;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
--- ./fdisk/cfdisk.c.orig 2002-10-11 22:50:24.000000000 +0200
|
|
||||||
+++ ./fdisk/cfdisk.c 2002-10-11 22:50:24.000000000 +0200
|
|
||||||
@@ -93,8 +93,8 @@
|
|
||||||
|
|
||||||
#define VERSION UTIL_LINUX_VERSION
|
|
||||||
|
|
||||||
-#define DEFAULT_DEVICE "/dev/hda"
|
|
||||||
-#define ALTERNATE_DEVICE "/dev/sda"
|
|
||||||
+#define DEFAULT_DEVICE "/dev/discs/disc0/disc"
|
|
||||||
+#define ALTERNATE_DEVICE "/dev/hda"
|
|
||||||
|
|
||||||
/* With K=1024 we have `binary' megabytes, gigabytes, etc.
|
|
||||||
Some misguided hackers like that.
|
|
||||||
--- ./fdisk/sfdisk.c.orig 2002-07-07 02:07:43.000000000 +0200
|
|
||||||
+++ ./fdisk/sfdisk.c 2002-10-11 22:50:24.000000000 +0200
|
|
||||||
@@ -2229,7 +2229,7 @@
|
|
||||||
usage(void) {
|
|
||||||
version();
|
|
||||||
printf(_("Usage: %s [options] device ...\n"), PROGNAME);
|
|
||||||
- puts (_("device: something like /dev/hda or /dev/sda"));
|
|
||||||
+ puts (_("device: something like /dev/discs/disc0/disc"));
|
|
||||||
puts (_("useful options:"));
|
|
||||||
puts (_(" -s [or --show-size]: list size of a partition"));
|
|
||||||
puts (_(" -c [or --id]: print or change partition Id"));
|
|
||||||
@ -1,49 +0,0 @@ |
|||||||
/*
|
|
||||||
* --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
||||||
* This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||||
* |
|
||||||
* Filename: package/.../util-linux/freeramdisk.c |
|
||||||
* Copyright (C) 2008 The OpenSDE Project |
|
||||||
* Copyright (C) 2004 - 2006 The T2 SDE Project |
|
||||||
* |
|
||||||
* More information can be found in the files COPYING and README. |
|
||||||
* |
|
||||||
* This program is free software; you can redistribute it and/or modify |
|
||||||
* it under the terms of the GNU General Public License as published by |
|
||||||
* the Free Software Foundation; version 2 of the License. A copy of the |
|
||||||
* GNU General Public License can be found in the file COPYING. |
|
||||||
* --- SDE-COPYRIGHT-NOTE-END --- |
|
||||||
*/ |
|
||||||
#include <stdio.h> |
|
||||||
#include <string.h> |
|
||||||
#include <sys/mount.h> |
|
||||||
#include <sys/types.h> |
|
||||||
#include <sys/stat.h> |
|
||||||
#include <fcntl.h> |
|
||||||
#include <unistd.h> |
|
||||||
#include <sys/ioctl.h> |
|
||||||
#include <errno.h> |
|
||||||
|
|
||||||
int main(int argc, char **argv) |
|
||||||
{ |
|
||||||
int c, f, rc=0; |
|
||||||
|
|
||||||
if (argc == 1) { |
|
||||||
fprintf(stderr,"Usage: %s /dev/rd/initrd " |
|
||||||
"[ /dev/rd/12 [ .. ] ]\n", argv[0]); |
|
||||||
return 1; |
|
||||||
} |
|
||||||
|
|
||||||
for (c=1; c < argc; c++) { |
|
||||||
if ((f=open(argv[c], O_RDWR)) == -1) { |
|
||||||
fprintf(stderr, "freeramdisk: cannot open %s: %s\n", |
|
||||||
argv[c], strerror(errno)); |
|
||||||
rc++; |
|
||||||
} else { |
|
||||||
ioctl(f, BLKFLSBUF); |
|
||||||
close(f); |
|
||||||
} |
|
||||||
} |
|
||||||
return rc; |
|
||||||
} |
|
||||||
|
|
||||||
@ -1,31 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/managed.patch
|
|
||||||
# Copyright (C) 2008 The OpenSDE Project
|
|
||||||
# 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.
|
|
||||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
||||||
|
|
||||||
Injected from Fedora Core CVS for HAL support.
|
|
||||||
|
|
||||||
- Rene Rebe <rene@exactcode.de>
|
|
||||||
|
|
||||||
--- util-linux-2.12a/mount/mount.c.sopwith 2004-03-04 20:28:22.000000000 -0500
|
|
||||||
+++ util-linux-2.12a/mount/mount.c 2004-07-16 16:50:18.792814782 -0400
|
|
||||||
@@ -191,6 +191,7 @@
|
|
||||||
{ "diratime", 0, 1, MS_NODIRATIME }, /* Update dir access times */
|
|
||||||
{ "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
|
|
||||||
#endif
|
|
||||||
+ { "managed", 0, 0, MS_COMMENT }, /* Silently remove this option */
|
|
||||||
{ NULL, 0, 0, 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,44 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||||
# |
|
||||||
# Filename: package/.../util-linux/nice-mount-paths.patch.disabled |
|
||||||
# Copyright (C) 2008 The OpenSDE Project |
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|
||||||
# Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||||
# |
|
||||||
# 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 --- |
|
||||||
|
|
||||||
--- ./mount/mount.c.orig Wed Mar 21 10:07:59 2001 |
|
||||||
+++ ./mount/mount.c Wed Mar 21 10:12:15 2001 |
|
||||||
@@ -1061,6 +1061,23 @@ |
|
||||||
/* Substitute values in opts, if required */ |
|
||||||
opts = usersubst(opts); |
|
||||||
|
|
||||||
+ /* make the node a nice absolute path name */ |
|
||||||
+ if (node[0] && node[0]!='/') { |
|
||||||
+ char *thisdir=get_current_dir_name(); |
|
||||||
+ char *oldnode=node; |
|
||||||
+ if (chdir(node) == 0) { |
|
||||||
+ /* we will never free this variable ... */ |
|
||||||
+ node=get_current_dir_name(); |
|
||||||
+ chdir(thisdir); |
|
||||||
+ if (verbose) printf("mount: change '%s' to '%s'\n",oldnode,node); |
|
||||||
+ } |
|
||||||
+ free(thisdir); |
|
||||||
+ } |
|
||||||
+ if (strlen(node)>=3 && node[strlen(node)-1]=='/') { |
|
||||||
+ if (verbose) printf("mount: remove the leading '/' in '%s'\n",node); |
|
||||||
+ node[strlen(node)-1]=0; |
|
||||||
+ } |
|
||||||
+ |
|
||||||
/* Merge the fstab and command line options. */ |
|
||||||
if (opts == NULL) |
|
||||||
opts = cmdlineopts; |
|
||||||
@ -1,82 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
||||||
#
|
|
||||||
# Filename: package/.../util-linux/sak_blocking.patch
|
|
||||||
# Copyright (C) 2008 The OpenSDE Project
|
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
||||||
# Copyright (C) 1998 - 2003 Clifford Wolf
|
|
||||||
#
|
|
||||||
# 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/agetty.c.orig Sun Mar 4 21:43:50 2001
|
|
||||||
+++ ./login-utils/agetty.c Wed Mar 21 10:17:47 2001
|
|
||||||
@@ -231,10 +231,14 @@
|
|
||||||
int bcode P_((char *s));
|
|
||||||
void usage P_((void));
|
|
||||||
void error P_((const char *, ...));
|
|
||||||
+void sak_blocking P_((int signr));
|
|
||||||
#undef P_
|
|
||||||
|
|
||||||
/* The following is used for understandable diagnostics. */
|
|
||||||
|
|
||||||
+/* message file for SAK blocking */
|
|
||||||
+char *sakmsg="/dev/null";
|
|
||||||
+
|
|
||||||
char *progname;
|
|
||||||
|
|
||||||
/* Fake hostname for ut_host specified on command line. */
|
|
||||||
@@ -393,7 +397,7 @@
|
|
||||||
extern int optind; /* getopt */
|
|
||||||
int c;
|
|
||||||
|
|
||||||
- while (isascii(c = getopt(argc, argv, "I:LH:f:hil:mt:wn"))) {
|
|
||||||
+ while (isascii(c = getopt(argc, argv, "I:LH:f:hil:mt:s:wn"))) {
|
|
||||||
switch (c) {
|
|
||||||
case 'I':
|
|
||||||
if (!(op->initstring = malloc(strlen(optarg)))) {
|
|
||||||
@@ -464,6 +468,10 @@
|
|
||||||
if ((op->timeout = atoi(optarg)) <= 0)
|
|
||||||
error(_("bad timeout value: %s"), optarg);
|
|
||||||
break;
|
|
||||||
+ case 's': /* SAK blocking after time out */
|
|
||||||
+ signal(SIGALRM,sak_blocking);
|
|
||||||
+ sakmsg = optarg;
|
|
||||||
+ break;
|
|
||||||
case 'w':
|
|
||||||
op->flags |= F_WAITCRLF;
|
|
||||||
break;
|
|
||||||
@@ -1251,4 +1259,26 @@
|
|
||||||
#endif
|
|
||||||
(void) sleep((unsigned) 10); /* be kind to init(8) */
|
|
||||||
exit(1);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* signal handler for alarm() timeout when doing SAK blocking */
|
|
||||||
+
|
|
||||||
+void sak_blocking(int signr) {
|
|
||||||
+ char buf[512];
|
|
||||||
+ int fd,rc,i;
|
|
||||||
+
|
|
||||||
+ if (signr != SIGALRM) return;
|
|
||||||
+ alarm(0);
|
|
||||||
+
|
|
||||||
+ /* print the SAK Message */
|
|
||||||
+ fd=open(sakmsg,O_RDONLY);
|
|
||||||
+ if (fd >= 0) {
|
|
||||||
+ while ( (rc=read(fd,buf,512)) > 0 )
|
|
||||||
+ write(1,buf,rc);
|
|
||||||
+ close(fd);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* lock */
|
|
||||||
+ for (i=1; i<=30; i++) signal(i,SIG_IGN);
|
|
||||||
+ while (1) sleep(600);
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@ |
|||||||
|
|
||||||
[TIMESTAMP] 1134215069 Sat Dec 10 12:44:29 2005 |
|
||||||
[BUILDTIME] 20 (9) |
|
||||||
[SIZE] 4.05 MB, 173 files |
|
||||||
|
|
||||||
[DEP] bash |
|
||||||
[DEP] binutils |
|
||||||
[DEP] bzip2 |
|
||||||
[DEP] coreutils |
|
||||||
[DEP] diffutils |
|
||||||
[DEP] e2fsprogs |
|
||||||
[DEP] findutils |
|
||||||
[DEP] gcc |
|
||||||
[DEP] gettext |
|
||||||
[DEP] glibc |
|
||||||
[DEP] grep |
|
||||||
[DEP] linux-header |
|
||||||
[DEP] make |
|
||||||
[DEP] ncurses |
|
||||||
[DEP] patch |
|
||||||
[DEP] sed |
|
||||||
[DEP] sysfiles |
|
||||||
[DEP] tar |
|
||||||
[DEP] zlib |
|
||||||
@ -1,63 +0,0 @@ |
|||||||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
||||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||||
# |
|
||||||
# Filename: package/.../util-linux/util-linux.conf |
|
||||||
# Copyright (C) 2006 - 2008 The OpenSDE Project |
|
||||||
# Copyright (C) 2004 - 2006 The T2 SDE Project |
|
||||||
# Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||||
# |
|
||||||
# More information can be found in the files COPYING and README. |
|
||||||
# |
|
||||||
# This program is free software; you can redistribute it and/or modify |
|
||||||
# it under the terms of the GNU General Public License as published by |
|
||||||
# the Free Software Foundation; version 2 of the License. A copy of the |
|
||||||
# GNU General Public License can be found in the file COPYING. |
|
||||||
# --- SDE-COPYRIGHT-NOTE-END --- |
|
||||||
|
|
||||||
# apply the patches defined in the util-linux.desc |
|
||||||
var_append patchfiles ' ' "`match_source_file -p patch`" |
|
||||||
|
|
||||||
prepare_cross_build() { |
|
||||||
# disable cramfs tools |
|
||||||
patch -p0 < $confdir/disable_cramfs_tools.diff |
|
||||||
} |
|
||||||
|
|
||||||
if ! atstage native; then |
|
||||||
hook_add premake 5 'prepare_cross_build' |
|
||||||
fi |
|
||||||
|
|
||||||
# CPU just selects optimization options, we can safely ignore this |
|
||||||
var_append makeopt " " "CPU=generic" |
|
||||||
var_append makeinstopt " " "CPU=generic" |
|
||||||
|
|
||||||
util_linux_postmake() { |
|
||||||
rm -f $root/sbin/sln # we are using sln from glibc |
|
||||||
$CC $confdir/freeramdisk.c -o $root/sbin/freeramdisk |
|
||||||
$MAKE -C partx |
|
||||||
cp -v partx/{partx,delpart,addpart} $root/sbin |
|
||||||
} |
|
||||||
|
|
||||||
hook_add postmake 5 "util_linux_postmake" |
|
||||||
|
|
||||||
util_linux_configure() { |
|
||||||
local k= |
|
||||||
( |
|
||||||
if pkginstalled shadow; then |
|
||||||
echo "HAVE_SHADOW=yes" |
|
||||||
else |
|
||||||
echo "HAVE_SHADOW=no" |
|
||||||
fi |
|
||||||
if pkginstalled pam; then |
|
||||||
echo "HAVE_PAM=yes" |
|
||||||
else |
|
||||||
echo "HAVE_PAM=no" |
|
||||||
fi |
|
||||||
|
|
||||||
# it was done on a patch |
|
||||||
echo "HAVE_KILL=yes" |
|
||||||
) | while read k; do |
|
||||||
sed -i -e "s,^${k%%=*}=.*,$k," MCONFIG |
|
||||||
done |
|
||||||
} |
|
||||||
|
|
||||||
hook_add premake 6 'util_linux_configure' |
|
||||||
@ -1,40 +0,0 @@ |
|||||||
|
|
||||||
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
||||||
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||||
[COPY] |
|
||||||
[COPY] Filename: package/.../util-linux/util-linux.desc |
|
||||||
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project |
|
||||||
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project |
|
||||||
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||||
[COPY] |
|
||||||
[COPY] More information can be found in the files COPYING and README. |
|
||||||
[COPY] |
|
||||||
[COPY] This program is free software; you can redistribute it and/or modify |
|
||||||
[COPY] it under the terms of the GNU General Public License as published by |
|
||||||
[COPY] the Free Software Foundation; version 2 of the License. A copy of the |
|
||||||
[COPY] GNU General Public License can be found in the file COPYING. |
|
||||||
[COPY] --- SDE-COPYRIGHT-NOTE-END --- |
|
||||||
|
|
||||||
[I] Miscellaneous system utilities for Linux |
|
||||||
|
|
||||||
[T] The util-linux package contains a large variety of low-level |
|
||||||
[T] system utilities that are necessary for a Linux system to |
|
||||||
[T] function. Among many features, Util-linux contains the fdisk |
|
||||||
[T] configuration tool and the login program. |
|
||||||
|
|
||||||
[A] Andries Brouwer <aeb@cwi.nl> |
|
||||||
[A] Use a Subject line with [util-linux] |
|
||||||
[M] The OpenSDE Community <list@opensde.org> |
|
||||||
|
|
||||||
[C] base/system |
|
||||||
[F] DIETLIBC |
|
||||||
|
|
||||||
[L] GPL |
|
||||||
[S] Stable |
|
||||||
[V] 2.12r |
|
||||||
[P] O -1-3-----9 179.200 |
|
||||||
|
|
||||||
[D] 1396171198 util-linux-2.12r.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/util-linux/ |
|
||||||
|
|
||||||
[D] 2915165956 util-linux-2.12r-cramfs-1.patch http://www.linuxfromscratch.org/patches/lfs/development/ |
|
||||||
[D] 1320463083 util-linux-2.12r-lseek-1.patch http://www.linuxfromscratch.org/patches/lfs/development/ |
|
||||||
Loading…
Reference in new issue