diff options
Diffstat (limited to 'sys-apps')
177 files changed, 0 insertions, 10079 deletions
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest deleted file mode 100644 index 22e84ec3..00000000 --- a/sys-apps/attr/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX attr-2.4.44-gettext.patch 1577 SHA256 d8e4948b48f657b174f642cf29b0830094d16ffae837149fc30c923afd06ddd4 SHA512 32db6077d3e05a225d18e40b44abe2fa83f0309131f61726c8fe221c6ae5270b524c4d36932161671b82b987fe1344d43c6492734b145018a0d9a147abf67e3d WHIRLPOOL b247a5a9aeba48de310498920c0c14f71b0dab7a2c4c94bba436f73ee03568c655588d1832bbbf3a1ef509099f4714ed2f2e51ee1b8cf5f44d1f3397740166fc -AUX attr-2.4.46-config-shell.patch 1497 SHA256 8e04776ea64be0a6a7bd39790c66df75cf9e51495fe7a1b895c16de6ca6f110c SHA512 378d58eaf662c9acfaea16faa64cfd65a5ff1b265e9abc79c758104146664eb346e205a3065067e27ae63b39f9b816990fef7e2f99a7e3c5cb1699bd4e37136c WHIRLPOOL f3efb1e737111c551bbb0eb7f7a683f3b0aaabb3ee5162311cf3439be2f8d39149e32a638b2ac5c4c77f1b6b46da1a4ad71d998be26e82e398d9d5306e50bd88 -AUX attr-2.4.46-generic-syscalls.patch 5977 SHA256 9fc575b72bce0927c52cd18c9b9aee50c32962aa20598097935c607e5b563b28 SHA512 8dd9f6e44c5862c77058a220ca4557dab5aa1af6ce8aee872567ee235f21b8bd147941e727880c6e0c84aa948a3eaaa6ee9a88880fcfb760fe59207d09bed308 WHIRLPOOL 3883aebc6392248a4eb152f847aacedb7b76cefb0c6e971f2b54ddb02d9184866768e55380146a0b46611a8dad6949b82df7cebcbcca2d04a60635c53a85b023 -AUX attr-2.4.46-ifdef_cplusplus.patch 746 SHA256 5642592689dbbd7547514a9d76ae69adb81d81c205dc6c7671ea94c4ddd99641 SHA512 36a3fd04e006877cdb6c3185a12b3239f1cef307420f9df43074852cf9a3979976144df12a966323f32c298e6901b137b2d030e8dd04f9227016829453543b17 WHIRLPOOL 00ef7704488e1953fe833798c573cdf037f3eb16d4fbbc2ca92e818e2f52fb95f627cccf1f9093578602ee0ef8902374d1dd03062e1ee6d21873b48c97aa60ca -DIST attr-2.4.46.src.tar.gz 338181 SHA256 dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f SHA512 f1b8e6e4d1aa9f5c1b51d5d08684c9fdfa4b7d22efc1a77c13e4d5f0ae8e053bbb3d49a1c1e3c4143f63c9752ed534a2d009e0ab49cea880032620edbe8fdbb5 WHIRLPOOL 300f3be50a015f2d6d44a4707c31a312015c308899acdf146dfbbdb373336f5de7696f4832dba9543abd9cdfceccd84ef602d672fb88a125210e2622a13cf8fa -DIST attr-2.4.47.src.tar.gz 343692 SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 WHIRLPOOL a012f7a0225e63d4d195fae7027e64c0c92edb039622bfdec611b2facbcde83eb5fc921ecfe95c50f54f7c9b518f57a0555dcedc148cc8ff6e73371668a40557 -EBUILD attr-2.4.46-r99.ebuild 1566 SHA256 d5be60eeda3480eef7d27cada97a1bc912c79aac155cefe8bbb9383965a90503 SHA512 da61738bbf71ab337c08e9094b5c2825154a0a2ccd1bfe5686c28a12be4d2943773b03936973d05f9d9c9ac5601450ef5bc91afb52b8d70b1ae2931a81ed2522 WHIRLPOOL 36aa49202378a92930284cdab4d98c66b9d2b683561cf0f3f46245010020144cf8f7f68fc6e40f48327669baac57b8d1b8f3f7607c27c4722736737df19f907f -EBUILD attr-2.4.47-r99.ebuild 1869 SHA256 e3f06c40d987c5a0111dc32f87ca3b5f61162e38266ab72c95d03cf5c9ea69bb SHA512 299ee7104a75d5edf086017f471a7cd69224e36dbf5b1ef2cb57743a7260163f3ec38835007fadfe5cd33ce463e1b3568baf5a3d21d336cec35d594ef607fea8 WHIRLPOOL 050be6291794309d26987def58c449be9482d656ded63d3f98c6d8cb1895f10d8809e5606b34b1a8a5d037231c2046896a18c29326ba49fc2de46d56f3f10b76 -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sys-apps/attr/attr-2.4.46-r99.ebuild b/sys-apps/attr/attr-2.4.46-r99.ebuild deleted file mode 100644 index c38d860e..00000000 --- a/sys-apps/attr/attr-2.4.46-r99.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.46-r2.ebuild,v 1.13 2014/01/17 04:23:10 vapier Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Extended attributes tools" -HOMEPAGE="http://savannah.nongnu.org/projects/attr" -SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="nls static-libs" - -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/autoconf" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.4.44-gettext.patch - epatch "${FILESDIR}"/${PN}-2.4.46-config-shell.patch #366671 - epatch "${FILESDIR}"/${PN}-2.4.46-generic-syscalls.patch #460702 - epatch "${FILESDIR}"/${PN}-2.4.46-ifdef_cplusplus.patch - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in \ - || die "failed to update builddefs" - strip-linguas -u po -} - -src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - $(use_enable nls gettext) \ - --enable-shared $(use_enable static-libs static) \ - --libexecdir="${EPREFIX}"/usr/$(get_libdir) \ - --bindir="${EPREFIX}"/bin -} - -src_install() { - emake DIST_ROOT="${D}" install install-lib install-dev || die - use static-libs || find "${D}" -name '*.la' -delete - # the man-pages packages provides the man2 files - rm -r "${ED}"/usr/share/man/man2 - - # we install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr -} diff --git a/sys-apps/attr/attr-2.4.47-r99.ebuild b/sys-apps/attr/attr-2.4.47-r99.ebuild deleted file mode 100644 index ccd15580..00000000 --- a/sys-apps/attr/attr-2.4.47-r99.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.9 2014/02/15 18:41:59 nimiux Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs multilib-minimal - -DESCRIPTION="Extended attributes tools" -HOMEPAGE="http://savannah.nongnu.org/projects/attr" -SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="nls static-libs" - -DEPEND="nls? ( sys-devel/gettext ) - sys-devel/autoconf" -RDEPEND="abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.4.46-ifdef_cplusplus.patch - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ - include/builddefs.in \ - || die - strip-linguas -u po - multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736 -} - -multilib_src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - econf \ - $(use_enable nls gettext) \ - --enable-shared $(use_enable static-libs static) \ - --libexecdir="${EPREFIX}"/usr/$(get_libdir) \ - --bindir="${EPREFIX}"/bin -} - -multilib_src_compile() { - emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=) -} - -multilib_src_install() { - emake \ - $(multilib_is_native_abi || echo TOOL_SUBDIRS=) \ - DIST_ROOT="${D}" \ - install install-lib install-dev - - if multilib_is_native_abi; then - # we install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - # the man-pages packages provides the man2 files - # note: man-pages are installed by TOOL_SUBDIRS - rm -r "${ED}"/usr/share/man/man2 || die - fi -} - -multilib_src_install_all() { - use static-libs || prune_libtool_files --all - einstalldocs -} diff --git a/sys-apps/attr/files/attr-2.4.44-gettext.patch b/sys-apps/attr/files/attr-2.4.44-gettext.patch deleted file mode 100644 index 49c2d32b..00000000 --- a/sys-apps/attr/files/attr-2.4.44-gettext.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- include/gettext.h -+++ include/gettext.h -@@ -0,0 +1,10 @@ -+#include <config.h> -+#ifdef ENABLE_GETTEXT -+# include <libintl.h> -+# define _(x) gettext(x) -+#else -+# define _(x) (x) -+# define textdomain(d) do { } while (0) -+# define bindtextdomain(d,dir) do { } while (0) -+#endif -+#include <locale.h> ---- attr/attr.c -+++ attr/attr.c -@@ -26,6 +26,7 @@ - #include <errno.h> - #include <string.h> - #include <locale.h> -+#include "gettext.h" - - #include <attr/attributes.h> - #include "config.h" ---- libattr/attr_copy_file.c.orig 2007-09-20 02:51:37.000000000 -0400 -+++ libattr/attr_copy_file.c 2007-09-20 02:51:51.000000000 -0400 -@@ -19,6 +19,7 @@ - - #if defined (HAVE_CONFIG_H) - #include "config.h" -+#include "gettext.h" - #endif - - #include <sys/types.h> ---- libattr/attr_copy_fd.c.orig 2007-09-20 02:52:23.000000000 -0400 -+++ libattr/attr_copy_fd.c 2007-09-20 02:52:31.000000000 -0400 -@@ -19,6 +19,7 @@ - - #if defined (HAVE_CONFIG_H) - #include "config.h" -+#include "gettext.h" - #endif - - #include <sys/types.h> ---- getfattr/getfattr.c.orig 2007-09-20 02:52:49.000000000 -0400 -+++ getfattr/getfattr.c 2007-09-20 02:52:59.000000000 -0400 -@@ -30,6 +30,7 @@ - #include <regex.h> - #include <ftw.h> - #include <locale.h> -+#include "gettext.h" - - #include <attr/xattr.h> - #include "config.h" ---- setfattr/setfattr.c.orig 2007-09-20 02:53:12.000000000 -0400 -+++ setfattr/setfattr.c 2007-09-20 02:53:20.000000000 -0400 -@@ -28,6 +28,7 @@ - #include <getopt.h> - #include <locale.h> - #include <ctype.h> -+#include "gettext.h" - - #include <attr/xattr.h> - #include "config.h" diff --git a/sys-apps/attr/files/attr-2.4.46-config-shell.patch b/sys-apps/attr/files/attr-2.4.46-config-shell.patch deleted file mode 100644 index b6660e63..00000000 --- a/sys-apps/attr/files/attr-2.4.46-config-shell.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://bugs.gentoo.org/366671 - -From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 16 May 2011 01:59:52 -0400 -Subject: [PATCH] use SHELL from configure - -If /bin/sh is not a functional enough shell, configure will select a -SHELL of /bin/bash or better. But the current build helpers always -hardcode /bin/sh, so if libtool itself configures itself for /bin/bash, -things will fail when it attempts to do: - SHELL = /bin/sh - LIBTOOL = $(SHELL) .../libtool - ... - eval: 1: base_compile+= -pipe: not found - ... - -So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let -configure find a good value for us. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - include/builddefs.in | 1 + - include/buildmacros | 1 - - 2 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/builddefs.in b/include/builddefs.in -index d054a56..434ce95 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -46,6 +46,7 @@ MAKE = @make@ - ECHO = @echo@ - SORT = @sort@ - LN_S = @LN_S@ -+SHELL = @SHELL@ - LIBTOOL = @LIBTOOL@ - MAKEDEPEND = @makedepend@ - -diff --git a/include/buildmacros b/include/buildmacros -index ab89182..8efb32e 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \ - - INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) - --SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images - DIST_DIR = $(TOPDIR)/dist - --- -1.7.5.rc3 - diff --git a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch b/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch deleted file mode 100644 index d12fcd29..00000000 --- a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch +++ /dev/null @@ -1,180 +0,0 @@ -http://lists.nongnu.org/archive/html/acl-devel/2012-12/msg00000.html -https://bugs.gentoo.org/460702 - ---- a/libattr/syscalls.c -+++ b/libattr/syscalls.c -@@ -23,172 +23,10 @@ - - #include <errno.h> - #include <unistd.h> -+#include <sys/syscall.h> - --#if defined (__i386__) -+#if defined (__NR_setxattr) - # define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 226 --# define __NR_lsetxattr 227 --# define __NR_fsetxattr 228 --# define __NR_getxattr 229 --# define __NR_lgetxattr 230 --# define __NR_fgetxattr 231 --# define __NR_listxattr 232 --# define __NR_llistxattr 233 --# define __NR_flistxattr 234 --# define __NR_removexattr 235 --# define __NR_lremovexattr 236 --# define __NR_fremovexattr 237 --#elif defined (__sparc__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 169 --# define __NR_lsetxattr 170 --# define __NR_fsetxattr 171 --# define __NR_getxattr 172 --# define __NR_lgetxattr 173 --# define __NR_fgetxattr 177 --# define __NR_listxattr 178 --# define __NR_llistxattr 179 --# define __NR_flistxattr 180 --# define __NR_removexattr 181 --# define __NR_lremovexattr 182 --# define __NR_fremovexattr 186 --#elif defined (__ia64__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 1217 --# define __NR_lsetxattr 1218 --# define __NR_fsetxattr 1219 --# define __NR_getxattr 1220 --# define __NR_lgetxattr 1221 --# define __NR_fgetxattr 1222 --# define __NR_listxattr 1223 --# define __NR_llistxattr 1224 --# define __NR_flistxattr 1225 --# define __NR_removexattr 1226 --# define __NR_lremovexattr 1227 --# define __NR_fremovexattr 1228 --#elif defined (__powerpc__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 209 --# define __NR_lsetxattr 210 --# define __NR_fsetxattr 211 --# define __NR_getxattr 212 --# define __NR_lgetxattr 213 --# define __NR_fgetxattr 214 --# define __NR_listxattr 215 --# define __NR_llistxattr 216 --# define __NR_flistxattr 217 --# define __NR_removexattr 218 --# define __NR_lremovexattr 219 --# define __NR_fremovexattr 220 --#elif defined (__x86_64__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 188 --# define __NR_lsetxattr 189 --# define __NR_fsetxattr 190 --# define __NR_getxattr 191 --# define __NR_lgetxattr 192 --# define __NR_fgetxattr 193 --# define __NR_listxattr 194 --# define __NR_llistxattr 195 --# define __NR_flistxattr 196 --# define __NR_removexattr 197 --# define __NR_lremovexattr 198 --# define __NR_fremovexattr 199 --#elif defined (__s390__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 224 --# define __NR_lsetxattr 225 --# define __NR_fsetxattr 226 --# define __NR_getxattr 227 --# define __NR_lgetxattr 228 --# define __NR_fgetxattr 229 --# define __NR_listxattr 230 --# define __NR_llistxattr 231 --# define __NR_flistxattr 232 --# define __NR_removexattr 233 --# define __NR_lremovexattr 234 --# define __NR_fremovexattr 235 --#elif defined (__arm__) --# define HAVE_XATTR_SYSCALLS 1 --# if defined(__ARM_EABI__) || defined(__thumb__) --# define __NR_SYSCALL_BASE 0 --# else --# define __NR_SYSCALL_BASE 0x900000 --# endif --# define __NR_setxattr (__NR_SYSCALL_BASE+226) --# define __NR_lsetxattr (__NR_SYSCALL_BASE+227) --# define __NR_fsetxattr (__NR_SYSCALL_BASE+228) --# define __NR_getxattr (__NR_SYSCALL_BASE+229) --# define __NR_lgetxattr (__NR_SYSCALL_BASE+230) --# define __NR_fgetxattr (__NR_SYSCALL_BASE+231) --# define __NR_listxattr (__NR_SYSCALL_BASE+232) --# define __NR_llistxattr (__NR_SYSCALL_BASE+233) --# define __NR_flistxattr (__NR_SYSCALL_BASE+234) --# define __NR_removexattr (__NR_SYSCALL_BASE+235) --# define __NR_lremovexattr (__NR_SYSCALL_BASE+236) --# define __NR_fremovexattr (__NR_SYSCALL_BASE+237) --#elif defined (__mips64) --# define HAVE_XATTR_SYSCALLS 1 --# ifdef __LP64__ /* mips64 using n64 ABI */ --# define __NR_Linux 5000 --# else /* mips64 using n32 ABI */ --# define __NR_Linux 6000 --# endif --# define __NR_setxattr (__NR_Linux + 180) --# define __NR_lsetxattr (__NR_Linux + 181) --# define __NR_fsetxattr (__NR_Linux + 182) --# define __NR_getxattr (__NR_Linux + 183) --# define __NR_lgetxattr (__NR_Linux + 184) --# define __NR_fgetxattr (__NR_Linux + 185) --# define __NR_listxattr (__NR_Linux + 186) --# define __NR_llistxattr (__NR_Linux + 187) --# define __NR_flistxattr (__NR_Linux + 188) --# define __NR_removexattr (__NR_Linux + 189) --# define __NR_lremovexattr (__NR_Linux + 190) --# define __NR_fremovexattr (__NR_Linux + 191) --#elif defined (__mips__) /* mips32, or mips64 using o32 ABI */ --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_Linux 4000 --# define __NR_setxattr (__NR_Linux + 224) --# define __NR_lsetxattr (__NR_Linux + 225) --# define __NR_fsetxattr (__NR_Linux + 226) --# define __NR_getxattr (__NR_Linux + 227) --# define __NR_lgetxattr (__NR_Linux + 228) --# define __NR_fgetxattr (__NR_Linux + 229) --# define __NR_listxattr (__NR_Linux + 230) --# define __NR_llistxattr (__NR_Linux + 231) --# define __NR_flistxattr (__NR_Linux + 232) --# define __NR_removexattr (__NR_Linux + 233) --# define __NR_lremovexattr (__NR_Linux + 234) --# define __NR_fremovexattr (__NR_Linux + 235) --#elif defined (__alpha__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 382 --# define __NR_lsetxattr 383 --# define __NR_fsetxattr 384 --# define __NR_getxattr 385 --# define __NR_lgetxattr 386 --# define __NR_fgetxattr 387 --# define __NR_listxattr 388 --# define __NR_llistxattr 389 --# define __NR_flistxattr 390 --# define __NR_removexattr 391 --# define __NR_lremovexattr 392 --# define __NR_fremovexattr 393 --#elif defined (__mc68000__) --# define HAVE_XATTR_SYSCALLS 1 --# define __NR_setxattr 223 --# define __NR_lsetxattr 224 --# define __NR_fsetxattr 225 --# define __NR_getxattr 226 --# define __NR_lgetxattr 227 --# define __NR_fgetxattr 228 --# define __NR_listxattr 229 --# define __NR_llistxattr 230 --# define __NR_flistxattr 231 --# define __NR_removexattr 232 --# define __NR_lremovexattr 233 --# define __NR_fremovexattr 234 - #else - # warning "Extended attribute syscalls undefined for this architecture" - # define HAVE_XATTR_SYSCALLS 0 diff --git a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch b/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch deleted file mode 100644 index 7b01afe3..00000000 --- a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur attr-2.4.46.orig/include/xattr.h attr-2.4.46/include/xattr.h ---- attr-2.4.46.orig/include/xattr.h 2014-01-21 22:14:56.418790180 +0000 -+++ attr-2.4.46/include/xattr.h 2014-01-21 22:14:19.626788123 +0000 -@@ -31,7 +31,11 @@ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - - -+#ifdef __cpluplus - __BEGIN_DECLS -+#else -+#define __THROW -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +62,8 @@ - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - -+#ifdef __cpluplus - __END_DECLS -+#endif - - #endif /* __XATTR_H__ */ diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml deleted file mode 100644 index 96a2d586..00000000 --- a/sys-apps/attr/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest deleted file mode 100644 index cb75bf55..00000000 --- a/sys-apps/busybox/Manifest +++ /dev/null @@ -1,37 +0,0 @@ -AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8 -AUX busybox-1.21.0-ifconfig.patch 281 SHA256 81a8ea4471d2d0c6b925878b7276ad9837d2d3fda2db0669a4934c63f8d42c43 SHA512 5a1d6a20a349562cc217663aea91c494703725f80e46a4fcf81bff2ed6940a4080f2008b9216f73b75c80c7408f933743d6b783da5b780b5731475dace85832f WHIRLPOOL d1f0219f407acdf131a33db01c0fb74dfd42d56e180feb7c549fb2867b4483e6255ab0bb9651f35f4446bd9159167b33086e5599a2e4b88f52a79821c6401a48 -AUX busybox-1.21.0-iplink.patch 401 SHA256 f3ef2c9294c83860fd1dbd10cd40347118b96d42e60a4a8cb12d76a19215ceb0 SHA512 45a13ca6749771319414090a86fa15644e57062641cdaf7b908136125aad6cb25628c85830b150392debb87992f386ece9ea3a730eee72a5e5727655429f451b WHIRLPOOL 64cf91527c39f0dd3fb8d2bf35df6c82d0d470a00aa98c3d680d7fb63a986885f6f834785d27afda7131a8fa46381a285be57b5ef7d22a4691b459dcf330e994 -AUX busybox-1.21.0-mdev.patch 1173 SHA256 911371ceff8c6a899323cda8d63a20b5f98d503681e5617b2448b555c4fecc61 SHA512 490a9a85d6df17e0111ad86f420207fed1b699b3b4e9ebe8d6700d4ce33ab3de0e0137dba1326efb5011dbcd53c769448ddab855995c896135ed6adbe61d2e44 WHIRLPOOL 2a302d310a6e82f3aa1c878a14fc4d2b1644d4e724aae1e25c1390cbd3852d252a38c76fd38fc79ee4b08d8f83aa2a442963955fe49486a28c060d1d4b6edc47 -AUX busybox-1.21.0-platform.patch 1227 SHA256 ee7b96577330a68598d4ec48ce94f6eca3079c32a86cca32f3bb6cc28d467654 SHA512 595e1081dcc9f2dca714066c1f59659d7c7e3f702df937c138ff60cf9af42272b71ac354521c3abd26ac406eb07a710c14c4f94e62a293edcd6473ba1fd53675 WHIRLPOOL d18661bccd8f43bc4fcb492013a647480ff4e0e88a1ac8ea9a1a3f176193363bfbd7777589b2796ccdf92315cd80a5d6999a321dafc441f4939546d6272002eb -AUX busybox-1.21.0-xz.patch 2647 SHA256 c807f73718e836a81ee74987306c72297ddba209038240f81fab96b4a28b73b4 SHA512 696dd31a73bbd919435a3ee1b8cd05769e6c3a45e853e3e052a22b7290bf332cd3b7e17e394911864b3c7ed7f9eea604dfbd7a5c43f0eb1e65b257d679fcccd3 WHIRLPOOL a3be95e60602374daff1629c38556f93b2342d81939afda86613f5fb0af0f7b600656118712ac33237cba230369f622a18502347e1dad0aa3570dc1d0a1725f1 -AUX busybox-1.22.1-ash.patch 344 SHA256 c3b5b5c5522fda8014b12a23c370d7f70f6d1625fefa93a62c5c14414528ad12 SHA512 297736a2b41badba50a64881e20778e05c9df5f6fed5cbe45cf8c5a31e5486a5fe85ce00897c2ef0c60787cc33467f03fc586f39945f513a7caeaea57aafc8d7 WHIRLPOOL bea756e5335b2ebcabb487b9a4f64e1aae0cf9a4652ed3bbab5232b31fb5730cdb726a152f1ef494aaaacc251a24a30c40bc89485d2b008eb56290f88008ea4e -AUX busybox-1.22.1-date.patch 1008 SHA256 8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8 SHA512 0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34 WHIRLPOOL 58b93b0553e81f98c49503bfec33f473c1a7cde2ca3110e96c0d80f45d458c98b5cea1528637b4d9bbbb3df4de6e074446d43cbeeee285cec3ea52a352c374d2 -AUX busybox-1.22.1-iplink.patch 425 SHA256 186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b SHA512 f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889 WHIRLPOOL c87b1c0dafab79fd707ec22d7540de939595d3fb6665df2c20e22059b4c675fab1d5f81353230e1a172a9fc618c766db32c8e0c35913f160a06224cd13de47a5 -AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92 -AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a -AUX klogd.initd 359 SHA256 ef607b72d270797e4be1fba425c23ba26078633c47c698063bd4b17e7b4ff8c3 SHA512 e9d6215e4b0dcc4fbb507ce2bb84c818ad18951282c47c98b0c98b3fa58e6b28218f608689a7786cb0447673ae1f5c3ba5767f9b29cffd73325d93bf2a928ac9 WHIRLPOOL d7e82a0d2a6a60b2444a3b212022250297ca163001045bf508442972fc6330c4eea55cb965920778e090c92a69441e864e6721f02ecc6d10279b6196b14f7e71 -AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea -AUX mdev.initd 978 SHA256 a7126916ba17b6d0c12dd9a0428e5ca27c229856cca0a497ddd12de33d345f68 SHA512 280d9004520acc7c23a8e68e4fa8516de99c5389b4c6ee1cbb7cd17bc328a029b6d56aefc35a2062fcdea76c27a7229b3bec8fc28043bbc04f6f84dc0aaaa706 WHIRLPOOL a3a3607536b62414eedfeb4ce2b5c22ff864309e50b7eb4a9a4f3c59d4808596541071f3fb7664202336b542fb89b0234ba3f43bee460175c17d804d50ad45d1 -AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320 -AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76 -AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de SHA512 ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a WHIRLPOOL ec24a4afe8333e2d4d856fe3853b844d113057daf3fe536a4c8ef481a5ec925254c7daeb09df378922fabb96400440f4bde40979417b7c35467934d7e2235739 -AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852 -AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38 -AUX mdev/usbdisk_link 984 SHA256 c72cdf4bfde9a8f8334a9d6bfce2a468c926a5530532b8a16a13a63d798abeb3 SHA512 05bc589f067cf988f97f10def3c05e139ac4f4ebe045bdb4c2f5453f5e672bf61d3dc1636974c5680c8c9cf22498bee9cfa28a8f4a264d9f5b10a72a9da0ca16 WHIRLPOOL 03f71c6ce87ea19d9b78615e06adbb5ad73e05b2e3dd69d28092df5e961aea2d06db6c97389d000d20b42b0df241a5e8a7f23056d0f40c5cde0557ce7fdf1fcc -AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c -AUX ntpd.initd 372 SHA256 66266f86f65a5095bdbcba4d8ec5893b086849e4dcf43dab81b2bcc5970f8e35 SHA512 4daec8c17e2d89abc386178ac172092b682b46d74dbb43c20bc9d0723bede720bc7dc5e90c24b33c6a7344d58f0ef43aab2fc331343ba12e69ff5446ac2a1345 WHIRLPOOL 4e92d44c95ae93622c838b4e0221e3d201983b649a50fe6ffceaab020aad7ec88024f66c9d9cbe044345af48bed81a1b985a8ed00df79bdf08045f9394add4b9 -AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae -AUX syslogd.initd 383 SHA256 b66e709317513b79139d5441c712839e271ff5177a3d743b86e39f70906fe2ee SHA512 b6bd8b7cb990c7c9c242baf4b3d20b3351e6ca0054b6d231787540b318ea9ac2332ac97ae4b56d07d2cf9ae52fb9c1644dede47bbfdd9f8bc7727bcfd0da8ed7 WHIRLPOOL 4b7a3e4ad7cc9e07853cc0e43b8f15aa0cb71642afeee89392190ba75d547e156ec4b790f8e35e56851bae01ff3965ef36e9160bf61aae95376c9fa2189f11a7 -AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767 -AUX watchdog.initd 334 SHA256 ae335a9540d282277d0a127673efff279177a1bb643e98afd772eef9423fe79f SHA512 e915a2b5567b1cfe5423b00ca984c37dea4afd72bc3b7a550858f7140dc18283831bb9cfeeb564ced2669706cf747f3934fd339f9e93d456b229b03781ac9303 WHIRLPOOL c57eaf47d0501394f2f08a6b6f09529f91fd34f3d5027f6e159573ea8c5321a88c2cb01511971d15f8b25c9a44693c88e340ee35949c4cdab49d7fbbbe064c22 -DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3 -DIST busybox-1.22.1.tar.bz2 2218650 SHA256 ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 WHIRLPOOL 8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8 -DIST busybox-1.23.0.tar.bz2 2253001 SHA256 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 SHA512 02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72 WHIRLPOOL 01d68487d4d3cff4fb807970446f42db1dec3309fdd3fb0402f138eee28dc0885dba324b5b12b417effd4fad87581a32da09a0e9f7c050377025a52ecce2308b -DIST busybox-1.23.1.tar.bz2 2252635 SHA256 300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512 60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362 WHIRLPOOL 7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99 -DIST busybox-1.23.2.tar.bz2 2252786 SHA256 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512 209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9 WHIRLPOOL a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2 -EBUILD busybox-1.21.0-r99.ebuild 8588 SHA256 f7e1429315ca4ce61ef7d64f4661531c27f41d2b59692ca99ea7172a97d0f4e3 SHA512 c511aa8f5b8760fad79afde3fec71bbe3c32b5786750fe20c8448af88b96ba99b24f7a949947dbf9a9e9daf2b65a70d5a8a4be24a33ac88d096eca5743979ed3 WHIRLPOOL 7598961b898f6cef190e1419772955bdb036dace22aa48947adfa665e1f0052b949c429001c4495b46e576acf8e5681dd5ffeae0074701238a216a8d9670668d -EBUILD busybox-1.22.1-r99.ebuild 8594 SHA256 fa0e6eee8c7759c8ac82355df9702132ccbec39dc38fb62cd8f211ac1bc10928 SHA512 67a43091a833dfe6b35f58d25028206ec69acbf5a395ff43087881af49fb66c96ed693995aa13855c5b333826dbf6acdf4b666b3b008c0f873874a3d3140e09f WHIRLPOOL e3cb3d0fd69ecb53ff140332b896351a13b037a57bfb1d05c1f714c4918eb47194339b3cb9e3543bf95ba21374b0775df87a090a6303027099b8a8c92c28805c -EBUILD busybox-1.23.0-r99.ebuild 8650 SHA256 842aad5a812f0442db537949e3aecec3a0ad18624bf7d5c8a2e8f7b197f2aca5 SHA512 625783b4b3d9c18d7e84389c6d405ae2e3a81a049c686fa9fae54a02a6fb468bbacdd6b9930d64be35bd32e3aa81d0a149d195b3941269b55f9864c446a0af82 WHIRLPOOL e5937cc929f06cee0df09742bef8374b4c5da3006d862dabcbcf32cdee55df5e26547e5fcad3075645dba32619021678c550560d386a18e31dd3bbdd3d8bb628 -EBUILD busybox-1.23.1-r99.ebuild 8787 SHA256 97a1ae68fbf5ba706133b5762aaa0e0058a82910cdd5af6ec18a04d0b682490b SHA512 033a6ae2c843bfcd1797688d2bd3ef3e95f7236e2a9299e7cdce832ca4cc4bc7d1b0bfade57c476d5d9a574af59dd5f19a3feac148d3407ab61eab18b34356f7 WHIRLPOOL 6f4d6404a8ea710e303d33e71bf511992f3a51573eef40f1401f6220a5ba6e09f5f4ef8c84f8a0b219007f4cd8e64a7e8cca57bd90a8c0ecffce68c10098cdab -EBUILD busybox-1.23.2-r99.ebuild 8787 SHA256 ead09859c4cfbb4c6a5ad0d7806f59382e59cfe51e85bf9053beed4920b40400 SHA512 a3fa1fc0dea7f6145374153f92891711a68d800409adfdb7e06dff45201505331da7c2d35513ddc0a4b71393127abd3782863eb3b2077c5d14a5bd9279342a82 WHIRLPOOL dbb5ea28bd7780028ad60331801351f6507aba9788ab5b021a6bb75cd179a58a6273abfd77cd64506fca3b89d348253636169182461364575dbc8fd18fca5e8e -MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388 diff --git a/sys-apps/busybox/busybox-1.21.0-r99.ebuild b/sys-apps/busybox/busybox-1.21.0-r99.ebuild deleted file mode 100644 index dab62580..00000000 --- a/sys-apps/busybox/busybox-1.21.0-r99.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.21 2013/09/14 10:38:45 ago Exp $ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # turn off some options causing trouble with musl - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - busybox_config_option n IFPLUGD - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.22.1-r99.ebuild b/sys-apps/busybox/busybox-1.22.1-r99.ebuild deleted file mode 100644 index da1fea12..00000000 --- a/sys-apps/busybox/busybox-1.22.1-r99.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1.ebuild,v 1.2 2014/02/02 08:17:37 vapier Exp $ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 oldconfig > /dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 allyesconfig > /dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # turn off some options causing trouble with musl - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - busybox_config_option n IFPLUGD - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.rc.1 mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.23.0-r99.ebuild b/sys-apps/busybox/busybox-1.23.0-r99.ebuild deleted file mode 100644 index cdc38d18..00000000 --- a/sys-apps/busybox/busybox-1.23.0-r99.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.0.ebuild,v 1.4 2015/01/17 03:11:56 zlogene Exp $ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !<sys-apps/openrc-0.13 )" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch -# epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s defconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # causes trouble with musl - busybox_config_option n IFPLUGD - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.23.1-r99.ebuild b/sys-apps/busybox/busybox-1.23.1-r99.ebuild deleted file mode 100644 index 14887a0c..00000000 --- a/sys-apps/busybox/busybox-1.23.1-r99.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1-r1.ebuild,v 1.3 2015/02/08 22:35:39 blueness Exp $ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !<sys-apps/openrc-0.13 )" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch -# epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n START_STOP_DAEMON - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # causes trouble with musl - busybox_config_option n IFPLUGD - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/busybox-1.23.2-r99.ebuild b/sys-apps/busybox/busybox-1.23.2-r99.ebuild deleted file mode 100644 index 98f537d7..00000000 --- a/sys-apps/busybox/busybox-1.23.2-r99.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1-r1.ebuild,v 1.3 2015/02/08 22:35:39 blueness Exp $ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ ${PV} == "9999" ]] ; then - MY_P=${PN} - EGIT_REPO_URI="git://busybox.net/busybox.git" - inherit git-2 -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !<sys-apps/openrc-0.13 )" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) - shift - done -} - -busybox_config_enabled() { - local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config) - case ${val} in - "") return 1 ;; - y) return 0 ;; - *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;; - esac -} - -src_prepare() { - unset KBUILD_OUTPUT #88088 - append-flags -fno-strict-aliasing #310413 - use ppc64 && append-flags -mminimal-toc #130943 - - # patches go here! - epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - #epatch "${FILESDIR}"/${P}-*.patch - cp "${FILESDIR}"/ginit.c init/ || die - - # flag cleanup - sed -i -r \ - -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ - Makefile.flags || die - #sed -i '/bbsh/s:^//::' include/applets.h - sed -i '/^#error Aborting compilation./d' applets/applets.c || die - use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile - sed -i \ - -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ - -e "/^AR\>/s:=.*:= $(tc-getAR):" \ - -e "/^CC\>/s:=.*:= $(tc-getCC):" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \ - Makefile || die - sed -i \ - -e 's:-static-libgcc::' \ - Makefile.flags || die -} - -src_configure() { - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - - restore_config .config - if [ -f .config ]; then - yes "" | emake -j1 -s oldconfig >/dev/null - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s allyesconfig >/dev/null - # nommu forces a bunch of things off which we want on #387555 - busybox_config_option n NOMMU - sed -i '/^#/d' .config - yes "" | emake -j1 -s oldconfig >/dev/null - - # now turn off stuff we really don't want - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - busybox_config_option n BUILD_AT_ONCE - busybox_config_option n BUILD_LIBBUSYBOX - busybox_config_option n FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n START_STOP_DAEMON - busybox_config_option n USE_PORTABLE_CODE - busybox_config_option n WERROR - - # causes trouble with musl - busybox_config_option n IFPLUGD - busybox_config_option n EXTRA_COMPAT - busybox_config_option n FEATURE_VI_REGEX_SEARCH - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y ASH - busybox_config_option n HUSH - - # disable ipv6 applets - if ! use ipv6; then - busybox_config_option n FEATURE_IPV6 - busybox_config_option n TRACEROUTE6 - busybox_config_option n PING6 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - busybox_config_option math FEATURE_AWK_LIBM - - # all the debug options are compiler related, so punt them - busybox_config_option n DEBUG - busybox_config_option y NO_DEBUG_LIB - busybox_config_option n DMALLOC - busybox_config_option n EFENCE - busybox_config_option $(usex debug y n) TFTP_DEBUG - - busybox_config_option selinux SELINUX - - # this opt only controls mounting with <linux-2.6.23 - busybox_config_option n FEATURE_MOUNT_NFS - - # default a bunch of uncommon options to off - local opt - for opt in \ - ADD_SHELL \ - BEEP BOOTCHARTD \ - CRONTAB \ - DC DEVFSD DNSD DPKG{,_DEB} \ - FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ - FEATURE_DEVFS \ - HOSTID HUSH \ - INETD INOTIFYD IPCALC \ - LOCALE_SUPPORT LOGNAME LPD \ - MAKEMIME MKFS_MINIX MSH \ - OD \ - RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ - SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ - TASKSET TCPSVD \ - RPM RPM2CPIO \ - UDPSVD UUDECODE UUENCODE - do - busybox_config_option n ${opt} - done - - emake -j1 oldconfig > /dev/null -} - -src_compile() { - unset KBUILD_OUTPUT #88088 - export SKIP_STRIP=y - - emake V=1 busybox -} - -src_install() { - unset KBUILD_OUTPUT #88088 - save_config .config - - into / - dodir /bin - if use sep-usr ; then - # install /ginit to take care of mounting stuff - exeinto / - newexe busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - fi - if use mdev ; then - dodir /$(get_libdir)/mdev/ - use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf - - exeinto /$(get_libdir)/mdev/ - doexe "${FILESDIR}"/mdev/* - - newinitd "${FILESDIR}"/mdev.initd mdev - fi - if use livecd ; then - dosym busybox /bin/vi - fi - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - tar cf busybox-links.tar -C _install . || : #;die - insinto /usr/share/${PN} - use make-symlinks && doins busybox-links.tar - - dodoc AUTHORS README TODO - - cd docs - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html - - cd ../examples - docinto examples - dodoc inittab depmod.pl *.conf *.script undeb unrpm -} - -pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then - ewarn "setting USE=make-symlinks and emerging to / is very dangerous." - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." - ewarn "If you are creating a binary only and not merging this is probably ok." - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want." - die "silly options will destroy your system" - fi - - if use make-symlinks ; then - mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die - fi -} - -pkg_postinst() { - savedconfig_pkg_postinst - - if use make-symlinks ; then - cd "${T}" || die - mkdir _install - tar xf busybox-links.tar -C _install || die - cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" - fi - - if use sep-usr ; then - elog "In order to use the sep-usr support, you have to update your" - elog "kernel command line. Add the option:" - elog " init=/ginit" - elog "To launch a different init than /sbin/init, use:" - elog " init=/ginit /sbin/yourinit" - elog "To get a rescue shell, you may boot with:" - elog " init=/ginit bb" - fi -} diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch deleted file mode 100644 index a66b45a5..00000000 --- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -75,6 +75,8 @@ - //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) - //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh)) - //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash)) -+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) -+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) - - //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o - //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -7255,6 +7255,8 @@ - } - /* re-exec ourselves with the new arguments */ - execve(bb_busybox_exec_path, argv, envp); -+ execve("/bin/busybox.static", argv, envp); -+ execve("/bin/busybox", argv, envp); - /* If they called chroot or otherwise made the binary no longer - * executable, fall through */ - } diff --git a/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch b/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch deleted file mode 100644 index bc74904b..00000000 --- a/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/busybox-1.21.0/networking/ifconfig.c -+++ b/busybox-1.21.0/networking/ifconfig.c -@@ -56,7 +56,7 @@ - #endif - - #if ENABLE_FEATURE_IFCONFIG_SLIP --# include <net/if_slip.h> -+# include <linux/if_slip.h> - #endif - - /* I don't know if this is needed for busybox or not. Anyone? */ diff --git a/sys-apps/busybox/files/busybox-1.21.0-iplink.patch b/sys-apps/busybox/files/busybox-1.21.0-iplink.patch deleted file mode 100644 index 80d8e5d6..00000000 --- a/sys-apps/busybox/files/busybox-1.21.0-iplink.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/busybox-1.21.0/networking/libiproute/iplink.c -+++ b/busybox-1.21.0/networking/libiproute/iplink.c -@@ -5,8 +5,7 @@ - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ - #include <net/if.h> --#include <net/if_packet.h> --#include <netpacket/packet.h> -+#include <linux/if_packet.h> - #include <netinet/if_ether.h> - - #include "ip_common.h" /* #include "libbb.h" is inside */ diff --git a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch b/sys-apps/busybox/files/busybox-1.21.0-mdev.patch deleted file mode 100644 index cb873faf..00000000 --- a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- busybox-1.21.0/util-linux/mdev.c -+++ busybox-1.21.0-mdev/util-linux/mdev.c -@@ -661,6 +661,8 @@ static void make_device(char *device_nam - if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST) - bb_perror_msg("can't create '%s'", node_name); - if (ENABLE_FEATURE_MDEV_CONF) { -+ if (G.verbose) -+ bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid); - chmod(node_name, rule->mode); - chown(node_name, rule->ugid.uid, rule->ugid.gid); - } -@@ -813,6 +815,7 @@ static void load_firmware(const char *fi - full_write(loading_fd, "-1", 2); - - out: -+ xchdir("/dev"); - if (ENABLE_FEATURE_CLEAN_UP) { - close(firmware_fd); - close(loading_fd); -@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha - } - - { -- int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND); -+ int logfd = open("mdev.log", O_WRONLY | O_APPEND); - if (logfd >= 0) { - xmove_fd(logfd, STDERR_FILENO); - G.verbose = 1; -- bb_error_msg("seq: %s action: %s", seq, action); -+ if (seq) -+ applet_name = xasprintf("%s[%s]", applet_name, seq); -+ bb_error_msg("action: %s", action); - } - } - diff --git a/sys-apps/busybox/files/busybox-1.21.0-platform.patch b/sys-apps/busybox/files/busybox-1.21.0-platform.patch deleted file mode 100644 index 9be6cb8f..00000000 --- a/sys-apps/busybox/files/busybox-1.21.0-platform.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- busybox-1.21.0/archival/libarchive/decompress_unxz.c -+++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c -@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t * - /* We use arch-optimized unaligned accessors */ - #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); }) - #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); }) --#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val)) --#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val)) -+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val)) -+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val)) - - #include "unxz/xz_dec_bcj.c" - #include "unxz/xz_dec_lzma2.c" ---- busybox-1.21.0/include/platform.h -+++ busybox-1.21.0-platform/include/platform.h -@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI - # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) - # define move_to_unaligned16(u16p, v) do { \ - uint16_t __t = (v); \ -- memcpy((u16p), &__t, 4); \ -+ memcpy((u16p), &__t, 2); \ - } while (0) - # define move_to_unaligned32(u32p, v) do { \ - uint32_t __t = (v); \ diff --git a/sys-apps/busybox/files/busybox-1.21.0-xz.patch b/sys-apps/busybox/files/busybox-1.21.0-xz.patch deleted file mode 100644 index 56ba1a27..00000000 --- a/sys-apps/busybox/files/busybox-1.21.0-xz.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- busybox-1.21.0/archival/libarchive/decompress_unxz.c -+++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c -@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t * - IF_DESKTOP(long long) int FAST_FUNC - unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) - { -+ enum xz_ret xz_result; - struct xz_buf iobuf; - struct xz_dec *state; - unsigned char *membuf; -@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t - /* Limit memory usage to about 64 MiB. */ - state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024); - -+ xz_result = X_OK; - while (1) { -- enum xz_ret r; -- - if (iobuf.in_pos == iobuf.in_size) { - int rd = safe_read(src_fd, membuf, BUFSIZ); - if (rd < 0) { -@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t - total = -1; - break; - } -+ if (rd == 0 && xz_result == XZ_STREAM_END) -+ break; - iobuf.in_size = rd; - iobuf.in_pos = 0; - } -+ if (xz_result == XZ_STREAM_END) { -+ /* -+ * Try to start decoding next concatenated stream. -+ * Stream padding must always be a multiple of four -+ * bytes to preserve four-byte alignment. To keep the -+ * code slightly smaller, we aren't as strict here as -+ * the .xz spec requires. We just skip all zero-bytes -+ * without checking the alignment and thus can accept -+ * files that aren't valid, e.g. the XZ utils test -+ * files bad-0pad-empty.xz and bad-0catpad-empty.xz. -+ */ -+ do { -+ if (membuf[iobuf.in_pos] != 0) { -+ xz_dec_reset(state); -+ goto do_run; -+ } -+ iobuf.in_pos++; -+ } while (iobuf.in_pos < iobuf.in_size); -+ } -+ do_run: - // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d", - // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size); -- r = xz_dec_run(state, &iobuf); -+ xz_result = xz_dec_run(state, &iobuf); - // bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d", --// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r); -+// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result); - if (iobuf.out_pos) { - xwrite(dst_fd, iobuf.out, iobuf.out_pos); - IF_DESKTOP(total += iobuf.out_pos;) - iobuf.out_pos = 0; - } -- if (r == XZ_STREAM_END) { -- break; -+ if (xz_result == XZ_STREAM_END) { -+ /* -+ * Can just "break;" here, if not for concatenated -+ * .xz streams. -+ * Checking for padding may require buffer -+ * replenishment. Can't do it here. -+ */ -+ continue; - } -- if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) { -+ if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) { - bb_error_msg("corrupted data"); - total = -1; - break; - } - } -+ - xz_dec_end(state); - free(membuf); - diff --git a/sys-apps/busybox/files/busybox-1.22.1-ash.patch b/sys-apps/busybox/files/busybox-1.22.1-ash.patch deleted file mode 100644 index 301e9428..00000000 --- a/sys-apps/busybox/files/busybox-1.22.1-ash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.22.1/shell/ash.c -+++ busybox-1.22.1-ash/shell/ash.c -@@ -13014,7 +13014,7 @@ init(void) - setvar2("PPID", utoa(getppid())); - #if ENABLE_ASH_BASH_COMPAT - p = lookupvar("SHLVL"); -- setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1)); -+ setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT); - #endif - p = lookupvar("PWD"); - if (p) { diff --git a/sys-apps/busybox/files/busybox-1.22.1-date.patch b/sys-apps/busybox/files/busybox-1.22.1-date.patch deleted file mode 100644 index 6380d878..00000000 --- a/sys-apps/busybox/files/busybox-1.22.1-date.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- busybox-1.22.1/libbb/time.c -+++ busybox-1.22.1-date/libbb/time.c -@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char - /* else end != NUL and we error out */ - } - } else -- /* yyyy-mm-dd HH */ -- if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, -+ if (strchr(date_str, '-') -+ /* Why strchr('-') check? -+ * sscanf below will trash ptm->tm_year, this breaks -+ * if parse_str is "10101010" (iow, "MMddhhmm" form) -+ * because we destroy year. Do these sscanf -+ * only if we saw a dash in parse_str. -+ */ -+ /* yyyy-mm-dd HH */ -+ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &ptm->tm_hour, - &end) >= 4 -- /* yyyy-mm-dd */ -- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, -+ /* yyyy-mm-dd */ -+ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &end) >= 3 -+ ) - ) { - ptm->tm_year -= 1900; /* Adjust years */ - ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ diff --git a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch b/sys-apps/busybox/files/busybox-1.22.1-iplink.patch deleted file mode 100644 index dbd76c57..00000000 --- a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- busybox-1.22.1/networking/libiproute/iplink.c -+++ busybox-1.22.1-iplink/networking/libiproute/iplink.c -@@ -31,6 +31,16 @@ - #ifndef IFLA_LINKINFO - # define IFLA_LINKINFO 18 - # define IFLA_INFO_KIND 1 -+# define IFLA_INFO_DATA 2 -+#endif -+ -+#ifndef IFLA_VLAN_MAX -+# define IFLA_VLAN_ID 1 -+# define IFLA_VLAN_FLAGS 2 -+struct ifla_vlan_flags { -+ uint32_t flags; -+ uint32_t mask; -+}; - #endif - - /* taken from linux/sockios.h */ diff --git a/sys-apps/busybox/files/ginit.c b/sys-apps/busybox/files/ginit.c deleted file mode 100644 index de98e4ac..00000000 --- a/sys-apps/busybox/files/ginit.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * simple init to bootstrap sep-/usr - * - * Copyright (C) 2012-2013 Mike Frysinger <vapier@gentoo.org> - * - * Licensed under GPLv2 or later - */ - -//applet:IF_GINIT(APPLET(ginit, BB_DIR_SBIN, BB_SUID_DROP)) - -//kbuild:lib-$(CONFIG_GINIT) += ginit.o - -//config:config GINIT -//config: bool "ginit" -//config: default y -//config: select MKDIR -//config: select MDEV -//config: select MOUNT -//config: select MOUNTPOINT -//config: help -//config: sep-/usr bootstrapper - -//usage:#define ginit_trivial_usage NOUSAGE_STR -//usage:#define ginit_full_usage "" - -#include "libbb.h" - -#define eprintf(fmt, args...) printf("%s" fmt, "sep-usr init: ", ## args) - -static void process_args(char **args) -{ - size_t i; - - eprintf("running: "); - for (i = 0; args[i]; ++i) { - /* String needs to be writable, so dupe it */ - args[i] = xstrdup(args[i]); - printf("'%s' ", args[i]); - } - printf("\n"); -} - -int ginit_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ginit_main(int argc UNUSED_PARAM, char **argv) -{ - FILE *mntlist; - bool ismnted_dev, ismnted_sys, ismnted_usr; - struct mntent *mntent; - - /* - int fd = open("/dev/console", O_RDWR); - if (fd >= 0) { - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - } - */ - - /* If given an argv[] with an applet name, run it instead. - * Makes recovering simple by doing: init=/ginit bb - */ - if (argv[1] && argv[1][0] != '/') { - eprintf("running user requested applet %s\n", argv[1]); - return spawn_and_wait(argv+1); - } - -#define saw(argv...) \ - ({ \ - static const char *args[] = { argv, NULL }; \ - /* These casts are fine -- see process_args for mem setup */ \ - process_args((void *)args); \ - spawn_and_wait((void *)args); \ - }) - - /* First setup basic /dev */ - if (saw("mountpoint", "-q", "/dev") != 0) { - /* Try /etc/fstab */ - if (saw("mount", "-n", "/dev")) - /* Then devtmpfs */ - if (saw("mount", "-n", "-t", "devtmpfs", "devtmpfs", "/dev")) - /* Finally normal tmpfs */ - saw("mount", "-n", "-t", "tmpfs", "dev", "/dev"); - } else { - eprintf("%s appears to be mounted; skipping its setup\n", "/dev"); - } - - /* If /dev is empty (e.g. tmpfs), run mdev to seed things */ - if (access("/dev/console", F_OK) != 0) { - if (saw("mountpoint", "-q", "/sys") != 0) { - if (saw("mount", "-n", "/sys")) - saw("mount", "-n", "-t", "sysfs", "sysfs", "/sys"); - } else { - eprintf("%s appears to be mounted; skipping its setup\n", "/sys"); - } - - /* Mount /proc as mdev will fork+exec /proc/self/exe */ - if (saw("mountpoint", "-q", "/proc") != 0) { - /* Try /etc/fstab */ - if (saw("mount", "-n", "/proc")) - saw("mount", "-n", "-t", "proc", "proc", "/proc"); - } - - saw("mdev", "-s"); - } - - /* Then seed the stuff we care about */ - saw("mkdir", "-p", "/dev/pts", "/dev/shm"); - - /* Then mount /usr */ - if (saw("mountpoint", "-q", "/usr") != 0) { - saw("mount", "-n", "/usr", "-o", "ro"); - } else { - eprintf("%s appears to be mounted; skipping its setup\n", "/usr"); - } - - /* Now that we're all done, exec the real init */ - if (!argv[1]) { - argv[0] = (void *)"/sbin/init"; - argv[1] = NULL; - } else - ++argv; - process_args(argv); - return execv(argv[0], argv); -} diff --git a/sys-apps/busybox/files/klogd.confd b/sys-apps/busybox/files/klogd.confd deleted file mode 100644 index 4c16096a..00000000 --- a/sys-apps/busybox/files/klogd.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/busybox-sysklogd - -# run "/sbin/klogd --help" to see all possible options. - -# activate if you need remote logging -#rc_need="net" - -# send warnings and above to the console -KLOGD_OPTS="-c 3" diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd deleted file mode 100644 index 4c6dbbc5..00000000 --- a/sys-apps/busybox/files/klogd.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/klogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ - -command="/bin/busybox klogd" -command_args="${KLOGD_OPTS}" -pidfile="/var/run/klogd.pid" - -depend() { - need clock hostname -} diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh deleted file mode 100755 index 8784cd55..00000000 --- a/sys-apps/busybox/files/mdev-start.sh +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -find_mdev() -{ - if [ -x /sbin/mdev ] ; then - echo "/sbin/mdev" - else - echo "/bin/busybox mdev" - fi -} - -populate_mdev() -{ - # populate /dev with devices already found by the kernel - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping mdev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices with mdev -s" - $(find_mdev) -s - eend $? - - return 0 -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before mdev creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/mdev/devices ] ; then - cp -RPp /lib/mdev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm -} - -mount_it_b1() -{ - if [ "${RC_USE_FSTAB}" = "yes" ] ; then - mntcmd=$(get_mount_fstab /dev) - else - unset mntcmd - fi - if [ -n "${mntcmd}" ] ; then - try mount -n ${mntcmd} - else - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 mdev /dev - fi -} -mount_it_b2() -{ - if fstabinfo --quiet /dev ; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev - fi -} -mount_it() -{ - type fstabinfo && mount_it_b2 || mount_it_b1 -} - -main() -{ - # Setup temporary storage for /dev - ebegin "Mounting /dev for mdev" - mount_it - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up proper hotplug agent" - eindent - einfo "Setting /sbin/mdev as hotplug agent ..." - echo $(find_mdev) > /proc/sys/kernel/hotplug - eoutdent - eend 0 - fi - - populate_mdev -} - -main - -# vim:ts=4 diff --git a/sys-apps/busybox/files/mdev.initd b/sys-apps/busybox/files/mdev.initd deleted file mode 100644 index 2a61f99b..00000000 --- a/sys-apps/busybox/files/mdev.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.initd,v 1.1 2014/12/30 19:13:42 williamh Exp $ - -depend() -{ - provide dev - need dev-mount sysfs -} - -find_mdev() -{ - if [ -x /sbin/mdev ] ; then - echo "/sbin/mdev" - else - echo "/bin/busybox mdev" - fi -} - -populate_mdev() -{ - ebegin "Populating /dev with existing devices with mdev -s" - $(find_mdev) -s - eend $? - return 0 -} - -seed_dev() -{ - # copy over any persistent things - if [ -d /lib/mdev/devices ] ; then - cp -RPp /lib/mdev/devices/* /dev 2>/dev/null - fi -} - -start() -{ - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up mdev as hotplug agent" - echo $(find_mdev) > /proc/sys/kernel/hotplug - eend 0 - fi - - if get_bootparam "nocoldplug" ; then - ewarn "Skipping mdev coldplug as requested in kernel cmdline" - else - populate_mdev - fi -} diff --git a/sys-apps/busybox/files/mdev.rc b/sys-apps/busybox/files/mdev.rc deleted file mode 100755 index 5470404a..00000000 --- a/sys-apps/busybox/files/mdev.rc +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc,v 1.1 2010/08/15 03:55:29 vapier Exp $ - -start() -{ - . /lib/rcscripts/addons/mdev-start.sh -} diff --git a/sys-apps/busybox/files/mdev.rc.1 b/sys-apps/busybox/files/mdev.rc.1 deleted file mode 100755 index 569d5407..00000000 --- a/sys-apps/busybox/files/mdev.rc.1 +++ /dev/null @@ -1,98 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc.1,v 1.2 2012/09/26 21:25:23 robbat2 Exp $ - -depend() -{ - provide dev dev-mount - need sysfs -} - -find_mdev() -{ - if [ -x /sbin/mdev ] ; then - echo "/sbin/mdev" - else - echo "/bin/busybox mdev" - fi -} - -populate_mdev() -{ - # populate /dev with devices already found by the kernel - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping mdev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices with mdev -s" - $(find_mdev) -s - eend $? - - return 0 -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before mdev creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/mdev/devices ] ; then - cp -RPp /lib/mdev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm -} - -mount_it() -{ - if fstabinfo --quiet /dev ; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev - fi -} - -start() -{ - # Setup temporary storage for /dev - ebegin "Mounting /dev for mdev" - mount_it - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up mdev as hotplug agent" - echo $(find_mdev) > /proc/sys/kernel/hotplug - eend 0 - fi - - populate_mdev -} diff --git a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev deleted file mode 100644 index f0186c17..00000000 --- a/sys-apps/busybox/files/mdev/dvbdev +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0 -ADAPTER=${MDEV%.*} -N=${ADAPTER#dvb} -# MDEV=dvb0.demux1 -> DEVB_DEV=demux1 -DVB_DEV=${MDEV#*.} - -case "$ACTION" in - add|"") - mkdir -p dvb/adapter${N} - mv ${MDEV} dvb/adapter${N}/${DVB_DEV} - ;; - remove) - rm -f dvb/adapter${N}/${DVB_DEV} - rmdir dvb/adapter${N} 2>/dev/null - rmdir dvb/ 2>/dev/null -esac diff --git a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links deleted file mode 100644 index be0c95aa..00000000 --- a/sys-apps/busybox/files/mdev/ide_links +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -[ -f /proc/ide/$MDEV/media ] || exit - -media=`cat /proc/ide/$MDEV/media` -for i in $media $media[0-9]* ; do - if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then - LINK=$i - break - fi -done - -# link exist, remove if necessary and exit -if [ "$LINK" ] ; then - [ "$ACTION" = remove ] && rm $LINK - exit -fi - -# create a link -num=`ls $media[0-9]* 2>/dev/null | wc -l` -ln -sf $MDEV "$media`echo $num`" -[ -e "$media" ] || ln -sf $MDEV "$media" - diff --git a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev deleted file mode 100644 index ea5b9155..00000000 --- a/sys-apps/busybox/files/mdev/usbdev +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# script is buggy; until patched just do exit 0 -#exit 0 - -# add zeros to device or bus -add_zeros () { - case "$(echo $1 | wc -L)" in - 1) echo "00$1" ;; - 2) echo "0$1" ;; - *) echo "$1" - esac - exit 0 -} - - -# bus and device dirs in /sys -USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/') -USB_PATH=$(find /sys/devices -type d -name "$USB_PATH") -USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/') - -# dir names in /dev -BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/')) -USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/')) - - -# try to load the proper driver for usb devices -case "$ACTION" in - add|"") - # load usb bus driver - for i in $USB_PATH/*/modalias ; do - modprobe `cat $i` 2>/dev/null - done - # load usb device driver if existent - if [ -d $USB_PATH/$USB_DEV_DIR ]; then - for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do - modprobe `cat $i` 2>/dev/null - done - fi - # move usb device file - mkdir -p bus/usb/$BUS - mv $MDEV bus/usb/$BUS/$USB_DEV - ;; - remove) - # unload device driver, if device dir is existent - if [ -d $USB_PATH/$USB_DEV_DIR ]; then - for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do - modprobe -r `cat $i` 2>/dev/null - done - fi - # unload usb bus driver. Does this make sense? - # what happens, if two usb devices are plugged in - # and one is removed? - for i in $USB_PATH/*/modalias ; do - modprobe -r `cat $i` 2>/dev/null - done - # remove device file and possible empty dirs - rm -f bus/usb/$BUS/$USB_DEV - rmdir bus/usb/$BUS/ 2>/dev/null - rmdir bus/usb/ 2>/dev/null - rmdir bus/ 2>/dev/null -esac diff --git a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link deleted file mode 100644 index 6bb06924..00000000 --- a/sys-apps/busybox/files/mdev/usbdisk_link +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars. - -current=$(readlink usbdisk) - -if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then - rm -f usbdisk usba1 -fi -[ -n "$current" ] && exit - -if [ -e /sys/block/$MDEV ]; then - SYSDEV=$(readlink -f /sys/block/$MDEV/device) - # if /sys device path contains '/usb[0-9]' then we assume its usb - # also, if it's a usb without partitions we require FAT - if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then - # do not create link if there is not FAT - dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0 - - ln -sf $MDEV usbdisk - # keep this for compat. people have it in fstab - ln -sf $MDEV usba1 - fi - -elif [ -e /sys/block/*/$MDEV ] ; then - PARENT=$(dirname /sys/block/*/$MDEV) - SYSDEV=$(readlink -f $PARENT/device) - if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then - ln -sf $MDEV usbdisk - # keep this for compat. people have it in fstab - ln -sf $MDEV usba1 - fi -fi - diff --git a/sys-apps/busybox/files/ntpd.confd b/sys-apps/busybox/files/ntpd.confd deleted file mode 100644 index f50d4c2e..00000000 --- a/sys-apps/busybox/files/ntpd.confd +++ /dev/null @@ -1,6 +0,0 @@ -# Config file for /etc/init.d/busybox-ntpd - -# run "/sbin/ntpd --help" to see all possible options. - -# Get time from specified server and run in background -NTPD_OPTS="-N -p pool.ntp.org" diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd deleted file mode 100644 index 5a05c31f..00000000 --- a/sys-apps/busybox/files/ntpd.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/ntpd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ - -command="/bin/busybox ntpd" -command_args="${NTPD_OPTS}" -pidfile="/var/run/ntpd.pid" - -depend() { - use net dns logger - after ntp-client -} diff --git a/sys-apps/busybox/files/syslogd.confd b/sys-apps/busybox/files/syslogd.confd deleted file mode 100644 index 7df6885c..00000000 --- a/sys-apps/busybox/files/syslogd.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/busybox-sysklogd - -# run "/sbin/syslogd --help" to see all possible options. - -# activate if you need remote logging -#rc_need="net" - -# Log to shared mem buffer (use logread to read it) -SYSLOGD_OPTS="-C128" diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd deleted file mode 100644 index f14224ae..00000000 --- a/sys-apps/busybox/files/syslogd.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/syslogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $ - -command="/bin/busybox syslogd" -command_args="${SYSLOGD_OPTS}" -pidfile="/var/run/syslogd.pid" - -depend() { - need clock hostname - provide logger -} diff --git a/sys-apps/busybox/files/watchdog.confd b/sys-apps/busybox/files/watchdog.confd deleted file mode 100644 index bd6aec0a..00000000 --- a/sys-apps/busybox/files/watchdog.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/busybox-watchdog - -# run "/sbin/watchdog --help" to see all possible options. - -# Periodically write to watchdog device -WATCHDOG_OPTS="/dev/watchdog" - -# optionally set the nice-level -#SSD_NICELEVEL="-20" diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd deleted file mode 100644 index 214468a2..00000000 --- a/sys-apps/busybox/files/watchdog.initd +++ /dev/null @@ -1,8 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/watchdog.initd,v 1.3 2013/04/27 07:47:23 vapier Exp $ - -command="/bin/busybox watchdog" -command_args="${WATCHDOG_OPTS}" -pidfile="/var/run/watchdog.pid" diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml deleted file mode 100644 index 72850fbb..00000000 --- a/sys-apps/busybox/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>embedded</herd> -<use> -<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag> -<flag name="math">Enable math support in gawk (requires libm)</flag> -<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf and support files</flag> -<flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag> -<flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag> -<flag name="systemd">Support systemd</flag> -</use> -</pkgmetadata> diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest deleted file mode 100644 index a3b698bc..00000000 --- a/sys-apps/findutils/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX findutils-4.4.2-gnulib-date-x32.patch 1210 SHA256 004a9d3a28ac727fddf3e54fcf2846aab90b30f29f40f8ff32b19742539e85eb SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60 WHIRLPOOL 7c866ac607fd7c9311160e398ccd98e593f69833ca643606d0462f2b125fce616249a8a0063f2514cd573542e5563539164a1527f3b02c1f20234880d287f258 -AUX findutils-4.4.2-gnulib-musl.patch 646 SHA256 65ae9c84a03b200b742a7e2eed785e7fe7ab3f045ae7151ad2b7e6209ed2fbe5 SHA512 900cf211161ce05d29c17f7e7a264615f616c94f4273d3733ca9ccf0678d911434bf2ff80fed5e13939d748d6cd13c8dab6e2c94be935ea5f1c3e1e6f5b7b11c WHIRLPOOL 5babeecf4d40117ab9086a73d1d311eca7139239e71ed1a7aef59339cf42a76f647dadeabcfc3e9f4a387de2180987040b496806487ab2aac22d45575cf4f7ed -AUX findutils-4.4.2-selinux.diff 15603 SHA256 67de61c659f8d524b70ebabafe25093c02374b1fc83770dd5633480745e2ee9d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9 WHIRLPOOL 612394c54d4095c6cd9d0dc326be2b5b6ce41e43cd3dc8e3cd2a4e99a0844aec769373243c62398df79d6f7561f865754b627917b5f1733d6b065b7e3ce7be35 -AUX findutils-4.5.12-gnulib-musl.patch 4945 SHA256 52ab4e59bad488d9fe2ea64e68e08b90128fd1d8ef2171b160449950f99b0177 SHA512 8137a3d33f4b8612b91db07e4219bfa6e66209783387b50ddbd78dde548f0679d92ff834d6ac2ad1805d7303e25c93d089b86ec66363cec11afc447e095e8dd3 WHIRLPOOL 9d1d8489f7fbe982bca49c9e0155e339d7d91d5763883921139f6504e621a96dd46383e4e0e35273f5033944a430efd82e7b94c3318bb4432cdaf72b08968ef5 -DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 WHIRLPOOL 2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393 -DIST findutils-4.5.12.tar.gz 3236073 SHA256 df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de SHA512 d909ca2d3629f871e6f79e99cf547f76ea73dad773972923c177267c272a7c82e308cca22e5c8746e6aca33dee8110f1af390fbe2abf93544e5917e6475ab2f8 WHIRLPOOL 046ef3394c0834800139c1c5a6c9caddbbf36190d27bb28bd2afa212c00bbbef6c959441f2afc36c058d3cee279d3b6c971192ff442e796ee7e72edfb76b2730 -EBUILD findutils-4.4.2-r99.ebuild 1439 SHA256 54565a9da76fa50f6af16fc8aec6ff7bb0696ee689ba8be72143b09fd8802176 SHA512 cfa4339cd8315c208ceb2e72ad488661936e9aace744eae6b037984cf9351eba8d0269bb6832f11f096e795354b57143489246a7279df9a00764b7363f131b43 WHIRLPOOL 150b650ac57083e2f52d1b7c4eabd6c820e2547d383347197485bea3d27bc50deb1144b33cb27b6c21f74445b21c7f1afb1f57127161730f7100e44755bd4cf9 -EBUILD findutils-4.5.12-r99.ebuild 1453 SHA256 969c9c10bedc2e2906917f7867212e629c2c482ca23705c1c7a61bd03671509e SHA512 4b9c1a712dc43dc2a707587dd6a299021e13cf0d9c5cc7f7a7390752b4e6da486fbb1f45fa5ce81ed321514713a47c88de7186c8791a152880b1906f08d99408 WHIRLPOOL 05fcc0cc44e61614b0dae52771956d5c650a8a89ccc49083ec73afe26e9549a59ba4c6c7ae62341a247fc04bce17a6f54cb9fee75207d1de98aa915af5abb4a0 -MISC metadata.xml 247 SHA256 c1aace970507b192985f753f5b6d6b4f909284fa2e8c9a6492c9d29651476bab SHA512 e42648aa29d9aaa1125770a5f89c68ede330e90c64562942f8cb64d85471cc8176f2ae10c1dad00230b4fcad3a65eae92676c6fd8a43c1bf8985e9ee8ac8fd29 WHIRLPOOL f8eb5d248383ef10b836b0a9ffa9154bb8f38d001813ca727ffb0d07ffa9234eee323894831b01144017cb8b43400dd910b685babf75ebe10a2615dc94999e08 diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch deleted file mode 100644 index 9ff86f6b..00000000 --- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch +++ /dev/null @@ -1,26 +0,0 @@ -newer gnulib has rewritten these checks in a way that works for the x32, -and for the targets we care about, these checks won't return false. so -just drop them to make our life simpler. - -https://sites.google.com/site/x32abi/x32-patches - ---- findutils-4.4.2/gnulib/lib/getdate.c.x32 2009-05-10 14:23:57.000000000 -0700 -+++ findutils-4.4.2/gnulib/lib/getdate.c 2011-12-05 11:41:18.130675712 -0800 -@@ -114,7 +114,6 @@ - wraps around, but there's no portable way to check for that at - compile-time. */ - verify (TYPE_IS_INTEGER (time_t)); --verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); - - /* An integer value, and the number of digits in its textual - representation. */ ---- findutils-4.4.2/gnulib/lib/mktime.c.x32 2009-05-10 14:25:13.000000000 -0700 -+++ findutils-4.4.2/gnulib/lib/mktime.c 2011-12-05 11:49:38.368589386 -0800 -@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda - { - verify (C99_integer_division, -1 / 2 == 0); -- verify (long_int_year_and_yday_are_wide_enough, -- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); - - /* Compute intervening leap days correctly even if year is negative. - Take care to avoid integer overflow here. */ diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch deleted file mode 100644 index 0a47c907..00000000 --- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur findutils-4.4.2.orig/gnulib/lib/freadahead.c findutils-4.4.2/gnulib/lib/freadahead.c ---- findutils-4.4.2.orig/gnulib/lib/freadahead.c 2009-05-10 21:23:57.000000000 +0000 -+++ findutils-4.4.2/gnulib/lib/freadahead.c 2013-07-06 01:54:25.443043832 +0000 -@@ -22,6 +22,7 @@ - size_t - freadahead (FILE *fp) - { -+#if 0 - #if defined _IO_ferror_unlocked /* GNU libc, BeOS */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; -@@ -63,4 +64,6 @@ - #else - #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib." - #endif -+#endif -+ return 0; - } diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff deleted file mode 100644 index 66c9c412..00000000 --- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff +++ /dev/null @@ -1,464 +0,0 @@ -diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am ---- findutils-4.4.2.orig/find/Makefile.am 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/Makefile.am 2010-04-25 03:58:33.762402367 +0000 -@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options - localedir = $(datadir)/locale - # noinst_PROGRAMS = regexprops - # regexprops_SOURCES = regexprops.c -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - - noinst_LIBRARIES = libfindtools.a - libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c -@@ -26,7 +27,7 @@ endif - - EXTRA_DIST = defs.h $(man_MANS) - INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" --LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = . testsuite - -diff -purN findutils-4.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in ---- findutils-4.4.2.orig/find/Makefile.in 2009-05-16 15:28:13.000000000 +0000 -+++ findutils-4.4.2/find/Makefile.in 2010-04-25 03:58:33.762402367 +0000 -@@ -275,7 +275,7 @@ CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - DEPDIR = @DEPDIR@ - DIRENT_H = @DIRENT_H@ - ECHO_C = @ECHO_C@ -@@ -607,7 +607,7 @@ libfindtools_a_SOURCES = finddata.c fsty - @WITH_FTS_TRUE@oldfind_SOURCES = find.c - @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c - EXTRA_DIST = defs.h $(man_MANS) --LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = . testsuite - all: all-recursive -diff -purN findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h ---- findutils-4.4.2.orig/find/defs.h 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/defs.h 2010-04-25 03:58:33.762402367 +0000 -@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat - #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) - #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) - -+#ifdef WITH_SELINUX -+#include <selinux/selinux.h> -+#endif /*WITH_SELINUX*/ - - struct predicate; - struct options; -@@ -315,6 +318,9 @@ struct predicate - struct samefile_file_id samefileid; /* samefile */ - mode_t type; /* type */ - struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */ -+#ifdef WITH_SELINUX -+ security_context_t scontext; /* scontext */ -+#endif /*WITH_SELINUX*/ - } args; - - /* The next predicate in the user input sequence, -@@ -459,7 +465,9 @@ PREDICATEFUNCTION pred_used; - PREDICATEFUNCTION pred_user; - PREDICATEFUNCTION pred_writable; - PREDICATEFUNCTION pred_xtype; -- -+#ifdef WITH_SELINUX -+PREDICATEFUNCTION pred_scontext; -+#endif /* WITH_SELINUX */ - - - int launch PARAMS((const struct buildcmd_control *ctl, -@@ -605,10 +613,13 @@ struct options - */ - unsigned short optimisation_level; - -- - /* How should we quote filenames in error messages and so forth? - */ - enum quoting_style err_quoting_style; -+ -+#ifdef WITH_SELINUX -+ int (*x_getfilecon)(); -+#endif /* WITH_SELINUX */ - }; - extern struct options options; - -diff -purN findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1 ---- findutils-4.4.2.orig/find/find.1 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/find.1 2010-04-25 03:58:33.762402367 +0000 -@@ -934,6 +934,10 @@ checks the type of the file that - .B \-type - does not check. - -+.IP "\-context \fIscontext\fR" -+.IP "\--context \fIscontext\fR" -+(SELinux only) File has the security context \fIscontext\fR. -+ - .SS ACTIONS - .IP "\-delete\fR" - Delete files; true if removal succeeded. If the removal failed, an -@@ -1354,6 +1358,8 @@ File's type (like in - U=unknown type (shouldn't happen) - .IP %Y - File's type (like %y), plus follow symlinks: L=loop, N=nonexistent -+.IP %Z -+(SELinux only) file's security context. - .PP - A `%' character followed by any other character is discarded, but the - other character is printed (don't rely on this, as further format -diff -purN findutils-4.4.2.orig/find/find.c findutils-4.4.2/find/find.c ---- findutils-4.4.2.orig/find/find.c 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/find.c 2010-04-25 03:58:33.764899827 +0000 -@@ -1270,7 +1270,7 @@ process_path (char *pathname, char *name - static void - process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent) - { -- int subdirs_left; /* Number of unexamined subdirs in PATHNAME. */ -+ int subdirs_left=0; /* Number of unexamined subdirs in PATHNAME. */ - boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */ - unsigned int idx; /* Which entry are we on? */ - struct stat stat_buf; -diff -purN findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c ---- findutils-4.4.2.orig/find/parser.c 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/parser.c 2010-04-25 03:58:33.764899827 +0000 -@@ -53,6 +53,13 @@ - #include <unistd.h> - #include <sys/stat.h> - -+#ifdef WITH_SELINUX -+#include <selinux/selinux.h> -+int optionh_getfilecon(const char *name, security_context_t *p); -+int optionl_getfilecon(const char *name, security_context_t *p); -+int optionp_getfilecon(const char *name, security_context_t *p); -+#endif /*WITH_SELINUX*/ -+ - #if ENABLE_NLS - # include <libintl.h> - # define _(Text) gettext (Text) -@@ -155,6 +162,9 @@ static boolean parse_noignore_race PARAM - static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); -+#ifdef WITH_SELINUX -+static boolean parse_scontext PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); -+#endif /*WITH_SELINUX*/ - - boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - -@@ -340,6 +350,8 @@ static struct parser_table const parse_t - {ARG_TEST, "-help", parse_help, NULL}, /* GNU */ - {ARG_TEST, "version", parse_version, NULL}, /* GNU */ - {ARG_TEST, "-version", parse_version, NULL}, /* GNU */ -+ {ARG_TEST, "context", parse_scontext, pred_scontext}, /* SELinux */ -+ {ARG_TEST, "-context", parse_scontext, pred_scontext}, /* SELinux */ - {0, 0, 0, 0} - }; - -@@ -451,10 +463,16 @@ set_follow_state(enum SymlinkOption opt) - case SYMLINK_ALWAYS_DEREF: /* -L */ - options.xstat = optionl_stat; - options.no_leaf_check = true; -+#ifdef WITH_SELINUX -+ options.x_getfilecon = optionl_getfilecon; -+#endif /* WITH_SELINUX */ - break; - - case SYMLINK_NEVER_DEREF: /* -P (default) */ - options.xstat = optionp_stat; -+#ifdef WITH_SELINUX -+ options.x_getfilecon = optionp_getfilecon; -+#endif /* WITH_SELINUX */ - /* Can't turn no_leaf_check off because the user might have specified - * -noleaf anyway - */ -@@ -463,6 +481,9 @@ set_follow_state(enum SymlinkOption opt) - case SYMLINK_DEREF_ARGSONLY: /* -H */ - options.xstat = optionh_stat; - options.no_leaf_check = true; -+#ifdef WITH_SELINUX -+ options.x_getfilecon = optionh_getfilecon; -+#endif /* WITH_SELINUX */ - } - } - options.symlink_handling = opt; -@@ -670,6 +691,94 @@ collect_arg_stat_info(char **argv, int * - - The predicate structure is updated with the new information. */ - -+#ifdef WITH_SELINUX -+ -+static int -+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv) -+{ -+ /* Our original getfilecon() call failed. Perhaps we can't follow a -+ * symbolic link. If that might be the problem, lgetfilecon() the link. -+ * Otherwise, admit defeat. -+ */ -+ switch (errno) -+ { -+ case ENOENT: -+ case ENOTDIR: -+#ifdef DEBUG_STAT -+ fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name); -+#endif -+ return lgetfilecon(name, p); -+ -+ case EACCES: -+ case EIO: -+ case ELOOP: -+ case ENAMETOOLONG: -+#ifdef EOVERFLOW -+ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */ -+#endif -+ default: -+ return prev_rv; -+ } -+} -+ -+ -+/* optionh_getfilecon() implements the getfilecon operation when the -+ * -H option is in effect. -+ * -+ * If the item to be examined is a command-line argument, we follow -+ * symbolic links. If the getfilecon() call fails on the command-line -+ * item, we fall back on the properties of the symbolic link. -+ * -+ * If the item to be examined is not a command-line argument, we -+ * examine the link itself. -+ */ -+int -+optionh_getfilecon(const char *name, security_context_t *p) -+{ -+ if (0 == state.curdepth) -+ { -+ /* This file is from the command line; deference the link (if it -+ * is a link). -+ */ -+ int rv = getfilecon(name, p); -+ if (0 == rv) -+ return 0; /* success */ -+ else -+ return fallback_getfilecon(name, p, rv); -+ } -+ else -+ { -+ /* Not a file on the command line; do not derefernce the link. -+ */ -+ return lgetfilecon(name, p); -+ } -+} -+ -+/* optionl_getfilecon() implements the getfilecon operation when the -+ * -L option is in effect. That option makes us examine the thing the -+ * symbolic link points to, not the symbolic link itself. -+ */ -+int -+optionl_getfilecon(const char *name, security_context_t *p) -+{ -+ int rv = getfilecon(name, p); -+ if (0 == rv) -+ return 0; /* normal case. */ -+ else -+ return fallback_getfilecon(name, p, rv); -+} -+ -+/* optionp_getfilecon() implements the stat operation when the -P -+ * option is in effect (this is also the default). That option makes -+ * us examine the symbolic link itself, not the thing it points to. -+ */ -+int -+optionp_getfilecon(const char *name, security_context_t *p) -+{ -+ return lgetfilecon(name, p); -+} -+#endif /* WITH_SELINUX */ -+ - - static boolean - parse_and (const struct parser_table* entry, char **argv, int *arg_ptr) -@@ -1128,6 +1237,10 @@ tests (N can be +N or -N or N): -amin N - -readable -writable -executable\n\ - -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ - -used N -user NAME -xtype [bcdpfls]\n")); -+#ifdef WITH_SELINUX -+ puts (_("\ -+ -context CONTEXT\n")); -+#endif /*WITH_SELINUX*/ - puts (_("\ - actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ - -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ -@@ -2552,6 +2665,29 @@ parse_version (const struct parser_table - exit (0); - } - -+#ifdef WITH_SELINUX -+ -+static boolean -+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr) -+{ -+ struct predicate *our_pred; -+ -+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) ) -+ return( false ); -+ -+ our_pred = insert_primary(entry); -+ our_pred->need_stat = false; -+#ifdef DEBUG -+ our_pred->p_name = find_pred_name (pred_scontext); -+#endif /*DEBUG*/ -+ our_pred->args.scontext = argv[*arg_ptr];; -+ -+ (*arg_ptr)++; -+ return( true ); -+} -+ -+#endif /*WITH_SELINUX*/ -+ - static boolean - parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) - { -@@ -2803,7 +2939,11 @@ insert_fprintf (struct format_val *vec, - if (*scan2 == '.') - for (scan2++; ISDIGIT (*scan2); scan2++) - /* Do nothing. */ ; -+#ifdef WITH_SELINUX -+ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2)) -+#else - if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2)) -+#endif - { - segmentp = make_segment (segmentp, format, scan2 - format, - KIND_FORMAT, *scan2, 0, -diff -purN findutils-4.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c ---- findutils-4.4.2.orig/find/pred.c 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/pred.c 2010-04-25 03:58:33.764899827 +0000 -@@ -48,6 +48,14 @@ - #include "error.h" - #include "verify.h" - -+#ifdef WITH_SELINUX -+#include <selinux/selinux.h> -+#endif /*WITH_SELINUX*/ -+ -+#ifndef FNM_CASEFOLD -+#define FNM_CASEFOLD (1<<4) -+#endif /*FNM_CASEFOLD*/ -+ - #if ENABLE_NLS - # include <libintl.h> - # define _(Text) gettext (Text) -@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] = - {pred_user, "user "}, - {pred_writable, "writable "}, - {pred_xtype, "xtype "}, -+#ifdef WITH_SELINUX -+ {pred_scontext, "context"}, -+#endif /*WITH_SELINUX*/ - {0, "none "} - }; - #endif -@@ -1054,6 +1065,26 @@ do_fprintf(struct format_val *dest, - mode_to_filetype(stat_buf->st_mode & S_IFMT)); - } - break; -+#ifdef WITH_SELINUX -+ case 'Z': /* SELinux security context */ -+ { -+ security_context_t scontext; -+ int rv; -+ rv = (*options.x_getfilecon)(state.rel_pathname, &scontext); -+ -+ if ( rv < 0 ) { -+ fprintf(stderr, "getfileconf(%s): %s", -+ pathname, strerror(errno)); -+ fflush(stderr); -+ } -+ else { -+ segment->text[segment->text_len] = 's'; -+ checked_fprintf (dest, segment->text, scontext); -+ freecon(scontext); -+ } -+ } -+ break ; -+#endif /* WITH_SELINUX */ - } - /* end of KIND_FORMAT case */ - break; -@@ -1844,6 +1875,31 @@ pred_xtype (const char *pathname, struct - */ - return (pred_type (pathname, &sbuf, pred_ptr)); - } -+ -+ -+#ifdef WITH_SELINUX -+ -+boolean -+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr) -+{ -+ int rv; -+ security_context_t scontext; -+ -+ rv = (* options.x_getfilecon)(state.rel_pathname, &scontext); -+ -+ if ( rv < 0 ) { -+ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno)); -+ (void) fflush(stderr); -+ return ( false ); -+ } -+ -+ rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0); -+ freecon(scontext); -+ return rv; -+} -+ -+#endif /*WITH_SELINUX*/ -+ - - /* 1) fork to get a child; parent remembers the child pid - 2) child execs the command requested -diff -purN findutils-4.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c ---- findutils-4.4.2.orig/find/tree.c 2009-05-16 15:17:01.000000000 +0000 -+++ findutils-4.4.2/find/tree.c 2010-04-25 03:58:33.764899827 +0000 -@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar - const struct parser_table *entry_close, *entry_print, *entry_open; - int i, oldi; - -+#ifdef WITH_SELINUX -+ int is_selinux_enabled_flag = is_selinux_enabled()>0; -+#endif /* WITH_SELINUX */ -+ - predicates = NULL; - - /* Find where in ARGV the predicates begin by skipping the list of -@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar - } - - predicate_name = argv[i]; -+ -+#ifdef WITH_SELINUX -+ if (! is_selinux_enabled_flag) { -+ if ((strncmp(predicate_name,"-context",strlen("-context"))==0) || -+ (strncmp(predicate_name,"--context",strlen("--context"))==0)) { -+ error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name); -+ } -+ } -+#endif -+ - parse_entry = find_parser (predicate_name); - if (parse_entry == NULL) - { -@@ -1434,6 +1448,9 @@ get_new_pred (const struct parser_table - last_pred->need_stat = true; - last_pred->need_type = true; - last_pred->args.str = NULL; -+#ifdef WITH_SELINUX -+ last_pred->args.scontext = NULL; -+#endif - last_pred->pred_next = NULL; - last_pred->pred_left = NULL; - last_pred->pred_right = NULL; diff --git a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch deleted file mode 100644 index b5538019..00000000 --- a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Naur findutils-4.5.12.orig/gl/lib/fseeko.c findutils-4.5.12/gl/lib/fseeko.c ---- findutils-4.5.12.orig/gl/lib/fseeko.c 2013-09-22 15:27:42.000000000 +0000 -+++ findutils-4.5.12/gl/lib/fseeko.c 2014-03-01 13:35:14.718973449 +0000 -@@ -26,128 +26,6 @@ - - int - fseeko (FILE *fp, off_t offset, int whence) --#undef fseeko --#if !HAVE_FSEEKO --# undef fseek --# define fseeko fseek --#endif --#if _GL_WINDOWS_64_BIT_OFF_T --# undef fseeko --# if HAVE__FSEEKI64 /* msvc, mingw64 */ --# define fseeko _fseeki64 --# else /* mingw */ --# define fseeko fseeko64 --# endif --#endif - { --#if LSEEK_PIPE_BROKEN -- /* mingw gives bogus answers rather than failure on non-seekable files. */ -- if (lseek (fileno (fp), 0, SEEK_CUR) == -1) -- return EOF; --#endif -- -- /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -- if (fp->_IO_read_end == fp->_IO_read_ptr -- && fp->_IO_write_ptr == fp->_IO_write_base -- && fp->_IO_save_base == NULL) --#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ --# if defined __SL64 && defined __SCLE /* Cygwin */ -- if ((fp->_flags & __SL64) == 0) -- { -- /* Cygwin 1.5.0 through 1.5.24 failed to open stdin in 64-bit -- mode; but has an fseeko that requires 64-bit mode. */ -- FILE *tmp = fopen ("/dev/null", "r"); -- if (!tmp) -- return -1; -- fp->_flags |= __SL64; -- fp->_seek64 = tmp->_seek64; -- fclose (tmp); -- } --# endif -- if (fp_->_p == fp_->_bf._base -- && fp_->_r == 0 -- && fp_->_w == ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ -- ? fp_->_bf._size -- : 0) -- && fp_ub._base == NULL) --#elif defined __EMX__ /* emx+gcc */ -- if (fp->_ptr == fp->_buffer -- && fp->_rcount == 0 -- && fp->_wcount == 0 -- && fp->_ungetc_count == 0) --#elif defined __minix /* Minix */ -- if (fp_->_ptr == fp_->_buf -- && (fp_->_ptr == NULL || fp_->_count == 0)) --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- if (fp_->_ptr == fp_->_base -- && (fp_->_ptr == NULL || fp_->_cnt == 0)) --#elif defined __UCLIBC__ /* uClibc */ -- if (((fp->__modeflags & __FLAG_WRITING) == 0 -- || fp->__bufpos == fp->__bufstart) -- && ((fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) == 0 -- || fp->__bufpos == fp->__bufread)) --#elif defined __QNX__ /* QNX */ -- if ((fp->_Mode & 0x2000 /* _MWRITE */ ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend) -- && fp->_Rback == fp->_Back + sizeof (fp->_Back) -- && fp->_Rsave == NULL) --#elif defined __MINT__ /* Atari FreeMiNT */ -- if (fp->__bufp == fp->__buffer -- && fp->__get_limit == fp->__bufp -- && fp->__put_limit == fp->__bufp -- && !fp->__pushed_back) --#elif defined EPLAN9 /* Plan9 */ -- if (fp->rp == fp->buf -- && fp->wp == fp->buf) --#else -- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." --#endif -- { -- /* We get here when an fflush() call immediately preceded this one (or -- if ftell() has created buffers but no I/O has occurred on a -- newly-opened stream). We know there are no buffers. */ -- off_t pos = lseek (fileno (fp), offset, whence); -- if (pos == -1) -- { --#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -- fp_->_flags &= ~__SOFF; --#endif -- return -1; -- } -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -- fp->_flags &= ~_IO_EOF_SEEN; -- fp->_offset = pos; --#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ --# if defined __CYGWIN__ -- /* fp_->_offset is typed as an integer. */ -- fp_->_offset = pos; --# else -- /* fp_->_offset is an fpos_t. */ -- { -- /* Use a union, since on NetBSD, the compilation flags -- determine whether fpos_t is typedef'd to off_t or a struct -- containing a single off_t member. */ -- union -- { -- fpos_t f; -- off_t o; -- } u; -- u.o = pos; -- fp_->_offset = u.f; -- } --# endif -- fp_->_flags |= __SOFF; -- fp_->_flags &= ~__SEOF; --#elif defined __EMX__ /* emx+gcc */ -- fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; --#elif defined __MINT__ /* Atari FreeMiNT */ -- fp->__offset = pos; -- fp->__eof = 0; --#endif -- return 0; -- } - return fseeko (fp, offset, whence); - } diff --git a/sys-apps/findutils/findutils-4.4.2-r99.ebuild b/sys-apps/findutils/findutils-4.4.2-r99.ebuild deleted file mode 100644 index 12c72e9a..00000000 --- a/sys-apps/findutils/findutils-4.4.2-r99.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.4.2-r1.ebuild,v 1.10 2012/03/27 17:50:37 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -SELINUX_PATCH="findutils-4.4.2-selinux.diff" - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="http://www.gnu.org/software/findutils/" -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz - mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="nls selinux static" - -RDEPEND="selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch - epatch "${FILESDIR}"/${P}-gnulib-musl.patch - - # Don't build or install locate because it conflicts with slocate, - # which is a secure version of locate. See bug 18729 - sed -i '/^SUBDIRS/s/locate//' Makefile.in - - use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}" -} - -src_compile() { - use static && append-ldflags -static - - local myconf - use userland_GNU || myconf=" --program-prefix=g" - - econf \ - $(use_enable nls) \ - --libexecdir=/usr/$(get_libdir)/find \ - ${myconf} \ - || die "configure failed" - emake AR="$(tc-getAR)" || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc NEWS README TODO ChangeLog -} diff --git a/sys-apps/findutils/findutils-4.5.12-r99.ebuild b/sys-apps/findutils/findutils-4.5.12-r99.ebuild deleted file mode 100644 index c3a869a6..00000000 --- a/sys-apps/findutils/findutils-4.5.12-r99.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.12.ebuild,v 1.4 2014/01/18 03:28:44 vapier Exp $ - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="http://www.gnu.org/software/findutils/" -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -IUSE="nls selinux static" - -RDEPEND="selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gnulib-musl.patch - # Don't build or install locate because it conflicts with slocate, - # which is a secure version of locate. See bug 18729 - sed -i '/^SUBDIRS/s/locate//' Makefile.in -} - -src_configure() { - use static && append-ldflags -static - - program_prefix=$(usex userland_GNU '' g) - econf \ - --with-packager="Gentoo" \ - --with-packager-version="${PVR}" \ - --with-packager-bug-reports="http://bugs.gentoo.org/" \ - --program-prefix=${program_prefix} \ - $(use_enable nls) \ - $(use_with selinux) \ - --libexecdir='$(libdir)'/find -} - -src_install() { - emake DESTDIR="${D}" install - dodoc NEWS README TODO ChangeLog - - # We don't need this, so punt it. - rm "${ED}"/usr/bin/${program_prefix}oldfind \ - "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die -} diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml deleted file mode 100644 index b122af87..00000000 --- a/sys-apps/findutils/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>base-system</herd> - <upstream> - <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest deleted file mode 100644 index dff69752..00000000 --- a/sys-apps/hdparm/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX hdparm-9.39-musl.patch 1616 SHA256 c7033556b993570d3c326cd47e5fcfc1dd39e6b9b225c9527fd4bf339be76b75 SHA512 3310b600443e53ac9320e537b6b053c580d3a940619953ae7fc68aecd8e1e6b041988199bdd90ebacd174771eb92cf15be7caa2285b379cec48cd7aca7ea3051 WHIRLPOOL 5037ced4431880c61a0d97164517e5842c743d73fe7470722e39d38cd0d4690b7588d0e544b49d87c05d9980c431589afcc68e32d9814dd7edba3398e4f0458d -AUX hdparm-9.45-musl.patch 1096 SHA256 8fc853886d40814cfcd21669cf261d122ed8f1903a2405c36f13943a3bb97da8 SHA512 2518f3e447bb16ff02e8bc0d0d219ce88be6c48ea26f86c5fad3848377867a3bb8421bd3e349dc03716a6d28c4d18d6e05586c4e1b2f82bd9288af24af746631 WHIRLPOOL c780dac1557c1147bbac4443191488a9fbcee03441f8d38570575ffda9ebdc3b40056a2de2595c3a7035f4ad6495f39f3929b4b0c3cdfdbdef23ccd533bc70a6 -AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 WHIRLPOOL 110d330860c4f5e3b1626b85ab369a02e5c092acf656edc845a2f311b5349644317ec2021063a0fb977d3b9851e0bb9c54fd66e814a080d6af3aa0f05fbd658b -AUX hdparm-init-8 1469 SHA256 434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e SHA512 f81100a4f06670639ac8c079a72028dbb0c1b6e5436e6c745c339612ad3287223d3307a40609625dd6904f737816e162af82ecc428d4405678ff0130d0f9752b WHIRLPOOL f0bb17c90466727a0a179928275a1abcfe6f669703a98a803395fe61de90aa7cc4c83b7f510cd1bdf8f44235cfcffe3c6b6a4182d7cfb6594be1b0f8936bab51 -DIST hdparm-9.39.tar.gz 126989 SHA256 72d550af4526aa96f0841c79321a0ee39d636cbaf1f294e52193e90c054b3cea SHA512 7332fb1c03faa9b916864640959d31a355d4c8daebdb97dc941375a2fb2499827546fd1f1cc1435b403da399e5f5a70a30e9384b4499bec8f45c9408ad074b3c WHIRLPOOL cb3ccbab588cf349a39f2df5844444bc0db51f8b3c75fa9068507382b46a92cc32dc3132e325820ea158182de5b65f46de2913bd58fd737a3242b33729d9c7df -DIST hdparm-9.45.tar.gz 129410 SHA256 23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669 SHA512 2692382f16fe9a87b7c9673bea44b8a9512b2449aaf18090f09c9e761fadc153f71d9779d063218f6951797649c0758f97242b7327da6653ea53991bf3da9eb8 WHIRLPOOL 6c424e265b7845afeff26f87654fbefe7d563404f2dee59f976594a87b375124262864305a14655bf5379e77e21bea0d8fb179e099374d7e8f952199f569ee58 -EBUILD hdparm-9.39-r99.ebuild 1002 SHA256 1856e129df57d01bef8b168fe55a038fdc4a253f161e235e8065ef59dacddc62 SHA512 0a948b0a02f171dc4f0f3c6f088b72aeca47b6d7f8af27b5a06b73e596d9ee7ce48071aedc0bb37e42d09e77088577471c4d41f5694e6a49f803deeb572f1ee4 WHIRLPOOL f41d0f15bf88d29fb112e38d95bec5de115749adb2493f62949bbb9271ef7a84ef8ea8eaf9f1ebf505a21862673b463c8d180ebf363967aae3e1fd7c674e499a -EBUILD hdparm-9.45-r99.ebuild 1059 SHA256 610efd5b18638e667c955e064d896b2a76f7a354996cab3f9ce39371525f3c10 SHA512 836667acc79f9b7bd25867ac222f6565f9e2b55b0dfe20e57e06cb19fbed04523ee56a69cdd68c44924e99f5be6d55f33065a5c41f9a0deee19aa95653e99d7e WHIRLPOOL 362a12083b9d8088805bb205d2b359e01e9fc421904033f145f71f0cd7393007d6cfa5b665c72e77193ffcabfef7c4d8ac7e2cfe335691a4bc4212e105cad812 -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sys-apps/hdparm/files/hdparm-9.39-musl.patch b/sys-apps/hdparm/files/hdparm-9.39-musl.patch deleted file mode 100644 index 8c71bc76..00000000 --- a/sys-apps/hdparm/files/hdparm-9.39-musl.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ur a/hdparm-9.39/Makefile b/hdparm-9.39/Makefile ---- a/hdparm-9.39/Makefile -+++ b/hdparm-9.39/Makefile -@@ -13,7 +13,7 @@ - CC ?= gcc - STRIP ?= strip - --CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) -+CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs -D _GNU_SOURCE $(CFLAGS) - - LDFLAGS = -s - #LDFLAGS = -s -static -diff -ur a/hdparm-9.39/geom.c b/hdparm-9.39/geom.c ---- a/hdparm-9.39/geom.c -+++ b/hdparm-9.39/geom.c -@@ -16,7 +16,7 @@ - #include <dirent.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#include <linux/types.h> -+#include <sys/types.h> - #include <linux/fs.h> - - #include "hdparm.h" -diff -ur a/hdparm-9.39/hdparm.h b/hdparm-9.39/hdparm.h ---- a/hdparm-9.39/hdparm.h -+++ b/hdparm-9.39/hdparm.h -@@ -2,6 +2,7 @@ - - //#undef __KERNEL_STRICT_NAMES - #include <linux/types.h> -+#include <sys/stat.h> - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) -diff -ur a/hdparm-9.39/sysfs.c b/hdparm-9.39/sysfs.c ---- a/hdparm-9.39/sysfs.c -+++ b/hdparm-9.39/sysfs.c -@@ -12,9 +12,10 @@ - #include <stdio.h> - #include <fcntl.h> - #include <errno.h> -+#include <limits.h> - #include <dirent.h> - #include <sys/stat.h> --#include <linux/types.h> -+#include <sys/types.h> - - #include "hdparm.h" - diff --git a/sys-apps/hdparm/files/hdparm-9.45-musl.patch b/sys-apps/hdparm/files/hdparm-9.45-musl.patch deleted file mode 100644 index a9fe0aa1..00000000 --- a/sys-apps/hdparm/files/hdparm-9.45-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur a/hdparm-9.45/fallocate.c b/hdparm-9.45/fallocate.c ---- a/hdparm-9.45/fallocate.c 2010-10-04 20:38:39.000000000 -0100 -+++ b/hdparm-9.45/fallocate.c 2015-01-28 21:19:59.201795557 -0100 -@@ -27,7 +27,7 @@ - err = EINVAL; - #else - int fd; -- loff_t offset = 0, len; -+ off_t offset = 0, len; - int mode = 0; - - fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600); -diff -ur a/hdparm-9.45/hdparm.h b/hdparm-9.45/hdparm.h ---- a/hdparm-9.45/hdparm.h 2014-09-27 14:31:18.000000000 -0100 -+++ b/hdparm-9.45/hdparm.h 2015-01-28 21:19:08.662427386 -0100 -@@ -1,7 +1,7 @@ - /* Some prototypes for extern functions. */ - - //#undef __KERNEL_STRICT_NAMES --#include <linux/types.h> -+#include <sys/types.h> - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) -diff -ur a/hdparm-9.45/sysfs.c b/hdparm-9.45/sysfs.c ---- a/hdparm-9.45/sysfs.c 2010-10-04 20:39:20.000000000 -0100 -+++ b/hdparm-9.45/sysfs.c 2015-01-28 21:19:25.692214485 -0100 -@@ -13,6 +13,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <dirent.h> -+#include <limits.h> - #include <sys/stat.h> - #include <linux/types.h> - diff --git a/sys-apps/hdparm/files/hdparm-conf.d.3 b/sys-apps/hdparm/files/hdparm-conf.d.3 deleted file mode 100644 index a1ae626b..00000000 --- a/sys-apps/hdparm/files/hdparm-conf.d.3 +++ /dev/null @@ -1,26 +0,0 @@ -# /etc/conf.d/hdparm: config file for /etc/init.d/hdparm - -# -# Note that options such as -y which force *immediate* power saving options -# should generally not be placed here. The hdparm init.d script may run at -# anytime with respect to other init.d scripts that do system wide drive -# scans (like the hald script), so they will merely get spun right back up. -# If you wish to use these options, please use the local.start init.d script -# instead so that you're guaranteed that it will run last. -# - -# You can either set hdparm arguments for each drive using hdX_args, -# discX_args, cdromX_args and genericX_args, e.g. -# -# hda_args="-d1 -X66" -# disc1_args="-d1" -# cdrom0_args="-d1" - -# or you can set options for all PATA drives -pata_all_args="-d1" - -# or you can set options for all SATA drives -sata_all_args="" - -# or, you can set hdparm options for all drives -all_args="" diff --git a/sys-apps/hdparm/files/hdparm-init-8 b/sys-apps/hdparm/files/hdparm-init-8 deleted file mode 100644 index 9a4200c8..00000000 --- a/sys-apps/hdparm/files/hdparm-init-8 +++ /dev/null @@ -1,61 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-init-8,v 1.3 2012/04/29 00:30:18 vapier Exp $ - -depend() { - before bootmisc -} - -do_hdparm() { - local e= - eval e=\$${extra_args} - [ -z "${args}${all_args}${e}" ] && return 0 - - if [ -n "${args:=${all_args} ${e}}" ] ; then - local orgdevice=$(readlink -f "${device}") - if [ -b "${orgdevice}" ] ; then - ebegin "Running hdparm on ${device}" - hdparm ${args} "${device}" > /dev/null - eend $? - fi - fi -} - -scan_nondevfs() { - # non-devfs compatible system - local device - - for device in /dev/hd* /dev/sd* /dev/cdrom* ; do - [ -e "${device}" ] || continue - case "${device}" in - *[0-9]) continue ;; - /dev/hd*) extra_args="pata_all_args" ;; - /dev/sd*) extra_args="sata_all_args" ;; - *) extra_args="_no_xtra_args" ;; - esac - - # check that the block device really exists by - # opening it for reading - local errmsg= status= nomed=1 - errmsg=$(export LC_ALL=C ; : 2>&1 <"${device}") - status=$? - case ${errmsg} in - *": No medium found") nomed=0;; - esac - if [ -b "${device}" ] && [ "${status}" = "0" -o "${nomed}" = "0" ] ; then - local conf_var="${device##*/}_args" - eval args=\$${conf_var} - do_hdparm - fi - done -} - -start() { - if get_bootparam "nohdparm" ; then - ewarn "Skipping hdparm init as requested in kernel cmdline" - return 0 - fi - - scan_nondevfs -} diff --git a/sys-apps/hdparm/hdparm-9.39-r99.ebuild b/sys-apps/hdparm/hdparm-9.39-r99.ebuild deleted file mode 100644 index a7814a6b..00000000 --- a/sys-apps/hdparm/hdparm-9.39-r99.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.39.ebuild,v 1.10 2012/09/29 09:58:03 ulm Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Utility to change hard drive performance parameters" -HOMEPAGE="http://sourceforge.net/projects/hdparm/" -SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" - -LICENSE="BSD GPL-2" # GPL-2 only -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="" - -src_prepare() { - epatch ${FILESDIR}/${P}-musl.patch - - sed -i \ - -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \ - -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \ - Makefile || die "sed" -} - -src_compile() { - emake STRIP=: CC="$(tc-getCC)" -} - -src_install() { - into / - dosbin hdparm contrib/idectl - - newinitd "${FILESDIR}"/hdparm-init-8 hdparm - newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm - - doman hdparm.8 - dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig - docinto wiper - dodoc wiper/{README.txt,wiper.sh} -} diff --git a/sys-apps/hdparm/hdparm-9.45-r99.ebuild b/sys-apps/hdparm/hdparm-9.45-r99.ebuild deleted file mode 100644 index d0826b09..00000000 --- a/sys-apps/hdparm/hdparm-9.45-r99.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.2 2015/06/02 11:38:26 zlogene Exp $ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="Utility to change hard drive performance parameters" -HOMEPAGE="http://sourceforge.net/projects/hdparm/" -SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" - -LICENSE="BSD GPL-2" # GPL-2 only -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc ~x86" -IUSE="static" - -src_prepare() { - use static && append-ldflags -static - sed -i \ - -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \ - -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \ - Makefile || die "sed" - epatch "${FILESDIR}"/${P}-musl.patch -} - -src_compile() { - emake STRIP=: CC="$(tc-getCC)" -} - -src_install() { - into / - dosbin hdparm contrib/idectl - - newinitd "${FILESDIR}"/hdparm-init-8 hdparm - newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm - - doman hdparm.8 - dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig - docinto wiper - dodoc wiper/{README.txt,wiper.sh} -} diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml deleted file mode 100644 index 96a2d586..00000000 --- a/sys-apps/hdparm/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest deleted file mode 100644 index c9601415..00000000 --- a/sys-apps/iproute2/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502 -AUX iproute2-3.1.0-no-ipv6.patch 1352 SHA256 ee93d86903e6f0aff54cd3c861f91e3d37639d7fc975c9c088f281f1ca8017da SHA512 b80f190d58c0ba5ab61185648c039133d870f72e9b270e905cc93aa335a20c1d880b00dd32eb7cd427c40f4e3182936b6b3156884ebf9ff976da0b76759ca9ab WHIRLPOOL ea155aa0e5c23b78df11b38613a763ac3e4674fd0c8aebad2f25c975e668ef00bd4b47a44e69f5bf5557d547436434a899dcfbd723d64828aaded76b207708db -AUX iproute2-3.10.0-no-ipv6.patch 1390 SHA256 7fd8cce977876c7815990912965d056396b25885219397ac4fd469357230265e SHA512 344d19146f1e518d4631cbebf794d047f54ff845d29439cb51d1398fded38b9ead6e4b6deede1c9c412fdb9c11f8c83058c6d514ba4229a8d4c71e3c967affa8 WHIRLPOOL 5dfe8c13297cc49ce785449c224527e24eebe10b41ad791777f9c5e8c8f650ae019d127bd1a2e80a92f32d7c63b6eb2745ce664306f025db2f1241c4713fb978 -AUX iproute2-3.19.0-musl.patch 794 SHA256 f15ef3d2455f8dbddc1e1060bdfe63e91d768a5678f230bf0dd8fba5d4032834 SHA512 43bf34904f504f87c6e9acdc1824cc9aa8d16c04d8a88923553a121c06d67f48784b62d4e27923d0b2803eb98f1fc2bcae66cc5232aced6ba929e0b93cff1de5 WHIRLPOOL 3a355863a898714c8754d5ebfd506fbfd1102d25e09c020f9267e187e4117e5f004ef8b227bedfce9fb59234914adfdb57590305cc6c6c8921e55bdafd24a333 -AUX iproute2-3.8.0-musl-headers.patch 2701 SHA256 3d6c6ff432f68ab76bc818aee6228eb6272c52679c86e3e49c556fec3de4d03d SHA512 bee8782ad8f2c3fcfc000f26e3d358a189f1518e45c2a2992356653e60381f31b2209c40b14b72ed11f925c330ca052f12a409b9575aa384274e91c47cbb3d8b WHIRLPOOL 9a1fa59e12bac76ea06e33481e10808d165d4a95eabb63eff69f5258df5c84dca5403c1096557e9fc595ec5acac4a306ff29feb8f3645b2af6d2cc8c3ba0ebd2 -AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf -AUX iproute2-4.0.0-fix-build-with-musl.patch 586 SHA256 e617316ce2803b6ad0dca43426a7a6c8762809f8e1e984da8c935bcff4db8e34 SHA512 2473432adbc02f0085be7b689af00527bc87f3ee89e313425dbc3a02e1a4569b1c397fc7160a2b26907c5edff3fdd5bd38d7e27043a9bebfbc36d714c8281953 WHIRLPOOL a6b451b38bb977a0b52fa904905c599922693c425537d5173c981dc2082d6c55f9a0d01514405e57c5719c376357f4759333ea3ad5dea849f4cef9df76d12181 -AUX iproute2-4.0.0-tc-show-buffer-overflow.patch 1717 SHA256 2ddb5ea744185f5ebff79961a054570b166ad1a5f3df0b91b59927d1b86c7aa3 SHA512 f5b507ce9d9a2cf4b86c0c2e2a18c5295226707df707eb229ec2f880b0fee64740a039fe5aa334c1dfc2d04faec4200cdb27dfaf631119a8705dd698f2767a77 WHIRLPOOL 801e25b3f6984b59d95eb494dfa63502e2c32551c8f5376ab6109a6bf5b9401f1b7bf6a0e0456dc68abb207d9505b5dbade675ea39e709e27a839357a431c444 -DIST iproute2-3.19.0.tar.xz 455004 SHA256 e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 SHA512 fc533b6a526cfda234f043ac25302a3206a81ab2a740640b997b6bfb22e6f94ddc21b704191a358ea8721a327ba785e0224a4b4129111ef5008b4003379c3706 WHIRLPOOL 6a0aa1a948286d7dcb3663d787167c27760d756385295bf0ca631920aed50fbd984c19204247097116ef0d4e293c3c8dbe13b0b44c6ec83e7815a7461293c89f -DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512 0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade WHIRLPOOL bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df -DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b -EBUILD iproute2-3.19.0-r99.ebuild 3638 SHA256 db56d0742f3a2e0808395a958118e36062e7f56b35a36d9c534f1caa6459bb3d SHA512 a5dfffef35a7c459def9dcf57a92af5caf11b84e6c0f76b81b6035bc053bb9b09c8e8f735a8009bb405fd596a6c8f08561d6ce00fd1f8c03871527dcd209248f WHIRLPOOL 3fbba0222b33ef1a8f250e10208a7a71dca90217869f86b552536bc47bbdbcbbdc616aad31ca0d387e40b7872e0e92b3a828348f5fefed3db5d810d45fa7e67a -EBUILD iproute2-3.8.0-r99.ebuild 3492 SHA256 c301203fe02eca67fb1a7cd4a7ad2d76eca17e2a2f0bfc8e877bf75260a253fb SHA512 aaa8305610842a4f87aee1512c5185a44d1fcf572a7cb21e3a6e4e1dd36c1d55efac7126a126f982e404c495a74934e9ca0048a707d9ed685719b467094ea5ab WHIRLPOOL 09b2e6783302c4fb2f61cd5641dd6dcbf9281adc13b3f13d414117beadf763ce9922bb86517ebdf47b79a82cdd42f0762b34ae486d3f0471644672a1ceb42248 -EBUILD iproute2-4.0.0-r99.ebuild 3723 SHA256 898e0da7fc5887d8f25fcaaa13b98afb53279ea2a7574f66b322d1bc0c5f3fc6 SHA512 3b6b7509e6f769e5fb005d6740c8914d1556027e4d9eafcea74c2e4d29e42e12c9da1388146fcaa50a0bd3eb81d917fc401dea695d5ee74e7e02f887e0376171 WHIRLPOOL ffe9b8168e081a89265c879d7899ffb1c4f6f0f9fc98cb581660440dcd60c9eab115737e3b0f6c5d0f9352233093dc989a60217425701b1f367d3912a5135b76 -MISC metadata.xml 317 SHA256 45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512 2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872 WHIRLPOOL 73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09 diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch deleted file mode 100644 index fa12dad2..00000000 --- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch +++ /dev/null @@ -1,48 +0,0 @@ -http://bugs.gentoo.org/291907 - -This patch was merged from two patches extracted from this thread: -http://markmail.org/thread/qkd76gpdgefpjlfn - -tc_stab.c: small fixes to commandline help - - -tc_core.c: -As kernel part of things relies on cell align which is always set to -1, -I also added it to userspace computation stage. This way if someone -specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't -end with tsize supporting mtu 4096 suddenly, New default mtu is also set -to 2048 (disregarding weirdness of setting mtu to such values). - - -Unless I missed something, this is harmless and feels cleaner, but if it's -not allowed, documentation will have to be changed back to 2047 + extra -explanation as well. - ---- iproute2/tc/tc_core.c -+++ iproute2/tc/tc_core.c -@@ -155,12 +155,12 @@ - } - - if (s->mtu == 0) -- s->mtu = 2047; -+ s->mtu = 2048; - if (s->tsize == 0) - s->tsize = 512; - - s->cell_log = 0; -- while ((s->mtu >> s->cell_log) > s->tsize - 1) -+ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1) - s->cell_log++; - - *stab = malloc(s->tsize * sizeof(__u16)); ---- iproute2/tc/tc_stab.c -+++ iproute2/tc/tc_stab.c -@@ -32,7 +32,7 @@ - fprintf(stderr, - "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n" - " [ overhead BYTES ] [ linklayer TYPE ] ...\n" -- " mtu : max packet size we create rate map for {2047}\n" -+ " mtu : max packet size we create size table for {2048}\n" - " tsize : how many slots should size table have {512}\n" - " mpu : minimum packet size used in rate computations\n" - " overhead : per-packet size overhead used in rate computations\n" diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch deleted file mode 100644 index 1282a1b5..00000000 --- a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/326849 - -allow ipv6 to be disabled - ---- a/ip/iptunnel.c -+++ b/ip/iptunnel.c -@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv) - break; - case AF_INET: - break; -- /* -- * This is silly enough but we have no easy way to make it -- * protocol-independent because of unarranged structure between -- * IPv4 and IPv6. -- */ -- case AF_INET6: -- return do_ip6tunnel(argc, argv); - default: - fprintf(stderr, "Unsupported family:%d\n", preferred_family); - exit(-1); ---- a/ip/Makefile -+++ b/ip/Makefile -@@ -1,6 +1,6 @@ - IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ -- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \ -+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \ - ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ - iplink_vlan.o link_veth.o link_gre.o iplink_can.o \ - iplink_macvlan.o iplink_macvtap.o ipl2tp.o ---- a/ip/ipmonitor.c -+++ b/ip/ipmonitor.c -@@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who, - if (n->nlmsg_type == RTM_NEWPREFIX) { - if (prefix_banner) - fprintf(fp, "[PREFIX]"); -- print_prefix(who, n, arg); - return 0; - } - if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { diff --git a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch deleted file mode 100644 index 86d80d2d..00000000 --- a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/326849 - -allow ipv6 to be disabled - ---- a/ip/iptunnel.c -+++ b/ip/iptunnel.c -@@ -629,13 +629,6 @@ int do_iptunnel(int argc, char **argv) - break; - case AF_INET: - break; -- /* -- * This is silly enough but we have no easy way to make it -- * protocol-independent because of unarranged structure between -- * IPv4 and IPv6. -- */ -- case AF_INET6: -- return do_ip6tunnel(argc, argv); - default: - fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family); - exit(-1); ---- a/ip/Makefile -+++ b/ip/Makefile -@@ -1,6 +1,6 @@ - IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ -- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ -+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \ - ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ - iplink_vlan.o link_veth.o link_gre.o iplink_can.o \ - iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o \ ---- a/ip/ipmonitor.c -+++ b/ip/ipmonitor.c -@@ -96,7 +96,6 @@ static int accept_msg(const struct socka - if (n->nlmsg_type == RTM_NEWPREFIX) { - if (prefix_banner) - fprintf(fp, "[PREFIX]"); -- print_prefix(who, n, arg); - return 0; - } - if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) { diff --git a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch b/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch deleted file mode 100644 index 6ebc8086..00000000 --- a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur a/iproute2-3.19.0/include/linux/if_bridge.h b/iproute2-3.19.0/include/linux/if_bridge.h ---- a/iproute2-3.19.0/include/linux/if_bridge.h 2015-02-11 01:14:32.000000000 -0200 -+++ b/iproute2-3.19.0/include/linux/if_bridge.h 2015-04-25 21:39:38.130830774 -0200 -@@ -15,7 +15,6 @@ - - #include <linux/types.h> - #include <linux/if_ether.h> --#include <linux/in6.h> - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff -ur a/iproute2-3.19.0/lib/namespace.c b/iproute2-3.19.0/lib/namespace.c ---- a/iproute2-3.19.0/lib/namespace.c 2015-02-11 01:14:32.000000000 -0200 -+++ b/iproute2-3.19.0/lib/namespace.c 2015-04-25 21:39:01.273291557 -0200 -@@ -9,6 +9,7 @@ - - #include <fcntl.h> - #include <dirent.h> -+#include <sys/param.h> - - #include "utils.h" - #include "namespace.h" diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch b/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch deleted file mode 100644 index a0b2e45f..00000000 --- a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c ---- iproute2-3.8.0.orig/misc/arpd.c 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/misc/arpd.c 2015-01-17 12:23:52.251980551 +0000 -@@ -18,7 +18,7 @@ - #include <netdb.h> - #include <db_185.h> - #include <sys/ioctl.h> --#include <sys/poll.h> -+#include <poll.h> - #include <errno.h> - #include <fcntl.h> - #include <sys/uio.h> -diff -Naur iproute2-3.8.0.orig/misc/ifstat.c iproute2-3.8.0/misc/ifstat.c ---- iproute2-3.8.0.orig/misc/ifstat.c 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/misc/ifstat.c 2015-01-17 12:23:42.795640740 +0000 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> -diff -Naur iproute2-3.8.0.orig/misc/lnstat.h iproute2-3.8.0/misc/lnstat.h ---- iproute2-3.8.0.orig/misc/lnstat.h 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/misc/lnstat.h 2015-01-17 12:33:50.391207710 +0000 -@@ -2,6 +2,7 @@ - #define _LNSTAT_H - - #include <limits.h> -+#include <sys/time.h> - - #define LNSTAT_VERSION "0.02 041002" - -diff -Naur iproute2-3.8.0.orig/misc/nstat.c iproute2-3.8.0/misc/nstat.c ---- iproute2-3.8.0.orig/misc/nstat.c 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/misc/nstat.c 2015-01-17 12:23:27.683097666 +0000 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> -diff -Naur iproute2-3.8.0.orig/misc/rtacct.c iproute2-3.8.0/misc/rtacct.c ---- iproute2-3.8.0.orig/misc/rtacct.c 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/misc/rtacct.c 2015-01-17 12:23:35.340372834 +0000 -@@ -22,7 +22,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <sys/mman.h> -diff -Naur iproute2-3.8.0.orig/tc/tc_stab.c iproute2-3.8.0/tc/tc_stab.c ---- iproute2-3.8.0.orig/tc/tc_stab.c 2015-01-17 12:19:44.001058119 +0000 -+++ iproute2-3.8.0/tc/tc_stab.c 2015-01-17 12:22:35.692229262 +0000 -@@ -21,6 +21,7 @@ - #include <arpa/inet.h> - #include <string.h> - #include <malloc.h> -+#include <sys/param.h> - - #include "utils.h" - #include "tc_util.h" -diff -Naur iproute2-3.8.0.orig/tc/tc_util.c iproute2-3.8.0/tc/tc_util.c ---- iproute2-3.8.0.orig/tc/tc_util.c 2013-02-21 16:41:20.000000000 +0000 -+++ iproute2-3.8.0/tc/tc_util.c 2015-01-17 12:21:57.785866923 +0000 -@@ -20,6 +20,7 @@ - #include <arpa/inet.h> - #include <string.h> - #include <math.h> -+#include <sys/param.h> - - #include "utils.h" - #include "tc_util.h" diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch b/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch deleted file mode 100644 index 96280e04..00000000 --- a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03fdb011dd661315a83998af8af779d8f089e3fe Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <stephen@networkplumber.org> -Date: Wed, 17 Apr 2013 13:33:26 -0700 -Subject: [PATCH] ipnetns: fix build on older systems - -Debian Squeeze has out of date <sys/mount.h> without the required flags. ---- - ip/ipnetns.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index b047b97..c9bc20a 100644 ---- a/ip/ipnetns.c -+++ b/ip/ipnetns.c -@@ -29,6 +29,20 @@ - #define MNT_DETACH 0x00000002 /* Just detach from the tree */ - #endif /* MNT_DETACH */ - -+/* sys/mount.h may be out too old to have these */ -+#ifndef MS_REC -+#define MS_REC 16384 -+#endif -+ -+#ifndef MS_SLAVE -+#define MS_SLAVE (1 << 19) -+#endif -+ -+#ifndef MS_SHARED -+#define MS_SHARED (1 << 20) -+#endif -+ -+ - #ifndef HAVE_SETNS - static int setns(int fd, int nstype) - { --- -1.8.2.1 - diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch b/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch deleted file mode 100644 index 5281be34..00000000 --- a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index 913bd8e..260d1e0 100644 ---- a/include/linux/if_bridge.h -+++ b/include/linux/if_bridge.h -@@ -15,7 +15,6 @@ - - #include <linux/types.h> - #include <linux/if_ether.h> --#include <linux/in6.h> - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff --git a/lib/namespace.c b/lib/namespace.c -index c03a103..f121eaa 100644 ---- a/lib/namespace.c -+++ b/lib/namespace.c -@@ -9,6 +9,7 @@ - - #include <fcntl.h> - #include <dirent.h> -+#include <sys/param.h> - - #include "utils.h" - #include "namespace.h" diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch b/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch deleted file mode 100644 index 6c6c9a5c..00000000 --- a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch +++ /dev/null @@ -1,62 +0,0 @@ -https://bugs.gentoo.org/546928 - -From 46679bbbe89699016d31486de7599590d02a5054 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan <vadim4j@gmail.com> -Date: Mon, 20 Apr 2015 08:33:32 +0300 -Subject: [PATCH] tc util: Fix possible buffer overflow when print class id - -Use correct handle buffer length. - -Signed-off-by: Vadim Kochan <vadim4j@gmail.com> ---- - tc/tc_util.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/tc/tc_util.c b/tc/tc_util.c -index 1d3153d..dc2b70f 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -128,30 +128,31 @@ ok: - return 0; - } - --int print_tc_classid(char *buf, int len, __u32 h) -+int print_tc_classid(char *buf, int blen, __u32 h) - { -- char handle[40] = {}; -+ SPRINT_BUF(handle) = {}; -+ int hlen = SPRINT_BSIZE - 1; - - if (h == TC_H_ROOT) - sprintf(handle, "root"); - else if (h == TC_H_UNSPEC) -- snprintf(handle, len, "none"); -+ snprintf(handle, hlen, "none"); - else if (TC_H_MAJ(h) == 0) -- snprintf(handle, len, ":%x", TC_H_MIN(h)); -+ snprintf(handle, hlen, ":%x", TC_H_MIN(h)); - else if (TC_H_MIN(h) == 0) -- snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16); -+ snprintf(handle, hlen, "%x:", TC_H_MAJ(h) >> 16); - else -- snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h)); -+ snprintf(handle, hlen, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h)); - - if (use_names) { - char clname[IDNAME_MAX] = {}; - - if (id_to_name(cls_names, h, clname)) -- snprintf(buf, len, "%s#%s", clname, handle); -+ snprintf(buf, blen, "%s#%s", clname, handle); - else -- snprintf(buf, len, "%s", handle); -+ snprintf(buf, blen, "%s", handle); - } else { -- snprintf(buf, len, "%s", handle); -+ snprintf(buf, blen, "%s", handle); - } - - return 0; --- -2.3.5 - diff --git a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild deleted file mode 100644 index 08c29dee..00000000 --- a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.19.0.ebuild,v 1.5 2015/04/25 12:36:09 zlogene Exp $ - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -RDEPEND="!net-misc/arpd - iptables? ( >=net-firewall/iptables-1.4.20:= ) - !minimal? ( berkdb? ( sys-libs/db ) ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-2.6.27 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849 - - epatch "${FILESDIR}"/${PN}-3.19.0-musl.patch - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - ip/ipnetns.c \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - # don't build arpd if USE=-berkdb #81660 - use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - echo 'main(){return setns();};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'main(){};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild b/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild deleted file mode 100644 index cae49ff0..00000000 --- a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.18 2014/01/18 11:02:22 vapier Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal" - -RDEPEND="!net-misc/arpd - iptables? ( >=net-firewall/iptables-1.4.16 ) - !minimal? ( berkdb? ( sys-libs/db ) ) - atm? ( net-dialup/linux-atm )" -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-2.6.27 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - epatch "${FILESDIR}"/${P}-old-mount-libc.patch #468120 - epatch "${FILESDIR}"/${P}-musl-headers.patch - use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849 - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - # don't build arpd if USE=-berkdb #81660 - use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - echo 'main(){return setns();};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'main(){};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild b/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild deleted file mode 100644 index c9ef0728..00000000 --- a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild,v 1.1 2015/04/20 20:51:18 vapier Exp $ - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-2 -else - SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" - -RDEPEND="!net-misc/arpd - iptables? ( >=net-firewall/iptables-1.4.20:= ) - !minimal? ( berkdb? ( sys-libs/db:= ) ) - atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - app-arch/xz-utils - iptables? ( virtual/pkgconfig ) - sys-devel/bison - sys-devel/flex - >=sys-kernel/linux-headers-2.6.27 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 - epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928 - use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849 - epatch "${FILESDIR}"/${PN}-4.0.0-fix-build-with-musl.patch - - sed -i \ - -e '/^CC =/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^WFLAGS/s:-Werror::" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Use /run instead of /var/run. - sed -i \ - -e 's:/var/run:/run:g' \ - ip/ipnetns.c \ - man/man8/ip-netns.8 || die - - # build against system headers - rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - # don't build arpd if USE=-berkdb #81660 - use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null - echo 'main(){return setns();};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n - echo 'main(){};' > test.c - ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile - popd >/dev/null - - cat <<-EOF > Config - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, #144265 #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - EOF -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - return 0 - fi - - emake \ - DESTDIR="${D}" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 - - dodir /bin - mv "${ED}"/{s,}bin/ip || die #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - # This local header pulls in a lot of linux headers it - # doesn't directly need. Delete this header that requires - # linux-headers-3.8 until that goes stable. #467716 - sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die - - if use berkdb ; then - dodir /var/lib/arpd - # bug 47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - fi -} diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml deleted file mode 100644 index eab1d3a7..00000000 --- a/sys-apps/iproute2/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<use> - <flag name='berkdb'>build programs that use berkdb (just arpd)</flag> - <flag name='iptables'>include support for iptables filtering</flag> -</use> -</pkgmetadata> diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest deleted file mode 100644 index c6b617e9..00000000 --- a/sys-apps/kbd/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX kbd-1.15.5-fix-struct_winsize-collision.patch 366 SHA256 510856ce92915a2f2c2547b99761a5c62c5ca452a6a57a43c2ec3392509fa3b6 SHA512 19f0623b594796e7bf3f82421d46fefcf9acc210683b4915d5ae6a0ddf026ccd373abb9f0cfb7d8ad99cc19443b5e585150f480653e360efb76dfdd722c801d2 WHIRLPOOL 8c7fd883c3b2b032ff0790514d519083a9a8dad09cfa3ad931ad9423d6ec511c2ab15938ba30c98fb986875dec44d0c5d3382cc223542f91d36ffb880e368e16 -AUX kbd-1.15.5-loadkeys-parse.patch 2163 SHA256 8fa928854ee1e3298df99e600cfdb08ccf8b44b7a7fc42423569fecc9365aa22 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d WHIRLPOOL 26b1adadc347b534675c7426eb9aca535556b81cffdd1ccd7ef50c603e127c1f9f6774af1b8050c67fc81daefe0c33da4593f74d3b77c47a089d6772363153e8 -AUX kbd-1.15.5-musl-headers-error.patch 3456 SHA256 5ada44aa9dc55385cb55d5b22a3d657e932652b8a0b0f261de91c635450e734c SHA512 56dd0fca91284ef76a5265cc92c08ac404b3ed2fde9d02a7d631d27ae380dde75343a889bdd7d320daa09212db1ae70a2f8b91ddc42513133fefa78da59e9b36 WHIRLPOOL 4908b996e41abead43259680630885ac65fc45cb0d75677302a32324c082b1c56927e73cdda16c37250d00d8e9820e56b624e7e21d12247e8a5489cdfaf540eb -AUX kbd-2.0.0-tests.patch 747 SHA256 b1bd608043ecd19a9f0a9431afd4f3202e4d953b7f5c361d3e5949de65eda852 SHA512 408df2b4a9409c10c350d4c879a273cf7126ba58b49546a910cc93e0fd3119014a32b3e8b9c19eddecc9f601aa9d2a1b2b25c563f9529691c2d44f8db4cd0974 WHIRLPOOL 27e78a5dfb6d4ee3e117cbbfdd3025ee99980201e590c4631fab399a89a408a5275d17beac60da2364d2dfaf7f9e1cfda5c8cc8e74713d4160241bffd41c9b6a -AUX kbd-2.0.2-musl-headers-error.patch 3327 SHA256 93add08a331bf538a3894a302fd9f5dc8631043feba7d1441773800f4d47e07c SHA512 4411480ed84e992cf8ede1f54983ef804cc2ce4ce3a952127454188a6a341293cb2ddfc26d61a04d678c8a58b311d6df78f4c406b475dbe18c379e36ee5406dd WHIRLPOOL 8512ed0f2738a9b4a69e6028c0c10b1adfde4537ad66a0b4393842df49475c7be94abe709556834a96d2781142a09acde7fc2fb9fdb9b3853c7b7440ac9432d9 -DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c WHIRLPOOL 431873623d4125b73622894c511711a2153fae498a17dc59851219405c69a641c24bb591fa66001eb4cc7491fc4f90e532661c2bf56f69e2a17dd435d1e14ace -DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849 -EBUILD kbd-1.15.5-r99.ebuild 1221 SHA256 c06e81423bcc222bb2b59913f3c4b6485cec106ba52bf8115448a15238ac52b5 SHA512 afcb55f95bc9bb004a83f91245ef2d436b9eebcb8ba3ae3935a12d4eb98d4857e0a6aed66797501fc53d49af2bddac295025cb4951a5d267962fc80e8210922d WHIRLPOOL 7e3316431c4b8a10a644ec99f3e23830be8fb7b759e9f40c1a923e1034733fc7842e61dec3485e97e2728ce5fa69ae34798b5596e33635eb5fe0e69600059017 -EBUILD kbd-2.0.2-r99.ebuild 1520 SHA256 786bb5ef7317bb5a3ac208d6f33002fe59387649c73d36d85ea9a18bc36acced SHA512 e5068082e06839f407ce553dde8b3cc0013cb0b8b855fcd009f895c4dde8ac7fcda876dc20ea246fbe7a10e7c26d7454b28773a8a4f2372016bdfe701f4de5dd WHIRLPOOL b8f8a57861cd48b87095ed713a94c6977c97c72e689ad9a165b92fbdf73bef68aa1798d7356199edca820bccc1e093e13adce63db49378f8acf53f749737a7e4 -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch deleted file mode 100644 index 29360908..00000000 --- a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur kbd-1.15.5.orig/src/resizecons.c kbd-1.15.5/src/resizecons.c ---- kbd-1.15.5.orig/src/resizecons.c 2012-12-01 21:41:38.000000000 +0000 -+++ kbd-1.15.5/src/resizecons.c 2014-01-16 13:48:25.793935059 +0000 -@@ -82,7 +82,6 @@ - #include <sys/perm.h> - #else - #include <linux/types.h> --#include <linux/termios.h> - #endif - #include <linux/vt.h> - #include "paths.h" diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch deleted file mode 100644 index c78a2278..00000000 --- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch +++ /dev/null @@ -1,90 +0,0 @@ -https://bugs.gentoo.org/447440 - -From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <gladkov.alexey@gmail.com> -Date: Tue, 11 Dec 2012 14:24:44 +0400 -Subject: [PATCH] Fix regression in 16117ce6ab - -Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> ---- - src/loadkeys.analyze.l | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l -index c18dcea..f817c78 100644 ---- a/src/loadkeys.analyze.l -+++ b/src/loadkeys.analyze.l -@@ -307,8 +307,10 @@ To to|To|TO - char *s = xstrndup(yytext+1, strlen(yytext)-2); - /* use static pathname to store *s ? */ - open_include(s); -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - } - <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} { - yyerror(_("expected filename between quotes")); -@@ -323,7 +325,7 @@ To to|To|TO - } - {Eol} { - line_nr++; -- if (state_ptr > 0) { -+ while (state_ptr > 0) { - yy_pop_state(); - state_ptr--; - } -@@ -428,8 +430,10 @@ To to|To|TO - } - <STR>\" { - *p = '\0'; -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - return(STRLITERAL); - } - . { ---- a/src/loadkeys.analyze.c -+++ b/src/loadkeys.analyze.c -@@ -1359,8 +1359,10 @@ YY_RULE_SETUP - char *s = xstrndup(yytext+1, strlen(yytext)-2); - /* use static pathname to store *s ? */ - open_include(s); -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - } - YY_BREAK - case 3: -@@ -1393,7 +1395,7 @@ YY_RULE_SETUP - #line 324 "loadkeys.analyze.l" - { - line_nr++; -- if (state_ptr > 0) { -+ while (state_ptr > 0) { - yy_pop_state(); - state_ptr--; - } -@@ -1670,8 +1670,10 @@ YY_RULE_SETUP - #line 429 "loadkeys.analyze.l" - { - *p = '\0'; -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - return(STRLITERAL); - } - YY_BREAK --- -1.8.0.2 diff --git a/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch deleted file mode 100644 index ad52a63f..00000000 --- a/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Naur kbd-1.15.3.orig/src/dumpkeys.c kbd-1.15.3/src/dumpkeys.c ---- kbd-1.15.3.orig/src/dumpkeys.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/dumpkeys.c 2013-07-06 02:20:41.660131968 +0000 -@@ -12,6 +12,7 @@ - #include <linux/kd.h> - #include <linux/keyboard.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - #include <string.h> - #include <errno.h> - #include "ksyms.h" -diff -Naur kbd-1.15.3.orig/src/kbdinfo.c kbd-1.15.3/src/kbdinfo.c ---- kbd-1.15.3.orig/src/kbdinfo.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/kbdinfo.c 2013-07-06 02:29:12.057160508 +0000 -@@ -1,6 +1,5 @@ - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <unistd.h> - #include <sys/ioctl.h> - #include <linux/kd.h> -@@ -9,6 +8,10 @@ - #include "nls.h" - #include "version.h" - -+#define error(e, n, s) \ -+ perror(s); \ -+ exit(e); \ -+ - static const char *action = NULL; - static const char *value = NULL; - -diff -Naur kbd-1.15.3.orig/src/kbdrate.c kbd-1.15.3/src/kbdrate.c ---- kbd-1.15.3.orig/src/kbdrate.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/kbdrate.c 2013-07-06 02:21:53.121135964 +0000 -@@ -74,6 +74,7 @@ - #include <errno.h> - #include <sys/file.h> - #include <sys/ioctl.h> -+#include <fcntl.h> - - #ifdef __sparc__ - #include <asm/param.h> -diff -Naur kbd-1.15.3.orig/src/loadkeys.c kbd-1.15.3/src/loadkeys.c ---- kbd-1.15.3.orig/src/loadkeys.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/loadkeys.c 2013-07-06 02:21:02.148133114 +0000 -@@ -79,6 +79,7 @@ - #include <ctype.h> - #include <sys/param.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - #include <linux/kd.h> - #include <linux/keyboard.h> - #include <unistd.h> -diff -Naur kbd-1.15.3.orig/src/openvt.c kbd-1.15.3/src/openvt.c ---- kbd-1.15.3.orig/src/openvt.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/openvt.c 2013-07-06 02:22:11.080136968 +0000 -@@ -10,6 +10,7 @@ - #include <sys/vt.h> - #include <sys/wait.h> - #include <sys/file.h> -+#include <fcntl.h> - - #include "version.h" - #include "xmalloc.h" -diff -Naur kbd-1.15.3.orig/src/setvtrgb.c kbd-1.15.3/src/setvtrgb.c ---- kbd-1.15.3.orig/src/setvtrgb.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/setvtrgb.c 2013-07-06 02:34:26.390178084 +0000 -@@ -5,12 +5,15 @@ - #include <sys/ioctl.h> - #include <linux/kd.h> - #include <errno.h> --#include <error.h> - #include "kbd.h" - #include "getfd.h" - #include "nls.h" - #include "version.h" - -+#define error(e, n, s) \ -+ perror(s); \ -+ exit(e); \ -+ - static unsigned char *cmap; - - /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's -@@ -82,25 +85,21 @@ - if (c == EOF) - error(EXIT_FAILURE, errno, "fscanf"); - -- error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."), -- filename, rows + 1, cols + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - } - - cmap[rows + cols * 3] = (unsigned char) val; - - if (cols < 15 && fgetc(fd) != ',') -- error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - cols++; - } - - if ((c = fgetc(fd)) == EOF) -- error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - - if (c != '\n') -- error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - } - } - diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch deleted file mode 100644 index 7a4e186c..00000000 --- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -11,7 +11,13 @@ - AC_CONFIG_SRCDIR([src/loadkeys.c]) - AC_CONFIG_HEADERS(config.h) - --PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -+AC_ARG_ENABLE(tests, -+ AS_HELP_STRING(--enable-tests, [build tests]), -+ [BUILD_TESTS=$enableval],[BUILD_TESTS=no]) -+AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes") -+if test "$BUILD_TESTS" = "yes"; then -+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -+fi - - m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) - AM_SILENT_RULES([yes]) ---- Makefile.am -+++ Makefile.am -@@ -8,7 +8,10 @@ - CREDITS \ - contrib docs rc - --SUBDIRS = src data po tests docs -+SUBDIRS = src data po docs -+if BUILD_TESTS -+SUBDIRS += tests -+endif - - kbd-$(VERSION).tar.xz: - make distcheck diff --git a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch b/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch deleted file mode 100644 index 69ac7d0e..00000000 --- a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/src/kbdinfo.c b/src/kbdinfo.c -index e5f122d..dcdcac0 100644 ---- a/src/kbdinfo.c -+++ b/src/kbdinfo.c -@@ -1,6 +1,5 @@ - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <unistd.h> - #include <sys/ioctl.h> - #include <linux/kd.h> -@@ -9,6 +8,10 @@ - #include "nls.h" - #include "version.h" - -+#define error(e, n, ...) \ -+ fprintf(stderr, ##__VA_ARGS__); \ -+ exit(e); -+ - static const char *action = NULL; - static const char *value = NULL; - -diff --git a/src/kbdrate.c b/src/kbdrate.c -index 2ab8388..5faff00 100644 ---- a/src/kbdrate.c -+++ b/src/kbdrate.c -@@ -74,6 +74,7 @@ beats rebuilding the kernel! - #include <errno.h> - #include <sys/file.h> - #include <sys/ioctl.h> -+#include <fcntl.h> - #include <linux/kd.h> - - #ifdef __sparc__ -diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c -index 0262e24..606931e 100644 ---- a/src/libkeymap/dump.c -+++ b/src/libkeymap/dump.c -@@ -13,6 +13,7 @@ - #include <string.h> - #include <ctype.h> - #include <unistd.h> -+#include <sys/types.h> - - #include "keymap.h" - -diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c -index 67be81e..e13498b 100644 ---- a/src/libkeymap/kmap.c -+++ b/src/libkeymap/kmap.c -@@ -1,5 +1,6 @@ - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - - #include "nls.h" - #include "kbd.h" -diff --git a/src/libkeymap/summary.c b/src/libkeymap/summary.c -index 46df90d..0912ae8 100644 ---- a/src/libkeymap/summary.c -+++ b/src/libkeymap/summary.c -@@ -9,6 +9,7 @@ - #include <string.h> - #include <errno.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - - #include "keymap.h" - -diff --git a/src/openvt.c b/src/openvt.c -index 075136f..49720d7 100644 ---- a/src/openvt.c -+++ b/src/openvt.c -@@ -10,6 +10,7 @@ - #include <sys/vt.h> - #include <sys/wait.h> - #include <sys/file.h> -+#include <fcntl.h> - - #include "version.h" - #include "xmalloc.h" -@@ -19,6 +20,8 @@ - #include "compat/linux-limits.h" - #endif - -+#define NAME_MAX 255 -+ - // There must be a universal way to find these! - #define TRUE (1) - #define FALSE (0) -diff --git a/src/setvtrgb.c b/src/setvtrgb.c -index f99badc..f1a631c 100644 ---- a/src/setvtrgb.c -+++ b/src/setvtrgb.c -@@ -5,12 +5,15 @@ - #include <sys/ioctl.h> - #include <linux/kd.h> - #include <errno.h> --#include <error.h> - #include "kbd.h" - #include "getfd.h" - #include "nls.h" - #include "version.h" - -+#define error(e, n, ...) \ -+ fprintf(stderr, ##__VA_ARGS__); \ -+ exit(e); -+ - static unsigned char *cmap; - - /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's -diff --git a/src/vlock/auth.c b/src/vlock/auth.c -index da135ce..a3f365b 100644 ---- a/src/vlock/auth.c -+++ b/src/vlock/auth.c -@@ -22,7 +22,6 @@ - */ - - #include <errno.h> --#include <error.h> - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -diff --git a/src/vlock/vlock.c b/src/vlock/vlock.c -index c2c4158..fa2f386 100644 ---- a/src/vlock/vlock.c -+++ b/src/vlock/vlock.c -@@ -23,7 +23,6 @@ - - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <string.h> - #include <stdlib.h> - #include <unistd.h> -diff --git a/src/vlock/vt.c b/src/vlock/vt.c -index 4e5282b..f3ba85d 100644 ---- a/src/vlock/vt.c -+++ b/src/vlock/vt.c -@@ -23,7 +23,6 @@ - - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <string.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/sys-apps/kbd/kbd-1.15.5-r99.ebuild b/sys-apps/kbd/kbd-1.15.5-r99.ebuild deleted file mode 100644 index 78572570..00000000 --- a/sys-apps/kbd/kbd-1.15.5-r99.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.6 2014/01/09 13:37:41 polynomial-c Exp $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://freshmeat.net/projects/kbd/" -SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="nls pam" - -RDEPEND="pam? ( virtual/pam )" -DEPEND="${RDEPEND}" - -src_unpack() { - default - cd "${S}" - - # broken file ... upstream git punted it - rm po/es.po - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 - mv dvorak/no.map dvorak/no-dvorak.map - mv fgGIod/trf.map fgGIod/trf-fgGIod.map - mv olpc/es.map olpc/es-olpc.map - mv olpc/pt.map olpc/pt-olpc.map - mv qwerty/cz.map qwerty/cz-qwerty.map -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440 - epatch "${FILESDIR}"/${P}-musl-headers-error.patch - epatch "${FILESDIR}"/${P}-fix-struct_winsize-collision.patch -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) -} - -src_install() { - default - dohtml doc/*.html -} diff --git a/sys-apps/kbd/kbd-2.0.2-r99.ebuild b/sys-apps/kbd/kbd-2.0.2-r99.ebuild deleted file mode 100644 index 93f2fb0a..00000000 --- a/sys-apps/kbd/kbd-2.0.2-r99.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-2.0.2.ebuild,v 1.1 2014/08/01 10:35:43 vapier Exp $ - -EAPI=5 - -SCM="" -if [[ ${PV} == "9999" ]] ; then - SCM="git-r3" - EGIT_REPO_URI="http://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git" - EGIT_BRANCH="master" -else - SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -fi - -inherit autotools eutils ${SCM} - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" - -RDEPEND="pam? ( virtual/pam )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv dvorak/no.map dvorak/no-dvorak.map || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch - epatch "${FILESDIR}"/${PN}-1.15.5-fix-struct_winsize-collision.patch - epatch "${FILESDIR}"/${PN}-2.0.2-musl-headers-error.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) \ - $(use_enable test tests) -} - -src_install() { - default - dohtml docs/doc/*.html -} diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml deleted file mode 100644 index 96a2d586..00000000 --- a/sys-apps/kbd/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest deleted file mode 100644 index 033aaee6..00000000 --- a/sys-apps/keyutils/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX keyutils-1.5.5-makefile-fixup.patch 879 SHA256 b68e7fab7293c680e5f44f3b116622b2d7dba2039e849ec53ab577c4e12f3a5b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0 WHIRLPOOL 69a9ec2b8386e39c6c133395b96b7a50cc12e1a4644ce06198f4a77431b685e0e962938b97c7a757074beae8794ceafc9f36cf270064b855f91db0c91475ba1e -AUX keyutils-1.5.9-UINT_MAX.patch 368 SHA256 6d8743f250bc23b3bda40f7ac319824345421d399294faaa8c6afc5dba604d12 SHA512 bf81128dbe5939ba88b884b68efcc08552ee5ef7ad9239d173e10e36a02c6a41f7fdd2093ed4111aacdc21cfc38b8a25feb226ce9849344b9fbf417b6791cb25 WHIRLPOOL c2f170df1176f7408b6123e2c69f9db3151b54e1638d4ca426402bd8e104f320921b17f6e1848389e94cef194ef80411999e11edf279fa8961416d773847859d -DIST keyutils-1.5.9.tar.bz2 74683 SHA256 4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2 WHIRLPOOL 0509cce076a32d2f319f596506d4aaeb83e1853ee6337e6a3041e6957e9098f4482ae56a9c6455605b72b3f34701a890e9be666b6fdd752ff14a3d3564dcba19 -EBUILD keyutils-1.5.9-r99.ebuild 2400 SHA256 ebf6b00892e437f12753db3d4914312eca1cfd84f72f99dff3da1eca655b1a37 SHA512 cdbbb086349787b5a76b5f9e746584dab95e912298839e92b800e431f90aec26575ab25942bad335b6374d05d84c4527dd336de4f2ef3a88e1d8e7e1187822e5 WHIRLPOOL 91de2851905f006226d2b309a922fd8ffa556a70cc74c52cb46786a7c9b6b78decaf20ede22bf604c727348ceb413909d8886ba36678145a6c314cf3f209b5f6 -MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820 diff --git a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch deleted file mode 100644 index ff4bcfa9..00000000 --- a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch +++ /dev/null @@ -1,27 +0,0 @@ -Raw patch edit based on: - -From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 2 Sep 2011 13:30:30 -0400 -Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils - ---- - Makefile | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 9e3fa9b..46695d1 100644 ---- a/Makefile -+++ b/Makefile -@@ -91,7 +91,7 @@ - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB) - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key - $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh --- -1.7.6 - diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch b/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch deleted file mode 100644 index 65a50b06..00000000 --- a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch +++ /dev/null @@ -1,12 +0,0 @@ -Patch sent to dhowells@redhat.com - ---- a/keyutils-1.5.9/key.dns_resolver.c 2014-02-21 17:18:24.000000000 -0200 -+++ b/keyutils-1.5.9/key.dns_resolver.c 2015-04-03 17:29:22.517832174 -0200 -@@ -42,6 +42,7 @@ - #include <netinet/in.h> - #include <arpa/nameser.h> - #include <arpa/inet.h> -+#include <limits.h> - #include <resolv.h> - #include <getopt.h> - #include <sys/types.h> diff --git a/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild deleted file mode 100644 index d148784e..00000000 --- a/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild,v 1.12 2015/01/05 13:45:19 jlec Exp $ - -EAPI="5" - -inherit multilib eutils toolchain-funcs linux-info multilib-minimal - -DESCRIPTION="Linux Key Management Utilities" -HOMEPAGE="http://people.redhat.com/dhowells/keyutils/" -SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="test" - -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" -DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" - -pkg_setup() { - CONFIG_CHECK="~KEYS" - use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS" - ERROR_KEYS="You must have CONFIG_KEYS to use this package!" - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" - linux-info_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch - epatch "${FILESDIR}"/${PN}-1.5.9-UINT_MAX.patch - - # The lsb check is useless, so avoid spurious command not found messages. - sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die - # All the test files are bash, but try to execute via `sh`. - sed -i -r \ - -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \ - tests/{Makefile*,*.sh} || die - find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + - # Some tests call the kernel which calls userspace, but that will - # run the install keyutils rather than the locally compiled one, - # so disable round trip tests. - rm -rf tests/keyctl/requesting/{bad-args,piped,valid} - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export CC - tc-export AR - sed -i \ - -e '1iRPATH=' \ - -e '/^C.*FLAGS/s|:=|+=|' \ - -e 's:-Werror::' \ - -e '/^BUILDFOR/s:=.*:=:' \ - -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \ - -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \ - -e "s: /: ${EPREFIX}/:g" \ - Makefile || die - - emake -} - -multilib_src_test() { - # Execute the locally compiled code rather than the - # older versions already installed in the system. - LD_LIBRARY_PATH=${BUILD_DIR} \ - PATH="${BUILD_DIR}:${PATH}" \ - emake test -} - -multilib_src_install() { - default - multilib_is_native_abi && gen_usr_ldscript -a keyutils -} - -multilib_src_install_all() { - dodoc README -} diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml deleted file mode 100644 index 035bc6b0..00000000 --- a/sys-apps/keyutils/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<maintainer> - <email>robbat2@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest deleted file mode 100644 index 6f82412e..00000000 --- a/sys-apps/kmod/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX kmod-19-strndupa.patch 579 SHA256 e090896840b0692bc52ba093f794289580863cc56e9d34191291a2200eac88fa SHA512 2edca256b43503e45cc9878d03619af4d9d02bddc9fb31a18d62e0516e484f49251f376d6545535a5fe83fe56eba45970e972186a18892e040b10035877e4b37 WHIRLPOOL 7fc53b00485312c3e4e42b68459d350f4b7d59e405aeae41a4418daf37b5f1cd8cd398d9186c4c7f0af7f4ee53d16b30d58962e2eebba712c55bf88111c47d20 -AUX kmod-static-nodes-r1 601 SHA256 21995879ee2ac6727ca5784a309eff5dd41b93030efc854f123b8a4d8ef3294b SHA512 d95b63174b7e28cc8d72b28a1a436fb108164528d5643ce9f65012f233151604f6b26c20c64fbe2f657fbbd6863c08ae9094c5bdc2dfc68d417448e268a7bc11 WHIRLPOOL f0342f23912535134e5cbc88cd13fdd9a6681ba5502a15cb5b0d5aafe2d6db4a2bba806293be29b9e14f11ad28456cc1104f6d031b88d1142ab313407df73163 -DIST kmod-19.tar.xz 1473916 SHA256 3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14 SHA512 317aebbfe12e2bd8f610d799642499d411e017cbda6082d0de92b1597753d29f42c4a2faac574879166e8cda8d7fd42ad2f98086b169e85b238cf024887ec0ee WHIRLPOOL a2aec8057cbc7776b71cea5c70fcec90fa20f09d2195f532f03085df2e85ae6dfbba50450a1b33425fd17caa01b997e052ec4676e0ed9c6afd7555b53aa8c589 -EBUILD kmod-19-r99.ebuild 5008 SHA256 1c2ab7972062629f53a1535320849c96348bc36538cbbd52d4c797f62c60511f SHA512 08e3db0296c39f0d258879051c0fa579bcd43d6154ee64acd128faa1b0f8170d8dec0b684686896b060d1f26eb9188b3be8ec50bddeecd3bb7b1a1c42ab82b01 WHIRLPOOL 93eb10f54be24c710e91b42d3cca03fe1f3a1602e54cc35c2fed1ee5f3ca172479818883b8c50e03837b94da9bc7fdaf793056fe0dcd45c54894b7fe0d198a3b -MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37 diff --git a/sys-apps/kmod/files/kmod-19-strndupa.patch b/sys-apps/kmod/files/kmod-19-strndupa.patch deleted file mode 100644 index 74b2af6c..00000000 --- a/sys-apps/kmod/files/kmod-19-strndupa.patch +++ /dev/null @@ -1,23 +0,0 @@ -From efb5bfaca938fa5991865c1e9a0c730dc919708c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 17 Nov 2014 09:36:29 +0100 -Subject: util: fix build on systems missing strndupa - -we need include shared/missing.h to be able to compile on sysmtes that -lacks strndupa. - -diff --git a/shared/util.c b/shared/util.c -index 855d4e4..23bbb26 100644 ---- a/shared/util.c -+++ b/shared/util.c -@@ -30,6 +30,7 @@ - #include <string.h> - #include <unistd.h> - -+#include <shared/missing.h> - #include <shared/util.h> - - #define USEC_PER_SEC 1000000ULL --- -cgit v0.10.1 - diff --git a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1 deleted file mode 100644 index dcbf6793..00000000 --- a/sys-apps/kmod/files/kmod-static-nodes-r1 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $ - -description="Create list of required static device nodes for the current kernel" - -depend() { - after dev-mount - before tmpfiles.dev dev - keyword -lxc -} - -start() { - ebegin "Creating list of required static device nodes for the current kernel" - checkpath -q -d /run/tmpfiles.d - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - eend $? -} diff --git a/sys-apps/kmod/kmod-19-r99.ebuild b/sys-apps/kmod/kmod-19-r99.ebuild deleted file mode 100644 index 6da3cd01..00000000 --- a/sys-apps/kmod/kmod-19-r99.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.1 2014/11/23 06:51:01 williamh Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) - -inherit bash-completion-r1 eutils multilib python-r1 - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-2 -else - SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="amd64 arm ~mips ppc x86" - inherit libtool -fi - -DESCRIPTION="library and tools for managing linux kernel modules" -HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc lzma python static-libs +tools zlib" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -RESTRICT="test" - -# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -RDEPEND="!sys-apps/module-init-tools - !sys-apps/modutils - !<sys-apps/openrc-0.13 - !<sys-apps/systemd-217 - lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - python? ( ${PYTHON_DEPS} ) - zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - lzma? ( virtual/pkgconfig ) - python? ( - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - ) - zlib? ( virtual/pkgconfig )" -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} - dev-libs/libxslt" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS="NEWS README TODO" - -src_prepare() { - if [ ! -e configure ]; then - if use doc; then - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - epatch "${FILESDIR}"/${P}-strndupa.patch - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" - --enable-shared - $(use_enable static-libs static) - $(use_enable tools) - $(use_enable debug) - $(use_enable doc gtk-doc) - $(use_with lzma xz) - $(use_with zlib) - --with-bashcompletiondir="$(get_bashcompdir)" - ) - - local ECONF_SOURCE="${S}" - - kmod_configure() { - mkdir -p "${BUILD_DIR}" || die - run_in_build_dir econf "${myeconfargs[@]}" "$@" - } - - BUILD_DIR="${WORKDIR}/build" - kmod_configure --disable-python - - if use python; then - python_parallel_foreach_impl kmod_configure --enable-python - fi -} - -src_compile() { - emake -C "${BUILD_DIR}" - - if use python; then - local native_builddir=${BUILD_DIR} - - python_compile() { - emake -C "${BUILD_DIR}" -f Makefile -f - python \ - VPATH="${native_builddir}:${S}" \ - native_builddir="${native_builddir}" \ - libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ - <<< 'python: $(pkgpyexec_LTLIBRARIES)' - } - - python_foreach_impl python_compile - fi -} - -src_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - einstalldocs - - if use python; then - local native_builddir=${BUILD_DIR} - - python_install() { - emake -C "${BUILD_DIR}" DESTDIR="${D}" \ - VPATH="${native_builddir}:${S}" \ - install-pkgpyexecLTLIBRARIES \ - install-dist_pkgpyexecPYTHON - } - - python_foreach_impl python_install - fi - - prune_libtool_files --modules - - if use tools; then - local bincmd sbincmd - for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do - dosym /bin/kmod /sbin/${sbincmd} - done - - # These are also usable as normal user - for bincmd in lsmod modinfo; do - dosym kmod /bin/${bincmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - doins "${T}"/usb-load-ehci-first.conf #260139 - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml deleted file mode 100644 index 723317e9..00000000 --- a/sys-apps/kmod/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>base-system</herd> - <maintainer> - <email>udev-bugs@gentoo.org</email> - </maintainer> - <use> - <flag name='tools'>Install module loading/unloading tools.</flag> - </use> -</pkgmetadata> diff --git a/sys-apps/ldconfig/Manifest b/sys-apps/ldconfig/Manifest deleted file mode 100644 index fecbe6c7..00000000 --- a/sys-apps/ldconfig/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX ldconfig-0.1 2435 SHA256 1ae38d1acbae2860f8e3ec4f990f98013f6fea456d3a9572ec0c4b15a63a88a4 SHA512 1f94dbb37bca54d32282e0967ca2009db34bf10751c0c4b8852d5e4d0072c5c16a159b489d40b1da0c48249ae21ae90f1f0be71a0317481d39cab511ecae728b WHIRLPOOL 6dfd8170581b847345ee61ee004d933f23649ca1714363ecb4d66f5525c50d8aeb7ad1cdc5e52f601eea769d83cb7be31c56f2e6d342dbe038fa9c7720b936d0 -EBUILD ldconfig-0.1.ebuild 607 SHA256 03b1a27b574e3160d6b6ae67e450c391cc3a6bceb09d7128dfda813ec4a9c70f SHA512 f6685e923ccccf985f96d62c349deb45e0bcdc510c8051ed285f09df3120754dbcfee02cd3daa811f28225af22a957ef7d8e662fcb8e3d0964457a7af1b2ec72 WHIRLPOOL 2569af7e1d0cf6890ff7cd165122851b72fb0d7cf11fb1a0b4db44ba554bff59d6711d3eb01ebebdb1ae2dfd4be43e22459a3197b903ee2cbc6f11230a6445e4 -MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3 diff --git a/sys-apps/ldconfig/files/ldconfig-0.1 b/sys-apps/ldconfig/files/ldconfig-0.1 deleted file mode 100644 index 71394508..00000000 --- a/sys-apps/ldconfig/files/ldconfig-0.1 +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash -e - -ROOT="/" - -LDSO_CONF="/etc/ld.so.conf" -if [[ ! -e $LDSO_CONF ]]; then - echo "$LDSO_CONF not found" >&2 - exit 1 -fi - -LDSO_CONF_DIR=$(dirname $LDSO_CONF) - -VERBOSE=0 - -UPDATE_LINKS=1 - -get_options() { - while getopts "vnNXf:C:r:p" opt "$@"; do - case $opt in - v) - echo "ldconfig for musl in Gentoo" - VERBOSE=1 - ;; - r) - ROOT=$OPTARG - ;; - f) - LDSO_CONF=$OPTARG - ;; - X) - UPDATE_LINKS=0 - ;; - \?) - echo "Invalid option: -$opt" >&2 - exit 1 - ;; - n|N|C|p) - echo "Unimplemented option: -$opt" >&2 - exit 1 - ;; - esac - done - - if [[ $UPDATE_LINKS == 1 ]]; then - echo "Updating links is not implemented." - fi -} - - -repeated() { - local l=$1 - local drs="${@:2}" - for m in $drs; do - [[ $m == $l ]] && return 0 - done - return 1 -} - -expand() { - # We are assuming the ld.so.conf's 'include' is not recursive - local f line l - local glob="$LDSO_CONF_DIR/$1" - local drs="${@:2} " - - for f in $glob; do - [[ ! -f $f ]] && continue - while read line; do - line=${line%%#*} - line=${line//:/ } - line=${line//,/ } - for l in $line; do - #We must add this whether or not the directory exists - repeated $l $drs && continue - drs+=" $l " - done - done < $f - done - - echo $drs -} - -read_ldso_conf() { - local drs=" " - - while read line; do - # Sanitize the line - see ldconfig(8) for delimiters - # Note: bash read turns tabs into spaces and read already - # delimits on newlines with the default $IFS - line=${line%%#*} # Remove comments - line=${line//:/ } # Change colon delimiter to space - line=${line//,/ } # Change comma delimiter to space - - next=0 - for l in $line; do - if [[ $next == 1 ]]; then - next=0 - drs=$(expand $l $drs) - elif [[ $l == "include" ]]; then - next=1 - else - # glibc's ldconfig silently skips non directories - if [[ -d $l ]]; then - repeated $l $drs && continue - drs+=" $l " - fi - fi - done - done < $1 - - echo $drs -} - -sanitize() { - local drs=$@ - - repeated "/lib" $drs || drs="/lib $drs" - repeated "/usr/lib" $drs || drs="/usr/lib $drs" - - echo $drs -} - -get_options "$@" -drs=$(read_ldso_conf "$LDSO_CONF") -drs=$(sanitize $drs) - -LDSO_PATH=$(ls /lib/ld-musl-*.so.1) -if [[ ! -e $LDSO_PATH ]]; then - echo "$LDSO_PATH not found" >&2 - exit 1 -fi - -LDSO_ARCH=$(basename $LDSO_PATH) -LDSO_NAME=${LDSO_ARCH%.so.1} -ETC_LDSO_PATH=/etc/${LDSO_NAME}.path - -X=$(mktemp --tmpdir=/tmp ${LDSO_NAME}.XXXXXX) -for d in $drs; do - echo $d >> $X -done -chmod 644 $X -mv $X $ETC_LDSO_PATH diff --git a/sys-apps/ldconfig/ldconfig-0.1.ebuild b/sys-apps/ldconfig/ldconfig-0.1.ebuild deleted file mode 100644 index 05ab221d..00000000 --- a/sys-apps/ldconfig/ldconfig-0.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="ldconfig for musl in Gentoo" -HOMEPAGE="http://dev.gentoo.org/~blueness" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -#KEYWORDS="~amd64" -KEYWORDS="" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -pkg_preinst () { - use elibc_musl || die "This package only works on a musl system" -} - -src_unpack () { - mkdir -p ${P} - cp "${FILESDIR}"/${P} ${P}/${PN} -} - -src_install () { - into / - dosbin ${PN} - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl - doenvd "${T}"/00musl || die -} diff --git a/sys-apps/ldconfig/metadata.xml b/sys-apps/ldconfig/metadata.xml deleted file mode 100644 index 1e758737..00000000 --- a/sys-apps/ldconfig/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> -</pkgmetadata> diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest deleted file mode 100644 index 266024ab..00000000 --- a/sys-apps/net-tools/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX net-tools-fix-header-assumptions.patch 3462 SHA256 bea5145e5a69bcea835bcb9a71cadcef55651b253c6e4552f007e37e16d60a1a SHA512 e14293a16d0111cb50f205d4a861f94b9525ce75311f8e3aeed1231ffc877d4d2715074d64419c72473c27cb4c2535ad4af17f911dc7ece71d2e941bce44297a WHIRLPOOL f6b378db90711d82d55cda0ee1903b32102f97854897236562f69a42470d7288ab7bbb4b166927086b758b237c1d091d7b1f392d1e798de06d875b6b0e293433 -DIST net-tools-1.60_p20120127084908-patches-1.tar.xz 3332 SHA256 1240a3c139b684da195f665447a80e1d05f0d6f3c2319dbf340dfcbb78b01501 SHA512 97602993e273d2fadac2bf3df892e09ba7c7cda44a7825209a644ada4d203e0c3d2248cbf976545afb07113976694fb581511641725ce1b95b00688d357d0a02 WHIRLPOOL 4fd537e042ab368795ff0db55717c424ef3bd7bc37302c5fa64936c4ffe4772557c25c83224f9ee0017f812817143b7168e70b2fdcf146abab06d18cafe3448d -DIST net-tools-1.60_p20120127084908.tar.xz 224992 SHA256 408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94 SHA512 1237a4bb0bba5273a25d707493d5bdb16f267bfa6731c526329cff459e06923e0d54aef6eded458d3cb72994bf4382f216212c34ad9329f5f1573a4228445996 WHIRLPOOL b14f24c13f2950fd92eb6b897cd14c5aa4d52e40062943fcb84de7e13555f98008db1aa6ec6fb6ca8f899a5bfdfc685f8822da2f3c0e5e002b9d20aec4d8b73c -DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce -DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa -DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190 -DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec -EBUILD net-tools-1.60_p20120127084908-r99.ebuild 2766 SHA256 11f9af8e9ce94583c366ec99c8c1d187b0ac85e17284fba7964f9cd14df3735a SHA512 a129f01d78933384114055c47f924f122c73008b57a46e2b7f1a8d9e95e1828a1a67b41934aacf479680de2eff23758981579be22faafb39bf865d6607ca2e13 WHIRLPOOL 1e59554cc984b68202cce4f378b99724b9c08e7fb4482f34b68d0c55475aa7e69ae752dd9e8d6574ea992ab56de98dccb60c797e8b98413c7fe6267be892940e -EBUILD net-tools-1.60_p20130513023548-r99.ebuild 2777 SHA256 7c74e71ea16d2821e6f3f369183cb430c91a0073379cf050ed8f4590f57b271a SHA512 990d3c30fe158c9a205ede566a87d948e9065d93b85f9a17c129aa44d33fd03a55f579378e4c671f642a70893ac237cc089d51a479a4d55a74e549c1006c29d6 WHIRLPOOL c52b338672edd287f07aa613c13a21970fc035f825b60c2d9c5d8fa617cadb49de4f5c370393aec05719d73256cf35841f0b11677f0293e901869a7833885c87 -EBUILD net-tools-1.60_p20141019041918-r99.ebuild 2781 SHA256 18d3b66d1f921fc7ab3cf778dfc6c731927bf39560feb8728c105aeeec9dd20b SHA512 a09b4ec16ae85656721df67ebfeda57bb6b9d49abde9a4e2840ccce0e6f931ff571adaa271bcb9863356f794c222fa738232670c621ec68e6c4a4ab9b5d19754 WHIRLPOOL 291d46d3c17f95e89ea1b6e9385c23dc81b7b4b6bd997cb14db05b9230849ec3efaaae33be46625d50aac131d04ba2f84463f6a1620d3e4380eaaa175435e8f8 -MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc diff --git a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch b/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch deleted file mode 100644 index f56dffcd..00000000 --- a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c net-tools-1.60_p20120127084908/lib/inet6_gr.c ---- net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/lib/inet6_gr.c 2014-01-21 19:18:50.557199377 +0000 -@@ -23,9 +23,6 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifndef __GLIBC__ --#include <netinet6/ipv6_route.h> /* glibc doesn't have this */ --#endif - #include "version.h" - #include "net-support.h" - #include "pathnames.h" -diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c net-tools-1.60_p20120127084908/lib/inet6_sr.c ---- net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/lib/inet6_sr.c 2014-01-21 19:19:23.307201208 +0000 -@@ -23,11 +23,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> --#ifdef __GLIBC__ - #include <net/route.h> --#else --#include <netinet6/ipv6_route.h> /* glibc does not have this */ --#endif - #include "version.h" - #include "net-support.h" - #include "pathnames.h" -diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet_sr.c net-tools-1.60_p20120127084908/lib/inet_sr.c ---- net-tools-1.60_p20120127084908.orig/lib/inet_sr.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/lib/inet_sr.c 2014-01-21 20:41:59.223478324 +0000 -@@ -26,6 +26,7 @@ - #include <string.h> - #include <stdio.h> - #include <unistd.h> -+#include <asm-generic/param.h> - #include "version.h" - #include "net-support.h" - #include "pathnames.h" -diff -Naur net-tools-1.60_p20120127084908.orig/lib/util-ank.c net-tools-1.60_p20120127084908/lib/util-ank.c ---- net-tools-1.60_p20120127084908.orig/lib/util-ank.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/lib/util-ank.c 2014-01-21 20:42:56.876481548 +0000 -@@ -25,6 +25,7 @@ - #include <netdb.h> - #include <arpa/inet.h> - #include <resolv.h> -+#include <limits.h> - - #include "intl.h" - #include "util-ank.h" -diff -Naur net-tools-1.60_p20120127084908.orig/mii-tool.c net-tools-1.60_p20120127084908/mii-tool.c ---- net-tools-1.60_p20120127084908.orig/mii-tool.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/mii-tool.c 2014-01-21 20:54:31.563520392 +0000 -@@ -47,10 +47,6 @@ - #include <net/if.h> - #include <linux/sockios.h> - --#ifndef __GLIBC__ --#include <linux/if_arp.h> --#include <linux/if_ether.h> --#endif - #include <linux/mii.h> - #include <linux/sockios.h> - #include "version.h" -diff -Naur net-tools-1.60_p20120127084908.orig/netstat.c net-tools-1.60_p20120127084908/netstat.c ---- net-tools-1.60_p20120127084908.orig/netstat.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/netstat.c 2014-01-21 20:43:34.023483625 +0000 -@@ -88,6 +88,7 @@ - #include <sys/stat.h> - #include <net/if.h> - #include <dirent.h> -+#include <asm-generic/param.h> - - #if HAVE_SELINUX - #include <selinux/selinux.h> -diff -Naur net-tools-1.60_p20120127084908.orig/slattach.c net-tools-1.60_p20120127084908/slattach.c ---- net-tools-1.60_p20120127084908.orig/slattach.c 2012-01-27 08:49:08.000000000 +0000 -+++ net-tools-1.60_p20120127084908/slattach.c 2014-01-21 20:44:46.953487703 +0000 -@@ -45,14 +45,7 @@ - #include <unistd.h> - #include <getopt.h> - #include <linux/if_slip.h> -- --#if defined(__GLIBC__) --#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 0 --# include <termbits.h> --#else - # include <termios.h> --#endif --#endif - - #include "pathnames.h" - #include "net-support.h" diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml deleted file mode 100644 index 0c72e81d..00000000 --- a/sys-apps/net-tools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<use> - <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag> -</use> -</pkgmetadata> diff --git a/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild deleted file mode 100644 index abb911a3..00000000 --- a/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild,v 1.16 2014/01/18 03:28:51 vapier Exp $ - -EAPI="3" - -inherit flag-o-matic toolchain-funcs eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" - inherit git-2 - KEYWORDS="" -else - PATCH_VER="1" - SRC_URI="mirror://gentoo/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -DESCRIPTION="Standard Linux networking tools" -HOMEPAGE="http://net-tools.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls old-output static" - -RDEPEND="!<sys-apps/openrc-0.9.9.3" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -maint_pkg_create() { - cd /usr/local/src/net-tools - #git-update - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) - local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} - local p="${PN}-${pv}" - git archive --prefix="nt/" master | tar xf - -C "${T}" - pushd "${T}" >/dev/null - pushd nt >/dev/null - sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die - emake dist >/dev/null - popd >/dev/null - zcat ${p}.tar.gz | xz > ${p}.tar.xz - rm -f ${p}.tar.gz - popd >/dev/null - - local patches="${p}-patches-${PATCH_VER:-1}" - local d="${T}/${patches}" - mkdir "${d}" - git format-patch -o "${d}" master..gentoo > /dev/null - echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README - tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz - rm -rf "${d}" - - du -b "${T}"/*.tar.xz -} - -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } - -set_opt() { - local opt=$1 ans - shift - ans=$("$@" && echo y || echo n) - einfo "Setting option ${opt} to ${ans}" - sed -i \ - -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ - config.in || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch - if [[ -n ${PATCH_VER} ]] ; then - use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch" - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER} - fi -} - -src_configure() { - set_opt I18N use nls - set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' - set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5' - set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' - set_opt HAVE_AFECONET 0 - if use static ; then - append-flags -static - append-ldflags -static - fi - tc-export AR CC - yes "" | ./configure.sh config.in || die -} - -src_install() { - emake DESTDIR="${ED}" install || die - dodoc README README.ipv6 TODO -} - -pkg_postinst() { - einfo "etherwake and such have been split into net-misc/ethercard-diag" -} diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild deleted file mode 100644 index b453df88..00000000 --- a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.6 2014/04/07 20:12:31 vapier Exp $ - -EAPI="3" - -inherit flag-o-matic toolchain-funcs eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" - inherit git-2 -else - PATCH_VER="1" - SRC_URI="mirror://gentoo/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz" - KEYWORDS="amd64 arm ~mips ppc x86" -fi - -DESCRIPTION="Standard Linux networking tools" -HOMEPAGE="http://net-tools.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls old-output selinux static" - -RDEPEND="!<sys-apps/openrc-0.9.9.3 - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - selinux? ( virtual/pkgconfig ) - app-arch/xz-utils" - -maint_pkg_create() { - cd /usr/local/src/net-tools - #git-update - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) - local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} - local p="${PN}-${pv}" - git archive --prefix="${p}/" master | tar xf - -C "${T}" - pushd "${T}" >/dev/null - sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die - tar cf - ${p}/ | xz > ${p}.tar.xz - popd >/dev/null - - local patches="${p}-patches-${PATCH_VER:-1}" - local d="${T}/${patches}" - mkdir "${d}" - git format-patch -o "${d}" master..gentoo > /dev/null - echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README - tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz - rm -rf "${d}" - - du -b "${T}"/*.tar.xz -} - -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } - -set_opt() { - local opt=$1 ans - shift - ans=$("$@" && echo y || echo n) - einfo "Setting option ${opt} to ${ans}" - sed -i \ - -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ - config.in || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch - if [[ -n ${PATCH_VER} ]] ; then - use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch" - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER} - fi -} - -src_configure() { - set_opt I18N use nls - set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' - set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5' - set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' - set_opt HAVE_AFECONET 0 - set_opt SELINUX use selinux - if use static ; then - append-flags -static - append-ldflags -static - fi - tc-export AR CC - yes "" | ./configure.sh config.in || die -} - -src_install() { - emake DESTDIR="${ED}" install || die - dodoc README README.ipv6 TODO -} - -pkg_postinst() { - einfo "etherwake and such have been split into net-misc/ethercard-diag" -} diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild deleted file mode 100644 index 529d30e4..00000000 --- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild,v 1.1 2014/10/19 04:24:16 vapier Exp $ - -EAPI="3" - -inherit flag-o-matic toolchain-funcs eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" - inherit git-2 -else - PATCH_VER="1" - SRC_URI="mirror://gentoo/${P}.tar.xz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" -fi - -DESCRIPTION="Standard Linux networking tools" -HOMEPAGE="http://net-tools.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls old-output selinux static" - -RDEPEND="!<sys-apps/openrc-0.9.9.3 - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - selinux? ( virtual/pkgconfig ) - app-arch/xz-utils" - -maint_pkg_create() { - cd /usr/local/src/net-tools - #git-update - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) - local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} - local p="${PN}-${pv}" - git archive --prefix="${p}/" master | tar xf - -C "${T}" - pushd "${T}" >/dev/null - sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die - tar cf - ${p}/ | xz > ${p}.tar.xz - popd >/dev/null - - local patches="${p}-patches-${PATCH_VER:-1}" - local d="${T}/${patches}" - mkdir "${d}" - git format-patch -o "${d}" master..gentoo > /dev/null - echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README - tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz - rm -rf "${d}" - - du -b "${T}"/*.tar.xz -} - -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } - -set_opt() { - local opt=$1 ans - shift - ans=$("$@" && echo y || echo n) - einfo "Setting option ${opt} to ${ans}" - sed -i \ - -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ - config.in || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch - if [[ -n ${PATCH_VER} ]] ; then - use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch" - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER} - fi -} - -src_configure() { - set_opt I18N use nls - set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' - set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5' - set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' - set_opt HAVE_AFECONET 0 - set_opt SELINUX use selinux - if use static ; then - append-flags -static - append-ldflags -static - fi - tc-export AR CC - yes "" | ./configure.sh config.in || die -} - -src_install() { - emake DESTDIR="${ED}" install || die - dodoc README README.ipv6 TODO -} - -pkg_postinst() { - einfo "etherwake and such have been split into net-misc/ethercard-diag" -} diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest deleted file mode 100644 index 33b454b1..00000000 --- a/sys-apps/pciutils/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX conf.d-pciparm 988 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4 WHIRLPOOL b5954d8897687a0c6d267c9f60feadb692ce637bf294f5b2f8b7eca479cf454ac541a4bfe904d43ff59e5a77a808c1cecd63aa1011817ba61152d7a4664c86ad -AUX init.d-pciparm 1871 SHA256 30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5 SHA512 231b7b96a751332a5a2395902e2a8024ae687f1e25b881d07bdcfba08acd1b6b6254e8fa694a7e01d851aa28c4ec6ff3d9c5ac64f8c1a471cc1f8f9a325881bd WHIRLPOOL 1fad1cc4fdb031f7f24d9ec47439b6c6f83f22e85b6081eca283ab8cc501f7af9bbf91f8a0118ca10f45490ffab26c4ff4650f1fc1ab418afaf2cf44a0aa9f00 -AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49 WHIRLPOOL 9d5bf04b08a76bb786524e8fdc4de412154340f17dcccf48ebcb7504a6b5feb8a719337489a20dd8d94d77bdeb93e75009f66840a18ec63805d8fe36dc7e1981 -AUX pciutils-3.2.0-io.patch 311 SHA256 aec9f72d5c7eae1e7a7ccc5c433322e2c3ff04237b1049cfe22cd952a3fac548 SHA512 9acea1ac1f6d87a647c1c69b084726930535ebcb75e79d5fc750dc2862c6cac0a89187febfd215bdc9bd6f75f2a809c02e7967a35eb288167db0a8a780864f99 WHIRLPOOL bcef00c8f4a079ced8e2354bdefee56fe5c33a60cdb0aaa72bd63528e3e792a22ad49fb894a88bdd46639419af89b9228600788a501684295259dcae6c379287 -DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418 -EBUILD pciutils-3.2.0.ebuild 2279 SHA256 baaee63528064e053068e03eec6210d68d533105fa2e4bd9fbcf5708c3135257 SHA512 03962535e2124984ecf9b02c50ee1b81f5f42bf0b529ebdcc47081bc441cd9cd01927b39ba7e8de79f12022efe3ee8580761b41199591ec20e616545f88a929f WHIRLPOOL 6e4c81b708b84ce1642079632f06c41bc1a576ec043371d33fb20af4cfe18abbfb6f4c03beb579969664bfd035b3ac0b67730d4f5fb050546528c5a61387dbff -MISC metadata.xml 345 SHA256 2e1f814fd8995f54e2d029e18f0f8f4b742f7383ce3448697994c4a57e498254 SHA512 d075e1944952d3d6c5316c46247003159782dd2e18d449048bc34bfd7f2f307fc287e9a9803f6f1399898c22d4faee294c013241d9b709b887c14b7966c52be6 WHIRLPOOL f1bc3329686d73cc96c8d4bdf5d05451e555aeda3bac9c3a5e2b1b5fa33294b39eff6a1ef5b945d8013c41dbfa188a38a62d205a7ce58ef1cac55828efa5941e diff --git a/sys-apps/pciutils/files/conf.d-pciparm b/sys-apps/pciutils/files/conf.d-pciparm deleted file mode 100644 index f036b15a..00000000 --- a/sys-apps/pciutils/files/conf.d-pciparm +++ /dev/null @@ -1,28 +0,0 @@ -# PCI tweaking article: -# http://www.gentoo.org/doc/en/articles/hardware-stability-p2.xml -# -# Apply to all devices: -# PCIPARM_ALL="...." -# Cards also can be addressed by vid:pid or by bus:slot.func -# (see setpci man page relative to -d and -s options) -# PCIPARM_(BUS|VENDOR)_#="...." -# Where # is sequentially numbered from zero. - -# Examples: -# "open up" the PCI bus by allowing fairly long bursts -# for all devices, increasing performance -# (equivalent to: setpci -v -d *:* latency_timer=b0) -#PCIPARM_ALL="latency_timer=b0" - -# maximize latency timers for network and audio, -# allowing them to transmit more data per burst, -# preventing buffer over/under-run conditions -#PCIPARM_BUS_0="00:04.0 latency_timer=ff" -#PCIPARM_BUS_1="01:04.0 latency_timer=ff" -#PCIPARM_VENDOR_0="1057:3410 latency_timer=ff" - -# -v : whether to be verbose about changes -# -D : dry-run, no commit -# -f : do not warn if the change is already set -# (see the setpci manpage for more advanced options) -SETPCI_OPT="-f" diff --git a/sys-apps/pciutils/files/init.d-pciparm b/sys-apps/pciutils/files/init.d-pciparm deleted file mode 100644 index 705b647e..00000000 --- a/sys-apps/pciutils/files/init.d-pciparm +++ /dev/null @@ -1,80 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.3 2008/10/11 02:47:50 robbat2 Exp $ - -depend() { - before bootmisc hdparm - after localmount -} - -checkconfig() { - if [ ! -f /etc/conf.d/pciparm ]; then - ewarn "/etc/conf.d/pciparm does not exist, skipping" - return 1 - fi - - if [ -z "${PCIPARM_ALL}" -a -z "${PCIPARM_BUS_0}" -a -z "${PCIPARM_VENDOR_0}" ]; then - ewarn "None of PCIPARM_ALL, PCIPARM_BUS_* or PCIPARM_VENDOR_* set in /etc/conf.d/pciparm" - return 1 - fi -} - -do_setpci() { - #ewarn "do_setpci: /usr/sbin/setpci $SETPCI_OPT $@" - SWITCH=$1 - SPEC_ID=$2 - shift 2 - case "$SWITCH" in - -d) DESC=vendor ;; - -s) DESC=bus ;; - *) eerror "Unknown setpci type: $SWITCH" ; return 1 ;; - esac - - if [ -z "$SPEC_ID" ]; then - eerror "Missing device specifier!" - return 1 - fi - if [ -z "$*" ]; then - eerror "Missing configuration to set for ($DESC) $SPEC_ID!" - return 1 - fi - - ebegin "Setting PCI params for ($DESC) $SPEC_ID to $@" - /usr/sbin/setpci $SETPCI_OPT $SWITCH $SPEC_ID "$@" - rc=$? - eend $rc - return $rc -} - -do_setpci_array() { - name=$1 - shift - i=0 - while true; do - eval opt="\$${name}_$i" - # End of loop - [ -z "${opt}" ] && break - # Pass in all other parameters here, in case we want to use multiple - # arguments later. - do_setpci "$@" $opt #|| return 1 - i=$(($i+1)) - done -} - -start() { - if get_bootparam "nopciparm" ; then - ewarn "Skipping pciparm init as requested in kernel cmdline" - return 0 - fi - - checkconfig || return 1 - - # We do not exit after any errors presently, because it might be a - # stability-related fix after a failure. - [ -n "$PCIPARM_ALL" ] && \ - do_setpci -d '*:*' $PCIPARM_ALL #|| return 1 - - do_setpci_array PCIPARM_BUS -s #|| return 1 - do_setpci_array PCIPARM_VENDOR -d #|| return 1 -} diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch deleted file mode 100644 index 9e63b7ec..00000000 --- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -make sure all lib entries get into libs.private in the .pc file - ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in - -e 's,@LIBDIR@,$(LIBDIR),' \ - -e 's,@IDSDIR@,$(IDSDIR),' \ - -e 's,@VERSION@,$(VERSION),' \ -- -e 's,@LDLIBS@,$(LDLIBS),' -+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),' - - init.o: init.c $(INCL) - access.o: access.c $(INCL) diff --git a/sys-apps/pciutils/files/pciutils-3.2.0-io.patch b/sys-apps/pciutils/files/pciutils-3.2.0-io.patch deleted file mode 100644 index f8cf13b2..00000000 --- a/sys-apps/pciutils/files/pciutils-3.2.0-io.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/pciutils-3.2.0/lib/i386-io-linux.h -+++ b/pciutils-3.2.0/lib/i386-io-linux.h -@@ -6,11 +6,7 @@ - * Can be freely distributed and used under the terms of the GNU GPL. - */ - --#ifdef __GLIBC__ - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - static int - intel_setup_io(struct pci_access *a UNUSED) diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml deleted file mode 100644 index aa9db869..00000000 --- a/sys-apps/pciutils/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>base-system</herd> - <use> - <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag> - <flag name='zlib'>Support compressed pci.ids database</flag> - </use> -</pkgmetadata> diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild deleted file mode 100644 index 8e9ed66e..00000000 --- a/sys-apps/pciutils/pciutils-3.2.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.14 2014/01/18 04:55:35 vapier Exp $ - -EAPI="5" - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Various utilities dealing with the PCI bus" -HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="+kmod static-libs zlib" - -# Have the sub-libs in RDEPEND with [static-libs] since, logically, -# our libssl.a depends on libz.a/etc... at runtime. -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )" -DEPEND="kmod? ( sys-apps/kmod ) - static-libs? ( ${LIB_DEPEND} ) - !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" -RDEPEND="${DEPEND} - sys-apps/hwids" -DEPEND="${DEPEND} - kmod? ( virtual/pkgconfig )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch - epatch "${FILESDIR}"/${PN}-3.2.0-io.patch - - if use static-libs ; then - cp -pPR "${S}" "${S}.static" || die - fi -} - -pemake() { - emake \ - HOST="${CHOST}" \ - CROSS_COMPILE="${CHOST}-" \ - CC="$(tc-getCC)" \ - DNS="yes" \ - IDSDIR='$(SHAREDIR)/misc' \ - MANDIR='$(SHAREDIR)/man' \ - PREFIX="${EPREFIX}/usr" \ - SHARED="yes" \ - STRIP="" \ - ZLIB=$(usex zlib) \ - PCI_COMPRESSED_IDS=0 \ - PCI_IDS=pci.ids \ - LIBDIR="\${PREFIX}/$(get_libdir)" \ - LIBKMOD="$(usex kmod)" \ - "$@" -} - -src_compile() { - pemake OPT="${CFLAGS}" all - if use static-libs ; then - pemake \ - -C "${S}.static" \ - OPT="${CFLAGS}" \ - SHARED="no" \ - lib/libpci.a - fi -} - -src_install() { - pemake DESTDIR="${D}" install install-lib - use static-libs && dolib.a "${S}.static/lib/libpci.a" - dodoc ChangeLog README TODO - - rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \ - "${ED}"/usr/share/man/man8/update-pciids.8* - - newinitd "${FILESDIR}"/init.d-pciparm pciparm - newconfd "${FILESDIR}"/conf.d-pciparm pciparm -} - -pkg_postinst() { - if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then - elog "The 'network-cron' USE flag is gone; if you want a more up-to-date" - elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)." - fi -} diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest deleted file mode 100644 index ee7e77a9..00000000 --- a/sys-apps/sandbox/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX 09sandbox 37 SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a WHIRLPOOL 80d55a34d3faf3314f2b9de2200d4b46a800128514be9e30eb59e5f03fb7a0a5197a9e5b5ab33d6b68d35bf83c86a1bd7ba734a33ccd382fe0af3b2c2a11d0bd -AUX sandbox-2.6-check-empty-paths-at.patch 7454 SHA256 a48759a4d3e9a70713473b6fad59bdd750b5cd37e7d632c786205ff20004ae2c SHA512 5eba7915dedf57f44c37881e9c6b48db8733d1493779a33127d08bb9ea77056d788ec9ace72c13eb101f42f01c95309c7cebca6c76212a8c99a8655372c0b7d7 WHIRLPOOL 46eb3a8ef8f22030cd793f3b16adc190b5750019c0df83e161c6918f08555a8ad890c1425b03cbf7e53ebcd34a07a9dd9b594d0c0fe31834656ffce3d58fa284 -AUX sandbox-2.6-desktop.patch 875 SHA256 2eecf67790aeac210f9aa899a86f7664776ed65d9b55159e1b359162dfb9ff74 SHA512 b72ec7f414d19bf513dfb1aea10523fa5dc07a1375d8f08f664d204b64b23c891a79ca14987528c595936f441e1f595b366aabbc57313667c7639d73d089ed9a WHIRLPOOL 7f787b8be9b5712eb2b2a0cd2ff825df1045ebf1cc4e73a50f610e620d30752045690a5c28835465d0ab0c3c4a9eaf8b92a5c123cd741ad69dfedb31aa457fa0 -AUX sandbox-2.6-include-PROTECTED-symbols.patch 569 SHA256 6edd24b329fd9908005e8566002f213d2799375ad4fced483be4707ddf0570ed SHA512 d96644fc48ec70f992bef55ccae03c0034bfb669586b8257a2c74f1cf0b78f2fbfebc2417ac62cd15841cc5e973272962252b88ca066224cf118eecf060e0d80 WHIRLPOOL f377d71928a6fb84b1e413ae2f4335fe6753d6cc056cb21fe758c8b5559330473a88098c85863c3157b0b5bec8f5530f233f1a2a659eee553c3bb07ae3633399 -AUX sandbox-2.6-log-var.patch 2039 SHA256 f464a29cdd9de0c510277310f4febc8f96515ff2ff03fc92df1c75b9cbd75619 SHA512 cf6f900b4078eff5870b63b2bc7c81c5b00488e030d7e9ce3007693e9d1339ac6201ddacfaff552c6c9b99b6d32383229133c80190404b7e4fde06ad376b2050 WHIRLPOOL db99737a6567788194f7b37b12b92fcfb4c263df40f40aef9e0a3ef2b6a1523331313b791fffa2b26775b646795364ab1db1711eb4329cda3337df27aebfeffa -AUX sandbox-2.6-musl.patch 1821 SHA256 df08faebffbfade91a2620ff8b56c2087e4a34506fbff3dcf9bc35c2d5bd467c SHA512 69d11e80c97a844c0d84404e802950c876edda8eb7909c90f6f5d4b3fe8a33b5bc884ecc3741c10c8bd7e0871db2db1853cfac969a153d162423b3f3c94039c9 WHIRLPOOL 7120eaf3062cb18c3b13a61fe2b6f839a5f267650d9aa809fafc6d25e8faaadd7af3d5fb41cce66ecf71668555847d264ea977442f03f4dfe7b88b98cf86f78e -AUX sandbox-2.6-no-pch.patch 702 SHA256 d95a65ffe23c6c81f6b1e695f27cffc1cb617ebf62ca467c8eae5e4c3771089b SHA512 2269b806c2b04c0891644c694d2e0cb87b3ad9236457add50df58d3af62ca5daf17e8b599d0190b4efcae7e84ba99308ea4b0f4a1482d08314d4f3b64bdaf884 WHIRLPOOL 343b62bcf88b0491d69b507eb2feb02b21e9e66cb9006c2043fcaee87f461b3228d37e9053f092e32fff4eb73b14db32a262b79c7430cddf0ddde6f90958e21b -AUX sandbox-2.6-open-nofollow.patch 2027 SHA256 c8816ae4e1991f9941abd43ec4bfdbf4e99cf36ee90694f77ab88754c53785ce SHA512 dd5222f32a40def38c9719363a24c48d5b112e3560b44c5f32afc3daa0614fe9bc5cb68ca8ac69032cc8d6299f09b25d4d7c72e16892188b42768ffb28c19f07 WHIRLPOOL 03cb5fb9df04a8d7f92855c292a6c431d01d330fecae198f2c4b95d824454f10ce1ad66db1a9d54d1bef5f74989cf6debb2d98de28ee0c2c6a09c1a0752b5519 -AUX sandbox-2.6-static-close-fd.patch 2945 SHA256 807eb4dc1ba6543c94a90a9a53bb89f42079ea20ed7c196f82d65f280e5de96a SHA512 e2f57c4d80816241f3ba4828c2b27c67d1d604b14b2d575888a978e5c4e8e47e60e3a609d81e59c615bc5b7cee6194cc362e255ae8508f632862a35180c30de8 WHIRLPOOL e08f60227fe954894d3a3a01297e9988f4d7722ea75ffbd2b0f3971d38c8ce00af230fcaecb1f53243a868d54f48bb680e2d547bbeb2ee3e5a11f8942d2084fd -AUX sandbox-2.6-trace-hppa.patch 850 SHA256 20688b2f33162f95af4af5e3c7d3700f2e7776e454b785ac1398f0870f84efa9 SHA512 fb7bf2202f960e952edc1e52fe4b6b085042158223d96b9baa899e871abcdef711ede3122c971120f55f71cc1aad71496a6079222dbaaa6c14b0c6f7ea182454 WHIRLPOOL 80f7fb529b912d19d81b9d71ee4a648db7b217583f2e8f2054cc666839030ea7d0112d69d52a2bf35c4d3549ffbd81dbd0cd39d5993bfabbb43bcb6a4455ade4 -DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03 -EBUILD sandbox-2.6-r999.ebuild 3391 SHA256 c4756c9265bc272f82bb6ad7221e15c3d28c9987ec5fb53e9957f02b44dcbf8b SHA512 a7b34f6fab52348f6024d2b719e01067d88c7b30fff4d73b361a5d24042c401e2b65ad3039256dd0c033ee2e3528e39d5988b0a40ec523eadb4a5da679b72503 WHIRLPOOL c80cc5e94914c56e528492cdb042bf79c8cc33d664a19aa38e981d8e453245412b5b4439e4374f1d7d023b0ec050abd641f675a718172012017f0b065e9112b5 -MISC metadata.xml 316 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b SHA512 2b4ddea0bb5a40cac834a09b89624049b8561a4a4f648b4d5072c413d4eca78b5cc24859664fa746be36c8b60188e88f2ae38c2c5af30d91dc6273c0f85de278 WHIRLPOOL 64ed27fc7abb1b3b82621f6bb91f03d0070933d0423f9d323ac803354fc6acf2182df1dd85a083fa047d63561a5e92d44287ef4935a11a733244d4393edf8f6f diff --git a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox deleted file mode 100644 index 9181eb06..00000000 --- a/sys-apps/sandbox/files/09sandbox +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT_MASK="/etc/sandbox.d" diff --git a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch b/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch deleted file mode 100644 index e4dc5290..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch +++ /dev/null @@ -1,201 +0,0 @@ -From dd726dcc6a95355d0e0cc949018d9c8aefc89a02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 19:41:49 -0500 -Subject: [PATCH 1/2] libsandbox: reject "" paths with *at funcs before - checking the dirfd - -When it comes to processing errors, an empty path is checked before -an invalid dirfd. Make sure sandbox matches that behavior for the -random testsuites out there that look for this. - -URL: https://bugs.gentoo.org/346929 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__pre_check.c | 2 ++ - libsandbox/wrapper-funcs/mkdirat_pre_check.c | 17 +++++------------ - libsandbox/wrapper-funcs/openat_pre_check.c | 15 ++++----------- - libsandbox/wrapper-funcs/unlinkat_pre_check.c | 17 +++++------------ - libsandbox/wrappers.h | 2 ++ - tests/mkdirat-3.sh | 7 +++++++ - tests/mkdirat.at | 1 + - tests/openat-2.sh | 9 +++++++++ - tests/openat.at | 1 + - tests/unlinkat-4.sh | 7 +++++++ - tests/unlinkat.at | 1 + - 11 files changed, 44 insertions(+), 35 deletions(-) - create mode 100755 tests/mkdirat-3.sh - create mode 100755 tests/openat-2.sh - create mode 100755 tests/unlinkat-4.sh - -diff --git a/libsandbox/wrapper-funcs/__pre_check.c b/libsandbox/wrapper-funcs/__pre_check.c -index 2d5711f..28ad91f 100644 ---- a/libsandbox/wrapper-funcs/__pre_check.c -+++ b/libsandbox/wrapper-funcs/__pre_check.c -@@ -20,3 +20,5 @@ - #if SB_NR_UNLINK != SB_NR_UNDEF && SB_NR_UNLINKAT == SB_NR_UNDEF - # include "unlinkat_pre_check.c" - #endif -+ -+#include "__pre_at_check.c" -diff --git a/libsandbox/wrapper-funcs/mkdirat_pre_check.c b/libsandbox/wrapper-funcs/mkdirat_pre_check.c -index 77a65df..0b48d1f 100644 ---- a/libsandbox/wrapper-funcs/mkdirat_pre_check.c -+++ b/libsandbox/wrapper-funcs/mkdirat_pre_check.c -@@ -1,20 +1,13 @@ - bool sb_mkdirat_pre_check(const char *func, const char *pathname, int dirfd) - { - char canonic[SB_PATH_MAX]; -- char dirfd_path[SB_PATH_MAX]; - - save_errno(); - -- /* Expand the dirfd path first */ -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ /* Check incoming args against common *at issues */ -+ char dirfd_path[SB_PATH_MAX]; -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Then break down any relative/symlink paths */ - if (-1 == canonicalize(pathname, canonic)) -diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c -index 0127708..5fd5eaa 100644 ---- a/libsandbox/wrapper-funcs/openat_pre_check.c -+++ b/libsandbox/wrapper-funcs/openat_pre_check.c -@@ -15,17 +15,10 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int - - save_errno(); - -- /* Expand the dirfd path first */ -+ /* Check incoming args against common *at issues */ - char dirfd_path[SB_PATH_MAX]; -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Doesn't exist -> skip permission checks */ - struct stat st; -diff --git a/libsandbox/wrapper-funcs/unlinkat_pre_check.c b/libsandbox/wrapper-funcs/unlinkat_pre_check.c -index 9f5e7d7..c004d15 100644 ---- a/libsandbox/wrapper-funcs/unlinkat_pre_check.c -+++ b/libsandbox/wrapper-funcs/unlinkat_pre_check.c -@@ -1,20 +1,13 @@ - bool sb_unlinkat_pre_check(const char *func, const char *pathname, int dirfd) - { - char canonic[SB_PATH_MAX]; -- char dirfd_path[SB_PATH_MAX]; - - save_errno(); - -- /* Expand the dirfd path first */ -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ /* Check incoming args against common *at issues */ -+ char dirfd_path[SB_PATH_MAX]; -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Then break down any relative/symlink paths */ - if (-1 == canonicalize(pathname, canonic)) -diff --git a/libsandbox/wrappers.h b/libsandbox/wrappers.h -index 5b97787..0aa58bb 100644 ---- a/libsandbox/wrappers.h -+++ b/libsandbox/wrappers.h -@@ -28,5 +28,7 @@ attribute_hidden bool sb_mkdirat_pre_check (const char *func, const char *pathn - attribute_hidden bool sb_openat_pre_check (const char *func, const char *pathname, int dirfd, int flags); - attribute_hidden bool sb_openat64_pre_check (const char *func, const char *pathname, int dirfd, int flags); - attribute_hidden bool sb_unlinkat_pre_check (const char *func, const char *pathname, int dirfd); -+attribute_hidden bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd, -+ char *dirfd_path, size_t dirfd_path_len); - - #endif --- -1.8.1.2 - -From 0b8a6d9773cc0e6d86bf1187f46817d5716698fe Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 19:41:49 -0500 -Subject: [PATCH 2/2] libsandbox: reject "" paths with *at funcs before - checking the dirfd [missing file] - -When it comes to processing errors, an empty path is checked before -an invalid dirfd. Make sure sandbox matches that behavior for the -random testsuites out there that look for this. - -Forgot to `git add` in the previous commit :/. - -URL: https://bugs.gentoo.org/346929 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__pre_at_check.c | 34 +++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 libsandbox/wrapper-funcs/__pre_at_check.c - -diff --git a/libsandbox/wrapper-funcs/__pre_at_check.c b/libsandbox/wrapper-funcs/__pre_at_check.c -new file mode 100644 -index 0000000..f72c40c ---- /dev/null -+++ b/libsandbox/wrapper-funcs/__pre_at_check.c -@@ -0,0 +1,34 @@ -+/* -+ * common *at() pre-checks. -+ * -+ * Copyright 1999-2012 Gentoo Foundation -+ * Licensed under the GPL-2 -+ */ -+ -+/* We assume the parent has nested use with save/restore errno */ -+bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd, -+ char *dirfd_path, size_t dirfd_path_len) -+{ -+ /* the empty path name should fail with ENOENT before any dirfd -+ * checks get a chance to run #346929 -+ */ -+ if (*pathname && *pathname[0] == '\0') { -+ errno = ENOENT; -+ sb_debug_dyn("EARLY FAIL: %s(%s): %s\n", -+ func, *pathname, strerror(errno)); -+ return false; -+ } -+ -+ /* Expand the dirfd path first */ -+ switch (resolve_dirfd_path(dirfd, *pathname, dirfd_path, dirfd_path_len)) { -+ case -1: -+ sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -+ func, *pathname, strerror(errno)); -+ return false; -+ case 0: -+ *pathname = dirfd_path; -+ break; -+ } -+ -+ return true; -+} --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch b/sys-apps/sandbox/files/sandbox-2.6-desktop.patch deleted file mode 100644 index fbecb072..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 00044ab0c8aaaabf048b5ff0ec2da5b3d7d25752 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 17 Nov 2012 14:14:26 -0500 -Subject: [PATCH] sandbox.desktop: drop .svg from Icon field -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -URL: http://bugs.gentoo.org/443672 -Reported-by: Petteri Räty <betelgeuse@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - data/sandbox.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/sandbox.desktop b/data/sandbox.desktop -index 5b5b576..27a887e 100644 ---- a/data/sandbox.desktop -+++ b/data/sandbox.desktop -@@ -5,6 +5,6 @@ Type=Application - Comment=launch a sandboxed shell ... useful for debugging ebuilds - Exec=sandbox - TryExec=sandbox --Icon=sandbox.svg -+Icon=sandbox - Categories=Development; - Terminal=true --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch b/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch deleted file mode 100644 index cb29a6c8..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur sandbox-2.6.orig/scripts/gen_symbol_version_map.awk sandbox-2.6/scripts/gen_symbol_version_map.awk ---- sandbox-2.6.orig/scripts/gen_symbol_version_map.awk 2009-02-20 06:29:29.000000000 +0000 -+++ sandbox-2.6/scripts/gen_symbol_version_map.awk 2015-06-08 19:29:55.727290000 +0000 -@@ -14,7 +14,7 @@ - - # Only check FUNCtion symbols which are not LOCAL, or - # do not have DEFAULT visibility -- if ($4 != "FUNC" || $5 == "LOCAL" || $6 != "DEFAULT") -+ if ($4 != "FUNC" || $5 == "LOCAL" || ($6 != "DEFAULT" && $6 != "PROTECTED")) - next; - - for (x in SYMBOLS) { diff --git a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch b/sys-apps/sandbox/files/sandbox-2.6-log-var.patch deleted file mode 100644 index bfea9e55..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 853b42c86432eefc6d4cfba86197fb37d446366d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 3 Mar 2013 05:34:09 -0500 -Subject: [PATCH] sandbox: accept SANDBOX_LOG vars whatever their values - -Commit 40abb498ca4a24495fe34e133379382ce8c3eaca subtly broke the sandbox -with portage. It changed how the sandbox log env var was accessed by -moving from getenv() to get_sandbox_log(). The latter has path checking -and will kick out values that contain a slash. That means every time a -new process starts, a new sandbox log path will be generated, and when a -program triggers a violation, it'll write to the new file. Meanwhile, -portage itself watches the original one which never gets updated. - -This code has been around forever w/out documentation, and I can't think -of a reason we need it. So punt it. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsbutil/get_sandbox_log.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -diff --git a/libsbutil/get_sandbox_log.c b/libsbutil/get_sandbox_log.c -index a79b399..bdb4278 100644 ---- a/libsbutil/get_sandbox_log.c -+++ b/libsbutil/get_sandbox_log.c -@@ -21,17 +21,13 @@ static void _get_sb_log(char *path, const char *tmpdir, const char *env, const c - - sandbox_log_env = getenv(env); - -- if (sandbox_log_env && is_env_on(ENV_SANDBOX_TESTING)) { -- /* When testing, just use what the env says to */ -+ if (sandbox_log_env) { -+ /* If the env is viable, roll with it. We aren't really -+ * about people breaking the security of the sandbox by -+ * exporting SANDBOX_LOG=/dev/null. -+ */ - strncpy(path, sandbox_log_env, SB_PATH_MAX); - } else { -- /* THIS CHUNK BREAK THINGS BY DOING THIS: -- * SANDBOX_LOG=/tmp/sandbox-app-admin/superadduser-1.0.7-11063.log -- */ -- if ((NULL != sandbox_log_env) && -- (NULL != strchr(sandbox_log_env, '/'))) -- sandbox_log_env = NULL; -- - snprintf(path, SB_PATH_MAX, "%s%s%s%s%d%s", - SANDBOX_LOG_LOCATION, prefix, - (sandbox_log_env == NULL ? "" : sandbox_log_env), --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-musl.patch b/sys-apps/sandbox/files/sandbox-2.6-musl.patch deleted file mode 100644 index ee288d76..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur sandbox-2.6.orig/headers.h sandbox-2.6/headers.h ---- sandbox-2.6.orig/headers.h 2012-07-03 18:27:44.000000000 +0000 -+++ sandbox-2.6/headers.h 2014-05-22 13:57:55.225002786 +0000 -@@ -133,9 +133,11 @@ - #ifdef HAVE_ASM_PTRACE_H - # include <asm/ptrace.h> - #endif -+/* - #ifdef HAVE_LINUX_PTRACE_H - # include <linux/ptrace.h> - #endif -+*/ - #undef FU_ia64_fpreg - #undef FU_pt_all_user_regs - -diff -Naur sandbox-2.6.orig/libsandbox/trace.c sandbox-2.6/libsandbox/trace.c ---- sandbox-2.6.orig/libsandbox/trace.c 2014-05-22 13:58:25.215002800 +0000 -+++ sandbox-2.6/libsandbox/trace.c 2014-05-22 13:57:26.515002772 +0000 -@@ -9,7 +9,7 @@ - #include "wrappers.h" - #include "sb_nr.h" - --static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data); -+static long _do_ptrace(int request, const char *srequest, void *addr, void *data); - #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data) - #define _trace_possible(data) true - -@@ -43,7 +43,7 @@ - _exit(status); - } - --static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data) -+static long _do_ptrace(int request, const char *srequest, void *addr, void *data) - { - long ret; - try_again: -diff -Naur sandbox-2.6.orig/scripts/gen_symbol_header.awk sandbox-2.6/scripts/gen_symbol_header.awk ---- sandbox-2.6.orig/scripts/gen_symbol_header.awk 2014-05-22 13:58:25.235002800 +0000 -+++ sandbox-2.6/scripts/gen_symbol_header.awk 2014-05-22 13:57:26.520002772 +0000 -@@ -161,7 +161,7 @@ - else - printf("symbol_version(%s, %s, %s);\n", - sym_real_name, sym_index, symbol_array[2]); -- } else { -+ } else if (!(sym_index ~ 64)) { - # For non-versioned libc's we use strong aliases - printf("strong_alias(%s, %s);\n", sym_real_name, - sym_index); diff --git a/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch b/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch deleted file mode 100644 index fe227492..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch +++ /dev/null @@ -1,29 +0,0 @@ -gcc crashes when trying to use pch under hardened kernels - -http://bugs.gentoo.org/425524 - ---- Makefile.in -+++ Makefile.in -@@ -300,7 +300,7 @@ - src \ - tests - --SANDBOX_PCH = headers.h.gch libsandbox/headers.h.gch libsbutil/headers.h.gch -+SANDBOX_PCH = - BUILT_SOURCES = $(SANDBOX_PCH) - noinst_LTLIBRARIES = libpch.la - nodist_libpch_la_SOURCES = $(SANDBOX_PCH) -@@ -862,10 +862,9 @@ - $(builddir)/headers.h.gch: headers.h - $(AM_V_GEN)$(COMPILE) -c -o $@.o $< && $(GCH_CP) - --libsbutil: libsbutil/headers.h.gch --libsandbox: libsbutil libsandbox/headers.h.gch --src: libsbutil headers.h.gch --tests: src headers.h.gch -+libsandbox: libsbutil -+src: libsbutil -+tests: src - - ChangeLog: - touch ChangeLog diff --git a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch b/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch deleted file mode 100644 index 0101ece2..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 45fa8714a1d35e6555083d88a71851ada2aacac4 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 18:46:29 -0500 -Subject: [PATCH] libsandbox: handle open(O_NOFOLLOW) - -We don't check for O_NOFOLLOW in the open wrappers, so we end up -returning the wrong error when operating on broken symlinks. - -URL: https://bugs.gentoo.org/413441 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__64_post.h | 1 + - libsandbox/wrapper-funcs/__64_pre.h | 1 + - libsandbox/wrapper-funcs/openat_pre_check.c | 2 +- - tests/open-2.sh | 10 ++++++++++ - tests/open.at | 1 + - 5 files changed, 14 insertions(+), 1 deletion(-) - create mode 100755 tests/open-2.sh - -diff --git a/libsandbox/wrapper-funcs/__64_post.h b/libsandbox/wrapper-funcs/__64_post.h -index 2fd2182..82d2a16 100644 ---- a/libsandbox/wrapper-funcs/__64_post.h -+++ b/libsandbox/wrapper-funcs/__64_post.h -@@ -1,3 +1,4 @@ - #undef SB64 - #undef stat -+#undef lstat - #undef off_t -diff --git a/libsandbox/wrapper-funcs/__64_pre.h b/libsandbox/wrapper-funcs/__64_pre.h -index 2132110..0b34b25 100644 ---- a/libsandbox/wrapper-funcs/__64_pre.h -+++ b/libsandbox/wrapper-funcs/__64_pre.h -@@ -1,3 +1,4 @@ - #define SB64 - #define stat stat64 -+#define lstat lstat64 - #define off_t off64_t -diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c -index c827ee6..0127708 100644 ---- a/libsandbox/wrapper-funcs/openat_pre_check.c -+++ b/libsandbox/wrapper-funcs/openat_pre_check.c -@@ -29,7 +29,7 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int - - /* Doesn't exist -> skip permission checks */ - struct stat st; -- if (-1 == stat(pathname, &st)) { -+ if (((flags & O_NOFOLLOW) ? lstat(pathname, &st) : stat(pathname, &st)) == -1) { - sb_debug_dyn("EARLY FAIL: %s(%s): %s\n", - func, pathname, strerror(errno)); - return false; --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch b/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch deleted file mode 100644 index 7fc09725..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From a3ff1534945c3898332b2481c9fd355dfbd56e1f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 23 Jun 2012 11:52:51 -0700 -Subject: [PATCH] libsandbox: clean up open file handles in parent tracing - process - -Currently, if a non-static app sets up a pipe (with cloexec enabled) and -executes a static app, the handle to that pipe is left open in the parent -process. This causes trouble when the parent is waiting for that to be -closed immediately. - -Since none of the fds in the forked parent process matter to us, we can -just go ahead and clean up all fds before we start tracing the child. - -URL: http://bugs.gentoo.org/364877 -Reported-by: Victor Stinner <victor.stinner@haypocalc.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/trace.c | 3 +- - libsbutil/sb_close.c | 26 +++++++++++- - libsbutil/sbutil.h | 1 + - tests/Makefile.am | 2 + - tests/pipe-fork_static_tst.c | 18 +++++++++ - tests/pipe-fork_tst.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ - tests/script-9.sh | 5 +++ - tests/script.at | 1 + - 8 files changed, 149 insertions(+), 2 deletions(-) - create mode 100644 tests/pipe-fork_static_tst.c - create mode 100644 tests/pipe-fork_tst.c - create mode 100755 tests/script-9.sh - -diff --git a/libsandbox/trace.c b/libsandbox/trace.c -index 32ad2d6..dfbab18 100644 ---- a/libsandbox/trace.c -+++ b/libsandbox/trace.c -@@ -504,8 +504,9 @@ void trace_main(const char *filename, char *const argv[]) - /* Not all kernel versions support this, so ignore return */ - ptrace(PTRACE_SETOPTIONS, trace_pid, NULL, (void *)PTRACE_O_TRACESYSGOOD); - #endif -+ sb_close_all_fds(); - trace_loop(); -- return; -+ sb_ebort("ISE: child should have quit, as should we\n"); - } - - sb_debug("child setting up ..."); -diff --git a/libsbutil/sb_close.c b/libsbutil/sb_close.c -index 17a4560..5379197 100644 ---- a/libsbutil/sb_close.c -+++ b/libsbutil/sb_close.c -@@ -29,3 +29,27 @@ int sb_close(int fd) - - return res; - } -+ -+/* Quickly close all the open fds (good for daemonization) */ -+void sb_close_all_fds(void) -+{ -+ DIR *dirp; -+ struct dirent *de; -+ int dfd, fd; -+ const char *fd_dir = sb_get_fd_dir(); -+ -+ dirp = opendir(fd_dir); -+ if (!dirp) -+ sb_ebort("could not process %s\n", fd_dir); -+ dfd = dirfd(dirp); -+ -+ while ((de = readdir(dirp)) != NULL) { -+ if (de->d_name[0] == '.') -+ continue; -+ fd = atoi(de->d_name); -+ if (fd != dfd) -+ close(fd); -+ } -+ -+ closedir(dirp); -+} -diff --git a/libsbutil/sbutil.h b/libsbutil/sbutil.h -index 02b88cb..479734b 100644 ---- a/libsbutil/sbutil.h -+++ b/libsbutil/sbutil.h -@@ -97,6 +97,7 @@ int sb_open(const char *path, int flags, mode_t mode); - size_t sb_read(int fd, void *buf, size_t count); - size_t sb_write(int fd, const void *buf, size_t count); - int sb_close(int fd); -+void sb_close_all_fds(void); - int sb_copy_file_to_fd(const char *file, int ofd); - - /* Reliable output */ --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch b/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch deleted file mode 100644 index 7e738228..00000000 --- a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7b01f6103a9baddaf0252e7f850a4cef91a48b67 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 6 Jul 2012 14:58:16 -0400 -Subject: [PATCH] libsandbox: fix hppa trace code - -URL: https://bugs.gentoo.org/425062 -Reported-by: Jeroen Roovers <jer@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/trace/linux/hppa.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libsandbox/trace/linux/hppa.c b/libsandbox/trace/linux/hppa.c -index d23b0d1..5414354 100644 ---- a/libsandbox/trace/linux/hppa.c -+++ b/libsandbox/trace/linux/hppa.c -@@ -1,5 +1,5 @@ --#define trace_reg_sysnum (20 * 4) /* PT_GR20 */ --#define trace_reg_ret (28 * 4) /* PT_GR28 */ -+#define trace_reg_sysnum gr[20] -+#define trace_reg_ret gr[28] - - static unsigned long trace_arg(void *vregs, int num) - { --- -1.7.9.7 - diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml deleted file mode 100644 index 9e13eaea..00000000 --- a/sys-apps/sandbox/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - -<!-- portage lacks a herd. correct this when we have one. --> - -<maintainer> - <email>sandbox@gentoo.org</email> - <description>Sandbox Maintainers</description> -</maintainer> -</pkgmetadata> diff --git a/sys-apps/sandbox/sandbox-2.6-r999.ebuild b/sys-apps/sandbox/sandbox-2.6-r999.ebuild deleted file mode 100644 index 1221d284..00000000 --- a/sys-apps/sandbox/sandbox-2.6-r999.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.16 2014/01/18 01:59:21 vapier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/proj/en/portage/sandbox/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -sb_foreach_abi() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Running $1 for ABI=${ABI}..." - "$@" - done - ABI=${OABI} -} - -src_unpack() { - unpacker - cd "${S}" - epatch "${FILESDIR}"/${P}-trace-hppa.patch #425062 - epatch "${FILESDIR}"/${P}-log-var.patch - epatch "${FILESDIR}"/${P}-static-close-fd.patch #364877 - epatch "${FILESDIR}"/${P}-desktop.patch #443672 - epatch "${FILESDIR}"/${P}-open-nofollow.patch #413441 - epatch "${FILESDIR}"/${P}-check-empty-paths-at.patch #346929 - epatch "${FILESDIR}"/${P}-no-pch.patch #425524 - epatch "${FILESDIR}"/${P}-musl.patch - epatch "${FILESDIR}"/${P}-include-PROTECTED-symbols.patch - epatch_user -} - -sb_configure() { - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - # hack for conflict between powerpc bits/user.h and asm/ptrace.h - use elibc_musl && append-cppflags -D_ASM_POWERPC_PTRACE_H - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die -} - -sb_compile() { - emake || die -} - -src_compile() { - filter-lfs-flags #90228 - - # Run configures in parallel! - multijob_init - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - multijob_child_init sb_configure - done - ABI=${OABI} - multijob_finish - - sb_foreach_abi sb_compile -} - -sb_test() { - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die -} - -src_test() { - sb_foreach_abi sb_test -} - -sb_install() { - emake DESTDIR="${D}" install || die - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die -} - -src_install() { - sb_foreach_abi sb_install - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${D}"/var/log/sandbox - chmod 0770 "${D}"/var/log/sandbox - - local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${ROOT}} - find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 - - # Sandbox builds on mips-musl but fails to run - use mips && chmod -x "${ROOT}"/usr/bin/sandbox -} diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest deleted file mode 100644 index 47d0d74e..00000000 --- a/sys-apps/shadow/Manifest +++ /dev/null @@ -1,21 +0,0 @@ -AUX default/useradd 96 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f WHIRLPOOL 9022a371e34e96a4c3193f24752979da27cdcd60aec1c8db1d2b427ab880b16917578ddcb4d8af02fd1d0eedc6b346cf43d7ae892e8580321e32e50f5498980b -AUX login.defs 6254 SHA256 b7bfd7b1c34ce3d35865b572abc69d278dea4eef4f349c26b238735547c4ac22 SHA512 7d21d6f72693e5485bde8bbf18a66b3aefef58fae057825fa84beeb548b78d7e12c00149d9c63a5fbdc32daaf1ee5bfa57f63b523b391562d4d2e81a6c06cf27 WHIRLPOOL 756549cd21f0101c861ece9194405a13a1fc4e7c3b9bae080103a3e1bb94b5073d90904d63c7c25fd2f02ef1c4a0d43b9eac4879adc0e1ad4ade4d2ee4532ab9 -AUX login.pamd.3 190 SHA256 1009e196b630dae5d1f40b1cc6ee42a38ecdb7c2cd4bfa40fb7114ee74e0bfd0 SHA512 7181fcdf5dc798230f482cd52827680839f054f79d67498bbdbc20d9926752d34858af37d0b5afc28be9ef5247ad884e027d6ccf29ea0f69ba75a6cdd80918f1 WHIRLPOOL 63012c9e4899f644e2f91fa31348d76718811035e42e5a94425a1e9689b8a67f92e11228b629ce70b9114a44ce4bdf54770fb6805aaacbc4beba4ab302589b24 -AUX login_defs.awk 738 SHA256 6ceb9e03c2f7df817f3162de48886c9c66a596cb2af98fbf523c93e26840113b SHA512 06a19785c55dd7b389342535c3dd9f56114eba54e27c415d921b8598f9862bad4c8d1b251bd0eb036ecefdf4124c444f30c504d7921d93dab3a0eaea03625f72 WHIRLPOOL 047cc78b7faf93b4508efa3f6238d2c013af4cffc920a7ffc0f0197d69cb301189f32ae2d74a9dceafea4999a33e0656dfd43aa4f791b5855e12a553e770ccde -AUX login_defs_pam.sed 479 SHA256 587239d5b1425c5766f10cea5352b325699fb35829d9375bda68bbfd74f1d839 SHA512 c4bda7776b5a0bdaa8e7e36c09fb005699cf8b1ef5b474021f7e95d98e62a39aebd354dcc8ad0c49316e8e5d0123429b893c3ff9e4024c18ac0e25b4ab4b45ed WHIRLPOOL a6c5ce16824dde56b4ae899cb9b8effc9b7d61133e88e262a22a5e0db080c85ead15d6d9a13c5583b6e55b368ffd890bf037a3957ce6071b370dd7fb50d63bf4 -AUX pam.d-include/login 245 SHA256 39bbe2ed696a22c7549a39a7cfd47c16e347e5af4fd71b8c01ec87fce59ba0a0 SHA512 87a503ed5df2c522cbf97dcb7f6c252fe9e6e4a4fd34e6641b5cbbaebd2ff4a4d861eeadb0196c7cb30717db8fa2194072500af2336f4b81d4bd87b106699c35 WHIRLPOOL 85a34f81ad9337d06c3162c4c897d8e20f26e9ad9eb399adf11e5eea4538d274ecd9498da37a4e374521d480eadcbcdf98b1991a79580af6e8bb1890f6e02f2f -AUX pam.d-include/other 142 SHA256 5e05df2743ec0021364b05f4bbe2e5a3a670abb5af845c3fa760731e5b7272ca SHA512 639db65a3f573e5d800790931ddac0f378a2d678338ff45068b9f5dda8aa9ebd858fed86c0c1e4f45c2ce3d04e3d8d4ec4ced57837a54e3c18e209711cfe2522 WHIRLPOOL ea34f5db2897fc506c63d0e0a2efc20d5f8c7b1f7353d1ab98c5becf8d0e73c1299a357114412376f17b42f43e0f1685810afe5dc86f42a400b86d7f9a314936 -AUX pam.d-include/passwd 144 SHA256 8c54d2e3aab50b2a8d3d36aa37f7d7bb32c15d9a3af9a10b7ec5b5ffcff9a5fb SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f WHIRLPOOL 879370adfb6a78c0acdeebf2c10a503d94925c34dceadb8677693f6c34e4e973f2584b221a9a81fdf23f084c430bbafa23a03440c1a95c798b58faedf4d412bd -AUX pam.d-include/shadow 152 SHA256 7fc1ccca85d2b1ac4dad9909792453c8d26e9aeab48c620d861a92b9355ac69f SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3 WHIRLPOOL 2b5282f983b5bf52c0311c2153dba2d12f6c07ae803d1723010bf4bbf4962d120aea026d32b1f3b062778da5222e7cb16dc39660e53b72173fba723a57b616de -AUX pam.d-include/su 1059 SHA256 63a6a6fb6194f4dff8fdd16214a563242a4ea6cb682f49af337378dfddaf2962 SHA512 c9535434437221fad058b9fad878da13f3a3d4fc9290e4a7366e6d4dab7e320ac40de297bcc874fbe83e50b5ea29c5aac39d7d250632f045d964150604381550 WHIRLPOOL 33283dee1e71ae36112c72d36852680291bab919158e8faab478f7fd32035732b2cf62d83df373fa06869d3c84f05b34477598e776f8e65a39dbc0ef8a2c3724 -AUX pam.d-include/su-openpam 249 SHA256 8d26b735b1b5aa598fc29a88a2d52eeed587210dd1dbd3180ef9bb440a3375b7 SHA512 242328ac89744a5178fdf904b4068d358e07a3ab69035ed586de05ae31a59a4d9929ae6e5f3aa0c60b61b22d8df8584aca47e3f682416979e89d4c7dbc76bdcd WHIRLPOOL 3f7e52c38abc07d9d289edc0b6b31ea8d5d84520e737f4e289e75c5df965eda424f0a4706bb3e5fd6e556b274a6472dc5ca90ba23d17f609ae1311b013b0aef7 -AUX pam.d-include/system-auth 380 SHA256 704c07b9bab8201d55d80970e5a086ea35d93d62969aeb27ee9ebef85a029ed9 SHA512 4a359425064711a4194cff517175f708c829e6f1ca24a77ce38eb10482a8ca5a7ac1f9e25ce301d1f0278963768483344d6caf0548685eb33019f8d4a7d4f847 WHIRLPOOL 8607d4d2a12ac3252902c5a5c592b07903e843a8ada2ed87bf589ab9ab358eef9734a5294862baa5558eef1381c5a77c4fd3e62b1bb9898232aab78f60fbe5d3 -AUX pam.d-include/system-auth-1.1 365 SHA256 e073f573c88515cf38fb22faa26ccf87d55d34e6d460d28ad25682958de4c13e SHA512 3633aff2be598a108d75bd5c2b92b399f0b244327be54ff29d498ef8f95107d0c39a62ffe983e19198d54540c36c028316b628081abf5e8f85cb946db41055c2 WHIRLPOOL 1cb61620c3fbc8ada4676b04d9e38da345f300e1115a13f81790decaa57d56d6d8ada8d1fa12c1857b0ea3591583cb9fa6f195237ebfa1e0ba48e667defa2c5f -AUX securetty 262 SHA256 9bc3c187d5535ebe83cf22129b7189a9d8e4c05520af187bff6cff4d8f083c67 SHA512 d841f00a4c83e9672ec3620cdff73f2cd02a1a9e883115b329720b5f6ffbf6faa0ff8ac975f1494f7ad07f0ffa91f6eb983a617e604af67dd46062069b09f7f2 WHIRLPOOL 4b7ee107532d1a2e528745c5e3dcb770fc54f7f2a7dcc0f706613e5623f9a5521ee808900a5ffeb68073d9787ebe08606e6eaf95cdb400c9490b0da3614deaa8 -AUX shadow-4.1.3-dots-in-usernames.patch 302 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d WHIRLPOOL f0258b24f7731ab7b15a1fca391593c8bbd6bdf2ddad57af1d7960d05af49bc5b706039caa576646cb3d817d2d4ad8e89526b12fe046301c63c1518d01dcf173 -AUX shadow-4.1.5.1-fix-RUSEROK.patch 397 SHA256 0f64dd68b55aee9a7059548c97906011d6799078462d41cdb3fcc75de1ff0b0d SHA512 31049022e162223cf66624f861e6acc5451ae10999f93fa3cc49edb0d208c7d522aa39d6aeb12fde0efae05f922acdb46b19a09e45e8c82e85232cf11139972f WHIRLPOOL 11b9999c38a730afa10c7315e204ffb8945e3e823f5a7807a778eeef7ebcceb8da95a6c30c98528675b8d1962104cf6edeb5af6b59c4efbfa11b4e262afde078 -AUX shadow-4.1.5.1-fix-struct_in_addr-collision.patch 418 SHA256 91ebfec6ab1bc824053f590ba8c6f3f90c0a47803e73531ad02521e1f3809c47 SHA512 0561d18a6e80f3250d290cc93c87e714c66f6e87ed147f40ae8a2c8011b0fddc7fc489569e6ea94c05867a5a8b2b65b23da22e35266274677b141b38475dfaf2 WHIRLPOOL bc2c4e11d73ae200b58b0ef273d940862d535e49d227984489d297c76f2e419b41861798371db0b241e2cb3b16a560999a47a7fb4438d7f742395fcba1570000 -AUX shadow-4.1.5.1-include-sys-socket.patch 439 SHA256 10889b8a8c168d708a8997bac6564c50bbcb2ad9d6ccca5412965c9b0d5860ac SHA512 eb526b3e932ebc599ca6a42c0a1aab9a9de8f8bd3ff7278ccddb1552c216c642be50e61e9cbc40798d027cbb944682fccf40cdc2b16fbefc65d60bcdafd56939 WHIRLPOOL 79ae6ded499296dc91fdeb4d25240f210902f202444f3ca44c935fe7a20d228fcdf9da2509cd68d85953a4fd1b457d38d325481713c97b68e5b7c112ca65fa8f -DIST shadow-4.1.5.1.tar.bz2 2193325 SHA256 aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb SHA512 c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c WHIRLPOOL 08751597b5b57057f0a3141be97204df49fada25adf0a9f43106a4099ce1b06fec6e90592e43ff1d789bf0a7e16a40b45f29830879ea5c71e9f5a1a81e7a7357 -EBUILD shadow-4.1.5.1-r99.ebuild 5315 SHA256 62908768e6ef0da9948c4c80bc7193b36bf8751d84d6424e6596e847a9f58239 SHA512 9a14a651c9a2baec762a5d338451092a5f07c714c659f5c0d603abeb5d61f8624d47ca801f22fe83980f551f530a555bee7e165666b74997be3b95efb43bfcc5 WHIRLPOOL 228fd1aedd45928939a06c71776f25191d105ef9ca4ffb9d5d0766128bed6a837891d226986d7a16f1ca644c6da1838b9f89fec4f7d4c20c58f242d8a53de897 -MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45 diff --git a/sys-apps/shadow/files/default/useradd b/sys-apps/shadow/files/default/useradd deleted file mode 100644 index ae81dbb3..00000000 --- a/sys-apps/shadow/files/default/useradd +++ /dev/null @@ -1,7 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel diff --git a/sys-apps/shadow/files/login.defs b/sys-apps/shadow/files/login.defs deleted file mode 100644 index 4aa7044b..00000000 --- a/sys-apps/shadow/files/login.defs +++ /dev/null @@ -1,212 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $ -# -# 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. -# -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 022 - -# -# 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 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 100 -GID_MAX 60000 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 3 - -# -# 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 - -# -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -GETPASS_ASTERISKS 0 - -# -# 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/sys-apps/shadow/files/login.pamd.3 b/sys-apps/shadow/files/login.pamd.3 deleted file mode 100644 index 13abd279..00000000 --- a/sys-apps/shadow/files/login.pamd.3 +++ /dev/null @@ -1,6 +0,0 @@ -auth required pam_securetty.so -auth include system-local-login - -account include system-local-login -password include system-local-login -session include system-local-login diff --git a/sys-apps/shadow/files/login_defs.awk b/sys-apps/shadow/files/login_defs.awk deleted file mode 100644 index 56087c64..00000000 --- a/sys-apps/shadow/files/login_defs.awk +++ /dev/null @@ -1,32 +0,0 @@ -# Fixes up login defs for PAM by commenting all non-PAM options and adding a -# comment that it is not supported with PAM. -# -# Call with lib/getdef.c and etc/login.defs as args in the root source directory -# of shadow, ie: -# -# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new -# - -(FILENAME == "lib/getdef.c") { - if ($2 == "USE_PAM") - start_printing = 1 - else if ($1 == "#endif") - nextfile - else if (start_printing == 1) - VARS[count++] = substr($1, 3, length($1) - 4) -} - -(FILENAME != "lib/getdef.c") { - print_line = 1 - for (x in VARS) { - regex = "(^|#)" VARS[x] - if ($0 ~ regex) { - print_line = 0 - printf("%s%s\t(NOT SUPPORTED WITH PAM)\n", - ($0 ~ /^#/) ? "" : "#", $0) - } - } - if (print_line) - print $0 -} - diff --git a/sys-apps/shadow/files/login_defs_pam.sed b/sys-apps/shadow/files/login_defs_pam.sed deleted file mode 100644 index ba308ba9..00000000 --- a/sys-apps/shadow/files/login_defs_pam.sed +++ /dev/null @@ -1,24 +0,0 @@ -/^FAILLOG_ENAB/b comment -/^LASTLOG_ENAB/b comment -/^MAIL_CHECK_ENAB/b comment -/^OBSCURE_CHECKS_ENAB/b comment -/^PORTTIME_CHECKS_ENAB/b comment -/^QUOTAS_ENAB/b comment -/^MOTD_FILE/b comment -/^FTMP_FILE/b comment -/^NOLOGINS_FILE/b comment -/^ENV_HZ/b comment -/^PASS_MIN_LEN/b comment -/^SU_WHEEL_ONLY/b comment -/^CRACKLIB_DICTPATH/b comment -/^PASS_CHANGE_TRIES/b comment -/^PASS_ALWAYS_WARN/b comment -/^CHFN_AUTH/b comment -/^ENVIRON_FILE/b comment - -b exit - -: comment - s:^:#: - -: exit diff --git a/sys-apps/shadow/files/pam.d-include/login b/sys-apps/shadow/files/pam.d-include/login deleted file mode 100644 index 9d216779..00000000 --- a/sys-apps/shadow/files/pam.d-include/login +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth include system-auth -auth required pam_nologin.so - -account include system-auth - -password include system-auth - -session include system-auth -session optional pam_console.so diff --git a/sys-apps/shadow/files/pam.d-include/other b/sys-apps/shadow/files/pam.d-include/other deleted file mode 100644 index bb0b9647..00000000 --- a/sys-apps/shadow/files/pam.d-include/other +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth required pam_deny.so - -account required pam_deny.so - -password required pam_deny.so - -session required pam_deny.so diff --git a/sys-apps/shadow/files/pam.d-include/passwd b/sys-apps/shadow/files/pam.d-include/passwd deleted file mode 100644 index 960b32ea..00000000 --- a/sys-apps/shadow/files/pam.d-include/passwd +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -auth include system-auth - -account include system-auth - -password include system-auth diff --git a/sys-apps/shadow/files/pam.d-include/shadow b/sys-apps/shadow/files/pam.d-include/shadow deleted file mode 100644 index 743b2f02..00000000 --- a/sys-apps/shadow/files/pam.d-include/shadow +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -auth required pam_permit.so - -account include system-auth - -password required pam_permit.so diff --git a/sys-apps/shadow/files/pam.d-include/su b/sys-apps/shadow/files/pam.d-include/su deleted file mode 100644 index d15c7edf..00000000 --- a/sys-apps/shadow/files/pam.d-include/su +++ /dev/null @@ -1,32 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required pam_wheel.so use_uid - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/su-openpam b/sys-apps/shadow/files/pam.d-include/su-openpam deleted file mode 100644 index e9ec7d3d..00000000 --- a/sys-apps/shadow/files/pam.d-include/su-openpam +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/system-auth b/sys-apps/shadow/files/pam.d-include/system-auth deleted file mode 100644 index b7c37afd..00000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok nodelay -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1 deleted file mode 100644 index fe804831..00000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/securetty b/sys-apps/shadow/files/securetty deleted file mode 100644 index c7042fae..00000000 --- a/sys-apps/shadow/files/securetty +++ /dev/null @@ -1,33 +0,0 @@ -# /etc/securetty: list of terminals on which root is allowed to login. -# See securetty(5) and login(1). -console - -vc/0 -vc/1 -vc/2 -vc/3 -vc/4 -vc/5 -vc/6 -vc/7 -vc/8 -vc/9 -vc/10 -vc/11 -vc/12 -tty0 -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -tty12 - -tts/0 -ttyS0 diff --git a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch deleted file mode 100644 index efcb33db..00000000 --- a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- shadow-4.1.3/libmisc/chkname.c -+++ shadow-4.1.3/libmisc/chkname.c -@@ -66,6 +66,7 @@ - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || -+ ('.' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) - )) { - return false; diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch b/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch deleted file mode 100644 index 35ed22e8..00000000 --- a/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur shadow-4.1.5.1.orig/libmisc/rlogin.c shadow-4.1.5.1/libmisc/rlogin.c ---- shadow-4.1.5.1.orig/libmisc/rlogin.c 2009-07-12 22:24:45.000000000 +0000 -+++ shadow-4.1.5.1/libmisc/rlogin.c 2013-07-06 11:01:09.415878105 +0000 -@@ -187,7 +187,7 @@ - * go fix the #define in config.h. - */ - --#ifndef RUSEROK -+#if RUSEROK == 0 - return 0; - #else - return ruserok (remote_host, pwd->pw_uid == 0, diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch b/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch deleted file mode 100644 index 6761ff92..00000000 --- a/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur shadow-4.1.5.1.orig/libmisc/utmp.c shadow-4.1.5.1/libmisc/utmp.c ---- shadow-4.1.5.1.orig/libmisc/utmp.c 2014-01-16 13:59:51.517973402 +0000 -+++ shadow-4.1.5.1/libmisc/utmp.c 2014-01-16 14:00:13.147974612 +0000 -@@ -45,8 +45,6 @@ - #include <netdb.h> - #include <stdio.h> - #include <sys/socket.h> --#include <linux/in.h> --#include <linux/in6.h> - - #ident "$Id: utmp.c 3720 2012-05-18 17:57:52Z nekral-guest $" - diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch b/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch deleted file mode 100644 index 0b93c9d0..00000000 --- a/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur shadow-4.1.5.1.orig/libmisc/utmp.c shadow-4.1.5.1/libmisc/utmp.c ---- shadow-4.1.5.1.orig/libmisc/utmp.c 2012-05-18 17:57:54.000000000 +0000 -+++ shadow-4.1.5.1/libmisc/utmp.c 2013-07-06 03:49:09.871428783 +0000 -@@ -44,6 +44,9 @@ - #include <assert.h> - #include <netdb.h> - #include <stdio.h> -+#include <sys/socket.h> -+#include <linux/in.h> -+#include <linux/in6.h> - - #ident "$Id: utmp.c 3720 2012-05-18 17:57:52Z nekral-guest $" - diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml deleted file mode 100644 index 59792273..00000000 --- a/sys-apps/shadow/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<herd>pam</herd> <!-- only for USE=pam --> -<use> - <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:debian:shadow</remote-id> -</upstream> -</pkgmetadata> diff --git a/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild b/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild deleted file mode 100644 index 26536e61..00000000 --- a/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1.ebuild,v 1.4 2013/03/12 14:19:37 vapier Exp $ - -EAPI=4 - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( - >=sys-libs/libselinux-1.28 - sys-libs/libsemanage - ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20120417 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${P}-include-sys-socket.patch - epatch "${FILESDIR}"/${P}-fix-RUSEROK.patch - epatch "${FILESDIR}"/${P}-fix-struct_in_addr-collision.patch - epatch_user - elibtoolize -} - -src_configure() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052 -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttymxc2 ttymxc3 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}"/pam.d-include/shadow - - for x in chpasswd chgpasswd newusers; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} - done - - for x in chage chsh chfn \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - - # Remove pam.d files provided by pambase. - rm "${D}"/etc/pam.d/{login,passwd,su} || die - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest deleted file mode 100644 index 2aa20dae..00000000 --- a/sys-apps/sysvinit/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX inittab-2.87 1893 SHA256 abe0e3a60564bbce32fb54a919166efc486678826f54fbf9847aeb68abb87831 SHA512 a24aecc907faf65492b3ffeaaf1f8d4fb80b5796ccd087bb148fb0df9ecdf448e040b04d6c9a54bd9fa30418c712e22aeeb8914af68741dcb105faca13e48472 WHIRLPOOL 7c5202b1b1e3e4b609a96dfdb8f089e692e762e897f3d5c17c3085a4c1c57124d20bc8bf68403ee55eb2ccdaee22895d4bcdf999a3a8cc8c982085efb8d9f198 -AUX reboot.sh 304 SHA256 967fa572014ac6dd69f5e7e24d5250abad9c20c644563b927b295778608cafef SHA512 d47cde84e3a3b98b2f24d09d58977e22ec3db23c5860624ce29a40815df1a7aa69d9da92fd13769e19b52291e48d24a930fe536ba16365ada0ad96a6e157b73c WHIRLPOOL 5fc4d2479eda414bbad53ffa9a22d1333b366d84657c816c9019d5050f84de551e8793712c2d4153189c22216afd1ba7dff7aed91544f7a2428fd65114968e42 -AUX shutdown.sh 385 SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c SHA512 cffa58c2b548e6aadeb05944cf7b88f93b4b40351766eaf24e0e3f258c03bb24c748311fcbb30c16efa3ed7b9cc0ccaa2be02099e1f37930f599d064da9e2054 WHIRLPOOL 42b63e21e12975c21c5aec479696b836e482b622b81ec7028139f7fea2f6a77d4bf98414ecd139ad5b1c5d698963a15ce5aedd06f7deb60193249f3dbc33c3d9 -AUX sysvinit-2.86-kexec.patch 3910 SHA256 a9d764afc05ae73c2153b024a3b9e3295ba913e14e9684ddf1fd94467e4bc823 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee WHIRLPOOL aecabc2b97e80d401bba856a38ab92d66c038eb00fe58e56e7e87d6ecb4ef0ec8e07534430887eb3f204dfac20f2d94e6ea81e2d7597e3a937442f376f703887 -AUX sysvinit-2.86-shutdown-single.patch 1229 SHA256 78852ca410e7ee23bf69cb6e566cb90404d8c8b7bcc10b264f66c97e0359d431 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 WHIRLPOOL a770eec46053c67a047832742197b8d30d8b5e2e27cad0dc4f608cbccde0b5ece7e08102c51372cc0b33304e266e3b03156d12209db14fbe61800b312ad556aa -AUX sysvinit-2.88-makefile.patch 1545 SHA256 34d6ee50be139ad08b620569df11ac6a4cdf3dae737733dda21a716c4064c194 SHA512 d19e260902f69dd19bfaa4f3e415a816388663a7f89b9d102b27f44c5f2d0654b64ab2e5689a20a3975ff0801e4fb96ef7b6737bfb4ba9466ec58c477de322aa WHIRLPOOL bba46046a59969ac2007c3c932bf07646a5ebece72a216990c185b8eeead724e88cd349219ae528060b9c71a5df97d1e3221691cdbb77e16c9522014c836a76d -AUX sysvinit-2.88-musl.patch 240 SHA256 392bea0f822852e740280a04b5446d41954cb8627d9edf076d2532a79ab15478 SHA512 cac79c4bc874b987db53d5011fded8a0a038c794bfe884ac9caf901d6098aa9a611150e80f23712c404768e2a0c8fb6ff4c392a269165a0104cb1f18e79b0987 WHIRLPOOL 473f855e5054228612d36e752bd052fa47ae962d757d3a5c4d3f73dbb90becdb106f7a0c4e6c39470a210e53e051b3ba9dd5b3430e640d312a556ded30137654 -AUX sysvinit-2.88-selinux.patch 1041 SHA256 e987ab6e478e5b3987ae1c6e338cfc66ae356f704d0c3ea932f9e4335b4986f0 SHA512 46eeb3ab2dd25f314b9f60b2dc8a7da2aa2aafb978953a730ccc36456d240e317930e86df69ce2592cf45978f3307dfc2522b24ae1158e64ff17dfa6ed84dcb8 WHIRLPOOL 4fe319df09759addf9499367a6da47e8effe93ec0a4ba5b7e7b1d0c746b324a303cdc81eb360c81e529faf41260d69e2b4364d6695b390db9dba1e3d1693c872 -AUX sysvinit-2.88-shutdown-h.patch 1626 SHA256 642585158e6fbb185ed53804be2eeea85c037726ed19beb51a9ffb594e63ca0f SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe WHIRLPOOL 6500d8be6313190e5ccf8ca0fe3d51ef879458f59e7ebe1849f666f3c20ffdea21d73f2951e978ac0bf7dce1f47be0113e129db784fdabb6f4407e4d78a3cb0d -DIST sysvinit-2.88dsf.tar.bz2 105551 SHA256 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf WHIRLPOOL f4809e19ea2c72c733d3c09a4964d7a6e67b091d1f1d9ef276515b2f138148bfbf516034d3fb1009289f9520f2fbe9e29687f432bba06fb437ebd6e2b9ef570c -EBUILD sysvinit-2.88-r999.ebuild 3430 SHA256 f475afa4de57de238795c580639b0f841b05f75b20e6cd7b1e8052b4b26d8743 SHA512 0f318cd38732fa0c968ca112342bcee413661df7f8e3334e3ca4d25af430a850e0fd57de0860a9ee63334fec28fb741e28d0308b42073159666fdfed8517d493 WHIRLPOOL 0a80ba5b1ef215168ffcee674793e1fc75f2fb0aa353cb17627456028e48c8be4a28997a6887378358454a3d0224459781dde63061344242576101233ec68290 -MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 deleted file mode 100644 index cf075481..00000000 --- a/sys-apps/sysvinit/files/inittab-2.87 +++ /dev/null @@ -1,58 +0,0 @@ -# -# /etc/inittab: This file describes how the INIT process should set up -# the system in a certain run-level. -# -# Author: Miquel van Smoorenburg, <miquels@cistron.nl> -# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com> -# Modified by: Daniel Robbins, <drobbins@gentoo.org> -# Modified by: Martin Schlemmer, <azarah@gentoo.org> -# Modified by: Mike Frysinger, <vapier@gentoo.org> -# Modified by: Robin H. Johnson, <robbat2@gentoo.org> -# -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $ - -# Default runlevel. -id:3:initdefault: - -# System initialization, mount local filesystems, etc. -si::sysinit:/sbin/rc sysinit - -# Further system initialization, brings up the boot runlevel. -rc::bootwait:/sbin/rc boot - -l0:0:wait:/sbin/rc shutdown -l0s:0:wait:/sbin/halt -dhp -l1:1:wait:/sbin/rc single -l2:2:wait:/sbin/rc nonetwork -l3:3:wait:/sbin/rc default -l4:4:wait:/sbin/rc default -l5:5:wait:/sbin/rc default -l6:6:wait:/sbin/rc reboot -l6r:6:wait:/sbin/reboot -dk -#z6:6:respawn:/sbin/sulogin - -# new-style single-user -su0:S:wait:/sbin/rc single -su1:S:wait:/sbin/sulogin - -# TERMINALS -c1:12345:respawn:/sbin/agetty 38400 tty1 linux -c2:2345:respawn:/sbin/agetty 38400 tty2 linux -c3:2345:respawn:/sbin/agetty 38400 tty3 linux -c4:2345:respawn:/sbin/agetty 38400 tty4 linux -c5:2345:respawn:/sbin/agetty 38400 tty5 linux -c6:2345:respawn:/sbin/agetty 38400 tty6 linux - -# SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 - -# What to do at the "Three Finger Salute". -ca:12345:ctrlaltdel:/sbin/shutdown -r now - -# Used by /etc/init.d/xdm to control DM startup. -# Read the comments in /etc/init.d/xdm for more -# info. Do NOT remove, as this will start nothing -# extra at boot if /etc/init.d/xdm is not added -# to the "default" runlevel. -x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/files/reboot.sh b/sys-apps/sysvinit/files/reboot.sh deleted file mode 100755 index 3e50f71c..00000000 --- a/sys-apps/sysvinit/files/reboot.sh +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-dpk" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" - -/sbin/reboot "${opts}" 2>/dev/null - -# hmm, if the above failed, that's kind of odd ... -# so let's force a reboot -/sbin/reboot -f diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh deleted file mode 100755 index 502ef527..00000000 --- a/sys-apps/sysvinit/files/shutdown.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="-d" -[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p" -[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" -[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h" - -/sbin/halt "${opts}" - -# hmm, if the above failed, that's kind of odd ... -# so let's force a halt -/sbin/halt -f diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch deleted file mode 100644 index 4948806d..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch +++ /dev/null @@ -1,142 +0,0 @@ -halt: add a -k kexec flag - ---- a/man/halt.8 -+++ b/man/halt.8 -@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system. - .RB [ \-d ] - .RB [ \-f ] - .RB [ \-i ] -+.RB [ \-k ] - .br - .B /sbin/poweroff - .RB [ \-n ] -@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off - .IP \fB\-p\fP - When halting the system, switch off the power. This is the default when halt is - called as \fBpoweroff\fP. -+.IP \fB\-k\fP -+Try to reboot using \fBkexec\fP, if kernel supports it. - .\"}}} - .\"{{{ Diagnostics - .SH DIAGNOSTICS ---- a/src/halt.c -+++ b/src/halt.c -@@ -8,7 +8,7 @@ - * execute an "shutdown -r". This is for compatibility with - * sysvinit 2.4. - * -- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] -+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k] - * -n: don't sync before halting the system - * -w: only write a wtmp reboot record and exit. - * -d: don't write a wtmp record. -@@ -16,6 +16,7 @@ - * -h: put harddisks in standby mode - * -i: shut down all network interfaces. - * -p: power down the system (if possible, otherwise halt). -+ * -k: reboot the system using kexec. - * - * Reboot and halt are both this program. Reboot - * is just a link to halt. Invoking the program -@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line); - */ - void usage(void) - { -- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n", -- progname, strcmp(progname, "halt") ? "" : " [-p]"); -+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n", -+ progname, -+ strcmp(progname, "halt") ? "" : " [-p]", -+ strcmp(progname, "reboot") ? "" : " [-k]"); - fprintf(stderr, "\t-n: don't sync before halting the system\n"); - fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n"); - fprintf(stderr, "\t-d: don't write a wtmp record.\n"); -@@ -84,6 +87,8 @@ void usage(void) - fprintf(stderr, "\t-i: shut down all network interfaces.\n"); - if (!strcmp(progname, "halt")) - fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n"); -+ if (!strcmp(progname, "reboot")) -+ fprintf(stderr, "\t-k: reboot the system using kexec.\n"); - exit(1); - } - -@@ -182,6 +187,7 @@ int main(int argc, char **argv) - int do_ifdown = 0; - int do_hddown = 0; - int do_poweroff = 0; -+ int do_kexec = 0; - int c; - char *tm = NULL; - -@@ -201,7 +207,7 @@ int main(int argc, char **argv) - /* - * Get flags - */ -- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) { -+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) { - switch(c) { - case 'n': - do_sync = 0; -@@ -225,6 +231,9 @@ int main(int argc, char **argv) - case 'p': - do_poweroff = 1; - break; -+ case 'k': -+ do_kexec = 1; -+ break; - case 't': - tm = optarg; - break; -@@ -242,10 +251,24 @@ int main(int argc, char **argv) - (void)chdir("/"); - - if (!do_hard && !do_nothing) { -+ c = get_runlevel(); -+ -+ /* -+ * We can't reboot using kexec through this path. -+ */ -+ if (c != '6' && do_reboot && do_kexec) { -+ fprintf(stderr, "ERROR: using -k at this" -+ " runlevel requires also -f\n" -+ " (You probably want instead to reboot" -+ " normally and let your reboot\n" -+ " script, usually /etc/init.d/reboot," -+ " specify -k)\n"); -+ exit(1); -+ } -+ - /* - * See if we are in runlevel 0 or 6. - */ -- c = get_runlevel(); - if (c != '0' && c != '6') - do_shutdown(do_reboot ? "-r" : "-h", tm); - } -@@ -277,6 +300,15 @@ int main(int argc, char **argv) - if (do_nothing) exit(0); - - if (do_reboot) { -+ /* -+ * kexec or reboot -+ */ -+ if (do_kexec) -+ init_reboot(BMAGIC_KEXEC); -+ -+ /* -+ * Fall through if failed -+ */ - init_reboot(BMAGIC_REBOOT); - } else { - /* ---- a/src/reboot.h -+++ b/src/reboot.h -@@ -47,5 +47,8 @@ - # define BMAGIC_POWEROFF BMAGIC_HALT - #endif - -+/* for kexec support */ -+#define BMAGIC_KEXEC 0x45584543 -+ - #define init_reboot(magic) reboot(magic) - diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch deleted file mode 100644 index b8e403f6..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch makes shutdown use the Single User runlevel by default so -the gettys are shutdown too. - -Roy Marples <uberlord@gentoo.org> - ---- a/man/shutdown.8 -+++ b/man/shutdown.8 -@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc. - \fBshutdown\fP does its job by signalling the \fBinit\fP process, - asking it to change the runlevel. - Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used --to reboot the system, and runlevel \fB1\fP is used to put to system into -+to reboot the system, and runlevel \fBS\fP is used to put to system into - a state where administrative tasks can be performed; this is the default - if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. - To see which actions are taken on halt or reboot see the appropriate ---- a/src/shutdown.c -+++ b/src/shutdown.c -@@ -506,7 +506,7 @@ int main(int argc, char **argv) - usage(); - exit(1); - } -- strcpy(down_level, "1"); -+ strcpy(down_level, "S"); - halttype = NULL; - - /* Process the options. */ -@@ -685,6 +685,8 @@ int main(int argc, char **argv) - strcpy(newstate, "for reboot"); - break; - case '1': -+ case 'S': -+ case 's': - strcpy(newstate, "to maintenance mode"); - break; - default: diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch deleted file mode 100644 index 22f463cd..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://savannah.nongnu.org/bugs/index.php?29758 - -From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001 -From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2> -Date: Tue, 4 May 2010 07:50:12 +0000 -Subject: [PATCH] Fix sysvinit bug #29758 - -git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2 - -diff --git a/src/Makefile b/src/Makefile -index e2b8028..19675c5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN) - init: LDLIBS += $(INITLIBS) $(STATIC) - init: init.o init_utmp.o - --halt: halt.o ifdown.o hddown.o utmp.o reboot.h -+halt: halt.o ifdown.o hddown.o utmp.o - --last: last.o oldutmp.h -+last: last.o - - mesg: mesg.o - -@@ -109,7 +109,7 @@ sulogin: sulogin.o - - wall: dowall.o wall.o - --shutdown: dowall.o shutdown.o utmp.o reboot.h -+shutdown: dowall.o shutdown.o utmp.o - - bootlogd: LDLIBS += -lutil - bootlogd: bootlogd.o -@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF) - sulogin.o: sulogin.c - - init.o: CPPFLAGS += $(SELINUX_DEF) --init.o: init.c init.h set.h reboot.h initreq.h -+init.o: init.c init.h initreq.h paths.h reboot.h set.h - --utmp.o: utmp.c init.h -+utmp.o: - - init_utmp.o: CPPFLAGS += -DINIT_MAIN --init_utmp.o: utmp.c init.h -+init_utmp.o: utmp.c init.h initreq.h paths.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - -+utmpdump.o: utmpdump.c oldutmp.h -+ -+shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h -+ -+halt.o: halt.c reboot.h -+ -+last.o: last.c oldutmp.h -+ - cleanobjs: - rm -f *.o *.bak - diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch b/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch deleted file mode 100644 index 6011278d..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sysvinit-2.88dsf.org/src/init.c -+++ sysvinit-2.88dsf/src/init.c -@@ -51,6 +51,7 @@ - #include <stdarg.h> - #include <sys/syslog.h> - #include <sys/time.h> -+#include <sys/ttydefaults.h> - - #ifdef WITH_SELINUX - # include <selinux/selinux.h> diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch deleted file mode 100644 index 91b7435b..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch +++ /dev/null @@ -1,38 +0,0 @@ -http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90 -https://bugs.gentoo.org/326697 - ---- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89 -+++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90 -@@ -54,10 +54,6 @@ - - #ifdef WITH_SELINUX - # include <selinux/selinux.h> --# include <sys/mount.h> --# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ --# define MNT_DETACH 2 --# endif - #endif - - #ifdef __i386__ -@@ -2872,11 +2868,9 @@ - - #ifdef WITH_SELINUX - if (getenv("SELINUX_INIT") == NULL) { -- const int rc = mount("proc", "/proc", "proc", 0, 0); -- if (is_selinux_enabled() > 0) { -- putenv("SELINUX_INIT=YES"); -- if (rc == 0) umount2("/proc", MNT_DETACH); -+ if (is_selinux_enabled() != 1) { - if (selinux_init_load_policy(&enforce) == 0) { -+ putenv("SELINUX_INIT=YES"); - execv(myname, argv); - } else { - if (enforce > 0) { -@@ -2887,7 +2881,6 @@ - } - } - } -- if (rc == 0) umount2("/proc", MNT_DETACH); - } - #endif - /* Start booting. */ diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch deleted file mode 100644 index 716999c3..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch +++ /dev/null @@ -1,65 +0,0 @@ -other inits have moved to not requiring the -h flag when used with -H/-P. -modify sysvinit to be the same since it really doesn't matter. - -https://bugs.gentoo.org/449354 - -patch by Doug Goldstein - ---- sysvinit-2.88dsf/man/shutdown.8 -+++ sysvinit-2.88dsf/man/shutdown.8 -@@ -66,16 +66,15 @@ - .\"}}} - .\"{{{ -h - .IP \fB\-h\fP --Halt or power off after shutdown. -+Equivalent to -P, unless -H is specified. - .\"}}} - .\"{{{ -P - .IP \fB\-P\fP --Halt action is to turn off the power. -+Action is to power-off the machine. - .\"}}} - .\"{{{ -H - .IP \fB\-H\fP --Modifier to the -h flag. Halt action is to halt or drop into boot --monitor on systems that support it. Must be used with the -h flag. -+Action is to halt the machine. - .\"}}} - .\"{{{ -f - .IP \fB\-f\fP ---- sysvinit-2.88dsf/src/shutdown.c -+++ sysvinit-2.88dsf/src/shutdown.c -@@ -514,9 +514,11 @@ - switch(c) { - case 'H': - halttype = "HALT"; -+ down_level[0] = '0'; - break; - case 'P': - halttype = "POWERDOWN"; -+ down_level[0] = '0'; - break; - case 'a': /* Access control. */ - useacl = 1; -@@ -532,6 +534,8 @@ - break; - case 'h': /* Halt after shutdown */ - down_level[0] = '0'; -+ if (!halttype) -+ halttype = "POWERDOWN"; - break; - case 'f': /* Don't perform fsck after next boot */ - fastboot = 1; -@@ -565,12 +569,6 @@ - } - } - -- if (NULL != halttype && down_level[0] != '0') { -- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); -- usage(); -- exit(1); -- } -- - /* Do we need to use the shutdown.allow file ? */ - if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { - diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml deleted file mode 100644 index 96a2d586..00000000 --- a/sys-apps/sysvinit/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild deleted file mode 100644 index 6fb78ceb..00000000 --- a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild,v 1.4 2013/09/29 01:24:03 vapier Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="selinux ibm static kernel_FreeBSD" - -RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" -DEPEND="${RDEPEND} - virtual/os-headers" - -S=${WORKDIR}/${P}dsf - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 - epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 - epatch "${FILESDIR}"/${P}-makefile.patch #319197 - epatch "${FILESDIR}"/${P}-selinux.patch #326697 - epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 - epatch "${FILESDIR}"/${P}-musl.patch - sed -i '/^CPPFLAGS =$/d' src/Makefile || die - - # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ - src/Makefile || die - - # pidof has moved to >=procps-3.3.9 - sed -i -r \ - -e '/\/bin\/pidof/d' \ - -e '/^MAN8/s:\<pidof.8\>::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" - cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - local myconf - - tc-export CC - append-lfs-flags - export DISTRO= #381311 - use static && append-ldflags -static - use selinux && myconf=WITH_SELINUX=yes - emake -C src ${myconf} || die -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - # dead symlink - rm -f "${D}"/usr/bin/lastb - - doinitd "${FILESDIR}"/{reboot,shutdown}.sh -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi - - elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" - elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." -} diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest deleted file mode 100644 index 83f9c8ff..00000000 --- a/sys-apps/tcp-wrappers/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX hosts.allow.example 585 SHA256 fbcdcedbdc985d8f0cc79e9a8752e69553b48aa38662321046cd4eae9f4d7e3b SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b WHIRLPOOL 449f28dad80a13497baa7d5d43cc99b8e7159b8e38dc7659947c9dd76ca2e8d7153de84a3706ec6658d94bb70d5b35554b72e9cf8f35bc8eaf27dacb8229cae9 -AUX tcp-wrappers-7.6-headers.patch 5419 SHA256 86d24cdf5d1c7f88d21b174988234d5024f506982e029e173c06cb5456c46bb0 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786 WHIRLPOOL 721d65254fd0d39152e0ba1c860fba5bb8c08ab61d1c89a10e1da9ed274b41ba2734253e79e0c680fe72cdf720eba7243c7b7e6f33d383c074f078b2c64d923d -AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 SHA256 b8b3bbbe223d3496b25070d1fbc62d9a1424709e20d380b55390b13f03b46e03 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4 WHIRLPOOL 05620832e55b9ef396601851d22e6fc1e60adb655340b1c1909c8138454b38338cba3bf9976d8458d157cc2ce8a3f30450efdf82943b885e325965b2d93697b7 -AUX tcp-wrappers-7.6-remove-DECLS.patch 490 SHA256 5155a217b51cede4179c3febb008e6397b05a2900d27be658e4aff5b26e8b6e2 SHA512 67eff00fd55d1f6c9628f629ffd49a49a7f92e2c6eda85e0c00f41077afd8ac33494c2a8ff1d0f402bc29694b4ffb9a056d88410959a0e1ee020c0653e05bc83 WHIRLPOOL aad11b4436134dcd1d7e8671e79083a773aedf1647c7f3173a3526b8934504e8135db9f71b63edd40ebad1a52b125a00023563e4bcc4b610be1c166a5cd255bb -AUX tcp-wrappers-7.6.22-remove-DECLS.patch 475 SHA256 d7fadcd9d60955e971402033c017ffa5aaee5ae489ff26ff0658e926131bdf66 SHA512 c56562e2209559c6c7aa10e3fd10eff2612efaa0455b4a405497d095b99926e057236f9a60ce4d2646dec0d442b9d1642ad3defc3f099fec49896d6a9b3fc76f WHIRLPOOL c03aca47527a07a3fc7115c3d14747202124aa837b24571eae715c2b6e90bd0ab83ccbe94240c2102d89c806dd00c40e19688fff5d4cbff00b07d73db7336216 -DIST tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 SHA256 dcb10f194684b16ae6aa9faf05dd8b063d81a3dde1431b664260dcf385089256 SHA512 b020006ce3f7578c0ab3c7b8cb71a3bb00ab0ae3d595b0612fa6464041e06905fb431acb85a759de90407ef502aa75191abed6225a57586abc7bbd1801cea969 WHIRLPOOL 819afd55ac96abe8e737592ac5663f3d41e96837eafe2511018cf6dda17dd2cb13ed8930ff0bf50a3d63a45fb834897586f78b10f0d8a55d31934fd970147903 -DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 SHA256 0ff28337c5effe4f91e7ea43ddd65fc629c06922326f5ef2804f70943be64fb3 SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8 WHIRLPOOL 4a22c083d3bfe18af020ea48663ab3eb5a77d613665bbeb935daffcce64641d66f5c32a88ef4e4dbf8b4edfe9d71bfc4e35601451d065c10806ea726430d2aa8 -DIST tcp_wrappers_7.6.tar.gz 99438 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac WHIRLPOOL e04861d03a49dd6d6d5cd9eba86732a40e79deff39d981a5e883bcfae4979c6e1c2a388eabd84691927b159e606a5649073473a717cb62c12cbd8546d75635bf -EBUILD tcp-wrappers-7.6-r99.ebuild 1975 SHA256 59731a917a5cc260227631d38c537a683c13353287b72340fc6b51c378df71fb SHA512 c2f52de54f6448eb1e7b768c0f537a0e2a46a53f4b8d283cf0dee4b27c17c92bf02ee555e19c25d1c686a7dddbdf5ac6a6caea0c78f4ee1bf99a3ba2e6c973ca WHIRLPOOL 24fa8061dd19cd3ad3eb96f31e1dc4de07b8dc66c1723be8c9c35e00579f3e616a738321db8003c251b386f309b5ced77d9cf8f9e6897dfc7219d897e256b860 -EBUILD tcp-wrappers-7.6.22-r99.ebuild 2711 SHA256 bb6b777d4eafe0fa671708d1dfbda7bbeb5a3aa4eea770e400d2aabbaac4b241 SHA512 76bb3fd216ae20d11c1f8e9191a20ee3eb56ae6c47c50df8d100f68289b8556cc71471c4b1d8009b32f08df3334bef8c19ae639b0b3f5f65e4b3c8575ca3d07d WHIRLPOOL 79844b6565cf3c1a5bf3a871ad48c75e7b1a481c871c543bfbb4ff218b35a3b4199680afb44547da4c76cace1b42ff3d2f8512bde3cacdf74acc6c0cb52879b7 -MISC metadata.xml 349 SHA256 81a5bdc0c787284f58b68dd7e3db3cfe6652b336d03698826dd86a705626b725 SHA512 b3c8aa5ea459990ef57ffa5b66e230ea6cf7aa8acd3481183f2dbe7394d98add0a2712cd5b74fd494ca0372e79097c3e2d712514a5f20815c7673372351f5755 WHIRLPOOL 2c28eb2f649bb90041c36b7c9b5fe5ec5826382a59a13f64846bd99746172bdea5daa8d3c025d74402ec9d8beb8a675ec536405b2b223aeffd9122d9af8342cd diff --git a/sys-apps/tcp-wrappers/files/hosts.allow.example b/sys-apps/tcp-wrappers/files/hosts.allow.example deleted file mode 100644 index c473eb95..00000000 --- a/sys-apps/tcp-wrappers/files/hosts.allow.example +++ /dev/null @@ -1,17 +0,0 @@ -# For more information, please see the hosts.allow(5) manpage - -# Rule format: -# daemon : client list -# The value for 'daemon' is determined by the name of the binary. -# OpenSSH runs as 'sshd' so you would use 'sshd' for 'daemon'. -# Client list can be a list of ip's or hostnames. - -# Allow only sshd connections from ips matching 192.168.0.* -#sshd: 192.168.0. - -# Only allow sendmail connections from the localhost -#sendmail: localhost - -# Allow everyone from foobar.edu to access everything except for -# the terminalserver -#ALL: .foobar.edu EXCEPT terminalserver.foobar.edu diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch deleted file mode 100644 index 328a4a10..00000000 --- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch +++ /dev/null @@ -1,295 +0,0 @@ ---- a/options.c -+++ b/options.c -@@ -34,6 +34,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> ---- a/safe_finger.c -+++ b/safe_finger.c -@@ -20,6 +20,11 @@ - - /* System libraries */ - -+#include <unistd.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <sys/wait.h> -+#include <grp.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <signal.h> -@@ -27,7 +31,7 @@ - #include <ctype.h> - #include <pwd.h> - --extern void exit(); -+int pipe_stdin(char **argv); - - /* Local stuff */ - ---- a/scaffold.c -+++ b/scaffold.c -@@ -10,6 +10,7 @@ - - /* System libraries. */ - -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/socket.h> -@@ -27,7 +27,4 @@ - #endif - --#ifndef INET6 --extern char *malloc(); --#endif - - /* Application-specific. */ ---- a/shell_cmd.c -+++ b/shell_cmd.c -@@ -14,6 +14,10 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <sys/wait.h> - #include <sys/types.h> - #include <sys/param.h> - #include <signal.h> -@@ -25,8 +25,6 @@ - #include <syslog.h> - #include <string.h> - --extern void exit(); -- - /* Local stuff. */ - - #include "tcpd.h" ---- a/tcpdchk.c -+++ b/tcpdchk.c -@@ -20,6 +20,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #ifdef INET6 -@@ -35,10 +36,7 @@ - #include <netdb.h> - #include <string.h> - --extern int errno; --extern void exit(); --extern int optind; --extern char *optarg; -+int cidr_mask_addr(char *str); - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/clean_exit.c -+++ b/clean_exit.c -@@ -13,8 +13,8 @@ - #endif - - #include <stdio.h> -- --extern void exit(); -+#include <unistd.h> -+#include <stdlib.h> - - #include "tcpd.h" - ---- a/hosts_access.c -+++ b/hosts_access.c -@@ -23,6 +23,7 @@ - - /* System libraries. */ - -+#include <stdlib.h> - #include <sys/types.h> - #ifdef INT32_T - typedef uint32_t u_int32_t; -@@ -43,8 +44,8 @@ - #include <netdb.h> - #endif - --extern char *fgets(); --extern int errno; -+static int match_pattern_ylo(const char *s, const char *pattern); -+int cidr_mask_addr(char *str); - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/inetcf.c -+++ b/inetcf.c -@@ -9,15 +9,14 @@ - static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23"; - #endif - -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <stdio.h> - #include <errno.h> - #include <string.h> - --extern int errno; --extern void exit(); -- -+#include "scaffold.h" - #include "tcpd.h" - #include "inetcf.h" - ---- a/percent_x.c -+++ b/percent_x.c -@@ -16,12 +16,12 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <stdio.h> - #include <syslog.h> - #include <string.h> - --extern void exit(); -- - /* Local stuff. */ - - #include "tcpd.h" ---- a/rfc931.c -+++ b/rfc931.c -@@ -15,6 +15,7 @@ - - /* System libraries. */ - -+#include <unistd.h> - #include <stdio.h> - #include <syslog.h> - #include <sys/types.h> ---- a/tcpd.c -+++ b/tcpd.c -@@ -16,6 +16,7 @@ - - /* System libraries. */ - -+#include <unistd.h> - #include <sys/types.h> - #include <sys/param.h> - #include <sys/stat.h> -@@ -39,6 +39,8 @@ - #include "patchlevel.h" - #include "tcpd.h" - -+void fix_options(struct request_info *request); -+ - int allow_severity = SEVERITY; /* run-time adjustable */ - int deny_severity = LOG_WARNING; /* ditto */ - ---- a/tcpdmatch.c -+++ b/tcpdmatch.c -@@ -19,6 +19,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/socket.h> -@@ -30,9 +32,6 @@ - #include <setjmp.h> - #include <string.h> - --extern void exit(); --extern int optind; --extern char *optarg; - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/update.c -+++ b/update.c -@@ -19,6 +19,7 @@ - - /* System libraries */ - -+#include <unistd.h> - #include <stdio.h> - #include <syslog.h> - #include <string.h> ---- a/misc.c -+++ b/misc.c -@@ -14,11 +14,10 @@ - #include <arpa/inet.h> - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - #include "tcpd.h" - --extern char *fgets(); -- - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ - #endif ---- a/fix_options.c -+++ b/fix_options.c -@@ -32,6 +32,7 @@ - - /* fix_options - get rid of IP-level socket options */ - -+void - fix_options(request) - struct request_info *request; - { -@@ -38,11 +38,8 @@ - #ifdef IP_OPTIONS - unsigned char optbuf[BUFFER_SIZE / 3], *cp; - char lbuf[BUFFER_SIZE], *lp; --#ifdef __GLIBC__ -- size_t optsize = sizeof(optbuf), ipproto; --#else -- int optsize = sizeof(optbuf), ipproto; --#endif -+ socklen_t optsize = sizeof(optbuf); -+ int ipproto; - struct protoent *ip; - int fd = request->fd; - unsigned int opt; ---- a/socket.c -+++ b/socket.c -@@ -95,11 +95,7 @@ - static struct sockaddr_in client; - static struct sockaddr_in server; - #endif --#ifdef __GLIBC__ -- size_t len; --#else -- int len; --#endif -+ socklen_t len; - char buf[BUFSIZ]; - int fd = request->fd; - -@@ -430,11 +426,7 @@ - #else - struct sockaddr_in sin; - #endif --#ifdef __GLIBC__ -- size_t size = sizeof(sin); --#else -- int size = sizeof(sin); --#endif -+ socklen_t size; - - /* - * Eat up the not-yet received datagram. Some systems insist on a diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch deleted file mode 100644 index 4a684762..00000000 --- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- tcp_wrappers_7.6/tcpd.c.bug11881 -+++ tcp_wrappers_7.6/tcpd.c -@@ -60,10 +60,10 @@ - */ - - if (argv[0][0] == '/') { -- strcpy(path, argv[0]); -+ strncpy(path, argv[0], sizeof(path)); - argv[0] = strrchr(argv[0], '/') + 1; - } else { -- sprintf(path, "%s/%s", REAL_DAEMON_DIR, argv[0]); -+ snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]); - } - - /* ---- tcp_wrappers_7.6/eval.c.bug11881 -+++ tcp_wrappers_7.6/eval.c -@@ -111,7 +111,7 @@ - return (hostinfo); - #endif - if (STR_NE(eval_user(request), unknown)) { -- sprintf(both, "%s@%s", request->user, hostinfo); -+ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo); - return (both); - } else { - return (hostinfo); -@@ -128,7 +128,7 @@ - char *daemon = eval_daemon(request); - - if (STR_NE(host, unknown)) { -- sprintf(both, "%s@%s", daemon, host); -+ snprintf(both, sizeof(both), "%s@%s", daemon, host); - return (both); - } else { - return (daemon); diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch deleted file mode 100644 index 1382c6dc..00000000 --- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h ---- tcp_wrappers_7.6.orig/tcpd.h 2013-07-06 02:14:23.070110799 +0000 -+++ tcp_wrappers_7.6/tcpd.h 2013-07-06 02:14:56.184112650 +0000 -@@ -21,8 +21,6 @@ - #include <netinet/in.h> - #include <stdio.h> - --__BEGIN_DECLS -- - /* Structure to describe one communications endpoint. */ - - #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -259,6 +257,4 @@ - extern char *my_strtok(); - #endif - --__END_DECLS -- - #endif /* tcpd.h */ diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch deleted file mode 100644 index 0fbd5ed9..00000000 --- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h ---- tcp_wrappers_7.6.orig/tcpd.h 2014-03-24 18:39:52.000000000 +0000 -+++ tcp_wrappers_7.6/tcpd.h 2014-03-24 18:48:21.000000000 +0000 -@@ -11,7 +11,9 @@ - #include <netinet/in.h> - #include <stdio.h> - -+#ifdef __cplusplus - __BEGIN_DECLS -+#endif - - /* Structure to describe one communications endpoint. */ - -@@ -252,6 +254,8 @@ - extern char *my_strtok(); - #endif - -+#ifdef __cplusplus - __END_DECLS -+#endif - - #endif diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml deleted file mode 100644 index 1cecd60a..00000000 --- a/sys-apps/tcp-wrappers/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<use> - <flag name='netgroups'> - Support matching NIS (host) netgroup names via the @netgroup syntax - (if you don't know what this means, you most likely need want it) - </flag> -</use> -</pkgmetadata> diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild deleted file mode 100644 index bca5ab94..00000000 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.26 2013/05/14 05:46:04 radhermit Exp $ - -inherit eutils toolchain-funcs multilib - -MY_P="${P//-/_}" -PATCH_VER="1.0" -DESCRIPTION="TCP Wrappers" -HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html" -SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" - -LICENSE="tcp_wrappers_license" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="ipv6" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - chmod ug+w Makefile - - EPATCH_SUFFIX="patch" - PATCHDIR=${WORKDIR}/${PV} - epatch ${PATCHDIR}/${P}-makefile.patch - epatch ${PATCHDIR}/generic - epatch ${PATCHDIR}/${P}-shared.patch - use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff - - epatch "${FILESDIR}"/${P}-remove-DECLS.patch -} - -src_compile() { - tc-export AR CC RANLIB - - local myconf="-DHAVE_WEAKSYMS" - use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" - - emake \ - REAL_DAEMON_DIR=/usr/sbin \ - GENTOO_OPT="${myconf}" \ - MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \ - config-check || die "emake config-check failed" - - emake \ - REAL_DAEMON_DIR=/usr/sbin \ - GENTOO_OPT="${myconf}" \ - MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \ - linux || die "emake linux failed" -} - -src_install() { - dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die - - doman *.[358] - dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5 - dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5 - - insinto /usr/include - doins tcpd.h - - into /usr - dolib.a libwrap.a - - into / - newlib.so libwrap.so libwrap.so.0.${PV} - dosym libwrap.so.0.${PV} /$(get_libdir)/libwrap.so.0 - dosym libwrap.so.0 /$(get_libdir)/libwrap.so - # bug #4411 - gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed" - - dodoc BLURB CHANGES DISCLAIMER README* "${FILESDIR}"/hosts.allow.example -} diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild deleted file mode 100644 index 39b8e844..00000000 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild,v 1.7 2014/03/16 17:17:09 maekke Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal - -MY_PV=$(get_version_component_range 1-2) -DEB_PV=$(get_version_component_range 3) -MY_P="${PN//-/_}_${MY_PV}" -DESCRIPTION="TCP Wrappers" -HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html" -SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz - mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.gz" - -LICENSE="tcp_wrappers_license" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="ipv6 netgroups static-libs" - -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - EPATCH_OPTS="-p1" \ - epatch $(sed -e 's:^:../debian/patches/:' ../debian/patches/series) - epatch "${FILESDIR}"/${PN}-7.6-headers.patch - epatch "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch - epatch "${FILESDIR}"/${PN}-7.6.22-remove-DECLS.patch - - multilib_copy_sources -} - -temake() { - local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED" - use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" - emake \ - REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \ - TLI= VSYSLOG= PARANOID= BUGS= \ - AUTH="-DALWAYS_RFC931" \ - AUX_OBJ="weak_symbols.o" \ - DOT="-DAPPEND_DOT" \ - HOSTNAME="-DALWAYS_HOSTNAME" \ - NETGROUP=$(usex netgroups -DNETGROUPS "") \ - STYLE="-DPROCESS_OPTIONS" \ - LIBS=$(usex netgroups -lnsl "") \ - LIB=$(usex static-libs libwrap.a "") \ - AR="$(tc-getAR)" ARFLAGS=rc \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \ - LDFLAGS="${LDFLAGS}" \ - "$@" || die -} - -multilib_src_configure() { - tc-export AR RANLIB - temake config-check -} - -multilib_src_compile() { - temake all -} - -multilib_src_install() { - into /usr - use static-libs && dolib.a libwrap.a - dolib.so shared/libwrap.so* - - insinto /usr/include - doins tcpd.h - - if multilib_build_binaries; then - gen_usr_ldscript -a wrap - dosbin tcpd tcpdchk tcpdmatch safe_finger try-from - fi -} - -multilib_src_install_all() { - doman *.[358] - dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5 - dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5 - - insinto /etc - newins "${FILESDIR}"/hosts.allow.example hosts.allow - - dodoc BLURB CHANGES DISCLAIMER README* -} - -pkg_preinst() { - # don't clobber people with our default example config - [[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow -} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest deleted file mode 100644 index 6989c257..00000000 --- a/sys-apps/util-linux/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX crypto-loop.confd 412 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600 SHA512 fdcb4e3a267afd1bbc836e368918da7edc709fc8a61e45b53ec3694a79722ebfda0f3bcbeb053c665a6552241c5a915b76f142bff07757a7c018446000dd7bd0 WHIRLPOOL 7e0c95f46bc7c5474f950a0da93d9eefda7962385e1f425f2ae3dd931f7119fb5efa5ca0a470706bdbde661a001bb3797cf6e5f2735f346efb69aed5d66146e7 -AUX crypto-loop.initd 1729 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810 SHA512 89983743c2277c2c88e7f77cd38ce0e2cc56255f7f314dcce74c5cbffe607323f888d00ef115a660ec6c52802b347d8e0d8cc0a411644f20118d776c88f9725b WHIRLPOOL 3f3256788ba61e2ce147b38144b739c4f7d0ed7bc1b8936b1bf4f33d4a0bce4cd17a49d81a573009601a597fff081170845b5cdf400dc8b7160022943538c7d9 -AUX ttydefaults.h 964 SHA256 ad3983370bad941522ebb481c2ca087a405b16870ac094301aa9a3afc2b24441 SHA512 151d19dee177c0851200c247b598aad2a2879b4721f87af7a81a5f709100f0a06d942f8473789973c61e075bc295d8728bb9711c2fe217ea24c553bea69ad289 WHIRLPOOL 03bc2f196386d3f7823ca51da88671b5f752fb4bba645af649072bd723817297b98a7453f23f8828cebbf8b6551b8a7990c5a21561ade10f5e97bc650ac402d9 -AUX util-linux-2.23.1-musl.patch 3946 SHA256 b36f16f7ccad9bb7177df149767dccbae03d948e10299d2f14a91bc2a919425e SHA512 16a529026bf590e51038cbc1101a126477194b79297f49629a0ce36afefce227c96ee5ef6f9442ec19c449a589b2bfb099f60f60d8c851ba0eea99ab5ab81382 WHIRLPOOL 92259307a9375c20593b75b7acfa87b5aaef7024f405eb8b54d225773f313b16935a7955ccfeec4adf581d2ab0705991f36d25cad2f3d7cfd18cd3c0d52b808f -AUX util-linux-2.24-last-tests.patch 4513 SHA256 61be31970f0aced6a8423e1f0ab35751f0dcd9e24265eb3221a8e0e14cae731f SHA512 f9be688b0a074ca3e93139fcd78c4a28b892b9cafedc70d92b08f695131631349044d1eb42b4534db9c09f656e503d400dc59b220234668cba206888ad43cd1a WHIRLPOOL fa1057d0b9d99a92f53975c468e7488d47b2a801d42141233c88b01a9bde66ae489cf862505f3eadfb6c7e99172d202e37ec4bc5cd7d97e2fdc6e043df3335f9 -AUX util-linux-2.24-skip-last-tests.patch 1003 SHA256 5ccbab17e26cc9b592b534b9b3e72b6a23dbdd04718f6360cb7d8886221ffa4d SHA512 9d89530f203c8a50e1def8164669b93ce1c1509d4da112c9db56cea9e29288c32964978e06ababa8e6c00222813d7a99bc35e0a7cfc17d8cd63804b629c9165c WHIRLPOOL 0e7c1cd6a4bdc94fdad3582f1855992d375238438d165627d60cddda8d1314c759b6e34171c5d00890956acdf9641ad5bf955f980fd142545b1ef468caa90be6 -AUX util-linux-2.24.1-musl.patch 977 SHA256 027890f21ad6ae870e519d6da6498cade79f42d0a8c95a3afa30a6af41b25aea SHA512 b01a915da3e288e19e7f1c404d982bb296ab33b2d1a068decea04f35bc69aad2b33b78215054911682db855a61e0446c11ce0a37af6bc7f2be05537c97557fc3 WHIRLPOOL 20f4f6a503e5645bd9e0360f84529bd9a878d7815940447e7a9db93b71bb3c24ad59ee9b5e0cb5ae83c4b3881c1121744332a5a5b82ead525bf17640068dfec9 -AUX util-linux-2.24.2-hexdump.patch 838 SHA256 3b225036f09ff2979c5c181b129231169d10b95a8bf3d37308ccb44fc9e164d8 SHA512 bc94e4c6ba5620c8e21a642052e91f74b4b1552af65fc5dea8f4c6fb0f976dd83c7b2ecc62956936a70561af0eeb5894f5dcca29283bff458d7d7696eed81c2f WHIRLPOOL 184f89870273a48d87fc7869128cc099851702dceb9342fb06dc5f2f155558e1df6f55aab2c745d73eeb1a4ba4d44befdc37d49b41917bb26635e66593512b0a -AUX util-linux-2.25-lscpu-pic.patch 2529 SHA256 5ca73497accd0a53084e756c150b32c6f7a7fa2524acceb17182bf866e03b13a SHA512 186bbc40330f118ca5cde88db113b0dbc2111de2aab7a3001b369fc01a2b7e05ae4cc9b6d164a5ed6b4d48bd19558d2ac4a18c5df60da5d5c02228fada2d7a2b WHIRLPOOL a4777871b7cc14b0c63153c7dd6e1a3a45eee0b1a06eee19f20a02796ac3bd18bbc17774cb45c51bec074dde21a2b93dd11167349ea285bfd73eda98bb27b0e8 -AUX util-linux-2.25-remove__SWORD_TYPE.patch 663 SHA256 29eb73d4a14352176bcc81bbb82518ebd8b8f57aecde0314465ffa5568407cf9 SHA512 80679400b61bd87aef8c8e0f448e83b8d14e15b4a0edda4e6866e15fc2d3d2968e23345b0d47edf6fc31d2e89707e0aa68d3def8bd0f3bb194cb1a08c9638b6e WHIRLPOOL a86a121b0496f7aeaa29c9b5c57449903e9364cc10e48c5b62c9a64e5db1bef4c45a14cadc5e9ae737cbdcb47d47333b21e594c95eb02aa4c7844b8d2168bcfa -AUX util-linux-2.25.2-runuser-bash-completion.patch 1372 SHA256 a3eebac8c53b3bf6e29e15e161ba460fdafed840647f49de93cf8e20856f10ed SHA512 d7a90f709480065eceddc9c0ca2186a12b941c08130d3bee69286e1cd13ef228bff6991373ce30eacbb29f4ddad8a1afdf6551652d5ca21063e0ab7211aa44da WHIRLPOOL ef5446ecee7ae1d932fe62a0a321cab55df0ed24d7ab98abf2d8cba9fbd47bd2524fac22c0a0d4ebdcacb642ece273ce97e76f763ed816eaa3df95a76579caba -DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410 SHA512 5636e1c57bd57954518e90ff0f079810cc2927f52bb925dde556ce2744a088577f8adbc19c19b2bd079efd253406767faa44d1de5f557e024762522e647f044b WHIRLPOOL 25862a85788eb1c275c7e06f3d2be8e6a9605811665e06a4b21d1e274fc4a5e19dd03e5c52061ee5d98ce8c86ba757a7f8076683edb603ad0c43c05ab5e52a51 -DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 -DIST util-linux-2.25.tar.xz 3681308 SHA256 47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a SHA512 9306bcf8ef4b25c09a56e2e96c885d47a43bc389c3bba6123ff11b146eddfec0d04da817ff599bf7f2aa330b1044a051f69e8d90b6f2c4b125d2842f852be690 WHIRLPOOL e787d474c64b0a4ef944d5ec205afc3de6ff5b8789448a9d00232179813ee8fdf6564b433409012fed27a1fdfbb79c8ff504fde904b5f3433da95b79825900bd -EBUILD util-linux-2.24.1-r99.ebuild 4037 SHA256 4b191a882c5b099ea3ee7b96d2391eaae4fdad98371476b290c53f72b564c792 SHA512 912c9e32ee3c704435537ab4c7c8add494673d8ec2266ce3a6b2095a872622379861b8f5869145bee029f362650bd1f3d956b0de79d1165a0cee1277630c0549 WHIRLPOOL 5ceddd10cb246ca8190e6316b0de0a85a5adf426a4e6fe0520d2ac25cdc79bbcc0549af94bb37831cba8a8141d8544d6a59f4fdb5aa029f15ae7416fb0c94925 -EBUILD util-linux-2.25-r99.ebuild 5195 SHA256 5615d0cde4c97893100b9c80f48c6c6b71bd434db580ad466fbf0a8063c4aada SHA512 fd72e236e89790310058391d24a3748a083fed638e3b5c83ff13059c0f4a61ea921d324ffcf7e774ad469b096707d00aefa702a47ab99addd7ff789d0fb8a858 WHIRLPOOL 19fac70b043702b79462ce954a461a19785c0aeff7536745019f8c4a12c5f21fbf2ba09c0f053fc08b5ccf7b5f6be9a0a60bf1fe2ef9100b110d914aa6427aa2 -EBUILD util-linux-2.25.2-r99.ebuild 5156 SHA256 20af508111b44fa8b53821f5f9ce93e3097d75cac40f206c55f35c9f5ed71dbd SHA512 772c617b54bf4e9ee74a72a8c79a711398095eb7140f2ee85bb534f57f2cf31eac995e9761baa6976ec4df12a373fabfaa254251cb44a216de994c97e5c730a1 WHIRLPOOL c8436040b3aa55908b96d101868bb7b5e5a518803a67d41a577669a625fad73cd44c0cb2c280047d1ab3390966561662b52a73cb752aed3bd90df2ae9ea4cf3e -MISC metadata.xml 846 SHA256 7fef382903a74be1395de2940640987cb09f84b4925bb9e19cbd803cad7041dc SHA512 47cbc59784221810ee0815e8078bb1c89147e6c69c9efa7ca3dddc66265225f98c698ca58d2a0406141aa3a069d68079c6dffae7f18cf1bc2a0b94ecf54ca6ef WHIRLPOOL 653bc6ee4435225a16ce7d662793af9bbe389185b831feeb43094b334a4662a593b5c92089ed71ed8108f6fc8768c46182f3a7f6210cfc6de14238b3c3088862 diff --git a/sys-apps/util-linux/files/crypto-loop.confd b/sys-apps/util-linux/files/crypto-loop.confd deleted file mode 100644 index 6a884346..00000000 --- a/sys-apps/util-linux/files/crypto-loop.confd +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop - -# More info can be found in the init.d script - -# Specify loopback configurations here. The format of this file is -# shown in the following commented-out example. One line per loopback -# configuration. For possible hash values, see `man hashalot`. - -# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test other='' diff --git a/sys-apps/util-linux/files/crypto-loop.initd b/sys-apps/util-linux/files/crypto-loop.initd deleted file mode 100755 index 853bae27..00000000 --- a/sys-apps/util-linux/files/crypto-loop.initd +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $ - -depend() { - if [ -x /etc/init.d/root ]; then - need root - else - need checkroot - fi - need modules - before localmount -} - -start() { - local status="0" - - ebegin "Starting crypto loop devices" - - if [ -e /etc/conf.d/crypto-loop ] ; then - egrep "^loop" /etc/conf.d/crypto-loop | \ - while read loopline ; do - eval ${loopline} - - local configured=$(awk -v MOUNT="${device}" \ - '($2 == MOUNT) { print "yes" }' /proc/mounts) - - if [ "${configured}" != "yes" ] ; then - einfo " Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): " - - if [ -n "${hash}" ] ; then - /usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\ - /sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other} - else - /sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other} - fi - - if [ $? -ne 0 ] ; then - ewarn "Failure configuring ${loop}. Skipping." - status=1 - fi - else - ewarn " Loop ${loop} on device ${device} are already configured" - fi - done - fi - ewend ${status} "Failed to start some loop devices." - - # We do not fail if some loop devices did not start ... - return 0 -} - -stop() { - local status="0" - for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do - losetup ${loop} > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1 - if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then - ewarn "Failure deconfiguring ${loop}." - status=1 - fi - fi - done - ewend ${status} -} - - -# vim:ts=4 diff --git a/sys-apps/util-linux/files/ttydefaults.h b/sys-apps/util-linux/files/ttydefaults.h deleted file mode 100644 index af692acb..00000000 --- a/sys-apps/util-linux/files/ttydefaults.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef _SYS_TTYDEFAULTS_H_ -#define _SYS_TTYDEFAULTS_H_ -#define TTYDEF_IFLAG (BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY) -#define TTYDEF_OFLAG (OPOST | ONLCR | XTABS) -#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) -#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL) -#define TTYDEF_SPEED (B9600) -#define CTRL(x) (x&037) -#define CEOF CTRL('d') -#ifdef _POSIX_VDISABLE -# define CEOL _POSIX_VDISABLE -#else -# define CEOL '\0' -#endif -#define CERASE 0177 -#define CINTR CTRL('c') -#ifdef _POSIX_VDISABLE -# define CSTATUS _POSIX_VDISABLE -#else -# define CSTATUS '\0' -#endif -#define CKILL CTRL('u') -#define CMIN 1 -#define CQUIT 034 -#define CSUSP CTRL('z') -#define CTIME 0 -#define CDSUSP CTRL('y') -#define CSTART CTRL('q') -#define CSTOP CTRL('s') -#define CLNEXT CTRL('v') -#define CDISCARD CTRL('o') -#define CWERASE CTRL('w') -#define CREPRINT CTRL('r') -#define CEOT CEOF -#define CBRK CEOL -#define CRPRNT CREPRINT -#define CFLUSH CDISCARD -#endif diff --git a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch deleted file mode 100644 index 7868998a..00000000 --- a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch +++ /dev/null @@ -1,110 +0,0 @@ -patch taken from sabotage linux -- https://github.com/rofl0r/sabotage -diff -aur util-linux-2.23.1.org/fdisks/cfdisk.c util-linux-2.23.1/fdisks/cfdisk.c ---- util-linux-2.23.1.org/fdisks/cfdisk.c 2013-07-01 21:37:58.508000002 +0000 -+++ util-linux-2.23.1/fdisks/cfdisk.c 2013-07-01 22:00:23.042000002 +0000 -@@ -325,7 +325,7 @@ - int logical = 0; - long long logical_sectors[MAXIMUM_PARTS]; - --__sighandler_t old_SIGINT, old_SIGTERM; -+sighandler_t old_SIGINT, old_SIGTERM; - - int arrow_cursor = FALSE; - int display_units = MEGABYTES; -diff -aur util-linux-2.23.1.org/fdisks/fdisksunlabel.c util-linux-2.23.1/fdisks/fdisksunlabel.c ---- util-linux-2.23.1.org/fdisks/fdisksunlabel.c 2013-07-01 21:37:58.508000002 +0000 -+++ util-linux-2.23.1/fdisks/fdisksunlabel.c 2013-07-01 21:59:43.721000002 +0000 -@@ -383,9 +383,11 @@ - } - } - --static int verify_sun_cmp(int *a, int *b, void *data) -+static void* cmp_data; -+static int verify_sun_cmp(const void *pa, const void *pb) - { -- unsigned int *verify_sun_starts = (unsigned int *) data; -+ const int *a = pa, *b = pb; -+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; - - if (*a == -1) - return 1; -@@ -449,9 +451,8 @@ - else - array[i] = -1; - } -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -+ cmp_data = verify_sun_starts; -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); - - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined")); -diff -aur util-linux-2.23.1.org/include/ttyutils.h util-linux-2.23.1/include/ttyutils.h ---- util-linux-2.23.1.org/include/ttyutils.h 2013-07-01 21:37:58.433000002 +0000 -+++ util-linux-2.23.1/include/ttyutils.h 2013-07-01 21:48:42.328000002 +0000 -@@ -10,6 +10,7 @@ - #include <stdlib.h> - #include <termios.h> - #include <limits.h> -+#include "ttydefaults.h" - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> - #endif -diff -aur util-linux-2.23.1.org/term-utils/setterm.c util-linux-2.23.1/term-utils/setterm.c ---- util-linux-2.23.1.org/term-utils/setterm.c 2013-07-01 21:37:58.442000002 +0000 -+++ util-linux-2.23.1/term-utils/setterm.c 2013-07-01 22:02:54.244000002 +0000 -@@ -123,7 +123,7 @@ - #include "nls.h" - #include "closestream.h" - --#if __GNU_LIBRARY__ < 5 -+#if defined(__GLIBC__) && __GNU_LIBRARY__ < 5 - #ifndef __alpha__ - # include <linux/unistd.h> - #define __NR_klogctl __NR_syslog -diff -aur util-linux-2.23.1.org/term-utils/ttymsg.c util-linux-2.23.1/term-utils/ttymsg.c ---- util-linux-2.23.1.org/term-utils/ttymsg.c 2013-07-01 21:37:58.442000002 +0000 -+++ util-linux-2.23.1/term-utils/ttymsg.c 2013-07-01 22:07:02.788000002 +0000 -@@ -41,6 +41,7 @@ - */ - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/uio.h> - #include <signal.h> - #include <fcntl.h> -diff -aur util-linux-2.23.1.org/text-utils/hexdump.h util-linux-2.23.1/text-utils/hexdump.h ---- util-linux-2.23.1.org/text-utils/hexdump.h 2013-07-01 21:37:58.437000002 +0000 -+++ util-linux-2.23.1/text-utils/hexdump.h 2013-07-01 22:01:27.005000002 +0000 -@@ -32,7 +32,7 @@ - * - * @(#)hexdump.h 5.4 (Berkeley) 6/1/90 - */ -- -+#include <sys/types.h> - typedef struct _pr { - struct _pr *nextpr; /* next print unit */ - #define F_ADDRESS 0x001 /* print offset */ -diff -aur util-linux-2.23.1.org/text-utils/pg.c util-linux-2.23.1/text-utils/pg.c ---- util-linux-2.23.1.org/text-utils/pg.c 2013-07-01 21:37:58.437000002 +0000 -+++ util-linux-2.23.1/text-utils/pg.c 2013-07-01 22:01:55.831000002 +0000 -@@ -37,7 +37,7 @@ - #ifndef TIOCGWINSZ - # include <sys/ioctl.h> - #endif --#include <sys/termios.h> -+#include <termios.h> - #include <fcntl.h> - #include <regex.h> - #include <stdio.h> ---- util-linux-2.23.1.orig/sys-utils/eject.c -+++ util-linux-2.23.1/sys-utils/eject.c -@@ -40,7 +40,6 @@ - #include <sys/mount.h> - #include <scsi/scsi.h> - #include <scsi/sg.h> --#include <scsi/scsi_ioctl.h> - #include <sys/time.h> - - #include <libmount.h> diff --git a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch deleted file mode 100644 index 77cf478e..00000000 --- a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://bugs.gentoo.org/501408 - -From 3c76515abd2e80dc1da03041eb868b8c1e596fb1 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerolasa@iki.fi> -Date: Sun, 16 Feb 2014 23:54:18 +0000 -Subject: [PATCH] tests: align last.1 with recent phantom detection - -None existing account is not still-logged-in but gone mysteriously, -assuming wtmp logout markup is missing. - -Signed-off-by: Sami Kerola <kerolasa@iki.fi> ---- - tests/expected/last/last | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tests/expected/last/last b/tests/expected/last/last -index 2ff5cc1..dfb140b 100644 ---- a/tests/expected/last/last -+++ b/tests/expected/last/last -@@ -1,6 +1,6 @@ - ~~~ basic output ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) - IPv4 root dns-server Wed Aug 28 13:00 - 14:00 (01:00) -@@ -17,7 +17,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ include system ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - reboot system boot system-name Wed Aug 28 18:00 still running - shutdown system down system-name Wed Aug 28 17:00 - 18:00 (01:00) - reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00) -@@ -47,16 +47,16 @@ IPv4 root Wed Aug 28 13:00 - 14:00 (01:00) a.root-servers.net - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ show ip ~~~ --torvalds linux 128.214.205.14 Mon Aug 26 00:57 still logged in -+torvalds linux 128.214.205.14 Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no host ~~~ --torvalds linux Mon Aug 26 00:57 still logged in -+torvalds linux Mon Aug 26 00:57 gone - no logout - - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ full times ~~~ - rick long never-gonna-logo Thu Jan 1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57:08 1991 still logged in -+torvalds linux hobby Mon Aug 26 00:57:08 1991 gone - no logout - reboot system boot system-name Wed Aug 28 18:00:00 2013 still running - reboot system boot system-name Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013 (01:00) - IPv4 root dns-server Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013 (01:00) -@@ -73,7 +73,7 @@ accounti foo nine Wed Aug 28 03:00:00 2013 - Wed Aug 28 04: - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ no time ~~~ - rick long never-gonna-logo (24855+03:14) --torvalds linux hobby logged in -+torvalds linux hobby - no logout - reboot system boot system-name running - reboot system boot system-name (01:00) - IPv4 root dns-server (01:00) -@@ -90,7 +90,7 @@ accounti foo nine (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ iso-8601 time ~~~ - rick long never-gonna-logout 1970-01-01T00:00:00+0000 - 2038-01-19T03:14:07+0000 (24855+03:14) --torvalds linux hobby 1991-08-26T00:57:08+0000 still logged in -+torvalds linux hobby 1991-08-26T00:57:08+0000 gone - no logout - reboot system boot system-name 2013-08-28T18:00:00+0000 still running - reboot system boot system-name 2013-08-28T16:00:00+0000 - 2013-08-28T17:00:00+0000 (01:00) - IPv4 root dns-server 2013-08-28T13:00:00+0000 - 2013-08-28T14:00:00+0000 (01:00) -@@ -115,7 +115,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00) - wtmp begins Wed Aug 28 03:00:00 2013 - ~~~ present ~~~ - rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14) --torvalds linux hobby Mon Aug 26 00:57 still logged in -+torvalds linux hobby Mon Aug 26 00:57 gone - no logout - runlevel foo one Wed Aug 28 11:00 - 12:00 (01:00) - - wtmp begins Wed Aug 28 03:00:00 2013 --- -1.8.5.5 - diff --git a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch deleted file mode 100644 index 5148053d..00000000 --- a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6b55612b9ad1193a042f3c3a1d9216e63b0d2907 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 22 Dec 2013 18:17:15 -0500 -Subject: [PATCH] tests: last: skip when last is not enabled - -References: https://bugs.gentoo.org/489794 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - tests/ts/last/ipv6 | 2 ++ - tests/ts/last/last | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6 -index 8e2b01e..60b72bd 100755 ---- a/tests/ts/last/ipv6 -+++ b/tests/ts/last/ipv6 -@@ -18,6 +18,8 @@ TS_DESC="last ipv6" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - -diff --git a/tests/ts/last/last b/tests/ts/last/last -index 4ad38cb..83b7f8d 100755 ---- a/tests/ts/last/last -+++ b/tests/ts/last/last -@@ -18,6 +18,8 @@ TS_DESC="last" - . $TS_TOPDIR/functions.sh - ts_init "$*" - -+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled" -+ - export LANG=C - export TZ=GMT - --- -1.8.4.3 - diff --git a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch deleted file mode 100644 index 3d9efcf7..00000000 --- a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -adapted from a patch from sabotage linux -diff -ru a/util-linux-2.24.1/libfdisk/src/sun.c b/util-linux-2.24.1/libfdisk/src/sun.c ---- a/util-linux-2.24.1/libfdisk/src/sun.c -+++ b/util-linux-2.24.1/libfdisk/src/sun.c -@@ -361,9 +361,11 @@ - } - } - --static int verify_sun_cmp(int *a, int *b, void *data) -+static void* cmp_data; -+static int verify_sun_cmp(const void *pa, const void *pb) - { -- unsigned int *verify_sun_starts = (unsigned int *) data; -+ const int *a = pa, *b = pb; -+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; - - if (*a == -1) - return 1; -@@ -427,9 +429,8 @@ - else - array[i] = -1; - } -- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), -- (int (*)(const void *,const void *,void *)) verify_sun_cmp, -- verify_sun_starts); -+ cmp_data = verify_sun_starts; -+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); - - if (array[0] == -1) { - fdisk_info(cxt, _("No partitions defined.")); diff --git a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch b/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch deleted file mode 100644 index 716ea531..00000000 --- a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch +++ /dev/null @@ -1,40 +0,0 @@ -from alpine linux ---- ./text-utils/parse.c.orig -+++ ./text-utils/parse.c -@@ -208,7 +208,7 @@ - PR *pr, **nextpr; - FU *fu; - char *p1, *p2; -- char savech, *fmtp, cs[3]; -+ char savech, *fmtp, cs[4]; - int nconv, prec; - - nextpr = NULL; -@@ -282,9 +282,10 @@ - goto isint; - case 'o': case 'u': case 'x': case 'X': - pr->flags = F_UINT; --isint: cs[2] = '\0'; -- cs[1] = cs[0]; -- cs[0] = 'q'; -+isint: cs[3] = '\0'; -+ cs[2] = cs[0]; -+ cs[1] = 'l'; -+ cs[0] = 'l'; - switch(fu->bcnt) { - case 0: case 4: - pr->bcnt = 4; -@@ -342,9 +343,10 @@ - ++p2; - switch(p1[2]) { - case 'd': case 'o': case'x': -- cs[0] = 'q'; -- cs[1] = p1[2]; -- cs[2] = '\0'; -+ cs[0] = 'l'; -+ cs[1] = 'l'; -+ cs[2] = p1[2]; -+ cs[3] = '\0'; - break; - default: - p1[3] = '\0'; diff --git a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch b/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch deleted file mode 100644 index f66ffa70..00000000 --- a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 5 Aug 2014 18:58:52 -0400 -Subject: [PATCH] lscpu: clean up vmware inline asm - -This code is not PIC clean which means it fails to build on hardened -32bit x86 systems (i.e. building as PIE). - -While here, optimize the existing cpuid logic slightly. - -URL: https://bugs.gentoo.org/518936 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - sys-utils/lscpu.c | 36 ++++++++++++++++++++++++++---------- - 1 file changed, 26 insertions(+), 10 deletions(-) - -diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c -index 062dff5..9965eeb 100644 ---- a/sys-utils/lscpu.c -+++ b/sys-utils/lscpu.c -@@ -546,10 +546,9 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, - __asm__( - #if defined(__PIC__) && defined(__i386__) - /* x86 PIC cannot clobber ebx -- gcc bitches */ -- "pushl %%ebx;" -+ "xchg %%ebx, %%esi;" - "cpuid;" -- "movl %%ebx, %%esi;" -- "popl %%ebx;" -+ "xchg %%esi, %%ebx;" - : "=S" (*ebx), - #else - "cpuid;" -@@ -656,12 +655,29 @@ read_hypervisor_powerpc(struct lscpu_desc *desc) - #define VMWARE_BDOOR_PORT 0x5658 - #define VMWARE_BDOOR_CMD_GETVERSION 10 - --#define VMWARE_BDOOR(eax, ebx, ecx, edx) \ -- __asm__("inl (%%dx), %%eax" : \ -- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \ -- "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \ -- "2"(VMWARE_BDOOR_PORT), "3"(0) : \ -- "memory"); -+static inline -+void vmware_bdoor(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) -+{ -+ __asm__( -+#if defined(__PIC__) && defined(__i386__) -+ /* x86 PIC cannot clobber ebx -- gcc bitches */ -+ "xchg %%ebx, %%esi;" -+ "inl (%%dx), %%eax;" -+ "xchg %%esi, %%ebx;" -+ : "=S" (*ebx), -+#else -+ "inl (%%dx), %%eax;" -+ : "=b" (*ebx), -+#endif -+ "=a" (*eax), -+ "=c" (*ecx), -+ "=d" (*edx) -+ : "0" (VMWARE_BDOOR_MAGIC), -+ "1" (VMWARE_BDOOR_CMD_GETVERSION), -+ "2" (VMWARE_BDOOR_PORT), -+ "3" (0) -+ : "memory"); -+} - - static jmp_buf segv_handler_env; - -@@ -697,7 +713,7 @@ is_vmware_platform(void) - if (sigaction(SIGSEGV, &act, &oact)) - err(EXIT_FAILURE, _("error: can not set signal handler")); - -- VMWARE_BDOOR(eax, ebx, ecx, edx); -+ vmware_bdoor(&eax, &ebx, &ecx, &edx); - - if (sigaction(SIGSEGV, &oact, NULL)) - err(EXIT_FAILURE, _("error: can not restore signal handler")); --- -2.0.0 - diff --git a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch deleted file mode 100644 index 86edab45..00000000 --- a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c ---- util-linux-2.25.orig/sys-utils/switch_root.c 2014-08-13 15:08:15.632801343 +0000 -+++ util-linux-2.25/sys-utils/switch_root.c 2014-08-13 15:09:19.617801087 +0000 -@@ -181,8 +181,8 @@ - if (pid <= 0) { - struct statfs stfs; - if (fstatfs(cfd, &stfs) == 0 && -- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC || -- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC)) -+ (stfs.f_type == STATFS_RAMFS_MAGIC || -+ stfs.f_type == STATFS_TMPFS_MAGIC)) - recursiveRemove(cfd); - else - warn(_("old root filesystem is not an initramfs")); diff --git a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch b/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch deleted file mode 100644 index 85c48114..00000000 --- a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/522288 - -From a95987423c4d7781a14ffda34f082086cd51f4f7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 24 Oct 2014 12:08:22 -0400 -Subject: [PATCH] bash-completion: fix runuser install - -The runuser symlink used to depend on su being enabled, but a refactoring -broke that. So if you build with runuser enabled but not su, you end up -with a broken symlink. Rework the logic so it works in both cases. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - bash-completion/Makemodule.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am -index 271a6db..045c2d5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -11071,7 +10823,8 @@ - @BUILD_MOUNT_TRUE@@MAKEINSTALL_DO_SETUID_TRUE@ chmod 4755 $(DESTDIR)$(bindir)/umount - - @BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@install-data-hook-bashcomp-runuser:: --@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser -+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser -+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_FALSE@ cp $(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser - - clean-local-tests: - rm -rf $(top_builddir)/tests/output $(top_builddir)/tests/diff --- -2.1.2 - diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml deleted file mode 100644 index 785ff9f5..00000000 --- a/sys-apps/util-linux/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>base-system</herd> -<use> - <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag> - <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag> - <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag> - <flag name='fdformat'>build fdformat (floppy disk format)</flag> - <flag name='suid'> - install mount/umount as setuid so non-root users may mount/umount devices, - and wall/write as setgid so non-root users can notify other users - </flag> - <flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag> -</use> - <upstream> - <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild b/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild deleted file mode 100644 index bb150bcd..00000000 --- a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild,v 1.8 2014/05/14 18:13:29 ssuominen Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="amd64 arm ~mips ppc x86" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !sys-block/eject - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-1.3-r2 - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( sys-libs/libselinux ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742 - epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408 - epatch "${FILESDIR}"/${PN}-2.24.1-musl.patch #for musl - epatch "${FILESDIR}"/${PN}-2.24.2-hexdump.patch #for musl - find tests/ -name bigyear -delete #489794 - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.c -} - -src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(usex pam) #485486 - econf \ - --docdir="/usr/share/doc/${PF}" \ - --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \ - $(use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(use_enable bash-completion) \ - $(use_enable caps setpriv) \ - $(use_enable cramfs) \ - $(use_enable cytune) \ - $(use_enable fdformat) \ - --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(use_enable tty-helpers wall) \ - $(use_enable tty-helpers write) \ - $(use_enable suid makeinstall-chown) \ - $(use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(use_with slang) \ - $(use_enable static-libs static) \ - $(use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -src_test() { - emake check -} - -src_install() { - default - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - use python && python_optimize - - # need the libs in / - gen_usr_ldscript -a blkid mount uuid - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.25-r99.ebuild b/sys-apps/util-linux/util-linux-2.25-r99.ebuild deleted file mode 100644 index 2e10960f..00000000 --- a/sys-apps/util-linux/util-linux-2.25-r99.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.ebuild,v 1.5 2014/08/05 23:04:39 vapier Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - #KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" - KEYWORDS="" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="bash-completion caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !sys-block/eject - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-1.3-r2 - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - epatch "${FILESDIR}"/${P}-lscpu-pic.patch #518936 - epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 - ECONF_SOURCE=${S} \ - econf \ - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ - $(multilib_native_use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(multilib_native_use_enable bash-completion) \ - $(multilib_native_use_enable caps setpriv) \ - --disable-chfn-chsh \ - $(multilib_native_use_enable cramfs) \ - $(multilib_native_use_enable fdformat) \ - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(multilib_native_use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(multilib_native_use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(multilib_native_use_enable tty-helpers wall) \ - $(multilib_native_use_enable tty-helpers write) \ - $(multilib_native_use_enable suid makeinstall-chown) \ - $(multilib_native_use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(multilib_native_use_with slang) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} diff --git a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild deleted file mode 100644 index 17f7738c..00000000 --- a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.2.ebuild,v 1.1 2014/10/24 16:27:07 vapier Exp $ - -EAPI="4" - -PYTHON_COMPAT=( python2_7 python3_{2,3,4} ) - -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - KEYWORDS="amd64 arm ~mips ppc x86" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - !<sys-apps/sysvinit-2.88-r7 - !sys-block/eject - !<sys-libs/e2fsprogs-libs-1.41.8 - !<sys-fs/e2fsprogs-1.41.8 - !<app-shells/bash-completion-1.3-r2 - caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2 ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - udev? ( virtual/udev ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288 - epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles - eautoreconf - fi - elibtoolize -} - -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include <fcntl.h> - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 - ECONF_SOURCE=${S} \ - econf \ - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ - $(multilib_native_use_enable nls) \ - --enable-agetty \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - --enable-bash-completion \ - $(multilib_native_use_enable caps setpriv) \ - --disable-chfn-chsh \ - $(multilib_native_use_enable cramfs) \ - $(multilib_native_use_enable fdformat) \ - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ - --disable-kill \ - --disable-login \ - $(multilib_native_use_enable tty-helpers mesg) \ - --disable-nologin \ - --enable-partx \ - $(multilib_native_use_with python) \ - --enable-raw \ - --enable-rename \ - --disable-reset \ - --enable-schedutils \ - --disable-su \ - $(multilib_native_use_enable tty-helpers wall) \ - $(multilib_native_use_enable tty-helpers write) \ - $(multilib_native_use_enable suid makeinstall-chown) \ - $(multilib_native_use_enable suid makeinstall-setuid) \ - $(use_with selinux) \ - $(multilib_native_use_with slang) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with udev) \ - $(tc-has-tls || echo --disable-tls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - prune_libtool_files -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} |