Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community/kdesvn/PKGBUILD community/lwm/PKGBUILD community/sakura/PKGBUILD extra/openmpi/PKGBUILD extra/qt/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2012-03-02 18:53:10 +0100
committer: Michał Masłowski <mtjm@mtjm.eu> 2012-03-02 18:53:10 +0100
commit: 588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch)
tree: a62b104d7b70d82767fbde6aeb782b1359302459 /testing
parent: 9ea487ed90ebf891571ea8fffd34c154cbf981df (diff)
parent: b479098a1b8d7cb545339cb225a7cde4988b2748 (diff)
43 files changed, 0 insertions, 3703 deletions
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
deleted file mode 100644
index 5533afa39..000000000
--- a/testing/libarchive/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 151513 2012-02-27 05:06:31Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=libarchive
-pkgver=3.0.3
-pkgrel=5
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
-        'interpret-non-posix-zips.patch'
-        'test-with-zip-mtime.patch'
-        'skip-fiemap-on-unavail.patch')
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
-         'f02b88eb10877c7a7d527ed89c662e44'
-         '8366def6d7d70d424fa28a986c78c015'
-         'efa7cbda9fc64a4f1392324d0b5707e2')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
-            '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
-            'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f'
-            '05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=225
-  patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=231
-  patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=238
-  patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch"
-
-  ./configure --prefix=/usr --without-xml2
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch
deleted file mode 100644
index 63bc439d9..000000000
--- a/testing/libarchive/interpret-non-posix-zips.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-Index: libarchive/archive_read_support_format_zip.c
-===================================================================
---- libarchive/archive_read_support_format_zip.c	(revision 4189)
-+++ libarchive/archive_read_support_format_zip.c	(revision 4190)
-@@ -217,14 +217,13 @@
- }
- 
- /*
-- * TODO: This is a performance sink because it forces
-- * the read core to drop buffered data from the start
-- * of file, which will then have to be re-read again
-- * if this bidder loses.
-+ * TODO: This is a performance sink because it forces the read core to
-+ * drop buffered data from the start of file, which will then have to
-+ * be re-read again if this bidder loses.
-  *
-- * Consider passing in the winning bid value to subsequent
-- * bidders so that this bidder in particular can avoid
-- * seeking if it knows it's going to lose anyway.
-+ * We workaround this a little by passing in the best bid so far so
-+ * that later bidders can do nothing if they know they'll never
-+ * outbid.  But we can certainly do better...
-  */
- static int
- archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid)
-@@ -311,19 +310,29 @@
- 		external_attributes = archive_le32dec(p + 38);
- 		zip_entry->local_header_offset = archive_le32dec(p + 42);
- 
-+		/* If we can't guess the mode, leave it zero here;
-+		   when we read the local file header we might get
-+		   more information. */
-+		zip_entry->mode = 0;
- 		if (zip_entry->system == 3) {
- 			zip_entry->mode = external_attributes >> 16;
--		} else {
--			zip_entry->mode = AE_IFREG | 0777;
- 		}
- 
--		/* Do we need to parse filename here? */
--		/* Or can we wait until we read the local header? */
-+		/* We don't read the filename until we get to the
-+		   local file header.  Reading it here would speed up
-+		   table-of-contents operations (removing the need to
-+		   find and read local file header to get the
-+		   filename) at the cost of requiring a lot of extra
-+		   space. */
-+		/* We don't read the extra block here.  We assume it
-+		   will be duplicated at the local file header. */
- 		__archive_read_consume(a,
- 		    46 + filename_length + extra_length + comment_length);
- 	}
- 
--	/* TODO: Sort zip entries. */
-+	/* TODO: Sort zip entries by file offset so that we
-+	   can optimize get_next_header() to use skip instead of
-+	   seek. */
- 
- 	return ARCHIVE_OK;
- }
-@@ -434,6 +443,11 @@
- 			return (30);
- 	}
- 
-+	/* TODO: It's worth looking ahead a little bit for a valid
-+	 * PK signature.  In particular, that would make it possible
-+	 * to read some UUEncoded SFX files or SFX files coming from
-+	 * a network socket. */
-+
- 	return (0);
- }
- 
-Index: libarchive/test/test_compat_zip_6.zip.uu
-===================================================================
---- libarchive/test/test_compat_zip_6.zip.uu	(revision 0)
-+++ libarchive/test/test_compat_zip_6.zip.uu	(revision 4190)
-@@ -0,0 +1,10 @@
-+begin 755 test_compat_zip_6.zip
-+M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@
-+M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD
-+M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0-
-+M"E!+`0(4"PH``````'@3-T`````````````````6````````````$```````
-+M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+
-+M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E
-+M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B```````
-+`
-+end
-Index: libarchive/test/test_compat_zip.c
-===================================================================
---- libarchive/test/test_compat_zip.c	(revision 4189)
-+++ libarchive/test/test_compat_zip.c	(revision 4190)
-@@ -348,6 +348,53 @@
- 	free(p);
- }
- 
-+/*
-+ * Issue 225: Errors extracting MSDOS Zip archives with directories.
-+ */
-+static void
-+compat_zip_6_verify(struct archive *a)
-+{
-+	struct archive_entry *ae;
-+
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-+	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
-+	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
-+	assertEqualInt(1327314468, archive_entry_mtime(ae));
-+	assertEqualInt(0, archive_entry_size(ae));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-+	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
-+	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
-+	assertEqualInt(1327314476, archive_entry_mtime(ae));
-+	assertEqualInt(11, archive_entry_size(ae));
-+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
-+}
-+
-+static void
-+test_compat_zip_6(void)
-+{
-+	const char *refname = "test_compat_zip_6.zip";
-+	struct archive *a;
-+	void *p;
-+	size_t s;
-+
-+	extract_reference_file(refname);
-+	p = slurpfile(&s, refname);
-+
-+	assert((a = archive_read_new()) != NULL);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
-+	compat_zip_6_verify(a);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
-+
-+	assert((a = archive_read_new()) != NULL);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
-+	assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7));
-+	compat_zip_6_verify(a);
-+	assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
-+}
-+
- DEFINE_TEST(test_compat_zip)
- {
- 	test_compat_zip_1();
-@@ -355,6 +402,7 @@
- 	test_compat_zip_3();
- 	test_compat_zip_4();
- 	test_compat_zip_5();
-+	test_compat_zip_6();
- }
- 
- 
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 4189)
-+++ Makefile.am	(revision 4190)
-@@ -462,6 +462,7 @@
- 	libarchive/test/test_compat_zip_3.zip.uu			\
- 	libarchive/test/test_compat_zip_4.zip.uu			\
- 	libarchive/test/test_compat_zip_5.zip.uu			\
-+	libarchive/test/test_compat_zip_6.zip.uu			\
- 	libarchive/test/test_fuzz_1.iso.Z.uu				\
- 	libarchive/test/test_fuzz.cab.uu				\
- 	libarchive/test/test_fuzz.lzh.uu				\
diff --git a/testing/libarchive/skip-fiemap-on-unavail.patch b/testing/libarchive/skip-fiemap-on-unavail.patch
deleted file mode 100644
index d054aea4e..000000000
--- a/testing/libarchive/skip-fiemap-on-unavail.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 293687358e2c52213a3f077bb3d8f860ea5bfda9 Mon Sep 17 00:00:00 2001
-From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
-Date: Mon, 6 Feb 2012 04:51:16 +0900
-Subject: [PATCH] Fix issue 238. Skip the setup sparse on linux without a
- check of errno if ioctl(,FS_IOC_FIEMAP,) failed because the
- errno is not fixed , for example, some file system returns
- ENOTTY, another returns EOPNOTSUPP, or EINVAL and so on. We
- cannot decide what errno exactly indicates an unsupported
- error.
-
----
- libarchive/archive_read_disk_entry_from_file.c |   13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
-index eef42ef74..6415008 100644
---- a/libarchive/archive_read_disk_entry_from_file.c
-+++ b/libarchive/archive_read_disk_entry_from_file.c
-@@ -859,16 +859,9 @@ setup_sparse(struct archive_read_disk *a,
- 
- 		r = ioctl(fd, FS_IOC_FIEMAP, fm); 
- 		if (r < 0) {
--			/* When errno is ENOTTY, it is better we should
--			 * return ARCHIVE_OK because an earlier version
--			 *(<2.6.28) cannot perfom FS_IOC_FIEMAP.
--			 * We should also check if errno is EOPNOTSUPP,
--			 * it means "Operation not supported". */
--			if (errno != ENOTTY && errno != EOPNOTSUPP) {
--				archive_set_error(&a->archive, errno,
--				    "FIEMAP failed");
--				exit_sts = ARCHIVE_FAILED;
--			}
-+			/* When something error happens, it is better we
-+			 * should return ARCHIVE_OK because an earlier
-+			 * version(<2.6.28) cannot perfom FS_IOC_FIEMAP. */
- 			goto exit_setup_sparse;
- 		}
- 		if (fm->fm_mapped_extents == 0)
--- 
-1.7.9.2
-
diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch
deleted file mode 100644
index 79e2f3c7e..000000000
--- a/testing/libarchive/test-with-zip-mtime.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: libarchive/test/test_compat_zip.c
-===================================================================
---- libarchive/test/test_compat_zip.c	(revision 4197)
-+++ libarchive/test/test_compat_zip.c	(revision 4198)
-@@ -359,12 +359,16 @@
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
- 	assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae));
- 	assertEqualInt(AE_IFDIR, archive_entry_filetype(ae));
--	assertEqualInt(1327314468, archive_entry_mtime(ae));
-+	/* Zip timestamps are local time, so vary by time zone. */
-+	/* TODO: A more complex assert would work here; we could
-+	   verify that it's within +/- 24 hours of a particular value. */
-+	/* assertEqualInt(1327314468, archive_entry_mtime(ae)); */
- 	assertEqualInt(0, archive_entry_size(ae));
- 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
- 	assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae));
- 	assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
--	assertEqualInt(1327314476, archive_entry_mtime(ae));
-+	/* Zip timestamps are local time, so vary by time zone. */
-+	/* assertEqualInt(1327314476, archive_entry_mtime(ae)); */
- 	assertEqualInt(11, archive_entry_size(ae));
- 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
- }
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
deleted file mode 100644
index 6f36b2690..000000000
--- a/testing/mkinitcpio-busybox/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 151125 2012-02-25 01:54:20Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-busybox
-pkgver=1.19.4
-pkgrel=1
-pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
-url="http://www.busybox.net/"
-license=('GPL')
-depends=('glibc')
-options=('!buildflags')
-source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
-        'config')
-sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee'
-            '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a')
-
-build() {
-  cd "$srcdir/busybox-$pkgver"
-
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
-  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
-    "$srcdir/config" > .config
-
-  make
-}
-
-package() {
-  install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
deleted file mode 100644
index 3cd776e03..000000000
--- a/testing/mkinitcpio-busybox/config
+++ /dev/null
@@ -1,1013 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.19.2
-# Sun Oct 16 15:24:19 2011
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-# CONFIG_FEATURE_SEAMLESS_GZ is not set
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP is not set
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_TAR is not set
-# CONFIG_FEATURE_TAR_CREATE is not set
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
-# CONFIG_ID is not set
-# CONFIG_GROUPS is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_BASE64 is not set
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-# CONFIG_TEE is not set
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TRUE=y
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHOAMI is not set
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-CONFIG_SETFONT=y
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-# CONFIG_PATCH is not set
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
-# CONFIG_FEATURE_ALLOW_EXEC is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-# CONFIG_DEFAULT_MODULES_DIR is not set
-# CONFIG_DEFAULT_DEPMOD_FILE is not set
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-
-#
-# Filesystem/Volume identification
-#
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
deleted file mode 100644
index 61895f9fa..000000000
--- a/testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 150956 2012-02-24 10:04:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=nspr
-pkgver=4.9
-pkgrel=1
-pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('glibc')
-makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-        nspr.pc.in)
-md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a'
-         'bce1611f3117b53fc904cab549c09967')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
-  else
-    confflags=""
-  fi
-
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-      -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --includedir=/usr/include/nspr \
-      --enable-optimize \
-      --disable-debug ${confflags}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
-  chmod 644 ${pkgdir}/usr/lib/*.a
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
-}
diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/testing/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD
deleted file mode 100644
index d24c3c91c..000000000
--- a/testing/nss/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 150999 2012-02-24 13:00:04Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nss
-pkgver=3.13.3
-pkgrel=1
-pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.9
-depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
-        nss.pc.in
-        nss-config.in
-        add_spi+cacert_ca_certs.patch
-        ssl-renegotiate-transitional.patch)
-sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6'
-          'c8fcdb153af9d39689243119adb475905a657284'
-          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
-          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
-          '3d89f29e321d7df7269b7ae6d219654543feaa6a'
-          '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
-  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
-  # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
-
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
-
-  # Generate certdata.c from certdata.txt
-  cd security/nss/lib/ckfw/builtins
-  make generate
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
-  export XCFLAGS="${CFLAGS}"
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${pkgver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
-  done
-
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
-}
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index bf7e2ca16..000000000
--- a/testing/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,568 +0,0 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:32:14.000000000 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:35:07.577861466 +0100
-@@ -23475,3 +23475,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+ 
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in
deleted file mode 100644
index f8f893e71..000000000
--- a/testing/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	nssutil
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/testing/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
- 
diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/testing/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/testing/nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
-     PR_FALSE,   /* noLocks            */
-     PR_FALSE,   /* enableSessionTickets */
-     PR_FALSE,   /* enableDeflate      */
--    2,          /* enableRenegotiation (default: requires extension) */
-+    3,          /* enableRenegotiation (default: transitional) */
-     PR_FALSE,   /* requireSafeNegotiation */
- };
- 
diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE
deleted file mode 100644
index c5ab15a56..000000000
--- a/testing/shadow/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1990 - 1994, Julianne Frances Haugh
- * Copyright (c) 1996 - 2000, Marek Michałkiewicz
- * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2009, Nicolas François
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the copyright holders or contributors may not be used to
- *    endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index 5757df664..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# $Id: PKGBUILD 151351 2012-02-25 15:53:24Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.5
-pkgrel=4
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
-        etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
-        etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
-        etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
-        etc/default/useradd)
-options=('!libtool')
-install='shadow.install'
-source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
-        LICENSE
-        adduser
-        chgpasswd
-        chpasswd
-        defaults.pam
-        login
-        login.defs
-        newusers
-        passwd
-        shadow.cron.daily
-        useradd.defaults
-        nscd-error-reporting.patch
-        xstrdup.patch
-        shadow-strncpy-usage.patch
-        shadow-add-missing-include.patch
-        userdel-avoid-bad-mem-access.patch
-        write-utmp-wtmp-entries.patch)
-sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
-          '0a31aafceb948a91fe7370a6378cafd6fd883145'
-          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
-          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
-          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          '895aad07c192b288b457e19dd7b8c55841b4ad22'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
-          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-          'ae6eebb842c433ac4022c493294a13ed68e06acc'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '21e12966a6befb25ec123b403cd9b5c492fe5b16'
-          '0697a21f7519de30821da7772677035652df4ad2'
-          'e1dd93d82c6eba76b5f17a9fefad4bbc513cff5b'
-          'bcef8558c9123b396d2d4df26c815a951f97a91a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # avoid transitive linking issues with binutils 2.22
-  sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
-
-  # link to glibc's crypt(3)
-  LDFLAGS+=" -lcrypt"
-
-  # need to offer these upstream
-  patch -Np1 <"$srcdir/xstrdup.patch"
-  patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
-
-  # backports queued for 4.1.5.1
-  patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
-  patch -Np1 <"$srcdir/nscd-error-reporting.patch"
-
-  # sent to ML
-  patch -Np0 <"$srcdir/userdel-avoid-bad-mem-access.patch"
-
-  # revert to fix FS#28543
-  patch -RNp1 <"$srcdir/write-utmp-wtmp-entries.patch"
-
-  # supress etc/pam.d/*, we provide our own
-  sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --with-libpam \
-    --without-selinux
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
-  # interactive useradd
-  install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
-  # useradd defaults
-  install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
-  # cron job
-  install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
-  # login.defs
-  install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
-  # PAM config - custom
-  install -dm755 "$pkgdir/etc/pam.d"
-  install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers}
-
-  # PAM config - from tarball
-  install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
-  # we use the 'useradd' PAM file for other similar utilities
-  for file in chage chfn chsh groupadd groupdel groupmod shadow \
-      useradd usermod userdel; do
-    install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
-  done
-
-  # Remove su - using su from coreutils instead
-  rm "$pkgdir/bin/su"
-  find "$pkgdir/usr/share/man" -name 'su.1' -delete
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995  Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
-# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-#          Based on the original Slackware adduser by Hrvoje Dogan
-#          with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04 
-#       * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-#       * Disallow user names that begin with a numeric because useradd 
-#         (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-#       * When supplying a null string for the uid (meaning 'Choose next available'), 
-#         if there were file names in the range 'a-z' in the pwd then the 
-#         egrep command considered these files rather than the null string. 
-#         The egrep expression is now in quotes.  
-#         Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-#       * Ask to chown user.group the home directory if it already exists.
-#         This helps reduce later confusion when adding users whose home dir
-#         already exists (mounted partition for example) and is owned
-#         by a user other than the user to which the directory is being
-#         assigned as home.  Default is not to chown.
-#         Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-#       * Advise & prevent users from creating logins with '.' characters
-#         in the user name. <sw>
-#       * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
-#         will let you create a user that has any uppercase chars in it
-#         This was reported on the userlocal.org forums
-#         by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-#       * Support 'broken' (null lines in) /etc/passwd and 
-#         /etc/group files <sw>       
-#       * For recycling UIDs (default still 'off'), we now look in 
-#         /etc/login.defs for the UID_MIN value and use it
-#         If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-#       * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-#       * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-#       * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
-   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid.  I like the idea of 
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() { 
-  local output
-  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
-    echo -n "${1} " >&2 # fudge for use with bash v1
-    read output
-  else # this should work with any other /bin/sh
-    read -ep "${1} " output
-  fi
-  echo $output
-}
-
-# Function to display the account info
-function display () {
-  local goose
-  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
-  echo -n "$1 "
-  # If it's null then display the 'other' information
-  if [ -z "$goose" -a ! -z "$3" ]; then 
-    echo "$3" 
-  else 
-    echo "$goose" 
-  fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
-  local got_error group
-  if [ ! -z "$@" ]; then  
-  for group in $@ ; do
-    local uid_not_named="" uid_not_num=""
-    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
-    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
-    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
-      echo "- Group '$group' does not exist"
-      got_error=yes
-    fi
-  done
-  fi
-  # Return exit code of 1 if at least one of the groups didn't exist
-  if [ ! -z "$got_error" ]; then
-    return 1
-  fi
-}   
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
-  if [ -z "$LOGIN" ]; then 
-    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
-  fi
-  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
-  if [ $? -eq 0 ]; then
-    echo "- User '$LOGIN' already exists; please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
-    echo "- User names cannot begin with a number; please choose another"
-    unset LOGIN
-  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
-    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
-    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
-    unset LOGIN
-  else
-    unset needinput
-  fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
-  echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd 
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
-  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    echo "- That UID is already in use; please choose another"
-  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
-    echo "- UIDs are numerics only"         
-  else
-    unset needinput
-  fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then 
-  U_ID="-u ${_UID}"
-else
-  # Will we be recycling UIDs?
-  if [ "$recycleuids" = "yes" ]; then
-    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
-  fi   
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number 
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  GID="$(get_input "Initial group [ ${defgroup} ]:")"
-  check_group "$GID"
-  if [ $? -gt 0 ]; then
-    echo "- Please choose another"
-  else
-    unset needinput 
-  fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
-  GID="-g ${defgroup}"
-else
-  GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  AGID="$(get_input "Additional groups (comma separated) []:")"
-  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
-  if [ ! -z "$AGID" ]; then
-    check_group "$AGID"  # check all groups at once (treated as N # of params)
-    if [ $? -gt 0 ]; then
-      echo "- Please re-enter the group(s)"
-    else
-      unset needinput # we found all groups specified
-      AGID="-G $(echo "$AGID" | tr ' ' ,)"
-    fi
-  else
-    unset needinput   # we don't *have* to have additional groups
-  fi
-done
-
-#: Get the new user's home dir :#
-#       
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
-  if [ -z "$HME" ]; then
-    HME="${defhome}/${LOGIN}"
-  fi 
-  # Warn the user if the home dir already exists
-  if [ -d "$HME" ]; then
-    echo "- Warning: '$HME' already exists !"
-    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
-      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
-      if [ "$(echo $getyn | grep -i "y")" ]; then
-         CHOWNHOMEDIR=$HME # set this to the home directory
-      fi
-    fi
-  else
-    unset needinput
-  fi
-done           
-HME="-d ${HME}"  
-    
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  unset got_error
-  SHL="$(get_input "Shell [ ${defshell} ]")"
-  if [ -z "$SHL" ]; then
-    SHL="${defshell}"
-  fi 
-  # Warn the user if the shell doesn't exist in /etc/shells or as a file
-  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
-    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
-    got_error=yes
-  fi
-  if [ ! -f "$SHL" ]; then
-    echo "- Warning: ${SHL} does not exist as a file"
-    got_error=yes
-  fi
-  if [ ! -z "$got_error" ]; then
-    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-    fi
-  else
-    unset needinput
-  fi
-done           
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
-  if [ ! -z "$EXP" ]; then
-    # Check to see whether the expiry date is in the valid format
-    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
-      echo "- That is not a valid expiration date"
-    else
-      unset needinput 
-      EXP="-e ${EXP}" 
-    fi
-  else
-    unset needinput
-  fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
-  echo "- Error running useradd command -- account not created!"
-  echo "(cmd: $CMD)"
-  exit 1
-fi
-
-# chown the home dir ?  We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
-  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "* WARNING: An error occured while setting the password for"
-  echo "           this account.  Please manually investigate this *"
-  exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-account		required	pam_permit.so
-password	include		system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/shadow/login b/testing/shadow/login
deleted file mode 100644
index b8555f89c..000000000
--- a/testing/shadow/login
+++ /dev/null
@@ -1,21 +0,0 @@
-#%PAM-1.0
-auth		required	pam_securetty.so
-auth		requisite	pam_nologin.so
-auth		required	pam_unix.so nullok
-auth		required	pam_tally.so onerr=succeed file=/var/log/faillog
-# use this to lockout accounts for 10 minutes after 3 failed attempts
-#auth		required	pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog
-account		required	pam_access.so
-account		required	pam_time.so
-account		required	pam_unix.so
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-session		required	pam_unix.so
-session		required	pam_env.so
-session		required	pam_motd.so
-session		required	pam_limits.so
-session		optional	pam_mail.so dir=/var/spool/mail standard
-session		optional	pam_lastlog.so
-session		optional	pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY		3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# *REQUIRED*
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-UMASK		077
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-# System accounts
-SYS_UID_MIN		  500
-SYS_UID_MAX		  999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			 1000
-GID_MAX			60000
-# System accounts
-SYS_GID_MIN		  500
-SYS_GID_MAX		  999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/nscd-error-reporting.patch b/testing/shadow/nscd-error-reporting.patch
deleted file mode 100644
index a4075756e..000000000
--- a/testing/shadow/nscd-error-reporting.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c
-index 227c205..7adb58f 100644
---- a/lib/nscd.c
-+++ b/lib/nscd.c
-@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
- 		/* nscd is not installed, or it is installed but uses an
- 		   interpreter that is missing.  Probably the former. */
- 		return 0;
-+	} else if (code == 1) {
-+		/* nscd is installed, but it isn't active. */
-+		return 0;
- 	} else if (code != 0) {
--		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
-+		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
- 		                Prog, code);
- 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
- 		return -1;
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index ab56da496..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-password	required	pam_unix.so sha512 shadow nullok
diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch
deleted file mode 100644
index 5c9e946ef..000000000
--- a/testing/shadow/shadow-add-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c
---- shadow-4.1.4.2+svn3283/libmisc/copydir.c	2010-09-05 11:35:26.000000000 -0400
-+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c	2011-06-26 01:26:52.000000000 -0400
-@@ -34,6 +34,7 @@
- 
- #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $"
- 
-+#include <stdarg.h>
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch
deleted file mode 100644
index 5aba8fa01..000000000
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
---- shadow-4.1.5/src/usermod.c.orig	2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c	2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- 	struct tm *tp;
- 
- 	if (date < 0) {
--		strncpy (buf, "never", maxsize);
-+		strncpy (buf, "never", maxsize - 1);
- 	} else {
- 		time_t t = (time_t) date;
- 		tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
---- shadow-4.1.5/src/login.c.orig	2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c	2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- 			          _("%s login: "), hostn);
- 		} else {
- 			strncpy (loginprompt, _("login: "),
--			         sizeof (loginprompt));
-+			         sizeof (loginprompt) - 1);
-+			loginprompt[sizeof (loginprompt) - 1] = '\0';
- 		}
- 
- 		retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index 14384c333..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  grpck -r >/dev/null 2>&1
-  if [ $? -eq 2 ]; then
-    printf '%s\n' \
-      "==> Warning: /etc/group or /etc/gshadow are inconsistent." \
-      "    Run 'grpck' to correct this."
-  fi
-  return 0
-}
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/userdel-avoid-bad-mem-access.patch b/testing/shadow/userdel-avoid-bad-mem-access.patch
deleted file mode 100644
index 1d36562b2..000000000
--- a/testing/shadow/userdel-avoid-bad-mem-access.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: src/userdel.c
-===================================================================
---- src/userdel.c	(revision 3713)
-+++ src/userdel.c	(working copy)
-@@ -329,26 +329,33 @@
- 	}
- 
- 	if (NULL == pwd) {
-+		char gr_name[GROUP_NAME_MAX_LENGTH + 1];
-+
-+		/* make a copy of the group name before we delete it.
-+		 * we can't use ->gr_name after the group is deleted
-+		 * for logging purposes */
-+		snprintf(gr_name, GROUP_NAME_MAX_LENGTH, "%s", grp->gr_name);
-+
- 		/*
- 		 * We can remove this group, it is not the primary
- 		 * group of any remaining user.
- 		 */
--		if (gr_remove (grp->gr_name) == 0) {
-+		if (gr_remove (gr_name) == 0) {
- 			fprintf (stderr,
- 			         _("%s: cannot remove entry '%s' from %s\n"),
--			         Prog, grp->gr_name, gr_dbname ());
-+			         Prog, gr_name, gr_dbname ());
- 			fail_exit (E_GRP_UPDATE);
- 		}
- 
- #ifdef WITH_AUDIT
- 		audit_logger (AUDIT_DEL_GROUP, Prog,
- 		              "deleting group",
--		              grp->gr_name, AUDIT_NO_ID,
-+		              gr_name, AUDIT_NO_ID,
- 		              SHADOW_AUDIT_SUCCESS);
- #endif				/* WITH_AUDIT */
- 		SYSLOG ((LOG_INFO,
- 		         "removed group '%s' owned by '%s'\n",
--		         grp->gr_name, user_name));
-+		         gr_name, user_name));
- 
- #ifdef	SHADOWGRP
- 		if (sgr_locate (user_name) != NULL) {
-@@ -361,12 +368,12 @@
- #ifdef WITH_AUDIT
- 			audit_logger (AUDIT_DEL_GROUP, Prog,
- 			              "deleting shadow group",
--			              grp->gr_name, AUDIT_NO_ID,
-+			              gr_name, AUDIT_NO_ID,
- 			              SHADOW_AUDIT_SUCCESS);
- #endif				/* WITH_AUDIT */
- 			SYSLOG ((LOG_INFO,
- 			         "removed shadow group '%s' owned by '%s'\n",
--			         grp->gr_name, user_name));
-+			         gr_name, user_name));
- 
- 		}
- #endif				/* SHADOWGRP */
diff --git a/testing/shadow/write-utmp-wtmp-entries.patch b/testing/shadow/write-utmp-wtmp-entries.patch
deleted file mode 100644
index b4272ca61..000000000
--- a/testing/shadow/write-utmp-wtmp-entries.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: upstream/trunk/src/login.c
-===================================================================
---- a/src/login.c	(revision 3437)
-+++ b/src/login.c	(revision 3438)
-@@ -126,10 +126,12 @@
- static void setup_tty (void);
- static void process_flags (int argc, char *const *argv);
- static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user);
-+#ifndef USE_PAM
- static void update_utmp (const char *user,
-                          const char *tty,
-                          const char *host,
-                          /*@null@*/const struct utmp *utent);
-+#endif				/* ! USE_PAM */
- 
- #ifndef USE_PAM
- static struct faillog faillog;
-@@ -471,6 +473,7 @@
- 	return failent_user;
- }
- 
-+#ifndef USE_PAM
- /*
-  * update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and
-  *               wtmpx
-@@ -496,6 +499,7 @@
- 	free (utx);
- #endif				/* USE_UTMPX */
- }
-+#endif				/* ! USE_PAM */
- 
- /*
-  * login - create a new login session for a user
-@@ -1208,11 +1212,13 @@
- 		}
- 	}
- 
-+#ifndef USE_PAM
- 	/*
- 	 * The utmp entry needs to be updated to indicate the new status
- 	 * of the session, the new PID and SID.
- 	 */
- 	update_utmp (username, tty, hostname, utent);
-+#endif				/* ! USE_PAM */
- 
- 	/* The pwd and spwd entries for the user have been copied.
- 	 *
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index 9b871e433..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 151587 2012-02-27 18:50:38Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.21
-pkgrel=3
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('udev')
-conflicts=('util-linux-ng')
-provides=("util-linux-ng=${pkgver}")
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz
-	libmount-canonicalize-all-paths-from-fs-tab.patch
-	lib-canonicalize-always-remove-tailing-slash.patch
-	libmount-canonicalize-targets-from-fstab-on-mount-a.patch
-	mount-new-cleanup-mount-a-return-codes.patch
-	libmount-use-mount.-type-s-for-NFS-only.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  patch -p1 -i ../libmount-canonicalize-all-paths-from-fs-tab.patch
-  patch -p1 -i ../lib-canonicalize-always-remove-tailing-slash.patch
-  patch -p1 -i ../libmount-canonicalize-targets-from-fstab-on-mount-a.patch
-  patch -p1 -i ../mount-new-cleanup-mount-a-return-codes.patch 
-  patch -p1 -i ../libmount-use-mount.-type-s-for-NFS-only.patch
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --enable-write \
-              --enable-raw \
-              --disable-wall \
-              --enable-new-mount
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-
-  install -dm755 var/lib/hwclock
-
-  # delete stray empty dir, fixed upstream
-  rm -r usr/share/man/ru
-}
-md5sums=('208aa058f4117759d2939d1be7d662fc'
-         'c4011222a19b020d9b8465c3c7e443f6'
-         '8c1bf7b10e22e2b835441e6ae2d804d6'
-         '7b92423c588ed35229a9a166349c29a9'
-         'c483ab2d52609b5857d096b256a5075c'
-         'e31037773db7f3244b71db434f60e6f0')
diff --git a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch b/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch
deleted file mode 100644
index 3b830a2ad..000000000
--- a/testing/util-linux/lib-canonicalize-always-remove-tailing-slash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 28074a0952469aebf021821d95238cfb964d13ff Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 21:26:11 +0100
-Subject: [PATCH 09/12] lib/canonicalize: always remove tailing slash
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- lib/canonicalize.c |   13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/lib/canonicalize.c b/lib/canonicalize.c
-index ab32c10..fd18af4 100644
---- a/lib/canonicalize.c
-+++ b/lib/canonicalize.c
-@@ -174,9 +174,16 @@ canonicalize_path(const char *path)
- 	if (path == NULL)
- 		return NULL;
- 
--	if (!myrealpath(path, canonical, PATH_MAX+1))
--		return strdup(path);
--
-+	if (!myrealpath(path, canonical, PATH_MAX+1)) {
-+		char *res = strdup(path);
-+		if (res) {
-+			p = strrchr(res, '/');
-+			/* delete trailing slash */
-+			if (p && p > res && *(p + 1) == '\0')
-+				*p = '\0';
-+		}
-+		return res;
-+	}
- 
- 	p = strrchr(canonical, '/');
- 	if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) {
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch b/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch
deleted file mode 100644
index 05961aa35..000000000
--- a/testing/util-linux/libmount-canonicalize-all-paths-from-fs-tab.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 59e32a1f240c5f6a1d64d5e71a4a357245c34eaf Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 20:25:43 +0100
-Subject: [PATCH 07/12] libmount: canonicalize all paths from (fs)tab
-
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797216
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/tab.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 37f47bd..f10c1de 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -456,7 +456,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
- 	while(mnt_table_next_fs(tb, &itr, &fs) == 0) {
- 		char *p;
- 
--		if (!fs->target || !mnt_fs_is_swaparea(fs) ||
-+		if (!fs->target || mnt_fs_is_swaparea(fs) ||
- 		    (*fs->target == '/' && *(fs->target + 1) == '\0'))
- 		       continue;
- 
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch b/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch
deleted file mode 100644
index 46ff55260..000000000
--- a/testing/util-linux/libmount-canonicalize-targets-from-fstab-on-mount-a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6eba938376c2c870d9258ef9d7b6a3690cfa78dd Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 22:52:45 +0100
-Subject: [PATCH 11/12] libmount: canonicalize targets from fstab on mount -a
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/tab.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libmount/src/tab.c b/libmount/src/tab.c
-index 66a9e4d..21b05c7 100644
---- a/libmount/src/tab.c
-+++ b/libmount/src/tab.c
-@@ -830,8 +830,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- {
- 	char *root = NULL;
- 	struct libmnt_fs *src_fs;
--	const char *src, *tgt;
--	char *xsrc = NULL;
-+	const char *src;
-+	char *xsrc = NULL, *tgt;
- 	int flags = 0, rc = 0;
- 
- 	assert(tb);
-@@ -852,7 +852,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 		src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs),
- 					      tb->cache);
- 
--	tgt = mnt_fs_get_target(fstab_fs);
-+	tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache);
- 
- 	if (tgt && src && root) {
- 		struct libmnt_iter itr;
-@@ -870,7 +870,7 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 			 * network filesystem source paths.
- 			 */
- 			if (t && s && r &&
--			    strcmp(t, tgt) == 0 &&
-+			    streq_except_trailing_slash(t, tgt) &&
- 			    streq_except_trailing_slash(s, src) &&
- 			    strcmp(r, root) == 0)
- 				break;
-@@ -881,6 +881,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
- 
- 	if (xsrc && !tb->cache)
- 		free(xsrc);
-+	if (!tb->cache)
-+		free(tgt);
- 
- 	free(root);
- 	return rc;
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch b/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
deleted file mode 100644
index 9041ab742..000000000
--- a/testing/util-linux/libmount-use-mount.-type-s-for-NFS-only.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 27 Feb 2012 16:43:12 +0100
-Subject: [PATCH] libmount: use mount.<type> -s for NFS only
-
-Unfortunately, it seems that for example mount.cifs don't care about
-the API, so we need exception like the original mount(8).
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libmount/src/context_mount.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8cbc25b..a0c5951 100644
---- a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
- 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
- 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
- 
--		if (mnt_context_is_sloppy(cxt))
-+		/*
-+		 * TODO: remove the exception for "nfs", -s is documented
-+		 *       for years should be usable everywhere.
-+		 */
-+		if (mnt_context_is_sloppy(cxt) &&
-+		    type && startswith(type, "nfs"))
- 			args[i++] = "-s";		/* 4 */
- 		if (mnt_context_is_fake(cxt))
- 			args[i++] = "-f";		/* 5 */
--- 
-1.7.9.2
-
diff --git a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch b/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch
deleted file mode 100644
index 274246416..000000000
--- a/testing/util-linux/mount-new-cleanup-mount-a-return-codes.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 16b73aae8cb73df2974fd75c2a42ec3b92535851 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 24 Feb 2012 23:03:22 +0100
-Subject: [PATCH 12/12] mount: (new) cleanup mount -a return codes
-
-New return codes:
-
-  0 : all mounted (or all ignored)
- 64 : some mounted, some failed
- 32 : all failed
-
-Note that already mounted or ignored (filtered out by -t or -O)
-filesystems don't affect the final return code.
-
-The original mount(8) returns 0 instead of 64, so the situation
-"some mounted, some failed" cannot be detected.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/mount.8 |    4 ++++
- sys-utils/mount.c |   23 +++++++++++++++++------
- 2 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
-index f1cff74..d18881b 100644
---- a/sys-utils/mount.8
-+++ b/sys-utils/mount.8
-@@ -2759,6 +2759,10 @@ mount failure
- .TP
- .BR 64
- some mount succeeded
-+.RE
-+
-+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some
-+failed, some success).
- 
- .SH NOTES
- The syntax of external mount helpers is:
-diff --git a/sys-utils/mount.c b/sys-utils/mount.c
-index 17991b0..3fbac04 100644
---- a/sys-utils/mount.c
-+++ b/sys-utils/mount.c
-@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt)
- 	struct libmnt_fs *fs;
- 	int mntrc, ignored, rc = MOUNT_EX_SUCCESS;
- 
-+	int nsucc = 0, nerrs = 0;
-+
- 	itr = mnt_new_iter(MNT_ITER_FORWARD);
- 	if (!itr) {
- 		warn(_("failed to initialize libmount iterator"));
-@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt)
- 				printf(ignored == 1 ? _("%-25s: ignored\n") :
- 						      _("%-25s: already mounted\n"),
- 						tgt);
--
- 		} else if (mnt_context_is_fork(cxt)) {
- 			if (mnt_context_is_verbose(cxt))
- 				printf("%-25s: mount successfully forked\n", tgt);
- 		} else {
--			rc |= mk_exit_code(cxt, mntrc);
-+			mk_exit_code(cxt, mntrc);	/* to print warnings */
- 
- 			if (mnt_context_get_status(cxt)) {
--				rc |= MOUNT_EX_SOMEOK;
-+				nsucc++;
- 
- 				if (mnt_context_is_verbose(cxt))
- 					printf("%-25s: successfully mounted\n", tgt);
--			}
-+			} else
-+				nerrs++;
- 		}
- 	}
- 
- 	if (mnt_context_is_parent(cxt)) {
- 		/* wait for mount --fork children */
--		int nerrs = 0, nchildren = 0;
-+		int nchildren = 0;
-+
-+		nerrs = 0, nsucc = 0;
- 
- 		rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs);
- 		if (!rc && nchildren)
--			rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK;
-+			nsucc = nchildren - nerrs;
- 	}
- 
-+	if (nerrs == 0)
-+		rc = MOUNT_EX_SUCCESS;		/* all success */
-+	else if (nsucc == 0)
-+		rc = MOUNT_EX_FAIL;		/* all failed */
-+	else
-+		rc = MOUNT_EX_SOMEOK;		/* some success, some failed */
-+
- 	mnt_free_iter(itr);
- 	return rc;
- }
--- 
-1.7.9.2
-
diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD
deleted file mode 100644
index 2e125cbee..000000000
--- a/testing/ypserv/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 151498 2012-02-26 19:05:20Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypserv
-pkgver=2.27
-pkgrel=1
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils')
-optdepends=('gawk: for printcap support')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	confpost.patch
-        'yppasswd'
-        'ypserv')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
-	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
-}
-md5sums=('fd9c43aec932a92be07b723c647b02a4'
-         '8acb314f30d6e531ac9efa8655f68ccb'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/testing/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/testing/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/testing/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
author	Michał Masłowski <mtjm@mtjm.eu>	2012-03-02 18:53:10 +0100
committer	Michał Masłowski <mtjm@mtjm.eu>	2012-03-02 18:53:10 +0100
commit	588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch)
tree	a62b104d7b70d82767fbde6aeb782b1359302459 /testing
parent	9ea487ed90ebf891571ea8fffd34c154cbf981df (diff)
parent	b479098a1b8d7cb545339cb225a7cde4988b2748 (diff)