commit: c0e9ecf6c020f5db084d8088f11d7fed9a714e01 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Fri Dec 9 23:48:54 2016 +0000 Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> CommitDate: Fri Dec 9 23:48:54 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c0e9ecf6
sys-process/lsof: in tree version works fine sys-process/lsof/Manifest | 6 -- sys-process/lsof/files/lsof-4.85-cross.patch | 33 ------- .../lsof/files/lsof-4.87-remove-glibc-check.patch | 15 --- .../lsof/files/lsof-4.88-linux.dnode.c.patch | 21 ----- sys-process/lsof/lsof-4.88-r99.ebuild | 103 --------------------- sys-process/lsof/metadata.xml | 11 --- 6 files changed, 189 deletions(-) diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest deleted file mode 100644 index 43344fc..0000000 --- a/sys-process/lsof/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX lsof-4.85-cross.patch 1000 SHA256 5067c73c65d9cbe75213572423d0ddea02a12ba7f3509767082cd9b6faf8b174 SHA512 399df859f225a69a7211c81439883afba38562d72b0d320dcf19acf7b705031963e97469a322af919d05aa14af501af6137301c24a29f871f59253c6d6a647d7 WHIRLPOOL b258a537f44d24c3e2bbc771476e98f79a3bcbf9b4d9d1e0f2779f9eae75e0a19eb8348a0d23ca2c9ad4d1835b859ec4f6ded74fd9fd5b8594d19bb1c8ff086b -AUX lsof-4.87-remove-glibc-check.patch 514 SHA256 c90a71adbdcc5fb6d32b7469196315cc5b6c1b71f351eef748b899ec3ea89671 SHA512 34efacf57c8e3bd1fa0f84ce58b8046177cb6dd075840837ea3f104570c63ceb9b7491bba8524b6c712440c86f11dc1a2d5bf475703c59345c4cb9c5624cabe6 WHIRLPOOL dea979075595f26a8d03b09857ac9ffab9602dc4c39bafd6fdb8f804ae5d9d4f7dd282771522169ed4cbf236cc186f7677e20eb8ae44b0058dc1062f4656e23a -AUX lsof-4.88-linux.dnode.c.patch 494 SHA256 8c824fe2ac4f4cb492a2d4539e8a921d50e337235c4f42650bade3728487b34b SHA512 253c0b3e3d50f805ffde21ba214e0a56fa554eb98fd126fd3edc4aa0401e24c2fbb72e30288fe8cc371a3f615f5365e6fc753e7dc2aa0a8367f132c7411b28f1 WHIRLPOOL 31aa05df4e7b3a1b0f9c8f37544a2c3d6be3d596a6ef844855cd3e99fb53291ded85e61690e91e274f5edcf805c73e7663723e8c43458d3a70e3abb6689fe2eb -DIST lsof_4.88.tar.bz2 778563 SHA256 fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b SHA512 acf3901ac08bac5acaa123af835de03fcf86c1cb851a2cba5bb6d08c53dff62570e4129c18ffa241ae84a83d5e6fc5207fb12e43b5ff5a21a0c1967ca117848b WHIRLPOOL 74d85794e5f05920ac83b160b02e510442ebe3f390a8f30bbf514f31bb8ff74ad191f89bed5b3eee47033cc7d6fe01ba4d9d812050d7132e041899d96264076f -EBUILD lsof-4.88-r99.ebuild 2853 SHA256 e387e35c16bfef5db5e44166a8fc5195f2a1aac9e9a6ea3d92f1b3e303ae6ca2 SHA512 3023ed3e2254f96d470cd3d1992c514b81d321af7b0d80b45d02c5f1f49a7f161efaf7bb49918c9bc9f6adc82cc4a9d554af055a3fbaa830da58ea82e975e737 WHIRLPOOL d99dd13974bd855df11d12e35c91b5c8433282e38262f63231cfce0c39706a147709d4bedbb60fa684fff01843f1d5467f6273e2ffb07574ca8449551f590850 -MISC metadata.xml 327 SHA256 be9246f94d3a616b0eed2cfe506c6673aafefb5d2bd85946ec462c2ff3f49494 SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98 WHIRLPOOL fa94b6d626e8e3d55b5f90ed6a9dbcfdb806cadf43ebdf5086c3dcdf08138f75cf7c14442edd4c5825571a5264d1dc666d4e0c6e242a450f5c8d2424d22416c6 diff --git a/sys-process/lsof/files/lsof-4.85-cross.patch b/sys-process/lsof/files/lsof-4.85-cross.patch deleted file mode 100644 index 186c6d8..0000000 --- a/sys-process/lsof/files/lsof-4.85-cross.patch +++ /dev/null @@ -1,33 +0,0 @@ -let the preprocessor work its magic rather than executing the code - -https://bugs.gentoo.org/432120 - ---- a/Configure -+++ b/Configure -@@ -2730,20 +2730,17 @@ LOCKF_OWNER4 - rm -f ${LSOF_TMPC}.* - cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1 - #include <features.h> --main() { -+#undef XXX - #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) --printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__); -+XXX: __GLIBC__ * 100 + __GLIBC_MINOR__ - #elif defined(__GLIBC__) --printf("-DGLIBCV=%d00\n",__GLIBC__); --#else --printf("\n"); -+XXX: __GLIBC__ * 100 - #endif --return(0); } - .LSOF_END_HERE_DOC1 -- $LINUX_CONF_CC ${LSOF_TMPC}.c -I$LSOF_INCLUDE -o ${LSOF_TMPC}.x > /dev/null 2>&1 -+ $LINUX_CONF_CC ${LSOF_TMPC}.c -E -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x -- if test -x ${LSOF_TMPC}.x # { -+ if test -s ${LSOF_TMPC}.x # { - then -- LINUX_CLIB=`${LSOF_TMPC}.x` -+ LINUX_CLIB="-DGLIBCV=$(( `cat ${LSOF_TMPC}.x` ))" - LSOF_TMP=$? - else - LINUX_CLIB="" diff --git a/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch b/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch deleted file mode 100644 index 1e121cb..0000000 --- a/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:00.731421615 +0000 -+++ b/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:57.585422124 +0000 -@@ -49,12 +49,7 @@ - #include <setjmp.h> - #include <unistd.h> - #include <netinet/in.h> -- --# if defined(GLIBCV) || defined(__UCLIBC__) - #include <netinet/tcp.h> --# else /* !defined(GLIBCV) && !defined(__UCLIBC__) */ --#include <linux/tcp.h> --# endif /* defined(GLIBCV) || defined(__UCLIBC__) */ - - # if !defined(HASNORPC_H) - #include <rpc/rpc.h> \ No newline at end of file diff --git a/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch b/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch deleted file mode 100644 index 28640a9..0000000 --- a/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch +++ /dev/null @@ -1,21 +0,0 @@ -ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/patches/4.88/linux.dnode.c.patch - -*** dnode.c ---- lsof_4.88_src/dialects/linux/dnode.c -*************** -*** 580,586 **** - Lf->inp_ty = 1; - - #if defined(HASEPTOPTS) -! if (Lf->ntype == N_FIFO) { - (void) enter_pinfo(); - Lf->sf |= SELPINFO; - } ---- 580,586 ---- - Lf->inp_ty = 1; - - #if defined(HASEPTOPTS) -! if ((Lf->ntype == N_FIFO) && FpipeE) { - (void) enter_pinfo(); - Lf->sf |= SELPINFO; - } diff --git a/sys-process/lsof/lsof-4.88-r99.ebuild b/sys-process/lsof/lsof-4.88-r99.ebuild deleted file mode 100644 index 1cb6920..0000000 --- a/sys-process/lsof/lsof-4.88-r99.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="Lists open files for running Unix processes" -HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"; -SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2 - ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2"; - -LICENSE="lsof" -SLOT="0" -KEYWORDS="amd64 arm ~mips ~ppc x86" -IUSE="examples ipv6 rpc selinux static" - -RDEPEND="rpc? ( net-libs/libtirpc ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - rpc? ( virtual/pkgconfig )" - -S=${WORKDIR}/${MY_P}/${MY_P}_src - -src_unpack() { - unpack ${A} - cd ${MY_P} - unpack ./${MY_P}_src.tar -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.87-remove-glibc-check.patch - epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120 - epatch "${FILESDIR}"/${P}-linux.dnode.c.patch - # fix POSIX compliance with `echo` - sed -i \ - -e 's:echo -n:printf:' \ - AFSConfig Configure Customize Inventory tests/CkTestDB || die - # convert `test -r header.h` into a compile test - sed -i -r \ - -e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \ - -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \ - Configure || die -} - -target() { - case ${CHOST} in - *-darwin*) echo darwin ;; - *-freebsd*) echo freebsd ;; - *-solaris*) echo solaris ;; - *-aix*) echo aixgcc ;; - *) echo linux ;; - esac -} - -src_configure() { - use static && append-ldflags -static - - append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H") - append-cppflags $(usex ipv6 -{D,U}HASIPv6) - - export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \ - $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)" - - # Set LSOF_INCLUDE to a dummy location so the script doesn't poke - # around in it and mix /usr/include paths with cross-compile/etc. - touch .neverInv - LINUX_HASSELINUX=$(usex selinux y n) \ - LSOF_INCLUDE=${T} \ - LSOF_CC=$(tc-getCC) \ - LSOF_AR="$(tc-getAR) rc" \ - LSOF_RANLIB=$(tc-getRANLIB) \ - LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \ - ./Configure -n $(target) || die -} - -src_compile() { - emake DEBUG="" all -} - -src_install() { - dobin lsof - - if use examples ; then - insinto /usr/share/lsof/scripts - doins scripts/* - fi - - doman lsof.8 - dodoc 00* -} - -pkg_postinst() { - if [[ ${CHOST} == *-solaris* ]] ; then - einfo "Note: to use lsof on Solaris you need read permissions on" - einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys" - elif [[ ${CHOST} == *-aix* ]] ; then - einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and" - einfo "/dev/kmem, i.e. you need to be root, or to be in the group system" - fi -} diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml deleted file mode 100644 index 4f913c0..0000000 --- a/sys-process/lsof/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> -<maintainer type="project"> - <email>base-sys...@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="rpc">support looking up RPC service info</flag> -</use> -</pkgmetadata>
