redigest everything

2013-10-29 18:26:14 +01:00
parent 4a38d73a58
commit 8751dafd50
221 changed files with 3778 additions and 3913 deletions
--- a/sys-kernel/recoveryinitramfs/files/busybox/1.20.2/001_all_1.18.1-openvt.patch
+++ b/sys-kernel/recoveryinitramfs/files/busybox/1.20.2/001_all_1.18.1-openvt.patch
--- a/sys-kernel/recoveryinitramfs/files/dropbear/2013.60/001_all_dropbear-initramfs-no-usr.patch
+++ b/sys-kernel/recoveryinitramfs/files/dropbear/2013.60/001_all_dropbear-initramfs-no-usr.patch
@@ -1,16 +1,7 @@
-diff -uNr dropbear-2012.55.orig/options.h dropbear-2012.55/options.h
--- dropbear-2012.55.orig/options.h	2012-12-03 11:33:02.582308907 +0100
-+++ dropbear-2012.55/options.h	2012-12-03 11:34:24.309329615 +0100
-@@ -214,7 +214,7 @@
- #define DROPBEAR_RANDOM_DEV "/dev/urandom"
- 
- /* prngd must be manually set up to produce output */
-/*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
-+/*#define DROPBEAR_PRNGD_SOCKET "/run/dropbear-rng"*/
- 
- /* Specify the number of clients we will allow to be connected but
-  * not yet authenticated. After this limit, connections are rejected */
-@@ -237,7 +237,7 @@
+diff -uNr dropbear-2013.60.orig/options.h dropbear-2013.60/options.h
+--- dropbear-2013.60.orig/options.h	2013-10-16 16:34:53.000000000 +0200
+++ dropbear-2013.60/options.h	2013-10-27 07:38:45.561526446 +0100
+@@ -241,7 +241,7 @@
 /* The default file to store the daemon's process ID, for shutdown
    scripts etc. This can be overridden with the -P flag */
 #ifndef DROPBEAR_PIDFILE
@@ -19,7 +10,7 @@ diff -uNr dropbear-2012.55.orig/options.h dropbear-2012.55/options.h
 #endif
 
 /* The command to invoke for xauth when using X11 forwarding.
-@@ -250,12 +250,12 @@
+@@ -254,12 +254,12 @@
  * OpenSSH), set the path below. If the path isn't defined, sftp will not
  * be enabled */
 #ifndef SFTPSERVER_PATH
--- a/sys-kernel/recoveryinitramfs/files/e2fsprogs/1.42.8/001_all_fix-musl-compile-__uint64_t.patch
+++ b/sys-kernel/recoveryinitramfs/files/e2fsprogs/1.42.8/001_all_fix-musl-compile-__uint64_t.patch
@@ -0,0 +1,17 @@
+diff -Naur e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c e2fsprogs-1.42.8/lib/ext2fs/unix_io.c
+--- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c	2013-10-24 15:50:44.234297410 -0400
+++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c	2013-10-24 16:29:06.436142156 -0400
+@@ -931,10 +931,10 @@
+ 
+ 	if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
+ #ifdef BLKDISCARD
+-		__uint64_t range[2];
+		uint64_t range[2];
+ 
+-		range[0] = (__uint64_t)(block) * channel->block_size;
+-		range[1] = (__uint64_t)(count) * channel->block_size;
+		range[0] = (uint64_t)(block) * channel->block_size;
+		range[1] = (uint64_t)(count) * channel->block_size;
+ 
+ 		ret = ioctl(data->dev, BLKDISCARD, &range);
+ #else
--- a/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/001_all_jfsutils-1.1.12-libjfs.patch
+++ b/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/001_all_jfsutils-1.1.12-libjfs.patch
@@ -0,0 +1,59 @@
+diff -Naur jfsutils-1.1.12.orig/include/Makefile.am jfsutils-1.1.12.partclone/include/Makefile.am
+--- jfsutils-1.1.12.orig/include/Makefile.am	2002-01-30 04:08:11.000000000 +0800
+++ jfsutils-1.1.12.partclone/include/Makefile.am	2010-06-30 11:21:37.000000000 +0800
+@@ -1,3 +1,7 @@
+jfsincludedir = $(includedir)/jfs
+jfsinclude_HEADERS = jfs_byteorder.h jfs_btree.h jfs_dinode.h jfs_dmap.h \
+	jfs_dtree.h jfs_filsys.h jfs_imap.h jfs_logmgr.h jfs_superblock.h \
+	jfs_types.h jfs_unicode.h jfs_version.h jfs_xtree.h
+ 
+ EXTRA_DIST = jfs_byteorder.h jfs_btree.h jfs_dinode.h jfs_dmap.h \
+          jfs_dtree.h jfs_filsys.h jfs_imap.h jfs_logmgr.h jfs_superblock.h \
+diff -Naur jfsutils-1.1.12.orig/libfs/log_work.c jfsutils-1.1.12.partclone/libfs/log_work.c
+--- jfsutils-1.1.12.orig/libfs/log_work.c	2006-06-05 05:37:29.000000000 +0800
+++ jfsutils-1.1.12.partclone/libfs/log_work.c	2010-06-30 11:14:46.000000000 +0800
+@@ -2416,6 +2416,7 @@
+ 	int32_t xlen, xlength;
+ 	int16_t nword;
+ 	int8_t upd_possible = 0;
+	struct dinode dip_local; /* Local copy of dinode data for alignment purposes */
+ 
+ 	if (ld->length <= 0)
+ 		return (0);
+@@ -2713,7 +2714,8 @@
+ 			 */
+ 
+ 			if (ino_rem == 0) {	/* inode base segment  */
+-				dip = (struct dinode *) data;
+			  	memcpy(&dip_local, data, size_dinode);
+				dip = &dip_local;
+ 				if (ln == 1) {
+ 					/* ibase only */
+ 					if (db->db_ibase & mask_8)
+diff -Naur jfsutils-1.1.12.orig/libfs/Makefile.am jfsutils-1.1.12.partclone/libfs/Makefile.am
+--- jfsutils-1.1.12.orig/libfs/Makefile.am	2005-10-04 10:42:59.000000000 +0800
+++ jfsutils-1.1.12.partclone/libfs/Makefile.am	2010-06-30 11:27:52.000000000 +0800
+@@ -1,7 +1,10 @@
+-
+jfsincludedir = $(includedir)/jfs
+ INCLUDES = -I$(top_srcdir)/include
+ 
+jfsinclude_HEADERS =debug.h fsck_base.h fsck_message.h jfs_endian.h logredo.h unicode_to_utf8.h devices.h fsckcbbl.h fsckwsp.h libjufs.h message.h utilsubs.h diskmap.h fscklog.h inode.h logform.h super.h
+
+ noinst_LIBRARIES = libfs.a
+lib_LIBRARIES = libjfs.a
+ 
+ libfs_a_SOURCES = fssubs.c unicode_to_utf8.c devices.c utilsubs.c \
+  super.c inode.c diskmap.c message.c uniupr.c jfs_endian.c \
+@@ -10,3 +13,11 @@
+  debug.h devices.h diskmap.h fsck_base.h fsckcbbl.h fscklog.h \
+  fsckwsp.h inode.h libjufs.h message.h super.h unicode_to_utf8.h \
+  utilsubs.h jfs_endian.h logform.h logredo.h fsck_message.h
+
+libjfs_a_SOURCES = fssubs.c unicode_to_utf8.c devices.c utilsubs.c \
+ super.c inode.c diskmap.c message.c uniupr.c jfs_endian.c \
+ open_by_label.c log_dump.c logform.c logredo.c log_work.c log_read.c \
+ log_map.c fsckmsgdef.c \
+ debug.h devices.h diskmap.h fsck_base.h fsckcbbl.h fscklog.h \
+ fsckwsp.h inode.h libjufs.h message.h super.h unicode_to_utf8.h \
+ utilsubs.h jfs_endian.h logform.h logredo.h fsck_message.h
--- a/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/002_all_jfsutils-1.1.15-linux-headers.patch
+++ b/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/002_all_jfsutils-1.1.15-linux-headers.patch
@@ -0,0 +1,12 @@
+Index: jfsutils-1.1.15/libfs/devices.h
+===================================================================
+--- jfsutils-1.1.15.orig/libfs/devices.h
+++ jfsutils-1.1.15/libfs/devices.h
+@@ -42,6 +42,7 @@
+ 
+ struct stat;
+ 
+#include <stdint.h>
+ int ujfs_get_dev_size(FILE *, int64_t * size);
+ int ujfs_rw_diskblocks(FILE *, int64_t, int32_t, void *, int32_t);
+ int ujfs_flush_dev(FILE *);
--- a/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/003_all_jfsutils-1.1.12-uuid.patch
+++ b/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/003_all_jfsutils-1.1.12-uuid.patch
@@ -0,0 +1,47 @@
+diff -urNp jfsutils-1.1.12.orig/fsck/Makefile.am jfsutils-1.1.12/fsck/Makefile.am
+--- jfsutils-1.1.12.orig/fsck/Makefile.am	2005-11-22 21:43:54.000000000 +0100
+++ jfsutils-1.1.12/fsck/Makefile.am	2008-03-03 16:21:58.495981389 +0100
+@@ -1,6 +1,6 @@
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libfs
+-LDADD = ../libfs/libfs.a -luuid
+LDADD = ../libfs/libfs.a -luuid -lblkid
+ 
+ sbin_PROGRAMS = jfs_fsck
+ man_MANS = jfs_fsck.8
+diff -urNp jfsutils-1.1.12.orig/fsck/Makefile.in jfsutils-1.1.12/fsck/Makefile.in
+--- jfsutils-1.1.12.orig/fsck/Makefile.in	2007-08-24 22:25:46.000000000 +0200
+++ jfsutils-1.1.12/fsck/Makefile.in	2008-03-03 16:21:50.765050221 +0100
+@@ -157,7 +157,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libfs
+-LDADD = ../libfs/libfs.a -luuid
+LDADD = ../libfs/libfs.a -luuid -lblkid
+ man_MANS = jfs_fsck.8
+ EXTRA_DIST = $(man_MANS)
+ jfs_fsck_SOURCES = fsckbmap.c fsckconn.c fsckdire.c fsckdtre.c fsckea.c \
+diff -urNp jfsutils-1.1.12.orig/fsck/xchkdsk.c jfsutils-1.1.12/fsck/xchkdsk.c
+--- jfsutils-1.1.12.orig/fsck/xchkdsk.c	2007-08-23 06:01:40.000000000 +0200
+++ jfsutils-1.1.12/fsck/xchkdsk.c	2008-03-03 16:44:28.499981978 +0100
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+#include <blkid/blkid.h>
+ /* defines and includes common among the jfs_fsck modules */
+ #include "xfsckint.h"
+ #include "xchkdsk.h"
+@@ -1807,7 +1808,11 @@ void parse_parms(int argc, char **argv)
+ 		fsck_usage();
+ 	}
+ 
+-	device_name = argv[optind];
+	device_name = blkid_get_devname(NULL, argv[optind], 0);
+	if (!device_name) {
+		printf("\nError: Unable to resolve %s\n", argv[optind]);
+		fsck_usage();
+	}
+ 
+ 	file_p = fopen(device_name, "r");
+ 	if (file_p) {
--- a/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/004_all_jfsutils-1.1.15-string-literal.patch
+++ b/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/004_all_jfsutils-1.1.15-string-literal.patch
@@ -0,0 +1,40 @@
+diff -up ./fscklog/display.c.tv ./fscklog/display.c
+--- ./fscklog/display.c.tv	2011-07-31 23:44:52.113168266 +0200
+++ ./fscklog/display.c	2011-07-31 23:45:24.992319623 +0200
+@@ -182,7 +182,7 @@ void dump_service_log()
+ 				} else {
+ 					/* the record looks ok */
+ 					msg_txt = &log_entry[log_entry_pos];
+-					printf(msg_txt);
+					printf("%s", msg_txt);
+ 					/*
+ 					 * set up for the next record
+ 					 */
+diff -up ./fscklog/fscklog.c.tv ./fscklog/fscklog.c
+--- ./fscklog/fscklog.c.tv	2011-07-31 23:44:35.382005089 +0200
+++ ./fscklog/fscklog.c	2011-07-31 23:45:53.638605854 +0200
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
+	printf("%s", msg_string);
+	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+diff -up ./logdump/helpers.c.tv2 ./logdump/helpers.c
+--- ./logdump/helpers.c.tv2	2011-07-31 23:58:42.767444686 +0200
+++ ./logdump/helpers.c	2011-07-31 23:59:24.429874361 +0200
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const c
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
+	printf("%s", msg_string);
+	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
--- a/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/005_all_jfsutils-1.1.15-musl.patch
+++ b/sys-kernel/recoveryinitramfs/files/jfsutils/1.1.15/005_all_jfsutils-1.1.15-musl.patch
@@ -0,0 +1,16 @@
+diff -uNr jfsutils-1.1.15.orig/libfs/fssubs.c jfsutils-1.1.15/libfs/fssubs.c
+--- jfsutils-1.1.15.orig/libfs/fssubs.c	2013-10-28 13:23:36.823701431 +0100
+++ jfsutils-1.1.15/libfs/fssubs.c	2013-10-28 13:31:48.387556038 +0100
+@@ -36,6 +36,12 @@
+ #include <sys/mount.h>
+ #endif
+ 
+#ifndef _PATH_MNTTAB
+#ifdef MOUNTED
+#define _PATH_MNTTAB MOUNTED
+#endif
+#endif
+
+ #if HAVE_SYS_STATVFS_H
+ 
+ #include <sys/statvfs.h>
--- a/sys-kernel/recoveryinitramfs/files/ncurses/5.9/ncurses-fallback.c
+++ b/sys-kernel/recoveryinitramfs/files/ncurses/5.9/ncurses-fallback.c
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/001_all_strcmp_NULL.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/001_all_strcmp_NULL.patch
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/Makefile
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/Makefile
@@ -0,0 +1,113 @@
+#
+# Makefile for libtermcap. It is intended for Linux/ELF only.
+#
+
+LIBNAME=termcap
+
+VERSION=1.3.1
+SONAME_VERSION=1
+
+CC=gcc
+CFLAGS=-O -I. -g
+CFLAGS=-O -I.
+
+AR=ar
+ARFLAGS=ucvr
+
+MAKEINFO=makeinfo
+
+OWNER=bin.bin
+
+STATIC_LIB=lib$(LIBNAME).a
+SHARED_LIB=lib$(LIBNAME).so.$(VERSION)
+SONAME_SHARED_LIB=lib$(LIBNAME).so.$(SONAME_VERSION)
+
+TARGETS=$(STATIC_LIB) $(SHARED_LIB)
+
+# Where is include and dir located?
+prefix=/
+
+.c.o:
+	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -fPIC -c $< -o pic/$@
+
+SRCS = termcap.c tparam.c version.c
+OBJS= $(SRCS:.c=.o)
+
+all lib: pic .depend $(TARGETS) info
+
+$(STATIC_LIB): $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+$(SHARED_LIB): $(OBJS)
+	cd pic; \
+	$(CC) -shared -o ../$@ -Wl,-soname,$(SONAME_SHARED_LIB) $(OBJS)
+
+pic:
+	-if [ ! -d pic ]; then mkdir pic; fi
+
+install: lib install-dirs install-data
+	-if [ -f $(prefix)/lib/$(SHARED_LIB) ]; then \
+	   mkdir -p $(prefix)/lib/backup; \
+	   mv $(prefix)/lib/$(SHARED_LIB) \
+		$(prefix)/lib/backup/$(SHARED_LIB).$$$$; \
+	fi
+	cp $(SHARED_LIB) $(prefix)/lib
+	chown $(OWNER) $(prefix)/lib/$(SHARED_LIB)
+	-if [ $(prefix) = "/" ]; then \
+	  cp -f $(STATIC_LIB) /usr/lib; \
+	  rm -f /lib/libtermcap.so; \
+	  rm -f /usr/lib/libtermcap.so; \
+	  ln -s /lib/$(SHARED_LIB) /usr/lib/libtermcap.so; \
+	  cp -f termcap.h /usr/include; \
+	  cp termcap.info* /usr/info; \
+	  chown $(OWNER) \
+		/usr/info/termcap.info* \
+		/usr/lib/$(STATIC_LIB) \
+		/usr/lib/libtermcap.so \
+		/usr/include/termcap.h; \
+	else \
+	  cp -f $(STATIC_LIB) $(prefix)/lib; \
+	  rm -f $(prefix)/lib/libtermcap.so; \
+	  ln -s $(prefix)/lib/$(SHARED_LIB) \
+		$(prefix)/lib/libtermcap.so; \
+	  ln -s $(prefix)/lib/$(SHARED_LIB) \
+		$(prefix)/lib/libtermcap.so.$(SONAME_VERSION); \
+	  cp -f termcap.h $(prefix)/include; \
+	  chown $(OWNER) \
+		$(prefix)/lib/$(STATIC_LIB) \
+		$(prefix)/lib/libtermcap.so \
+		$(prefix)/include/termcap.h; \
+	fi
+
+install-dirs:
+	-if [ $(prefix) = "/" ]; then \
+	  mkdir -p /usr/lib /usr/info /usr/include /etc /lib; \
+	fi
+
+install-data:
+	-if [ $(prefix) = "/" ]; then \
+	  cp termcap.src /etc/termcap; \
+	  chown $(OWNER) /etc/termcap; \
+	fi
+
+info: termcap.info
+
+termcap.info: termcap.texi
+	$(MAKEINFO) termcap.texi --output=$@
+
+clean:
+	-rm -fr core a.out *.o pic $(TARGETS)
+
+distclean: clean
+	-rm -f .depend
+
+depend: .depend
+
+.depend: $(SRCS) Makefile
+	$(CC) $(CFLAGS) -M $(SRCS) | \
+		sed -e 's,^[ 	]*\(.*\.o\)[ 	]*:,\1 pic/\1:,' > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/README.Gentoo.patches
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/README.Gentoo.patches
@@ -1,59 +0,0 @@
- ================
- === W[hat]TF ===
- ================
-
-Gentoo patchsets that have grown too large to keep on the rsync mirrors have 
-been moved to our cvs tree.  From there, we bundle up all the whee little 
-patches into a tarball and distribute it via our public mirroring system.
-
-If you want specific info about a patch (like wtf it does or whose great idea 
-it was to change the code), read the patch !  We try to fill out the top of 
-them with useful info such as what it does, why it's needed, bug reports, 
-original creators, etc...  For simple patches, we reserve the right to assume 
-your IQ is greater than absolute 0 and figure out what it does w/out an 
-explanation.  If, by some miracle of science, it falls below the absolute 0 
-mark, you should help mankind by finding some scientists and letting them 
-probe you with their ... erm ... probes.
-
- =================
- === W[here]TF ===
- =================
-
-For those with CVS access, you want the 'src/patchsets' dir inside of the 
-'gentoo' cvs module.
-
-For those w/out CVS access, this URL should help you:
-http://sources.gentoo.org/gentoo/src/patchsets/
- (you can also find anon cvs access there too)
-
-It should be pretty easy to find your way around, you're a big boy after all.
-
- ===============
- === H[ow]TF ===
- ===============
-
-The patch naming/applying convention might be a little confusing to the Gentoo
-outsider, so here's a quick rundown.  Patch tarballs are applied in Gentoo via
-a helper command called "epatch".  This command is pretty forgiving when it
-comes to applying patches.
-
-For example, it will autodetect the required -p# by starting at 0 and counting
-up until things apply.  So do not expect a patch series to all be at the same -p
-level even if they all apply from the same source directory.  Typically however,
-people will use -p0 or -p1.
-
-The epatch command will also use the -E option by default as the `patch` command
-can be pretty picky about removing files.  We just force the issue.  If you
-really need to empty out a file but leave it behind, people can use `touch` in
-the ebuild.
-
-The patch naming convention is part rigorous and part open ended.  By default,
-the patch should follow:
-	#_<arch>_<desc>.patch
-The number field is to provide strict numerical ordering and has no limit (well,
-except for your IMAGINATION).  The <arch> field corresponds to the Gentoo arch
-naming convention (so expect to see "amd64" instead of "x86_64").  If you see
-"all" (which is how we strongly encourage people to manage things), then the
-patch should be applied for all arches, and any arch-specific issues can then
-be handled at build time (configure detection or something).  The <desc> is a
-free form field where people can stick whatever they want.
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/001_all_termcap-linuxlat.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/001_all_termcap-linuxlat.patch
@@ -1,24 +0,0 @@
--- ./termcap.linuxlat	Mon Mar  6 09:47:25 2000
-+++ ./termcap	Mon Mar  6 09:48:21 2000
-@@ -495,7 +495,10 @@
- # (untranslatable capabilities removed to fit entry within 1023 bytes)
- # (sgr removed to fit entry within 1023 bytes)
- # (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-linux|linux console:\
-+#
-+# added linux-lat as an alias -- the line drawing characters aren't right, but
-+# I think everything which uses line-drawing chars uses terminfo anyway -- ewt
-+linux|linux-lat|linux console:\
- 	:am:eo:mi:ms:xn:xo:\
- 	:it#8:\
- 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:K2=\E[G:al=\E[L:\
-@@ -504,7 +507,8 @@
- 	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:k1=\E[[A:k2=\E[[B:\
- 	:k3=\E[[C:k4=\E[[D:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
- 	:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\
-	:kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mh=\E[2m:\
-+	:kd=\E[B:kh=\E[1~:kH=\E[4~:@7=\E[4~:*6=\E[4~:\
-+	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mh=\E[2m:\
- 	:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:se=\E[27m:sf=^J:\
- 	:sr=\EM:st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:\
- 	:vb=200\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/002_all_termcap-xtermchanges.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/002_all_termcap-xtermchanges.patch
@@ -1,351 +0,0 @@
--- termcap.xtermchanges	Mon Mar 20 02:21:17 2000
-+++ termcap	Mon Mar 20 02:28:12 2000
-@@ -1723,178 +1723,123 @@
- 	:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:\
- 	:mr=\E[7m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
- 	:ue=\E[m:up=\E[A:us=\E[4m:
-# Compatible with the R5 xterm 
-# (from the XFree86 3.2 distribution, <blink=@> removed)
-# added khome/kend, rmir/smir, rmul/smul based on the R5 xterm code - TD
-# corrected typos in rs2 string - TD
-xterm-r5|xterm R5 version:\
-	:am:bs:km:ms:xn:\
-	:co#80:it#8:li#24:\
-	:@7=\E[4~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:\
-	:F1=\E[23~:F2=\E[24~:IC=\E[%d@:Km=\E[M:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:\
-	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:ic=\E[@:\
-	:im=\E[4h:k0=\EOq:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
-+xf|xterm-xfree86|XFree86 xterm:\
-+	:is=\E[!p\E[?3;4l\E[4l\E>:\
-+	:rs=\E[!p\E[?3;4l\E[4l\E>:\
-+	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:DO=\E[%dB:UP=\E[%dA:\
-+	:LE=\E[%dD:RI=\E[%dC:\
-+	:al=\E[L:am:bl=^G:\
-+	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
-+	:cs=\E[%i%d;%dr:ct=\E[3g:\
-+	:dc=\E[P:dl=\E[M:ho=\E[H:\
-+	:im=\E[4h:ei=\E[4l:mi:\
-+	:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-+	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
- 	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-	:k;=\E[21~:kA=\E[30~:kD=\E[3~:kE=\E[8~:kI=\E[2~:kL=\E[31~:\
-	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\E[1~:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
-	:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r2=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H:\
-	:rc=\E8:\
-	:..sa=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:\
-	:up=\E[A:us=\E[4m:
-+	:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
-+	:kn#12:\
-+	:kH=\E[4~::@7=\E[4~:kh=\E[1~:\
-+	:@0=\E[1~:kI=\E[2~:kD=\177:\
-+	:*6=\E[4~:kP=\E[5~:kN=\E[6~:\
-+	:km:\
-+	:kb=^H:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
-+	:li#24:md=\E[1m:me=\E[m^O:mr=\E[7m:ms:nd=\E[C:\
-+	:eA=\E)0:as=^N:ae=^O:ml=\El:mu=\Em:\
-+	:sc=\E7:rc=\E8:sf=\n:so=\E[7m:se=\E[27m:sr=\EM:st=\EH:\
-+	:ti=\E7\E[?47h:te=\E[2J\E[?47l\E8:\
-+	:vi=\E[?25l:ve=\E[?25h:\
-+	:up=\E[A:us=\E[4m:ue=\E[24m:xn:\
-+	:ut:Co#8:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\
-+	:pa#64:Sf=\E[3%dm:Sb=\E[4%dm:
-+v1|xterm-24|xterms|vs100|24x80 xterm:\
-+	:li#24:\
-+	:tc=xterm:
-+v2|xterm-65|65x80 xterm:\
-+	:li#65:tc=xterm:
-+vb|xterm-bold|xterm with bold for underline:\
-+	:us=\E[1m:tc=xterm:
-+vb|xterm-boldso|xterm with bold for standout:\
-+	:se=\E[m:so=\E[1m:tc=xterm:
-+vm|xtermm|monochrome xterm:\
-+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
-+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
-+	:kn#20:\
-+	:st@:ut@:Co@:NC@:op@:AB@:AF@:pa@:Sf@:Sb@:tc=xterm:
-+#
-+# This should work for the commonly used "color xterm" variations (XFree86
-+# xterm, color_xterm, nxterm, rxvt).  You may have trouble with this using
-+# conventional termcap because ncurses reports it is longer than 1023
-+# characters.  That is because resolving it adds the alternate character-set
-+# (you can suppress it with "ac@").
-+vc|xterm-color|generic "ANSI" color xterm:\
-+	:Co#8:NC@:pa#64:op=\E[m:AB=\E[4%dm:AF=\E[3%dm:tc=xterm-r6:
-+xterm-redhat|xterm with modifications to follow Debian keyboard policy:\
-+	:kb=\177:kD=\E[3~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
-+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
-+	:tc=xterm-xfree86:
-+vt|xterm-vt220|xterm emulating vt220:\
-+	:tc=xterm-xfree86:
-+#
-+# vi may work better with this entry, because vi doesn't use insert mode much.+ # |xterm-ic|xterm-vi|xterm with insert character instead of insert mode:\
-+vi|xterm-ic|xterm-vi|xterm with insert char:\
-+	:im@:ei@:mi@:ic=\E[@:IC=\E[%d@:tc=xterm:
-+#
- # Compatible with the R6 xterm
-# (from XFree86 3.2 distribution, <acsc> and :it: added, <blink@> removed)
-# added khome/kend - TD
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-# (sgr removed to fit entry within 1023 bytes)
-# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:\
-	:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:k1=\EOP:\
-	:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:\
-	:k8=\E[19~:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
-	:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-# This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
-# The name has been changed and some aliases have been removed.
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-# (sgr removed to fit entry within 1023 bytes)
-# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System):\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:K1=\EOw:K2=\EOy:K3=\EOu:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
-	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
-	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
-+r6|xterm-r6|xterm-old|X11R6 xterm:\
- 	:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\177:kI=\E[2~:\
-	:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kh=\EOH:\
-	:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:\
-	:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
-	:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[2J\E[?47l\E8:\
-	:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\
-	:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:
-
-# This is the stock xterm entry supplied with XFree86 3.3, which uses VT100
-# codes for F1-F4 except while in VT220 mode.
-xterm-xf86-v33|xterm terminal emulator (XFree86 3.3 Window System):\
-+	:rs=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
-+	:AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:DO=\E[%dB:UP=\E[%dA:\
-+	:LE=\E[%dD:RI=\E[%dC:\
-+	:al=\E[L:am:bl=^G:\
-+	:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
-+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:ho=\E[H:\
-+	:im=\E[4h:ei=\E[4l:mi:\
-+	:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-+	:@7=\E[4~:kh=\E[1~:\
- 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
-	:tc=xterm-xf86-v32:
-
-# This version was released in XFree86 3.3.3 (November 1998).
-# Besides providing printer support, it exploits a new feature that allows
-# xterm to use terminfo-based descriptions with the titeInhibit resource.
-xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System):\
-	:5i:\
-	:*6@:@0@:@7=\E[4~:ei=:ic@:im=:is=\E[\041p\E[?3;4l\E[4l\E>:\
-	:kD=\E[3~:kh=\E[1~:mb=\E[5m:mk=\E[8m:pf=\E[4i:po=\E[5i:\
-	:ps=\E[i:r1=\Ec:r2=\E[\041p\E[?3;4l\E[4l\E>:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;:\
-	:te=\E[?1047l\E[?1048l:ti=\E[?1048h\E[?1047h:\
-	:tc=xterm-xf86-v33:
-
-# This beta version will probably be released in XFree86 4.0.
-xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System):\
-	:@7=\EOF:K1=\EOH:K2=\EOE:K3=\E[5~:K4=\EOF:K5=\E[6~:kD=\177:\
-	:kh=\EOH:te=\E[?1049l:ti=\E[?1049h:\
-	:tc=xterm-xf86-v333:
-
-xterm-xfree86|xterm-new|xterm terminal emulator (XFree86 4.0 Window System):\
-	:tc=xterm-xf86-v40:
-
-# From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
-xterm-xi|xterm on XI Graphics Accelerated X under BSD/OS 3.1:\
-	:se=\E[m:ue=\E[m:\
-	:tc=xterm-xf86-v33:
-
-# This is one of the variants of XFree86 3.3 xterm, updated for 4.0 (T.Dickey)
-xterm-16color|xterm with 16 colors like aixterm:\
-	:Co#16:NC#32:pa#256:\
-	:AB=\E[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm:\
-	:AF=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm:\
-	:..Sb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m:\
-	:..Sf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m:\
-	:tc=xterm-xf86-v40:
-
-# This is another variant, for XFree86 4.0 xterm (T.Dickey)
-# This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color.
-# To use it, your decTerminalID resource must be set to 200 or above.
-#
-#	HTS	\E H	\210
-#	RI	\E M	\215
-#	SS3	\E O	\217
-#	CSI	\E [	\233
-#
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-# (sgr removed to fit entry within 1023 bytes)
-# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
-	:K1=\217w:K2=\217y:K3=\217u:K4=\217q:K5=\217s:LE=\233%dD:\
-	:RI=\233%dC:UP=\233%dA:ae=^O:al=\233L:as=^N:bl=^G:bt=\233Z:\
-	:cd=\233J:ce=\233K:cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:\
-	:cs=\233%i%d;%dr:ct=\2333g:dc=\233P:dl=\233M:do=^J:\
-	:ec=\233%dX:ei=\2334l:ho=\233H:im=\2334h:\
-	:is=\E7\E G\233r\233m\233?7h\233?1;3;4;6l\2334l\E8\E>:\
-	:k1=\23311~:k2=\23312~:k3=\23313~:k4=\23314~:k5=\23315~:\
-	:k6=\23317~:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:\
-	:kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\217B:\
-	:ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\
-	:ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m^O:mr=\2337m:\
-	:nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\
-	:st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:\
-	:up=\233A:us=\2334m:vb=\233?5h\233?5l:ve=\233?25h:\
-	:vi=\233?25l:vs=\233?25h:
-
-xterm-24|vs100|xterms|xterm terminal emulator (X Window System):\
-	:li#24:tc=xterm:
-
-# This is xterm for ncurses.
-xterm|xterm terminal emulator (X Window System):\
-	:Km=\E[M:\
-	:ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:u6=\E[%i%d;%dR:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:\
-	:tc=xterm-r6:
-
-# These entries allow access to the X titlebar and icon name as a status line. 
-# Note that twm (and possibly window managers descended from it such as tvtwm, 
-# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
-# with it.
-xterm+sl|access X title line and icon name:\
-	:hs:\
-	:ws#40:\
-	:ds=\E]0;\007:fs=^G:ts=\E]0;:tc=xterm:
-xterm+sl-twm|access X title line (pacify twm-descended window managers):\
-	:hs:\
-	:ws#40:\
-	:ds=\E]2;\007:fs=^G:ts=\E]2;:tc=xterm:
-+	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-+	:k;=\E[21~:\
-+	:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:F5=\E[28~:\
-+	:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:FA=\E[34~:\
-+	:kn#20:\
-+	:@0=\E[1~:kI=\E[2~:kD=\E[3~:\
-+	:*6=\E[4~:kP=\E[5~:kN=\E[6~:\
-+	:km:\
-+	:kb=^H:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:\
-+	:li#24:md=\E[1m:me=\E[m:mr=\E[7m:ms:nd=\E[C:pt:\
-+	:eA=\E)0:as=^N:ae=^O:\
-+	:ml=\El:mu=\Em:\
-+	:sc=\E7:rc=\E8:sf=\n:so=\E[7m:se=\E[m:sr=\EM:\
-+	:ti=\E7\E[?47h:te=\E[2J\E[?47l\E8:\
-+	:up=\E[A:us=\E[4m:ue=\E[m:xn:
-+#
-+# Compatible with the R5 xterm
-+r5|xterm-r5|X11R5 xterm X11R5:\
-+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:UP=\E[%dA:\
-+	:al=\E[L:am:\
-+	:bs:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:co#80:\
-+	:cs=\E[%i%d;%dr:ct=\E[3g:\
-+	:dc=\E[P:dl=\E[M:\
-+	:im=\E[4h:ei=\E[4l:mi:\
-+	:ho=\E[H:\
-+	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-+	:rs=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H:\
-+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:kb=^H:kd=\EOB:ke=\E[?1l\E>:\
-+	:kl=\EOD:km:kn#4:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:\
-+	:@7=\E[4~:kh=\E[1~:\
-+	:li#24:md=\E[1m:me=\E[m:mr=\E[7m:ms:nd=\E[C:pt:\
-+	:sc=\E7:rc=\E8:sf=\n:so=\E[7m:se=\E[m:sr=\EM:\
-+	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\
-+	:up=\E[A:us=\E[4m:ue=\E[m:xn:
-+#
-+# This is the only entry which you should have to customize, since "xterm"
-+# is widely used for a variety of incompatible terminal emulations including
-+# color_xterm and rxvt.
-+v0|xterm|X11 terminal emulator:\
-+	:tc=xterm-redhat:
-+#       :tc=xterm-xfree86:
-+#       :tc=xterm-r6:
- 
-#
-# The following xterm variants don't depend on your base version
-#
-# xterm with bold instead of underline
-xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold:\
-	:so=\E[7m:us=\E[1m:\
-	:tc=xterm:
- # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
- # (kterm should not invoke DEC Graphics as the alternate character set
- #  -- Kenji Rikitake)
-@@ -1912,40 +1857,6 @@
- 	:te@:ti@:\
- 	:tc=xterm:
- 
-# This describes the capabilities of color_xterm, an xterm variant from
-# before ECMA-64 color support was folded into the main-line xterm release.
-# This entry is straight from color_xterm's maintainer.
-# From: Jacob Mandelson <jlm@ugcs.caltech.edu>, 09 Nov 1996
-# The README's with the distribution also say that it supports SGR 21, 24, 25
-# and 27, but they are not present in the terminfo or termcap.
-# (untranslatable capabilities removed to fit entry within 1023 bytes)
-# (sgr removed to fit entry within 1023 bytes)
-# (terminfo-only capabilities suppressed to fit entry within 1023 bytes)
-color_xterm|cx|cx100|color_xterm color terminal emulator for X:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#65:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:i1=\E[r\E[m\E[?7h\E[?4;6l\E[4l:im=\E[4h:k1=\E[11~:\
-	:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:\
-	:kb=^H:kd=\EOB:kh=\E[7~:kl=\EOD:kr=\EOC:ku=\EOA:le=^H:\
-	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\
-	:sf=^J:so=\E[7m:sr=\EM:ta=^I:te=\E>\E[?41;1r:\
-	:ti=\E[?1;41s\E[?1;41h\E=:ue=\E[24m:up=\E[A:us=\E[4m:
-
-# The 'nxterm' distributed with Redhat Linux is a slight rehack of
-# xterm-sb_right-ansi-3d, which implements ANSI colors, but does not support
-# SGR 39 or 49.  SGR 0 does reset colors (along with everything else).  This
-# description is "compatible" with color_xterm, rxvt and XFree86 xterm, except
-# that each of those implements the home, end, delete keys differently.
-nxterm|xterm-color|generic color xterm:\
-	:NC@:\
-	:op=\E[m:tc=xterm-r6:tc=klone+color:
-
- # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
- # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
- # Notes:
-@@ -2023,16 +1934,6 @@
- 	:..Sf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m:\
- 	:op=\E[100m:\
- 	:tc=xtermm:
-
-# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
-# Here's a termcap entry I've been using for xterm_color, which comes
-# with BSD/OS 2.0, and the X11R6 contrib tape too I think.  Besides the
-# color stuff, I also have a status line defined as the window manager
-# title bar. [I have translated it to terminfo -- ESR]
-xterm-pcolor|xterm with color used for highlights and status line:\
-	:md=\E[1m\E[43m:mr=\E[7m\E[34m:so=\E[7m\E[31m:\
-	:us=\E[4m\E[42m:\
-	:tc=xterm+sl:tc=xterm-r6:
- 
- # HP ships this, except for the pb#9600 which was merged in from BSD termcap.
- # (hpterm: added empty <acsc>, we have no idea what ACS chars look like --esr)
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/003_all_termcap-utf8.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/003_all_termcap-utf8.patch
@@ -1,52 +0,0 @@
--- termcap.old	Wed May 24 22:37:06 2000
-+++ termcap	Wed May 24 22:38:57 2000
-@@ -616,6 +616,22 @@
- 	:vb=200\E[?5h\E[?5l:ve=\E[?25h\E[?0c:vi=\E[?25l\E[?1c:\
- 	:vs=\E[?25h\E[?8c:\
- 	:tc=klone+sgr:tc=ecma+color:
-+# From Unicode-HOWTO
-+linux-utf8|linux in Unicode (UTF-8) mode:\
-+ 	:am:eo:mi:ms:xn:xo:\
-+ 	:it#8:\
-+ 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@:K2=\E[G:\
-+ 	:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:cd=\E[J:ce=\E[K:\
-+ 	:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:\
-+ 	:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
-+ 	:ic=\E[@:im=\E[4h:k1=\E[[A:k2=\E[[B:k3=\E[[C:k4=\E[[D:\
-+ 	:k5=\E[[E:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-+ 	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\E[B:\
-+ 	:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-+ 	:me=\E[m:mh=\E[2m:mr=\E[7m:nd=\E[C:nw=^M^J:rc=\E8:sc=\E7:\
-+ 	:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[24m:\
-+ 	:up=\E[A:us=\E[4m:vb=200\E[?5h\E[?5l:ve=\E[?25h:\
-+ 	:vi=\E[?25l:vs=\E[?25h:
- linux-m|Linux console no color:\
- 	:Co@:pa@:\
- 	:AB@:AF@:Sb@:Sf@:tc=linux:
-@@ -1779,6 +1795,26 @@
- 	:tc=xterm-xfree86:
- vt|xterm-vt220|xterm emulating vt220:\
- 	:tc=xterm-xfree86:
-+
-+xterm-utf8|xterm in Unicode (UTF-8) mode:\
-+ 	:am:km:mi:ms:xn:\
-+ 	:co#80:it#8:li#24:\
-+ 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-+ 	:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
-+ 	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:bt=\E[Z:\
-+ 	:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-+ 	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\
-+ 	:ei=\E[4l:ho=\E[H:ic=\E[@:im=\E[4h:\
-+ 	:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
-+ 	:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
-+ 	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
-+ 	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:\
-+ 	:ke=\E[?1l\E>:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-+ 	:ku=\EOA:le=^H:md=\E[1m:me=\E[m\017:mr=\E[7m:nd=\E[C:\
-+ 	:rc=\E8:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-+ 	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\
-+ 	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
-+ 	:vs=\E[?25h:
- #
- # vi may work better with this entry, because vi doesn't use insert mode much.+ # |xterm-ic|xterm-vi|xterm with insert character instead of insert mode:\
- vi|xterm-ic|xterm-vi|xterm with insert char:\
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/004_all_termcap-xterm-X11R6.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/004_all_termcap-xterm-X11R6.patch
@@ -1,12 +0,0 @@
--- termcap.orig	Thu Mar 22 17:19:03 2001
-+++ termcap	Thu Mar 22 17:17:41 2001
-@@ -1872,7 +1872,8 @@
- # is widely used for a variety of incompatible terminal emulations including
- # color_xterm and rxvt.
- v0|xterm|X11 terminal emulator:\
-	:tc=xterm-redhat:
-+	:tc=xterm-redhat:\
-+	:kh=\EOH:ho=\E[1~:@7=\EOF:kH=\E[4~:
- #       :tc=xterm-xfree86:
- #       :tc=xterm-r6:
- 
--- a/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/005_all_termcap-Eterm.patch
+++ b/sys-kernel/recoveryinitramfs/files/termcap/1.3.1/tc.file/005_all_termcap-Eterm.patch
@@ -1,29 +0,0 @@
--- termcap.Eterm	2002-08-23 13:30:46.000000000 -0600
-+++ termcap	2002-08-23 13:40:54.000000000 -0600
-@@ -1894,6 +1894,26 @@
- 	:te@:ti@:\
- 	:tc=xterm:
- 
-+# support for Eterm
-+Eterm|Eterm-color|Eterm with xterm-style color support (X Window System):\
-+	:am:bw:eo:km:mi:ms:xn:xo:\
-+	:co#80:it#8:li#24:lm#0:\
-+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-+	:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\
-+	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
-+	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-+	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\
-+	:ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E>\E[?1l:ic=\E[@:\
-+	:im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\
-+	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
-+	:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-+	:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\
-+	:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-+	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\
-+	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:
-+
- # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
- # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
- # Notes:
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/001_all_xfsprogs-3.1.10-sharedlibs.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/001_all_xfsprogs-3.1.10-sharedlibs.patch
@@ -0,0 +1,120 @@
+ripped from PLD Linux
+
+--- xfsprogs-3.1.2/libdisk/Makefile
+++ xfsprogs-3.1.2/libdisk/Makefile
+@@ -25,8 +25,10 @@
+ include $(BUILDRULES)
+ 
+ install: default
+	$(INSTALL_LTLIB)
+ 
+ install-dev: default
+	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: install-dev
+ 
+--- xfsprogs-3.1.2/libxcmd/Makefile
+++ xfsprogs-3.1.2/libxcmd/Makefile
+@@ -32,6 +32,12 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
+install: default
+	$(INSTALL_LTLIB)
+
+install-dev: default
+	$(INSTALL_LTLIB_DEV)
+
+install-qa: default
+ 
+ -include .dep
+--- xfsprogs-3.1.2/libxfs/Makefile
+++ xfsprogs-3.1.2/libxfs/Makefile
+@@ -41,7 +41,9 @@
+ include $(BUILDRULES)
+ 
+ install: default
+	$(INSTALL_LTLIB_ROOT)
+ 
+ install-dev: default
+	$(INSTALL_LTLIB_DEV)
+ 
+ install-qa: default
+--- xfsprogs-3.1.2/libxlog/Makefile
+++ xfsprogs-3.1.2/libxlog/Makefile
+@@ -12,6 +12,8 @@
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
+LTLIBS = $(LIBUUID) $(LIBXFS)
+
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 
+@@ -19,6 +21,12 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev install-qa: default
+install: default
+	$(INSTALL_LTLIB_ROOT)
+
+install-dev: default
+	$(INSTALL_LTLIB_DEV)
+
+install-qa: default
+ 
+ -include .dep
+--- xfsprogs-3.1.2/Makefile
+++ xfsprogs-3.1.2/Makefile
+@@ -66,6 +66,8 @@
+ mkfs: libxfs
+ quota: libxcmd
+ repair: libxfs libxlog
+libxlog: libxfs
+libxlog-install-dev: libxfs-install-dev
+ 
+ ifneq ($(ENABLE_BLKID), yes)
+ mkfs: libdisk
+--- xfsprogs-3.1.2/include/buildmacros
+++ xfsprogs-3.1.2/include/buildmacros
+@@ -56,11 +56,13 @@
+ endif
+ 
+ ifeq ($(ENABLE_SHARED),yes)
+-INSTALL_LTLIB = \
+_INSTALL_LTLIB = set -e; \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
+	../$(INSTALL) -m 755 -d $(1); \
+	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(1); \
+	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1)
+INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR))
+INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR))
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -71,17 +71,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-	../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+-	fi
+	set -e; cd $(TOPDIR)/$(LIBNAME); \
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/002_all_xfsprogs-3.1.11-musl.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/002_all_xfsprogs-3.1.11-musl.patch
@@ -0,0 +1,150 @@
+--- xfsprogs-3.0.0/include/linux.h~	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0/include/linux.h	2009-03-19 16:19:35.000000000 +0100
+@@ -25,6 +25,10 @@
+ #include <malloc.h>
+ #include <getopt.h>
+ #include <endian.h>
+/* MUSL */
+#include <libgen.h>
+#include <xfs/xfs_types.h>
+/* MUSL */
+ 
+ static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
+ {
+diff -ur xfsprogs-3.0.0/include/project.h xfsprogs-3.0.0-diet/include/project.h
+--- xfsprogs-3.0.0/include/project.h	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0-diet/include/project.h	2009-03-19 12:55:05.000000000 +0100
+@@ -19,6 +19,9 @@
+ #define __PROJECT_H__
+ 
+ #include <xfs/xfs.h>
+/* MUSL */
+#include <xfs/xfs_types.h>
+/* MUSL */
+ 
+ #if !defined(__sgi__)
+ typedef __uint32_t	prid_t;
+diff -ur xfsprogs-3.0.0/include/xfs_types.h xfsprogs-3.0.0-diet/include/xfs_types.h
+--- xfsprogs-3.0.0/include/xfs_types.h	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0-diet/include/xfs_types.h	2009-03-19 12:40:08.000000000 +0100
+@@ -28,18 +28,6 @@
+ typedef unsigned int		uint_t;
+ typedef unsigned long		ulong_t;
+ 
+-/*
+- * Additional type declarations for XFS
+- */
+-typedef signed char		__int8_t;
+-typedef unsigned char		__uint8_t;
+-typedef signed short int	__int16_t;
+-typedef unsigned short int	__uint16_t;
+-typedef signed int		__int32_t;
+-typedef unsigned int		__uint32_t;
+-typedef signed long long int	__int64_t;
+-typedef unsigned long long int	__uint64_t;
+-
+ typedef enum { B_FALSE,B_TRUE }	boolean_t;
+ typedef __uint32_t		prid_t;		/* project ID */
+ typedef __uint32_t		inst_t;		/* an instruction */
+@@ -64,6 +52,20 @@
+ 
+ #endif	/* __KERNEL__ */
+ 
+/* MUSL */
+/*
+ * Additional type declarations for XFS
+ */
+typedef signed char		__int8_t;
+typedef unsigned char		__uint8_t;
+typedef signed short int	__int16_t;
+typedef unsigned short int	__uint16_t;
+typedef signed int		__int32_t;
+typedef unsigned int		__uint32_t;
+typedef signed long long int	__int64_t;
+typedef unsigned long long int	__uint64_t;
+/* MUSL */
+
+ typedef __uint32_t	xfs_agblock_t;	/* blockno in alloc. group */
+ typedef	__uint32_t	xfs_extlen_t;	/* extent length in blocks */
+ typedef	__uint32_t	xfs_agnumber_t;	/* allocation group number */
+--- xfsprogs-3.0.0/libdisk/evms.h~	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0/libdisk/evms.h	2009-03-19 21:52:18.000000000 +0100
+@@ -15,6 +15,9 @@
+  *   along with this program;  if not, write to the Free Software
+  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+/* MUSL */
+#include <xfs/platform_defs.h>
+/* MUSL */
+ 
+ #define EVMS_MAJOR			117
+ #define EVMS_GET_VOL_STRIPE_INFO	\
+diff -ur xfsprogs-3.0.0/libdisk/xvm.h xfsprogs-3.0.0-diet/libdisk/xvm.h
+--- xfsprogs-3.0.0/libdisk/xvm.h	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0-diet/libdisk/xvm.h	2009-03-19 12:56:54.000000000 +0100
+@@ -15,6 +15,10 @@
+  * along with this program; if not, write the Free Software Foundation,
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+/* MUSL */
+#include <xfs/platform_defs.h>
+#include <xfs/xfs_types.h>
+/* MUSL */
+ 
+ #define _DIOC_(x)        (('d'<<8) | x)
+ #define DIOCGETVOLDEV    _DIOC_(36) /* subvolume devices */
+diff -ur xfsprogs-3.0.0/libhandle/handle.c xfsprogs-3.0.0-diet/libhandle/handle.c
+--- xfsprogs-3.0.0/libhandle/handle.c	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0-diet/libhandle/handle.c	2009-03-19 12:56:03.000000000 +0100
+@@ -17,6 +17,10 @@
+ #include <xfs/xfs.h>
+ #include <xfs/handle.h>
+ #include <xfs/parent.h>
+/* MUSL */
+#include <xfs/xfs_types.h>
+#include <linux/limits.h>
+/* MUSL */
+ 
+ /* just pick a value we know is more than big enough */
+ #define	MAXHANSIZ	64
+diff -ur xfsprogs-3.0.0/libhandle/jdm.c xfsprogs-3.0.0-diet/libhandle/jdm.c
+--- xfsprogs-3.0.0/libhandle/jdm.c	2009-02-04 23:29:25.000000000 +0100
+++ xfsprogs-3.0.0-diet/libhandle/jdm.c	2009-03-19 12:56:28.000000000 +0100
+@@ -17,6 +17,10 @@
+ #include <xfs/handle.h>
+ #include <xfs/jdm.h>
+ #include <xfs/parent.h>
+/* MUSL */
+#include <xfs/xfs_types.h>
+#include <linux/limits.h>
+/* MUSL */
+ 
+ /* internal fshandle - typecast to a void for external use */
+ #define FSHANDLE_SZ		8
+diff -uNr xfsprogs-3.1.11.orig/libdisk/fstype.h xfsprogs-3.1.11/libdisk/fstype.h
+--- xfsprogs-3.1.11.orig/libdisk/fstype.h	2013-10-27 16:58:06.886952140 +0100
+++ xfsprogs-3.1.11/libdisk/fstype.h	2013-10-27 16:58:48.249435038 +0100
+@@ -192,7 +192,7 @@
+ 	char    s_dummy2[62];
+ 	char    s_checksum[1];
+ };
+-#define adfsblksize(s)	((uint) s.s_blksize[0])
+#define adfsblksize(s)	((unsigned int) s.s_blksize[0])
+ 
+ /* found in first 4 bytes of block 1 */
+ struct vxfs_super_block {
+diff -uNr xfsprogs-3.1.11.orig/fsr/xfs_fsr.c xfsprogs-3.1.11/fsr/xfs_fsr.c
+--- xfsprogs-3.1.11.orig/fsr/xfs_fsr.c	2013-10-27 17:23:03.447242562 +0100
+++ xfsprogs-3.1.11/fsr/xfs_fsr.c	2013-10-27 17:23:47.737688855 +0100
+@@ -45,6 +45,11 @@
+ #define _PATH_FSRLAST		"/var/tmp/.fsrlast_xfs"
+ #define _PATH_PROC_MOUNTS	"/proc/mounts"
+ 
+#ifndef _PATH_MOUNTED
+#ifdef MOUNTED
+#define _PATH_MOUNTED MOUNTED
+#endif
+#endif
+ 
+ char *progname;
+ 
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/003_all_xfsprogs-3.1.11-ustat.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/003_all_xfsprogs-3.1.11-ustat.patch
@@ -0,0 +1,96 @@
+X-Spam-Checker-Version: SpamAssassin 3.4.0-r929098 (2010-03-30) on oss.sgi.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
+	T_TO_NO_BRKTS_FREEMAIL autolearn=ham version=3.4.0-r929098
+Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15])
+	by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q21LELF2187409
+	for <xfs@oss.sgi.com>; Thu, 1 Mar 2012 15:14:21 -0600
+X-ASG-Debug-ID: 1330636459-04cb6c77b78a450001-NocioJ
+Received: from MMS3.broadcom.com (mms3.broadcom.com [216.31.210.19]) by cuda.sgi.com with ESMTP id EN5xnXt8f6M6fczc for <xfs@oss.sgi.com>; Thu, 01 Mar 2012 13:14:20 -0800 (PST)
+X-Barracuda-Envelope-From: kdasu.kdev@gmail.com
+X-Barracuda-Apparent-Source-IP: 216.31.210.19
+Received: from [10.9.200.133] by MMS3.broadcom.com with ESMTP (Broadcom
+ SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Mar 2012 13:23:13 -0800
+X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201
+Received: from mail-irva-13.broadcom.com (10.11.16.103) by
+ IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP
+ Server id 8.2.247.2; Thu, 1 Mar 2012 13:13:41 -0800
+Received: from kdasu-VirtualBox.and.broadcom.com (
+ dhcp-mhtb-6-210.and.broadcom.com [10.28.6.210]) by
+ mail-irva-13.broadcom.com (Postfix) with ESMTP id 5FB8BBC395; Thu, 1
+ Mar 2012 13:14:16 -0800 (PST)
+From: "Kamal Dasu" <kdasu.kdev@gmail.com>
+To: xfs@oss.sgi.com
+cc: "Kamal Dasu" <kdasu.kdev@gmail.com>
+Subject: [PATCH 1/2] xfsprogs: replace deprecated ustat call with statfs
+ in libxfs/linux.c
+Date: Thu, 1 Mar 2012 16:11:24 -0500
+X-ASG-Orig-Subj: [PATCH 1/2] xfsprogs: replace deprecated ustat call with statfs
+ in libxfs/linux.c
+Message-ID: <de74feb44ebd887269fe85d9a5879765afccf4c2.1330635228.git.kdasu.kdev@gmail.com>
+X-Mailer: git-send-email 1.7.5.4
+In-Reply-To: <1330636285-11200-1-git-send-email-kdasu.kdev@gmail.com>
+References: <1330636285-11200-1-git-send-email-kdasu.kdev@gmail.com>
+MIME-Version: 1.0
+X-WSS-ID: 6351374B50429576722-01-01
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+X-Barracuda-Connect: mms3.broadcom.com[216.31.210.19]
+X-Barracuda-Start-Time: 1330636460
+X-Barracuda-URL: http://192.48.176.15:80/cgi-mod/mark.cgi
+X-Virus-Scanned: by bsmtpd at sgi.com
+X-Barracuda-Spam-Score: 0.00
+X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1.3 tests=
+X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.89996
+	Rule breakdown below
+	 pts rule name              description
+	---- ---------------------- --------------------------------------------------
+
+>From the ustat man page
+
+NOTES
+       ustat() is deprecated and has only  been  provided  for  compatibility.
+       All new programs should use statfs(2) instead.
+
+Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
+---
+ libxfs/linux.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/libxfs/linux.c b/libxfs/linux.c
+index 2e07d54..b8cc028 100644
+--- a/libxfs/linux.c
+++ b/libxfs/linux.c
+@@ -21,7 +21,9 @@
+ #include <mntent.h>
+ #include <sys/stat.h>
+ #undef ustat
+-#include <sys/ustat.h>
+#include <sys/statfs.h>
+#include <sys/types.h>
+
+ #include <sys/mount.h>
+ #include <sys/ioctl.h>
+ #include <sys/sysinfo.h>
+@@ -50,7 +52,7 @@ int
+ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
+ {
+ 	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
+-	struct ustat	ust[2];
+	struct statfs	fst;
+ 	struct stat64	st;
+ 
+ 	if (!s) {
+@@ -61,7 +63,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
+ 		s = &st;
+ 	}
+ 
+-	if (ustat(s->st_rdev, ust) >= 0) {
+	if (statfs(block, &fst) >= 0) {
+ 		if (verbose)
+ 			fprintf(stderr,
+ 				_("%s: %s contains a mounted filesystem\n"),
+-- 
+1.7.5.4
+
+
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/004_all_xfsprogs-3.1.11-dynamic_exe.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/004_all_xfsprogs-3.1.11-dynamic_exe.patch
@@ -0,0 +1,108 @@
+diff -Nur xfsprogs-2.7.11/copy/Makefile xfsprogs-2.7.11.dynamic/copy/Makefile
+--- xfsprogs-2.7.11/copy/Makefile	2006-01-17 04:46:46.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/copy/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD)
+ LTDEPENDENCIES = $(LIBXFS)
+-LLDFLAGS = -static
+LLDFLAGS = 
+ 
+ default: $(LTCOMMAND)
+ 
+diff -Nur xfsprogs-2.7.11/db/Makefile xfsprogs-2.7.11.dynamic/db/Makefile
+--- xfsprogs-2.7.11/db/Makefile	2006-01-17 04:46:46.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/db/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -18,7 +18,7 @@
+ LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh
+ LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
+-LLDFLAGS += -static
+LLDFLAGS += 
+ 
+ ifeq ($(ENABLE_READLINE),yes)
+ LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+diff -Nur xfsprogs-2.7.11/growfs/Makefile xfsprogs-2.7.11.dynamic/growfs/Makefile
+--- xfsprogs-2.7.11/growfs/Makefile	2006-01-17 04:46:48.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/growfs/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
+-LLDFLAGS = -static
+LLDFLAGS = 
+ LSRCFILES = xfs_info.sh
+ 
+ default: $(LTCOMMAND)
+diff -Nur xfsprogs-2.7.11/io/Makefile xfsprogs-2.7.11.dynamic/io/Makefile
+--- xfsprogs-2.7.11/io/Makefile	2006-01-17 04:46:49.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/io/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ LLDLIBS = $(LIBXCMD) $(LIBHANDLE)
+ LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)
+-LLDFLAGS = -static
+LLDFLAGS = 
+ 
+ ifeq ($(HAVE_FADVISE),yes)
+ CFILES += fadvise.c
+diff -Nur xfsprogs-2.7.11/logprint/Makefile xfsprogs-2.7.11.dynamic/logprint/Makefile
+--- xfsprogs-2.7.11/logprint/Makefile	2006-01-17 04:46:50.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/logprint/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
+-LLDFLAGS = -static
+LLDFLAGS = 
+ 
+ default: $(LTCOMMAND)
+ 
+diff -Nur xfsprogs-2.7.11/mkfs/Makefile xfsprogs-2.7.11.dynamic/mkfs/Makefile
+--- xfsprogs-2.7.11/mkfs/Makefile	2006-01-17 04:46:51.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/mkfs/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -21,7 +21,7 @@
+ 
+ LLDLIBS += $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
+ LTDEPENDENCIES += $(LIBXFS)
+-LLDFLAGS = -static
+LLDFLAGS =
+ 
+ LSRCFILES = $(FSTYP).c
+ LDIRT = $(FSTYP)
+diff -Nur xfsprogs-2.7.11/quota/Makefile xfsprogs-2.7.11.dynamic/quota/Makefile
+--- xfsprogs-2.7.11/quota/Makefile	2006-01-17 04:46:51.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/quota/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -16,7 +16,7 @@
+ 
+ LLDLIBS = $(LIBXCMD)
+ LTDEPENDENCIES = $(LIBXCMD)
+-LLDFLAGS = -static
+LLDFLAGS =
+ 
+ ifeq ($(ENABLE_READLINE),yes)
+ LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
+diff -Nur xfsprogs-2.7.11/repair/Makefile xfsprogs-2.7.11.dynamic/repair/Makefile
+--- xfsprogs-2.7.11/repair/Makefile	2006-01-17 04:46:52.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/repair/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -19,7 +19,7 @@
+ 
+ LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
+-LLDFLAGS = -static
+LLDFLAGS = 
+ 
+ default: $(LTCOMMAND)
+ 
+diff -Nur xfsprogs-2.7.11/rtcp/Makefile xfsprogs-2.7.11.dynamic/rtcp/Makefile
+--- xfsprogs-2.7.11/rtcp/Makefile	2006-01-17 04:46:52.000000000 +0100
+++ xfsprogs-2.7.11.dynamic/rtcp/Makefile	2006-03-10 18:13:45.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ LTCOMMAND = xfs_rtcp
+ CFILES = xfs_rtcp.c
+-LLDFLAGS = -static
+LLDFLAGS = 
+ 
+ default: $(LTCOMMAND)
+ 
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/005_all_xfsprogs-3.1.11-miscfix-v2.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/005_all_xfsprogs-3.1.11-miscfix-v2.patch
@@ -0,0 +1,32 @@
+--- xfsprogs-2.5.4/m4/manual_format.m4.orig	2003-07-25 19:42:03.000000000 +0200
+++ xfsprogs-2.5.4/m4/manual_format.m4	2003-08-08 08:22:59.000000000 +0200
+@@ -6,12 +6,5 @@
+ # 
+ AC_DEFUN([AC_MANUAL_FORMAT],
+   [ have_zipped_manpages=false
+-    for d in ${prefix}/share/man ${prefix}/man ; do
+-        if test -f $d/man1/man.1.gz
+-        then
+-            have_zipped_manpages=true
+-            break
+-        fi
+-    done
+     AC_SUBST(have_zipped_manpages)
+   ])
+
+--- xfsprogs-3.1.3/Makefile~	2010-08-18 06:54:06.000000000 +0200
+++ xfsprogs-3.1.3/Makefile	2010-08-28 16:35:25.820731669 +0200
+@@ -39,7 +39,11 @@
+ LDIRT += $(SRCTAR)
+ endif
+ 
+-LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
+LIB_SUBDIRS = libxfs libxlog libxcmd libhandle
+ifneq ($(ENABLE_BLKID), yes)
+LIB_SUBDIRS += libdisk
+endif
+
+ TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
+ 		mdrestore repair rtcp m4 man doc po debian
+ 
+
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/006_all_xfsprogs_3.1.7-1drbl.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/006_all_xfsprogs_3.1.7-1drbl.patch
@@ -0,0 +1,11 @@
+diff -uNr xfsprogs-3.1.7.orig/include/Makefile xfsprogs-3.1.7/include/Makefile
+--- xfsprogs-3.1.7.orig/include/Makefile	2011-11-18 00:30:24.000000000 +0100
+++ xfsprogs-3.1.7/include/Makefile	2011-11-23 11:25:30.000000000 +0100
+@@ -53,6 +53,7 @@
+ 	$(INSTALL) -m 755 -d $(PKG_INC_DIR)
+ 	$(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR)
+ 	$(INSTALL) -m 644 platform_defs.h $(PKG_INC_DIR)
+	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
+ 
+ install-qa: install-dev
+ 	$(INSTALL) -m 644 $(QAHFILES) $(PKG_INC_DIR)
--- a/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/007_all_xfsprogs_3.1.11-disable-quota.patch
+++ b/sys-kernel/recoveryinitramfs/files/xfsprogs/3.1.11/007_all_xfsprogs_3.1.11-disable-quota.patch
@@ -0,0 +1,12 @@
+diff -uNr xfsprogs-3.1.11.orig/Makefile xfsprogs-3.1.11/Makefile
+--- xfsprogs-3.1.11.orig/Makefile	2013-10-27 17:48:05.641462550 +0100
+++ xfsprogs-3.1.11/Makefile	2013-10-27 17:48:29.295166838 +0100
+@@ -45,7 +45,7 @@
+ LIB_SUBDIRS += libdisk
+ endif
+ 
+-TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
+TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs \
+ 		mdrestore repair rtcp m4 man doc po debian
+ 
+ SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)