diff options
author | 2011-07-24 09:00:54 +0000 | |
---|---|---|
committer | 2011-07-24 09:00:54 +0000 | |
commit | 236eeebe853a5158f174204fd333c759ce2ea9d5 (patch) | |
tree | e80f28beba337468ac5ee1ebc9ccce3e182f377a | |
parent | dev-util/abi-compliance-checker: version bump. (diff) | |
download | pva-236eeebe853a5158f174204fd333c759ce2ea9d5.tar.gz pva-236eeebe853a5158f174204fd333c759ce2ea9d5.tar.bz2 pva-236eeebe853a5158f174204fd333c759ce2ea9d5.zip |
net-firewall/xtables-addons: moved to the tree, dev-libs/foobar to test wireshark, bump dev-util/abi-compliance-checker.
svn path=/; revision=501
-rw-r--r-- | dev-libs/foobar/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/foobar/foobar-1.0.0.ebuild | 19 | ||||
-rw-r--r-- | dev-util/abi-compliance-checker/Manifest | 4 | ||||
-rw-r--r-- | dev-util/abi-compliance-checker/abi-compliance-checker-1.23.3.ebuild | 10 | ||||
-rw-r--r-- | net-firewall/xtables-addons/ChangeLog | 74 | ||||
-rw-r--r-- | net-firewall/xtables-addons/Manifest | 6 | ||||
-rw-r--r-- | net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch | 26 | ||||
-rw-r--r-- | net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch | 13 | ||||
-rw-r--r-- | net-firewall/xtables-addons/metadata.xml | 18 | ||||
-rw-r--r-- | net-firewall/xtables-addons/xtables-addons-1.36.ebuild | 160 |
10 files changed, 27 insertions, 305 deletions
diff --git a/dev-libs/foobar/Manifest b/dev-libs/foobar/Manifest new file mode 100644 index 0000000..77e1ff2 --- /dev/null +++ b/dev-libs/foobar/Manifest @@ -0,0 +1,2 @@ +DIST foobar-1.0.0.tar.bz2 249143 RMD160 568545fe4bb7834155b5bcdce35155d925ed728c SHA1 e3a466c433e1a048a29d3b314c9bc5330bd12ff8 SHA256 de1c508b1d0720e5eef0bdd726a042a936e4c9ed8620ed410123c75631cd5dc1 +EBUILD foobar-1.0.0.ebuild 344 RMD160 f67a63a015e96ad4943854ce37640412ea184105 SHA1 df2b5775b37637cb7443cd9936ee1780a60420f0 SHA256 d4ffbf25be5b7b1a63611ebd920940c311be0e5e5b403072c1047c34c9e7a463 diff --git a/dev-libs/foobar/foobar-1.0.0.ebuild b/dev-libs/foobar/foobar-1.0.0.ebuild new file mode 100644 index 0000000..eab53c3 --- /dev/null +++ b/dev-libs/foobar/foobar-1.0.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +DESCRIPTION="Test package to expose libtool bug" +HOMEPAGE="www.gentoo.org/~pva" +SRC_URI="http://www.gentoo.org/~pva/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + + diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest index d6a4a00..37b6879 100644 --- a/dev-util/abi-compliance-checker/Manifest +++ b/dev-util/abi-compliance-checker/Manifest @@ -1,2 +1,2 @@ -DIST Abi-compliance-checker-1.2.tar.gz 43097 RMD160 f183f73f7346dc6796fe0aa6eebfd688d6339c4d SHA1 04fb9d2357f24fab6e7ed3187e16d0ac97077126 SHA256 363df2bf0aa08f75961cd09297a81999234f092f5a3f9a64091756896040ba72 -EBUILD abi-compliance-checker-1.2.ebuild 563 RMD160 cb02baa990cb2ad8c06722b5ed898cdfaa34470d SHA1 21a404aa6221d9aa077ae575bb4fe1a233c02e54 SHA256 ac137a68bfb02b81ea6a2168431652f8c3818f5c81b1eb842c78d47dba010d37 +DIST abi-compliance-checker-1.23.3.tar.gz 144011 RMD160 b38222c160d99abdb80fa8f961e77532357e176f SHA1 cdd14412ca1a2b521a5766a595d16d13b13a97fd SHA256 0a0088f911538f782f6a17517a2600365bf8f8a74710aed006cb1f3b88354c87 +EBUILD abi-compliance-checker-1.23.3.ebuild 533 RMD160 8e02b2b4a8592bd12b000ed921d3b945163ec56c SHA1 a24b940d44555ba22299db3c9676cfd368f4098f SHA256 f26e089aa7bfc64e2677b30e4cb6f50dfee9e268379ba2d7d29c8dc69354d218 diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.23.3.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.23.3.ebuild index 8b2c2a8..056d7e4 100644 --- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.23.3.ebuild +++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.23.3.ebuild @@ -2,18 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" - -MY_PN=${PN/a/A} -MY_P=${MY_PN}-${PV} +EAPI="4" DESCRIPTION="lightweight tool for checking backward binary compatibility of shared C/C++ libraries" HOMEPAGE="http://ispras.linux-foundation.org/index.php/ABI_compliance_checker" -SRC_URI="http://ispras.linux-foundation.org/images/a/a0/${MY_P}.tar.gz" +SRC_URI="http://linuxtesting.org/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="" @@ -21,4 +18,5 @@ RDEPEND="dev-lang/perl" src_install() { dobin abi-compliance-checker.pl || die + dohtml -r doc/ } diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog deleted file mode 100644 index ccb15ac..0000000 --- a/net-firewall/xtables-addons/ChangeLog +++ /dev/null @@ -1,74 +0,0 @@ -# ChangeLog for net-firewall/xtables-addons -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.14 2011/04/28 18:54:21 ulm Exp $ - - 28 Apr 2011; Ulrich Mueller <ulm@gentoo.org> xtables-addons-1.28-r1.ebuild, - xtables-addons-1.30.ebuild, xtables-addons-1.31.ebuild: - Fix dependency on virtual/linux-sources, bug 118442. - - 24 Apr 2011; Ulrich Mueller <ulm@gentoo.org> xtables-addons-1.28-r1.ebuild, - xtables-addons-1.30.ebuild, xtables-addons-1.31.ebuild: - Remove dependency on virtual/modutils, it is redundant with linux-mod.eclass, - bug 358891. - -*xtables-addons-1.31 (11 Nov 2010) - - 11 Nov 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.31.ebuild: - Version bump. New grsecurity match for bug #339596, thank Anthony Basile - for pushing this upstream! - - 25 Oct 2010; Sven Wegener <swegener@gentoo.org> - xtables-addons-1.28-r1.ebuild, xtables-addons-1.30.ebuild: - linux-sources is only required at build-time and the ipset extension can - be build with ipset installed, just not being installed at the same time. - - 14 Oct 2010; Peter Volkov <pva@gentoo.org> -xtables-addons-1.27.ebuild, - -xtables-addons-1.28.ebuild: - Drop old. - -*xtables-addons-1.30 (14 Oct 2010) - - 14 Oct 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.30.ebuild: - Version bump. - - 06 Oct 2010; Markus Meier <maekke@gentoo.org> - xtables-addons-1.28-r1.ebuild: - x86 stable, bug #337954 - - 21 Sep 2010; Markos Chandras <hwoarang@gentoo.org> - xtables-addons-1.28-r1.ebuild: - Stable on amd64 wrt bug #337954 - -*xtables-addons-1.28-r1 (13 Aug 2010) - - 13 Aug 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.28-r1.ebuild: - Don't install geoip scripts in case it is disabled and add correct depends - for them, bug 332495, thank Marcin Mirosław for report. - -*xtables-addons-1.28 (12 Aug 2010) - - 12 Aug 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.28.ebuild: - Version bump, bug #331399, thank Marcin Mirosław for report. - - 02 Jul 2010; Peter Volkov <pva@gentoo.org> -xtables-addons-1.26.ebuild, - xtables-addons-1.27.ebuild: - Avoid maintainer mode, make build verbose, fix ED->D typo. Drop old. - -*xtables-addons-1.27 (01 Jun 2010) - - 01 Jun 2010; Peter Volkov <pva@gentoo.org> -xtables-addons-1.25.ebuild, - +xtables-addons-1.27.ebuild: - Version bump, drop old. - -*xtables-addons-1.26 (08 May 2010) - - 08 May 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.26.ebuild: - Version bump. - -*xtables-addons-1.25 (29 Apr 2010) - - 29 Apr 2010; Peter Volkov <pva@gentoo.org> +xtables-addons-1.25.ebuild, - +metadata.xml: - Initial import, ebuild by me. Fixes bug #250407, thank Nathan McSween for - report and others who tested this package. - diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest deleted file mode 100644 index 5d27897..0000000 --- a/net-firewall/xtables-addons/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX xtables-addons-1.36-absolute-M.patch 1055 RMD160 596e6fb2caa77af11ff663686a22fc749739904b SHA1 f88136c66fb60517caf76c8295b39c77305f16c7 SHA256 bf4db7c5667ea9a7a5cafeea2504f5a94881f30bf4c9f6b7a1ce1d47b56ab3d5 -AUX xtables-addons-1.36-kernel-detection.patch 476 RMD160 e949144870a630d8f590eb9879e7ad6101eab752 SHA1 d3c47ea269b7a7f416815ca13e8c0feffdc20449 SHA256 825c87dc5f42b234104cea06666524d47ca3ab8ac8ed2821870059d9c633d2ed -DIST xtables-addons-1.36.tar.xz 423580 RMD160 e7e14935d41c93df184ffa20c02d6c159285c982 SHA1 4e46d094353fe2fe11f6845ed8f3c72a2386b7ac SHA256 cfa2109c332f1c8b91cf64973e79a20dae6643da0c35b9d80c16ad2687bc21c4 -EBUILD xtables-addons-1.36.ebuild 4930 RMD160 27c6f0b344d07c47a84244dd8e19ad5e79af63fc SHA1 366f521aa839226058f9d7b60ff8b2c5304e267c SHA256 627caaaeee8f481582c9918f50fa809e8e44efb3f68844754b765cd23559013e -MISC ChangeLog 2748 RMD160 100441045c3bb094f1a18a82973cef4ac403e8a6 SHA1 79384fd746cfc51c38d7f227b7968263fcb75d6c SHA256 b3c785341ee505931d61a269a09c02d5c5a901935bdb2cd95d44a967cbffb020 -MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch b/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch deleted file mode 100644 index 95e2ee7..0000000 --- a/net-firewall/xtables-addons/files/xtables-addons-1.36-absolute-M.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit e84391ce665cef046967f796dd91026851d6bbf3 -Author: Peter Volkov <pva@gentoo.org> -Date: Mon Jun 20 10:50:29 2011 +0400 - - build: use absolute path for M= - - Use absolute path for M during checking kernelrelease. This will force - temporary objects be built in the current directory and not $kbuilddir - as it happened, e.g. in the current kernel scripts/Kbuild.include - try-run target (it is called with TMPOUT=M=. and during call - pwd=$kbuilddir). This should fix sandbox violation in Gentoo: - https://bugs.gentoo.org/show_bug.cgi?id=371997 - -diff --git a/configure.ac b/configure.ac -index 0660eea..14dae83 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ - - if test -n "$kbuilddir"; then - AC_MSG_CHECKING([kernel version that we will build against]) -- krel="$(make -sC "$kbuilddir" M=. kernelrelease)"; -+ krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; - kmajor="${krel%%[[^0-9]]*}"; - kmajor="$(($kmajor+0))"; - krel="${krel:${#kmajor}}"; diff --git a/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch b/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch deleted file mode 100644 index 0d6098e..0000000 --- a/net-firewall/xtables-addons/files/xtables-addons-1.36-kernel-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ff0e171..0660eea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,7 +65,7 @@ if test -n "$kbuilddir"; then - echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; - elif test "$kmajor" -eq 3; then - :; -- elif test "$kmajor" -eq 2 -a "$kminor" -ge 29; then -+ elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 29; then - :; - else - echo "WARNING: That kernel version is not supported."; diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml deleted file mode 100644 index 1fe6ec7..0000000 --- a/net-firewall/xtables-addons/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>pva@gentoo.org</email> - <name>Peter Volkov</name> -</maintainer> -<longdescription> -Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains -extensions that were not, or are not yet, accepted in the main kernel/iptables -packages. - -Xtables-addons is different from patch-o-matic in that you do not have to patch -or recompile the kernel, sometimes recompiling iptables is also not needed. But -please see the INSTALL file for the minimum requirements of this package. -</longdescription> -</pkgmetadata> diff --git a/net-firewall/xtables-addons/xtables-addons-1.36.ebuild b/net-firewall/xtables-addons/xtables-addons-1.36.ebuild deleted file mode 100644 index ddbdcbd..0000000 --- a/net-firewall/xtables-addons/xtables-addons-1.36.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.36.ebuild,v 1.1 2011/06/16 13:50:06 pva Exp $ - -EAPI="4" -inherit eutils linux-info linux-mod multilib autotools - -DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)" -HOMEPAGE="http://xtables-addons.sourceforge.net/" -SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="modules" - -REQUIRED_USE=" - xtables_addons_ipset4? ( !xtables_addons_ipset6 ) - xtables_addons_ipset6? ( !xtables_addons_ipset4 )" - -MODULES="quota2 psd pknock lscan length2 ipv4options ipset6 ipset4 ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account" - -for mod in ${MODULES}; do - IUSE="${IUSE} xtables_addons_${mod}" -done - -DEPEND=">=net-firewall/iptables-1.4.3" - -RDEPEND="${DEPEND} - xtables_addons_ipset4? ( !net-firewall/ipset ) - xtables_addons_ipset6? ( - !net-firewall/ipset - net-libs/libmnl ) - xtables_addons_geoip? ( virtual/perl-Getopt-Long - dev-perl/Text-CSV_XS )" - -DEPEND="${DEPEND} - virtual/linux-sources" - -pkg_setup() { - if use modules; then - get_version - check_modules_supported - CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR" - ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector" - linux-mod_pkg_setup - - if ! linux_chkconfig_present IPV6; then - SKIP_IPV6_MODULES="ip6table_rawpost ipset6" - ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}" - fi - if ! (use xtables_addons_ipset4 || use xtables_addons_ipset6) && - kernel_is -lt 2 6 35; then - die "${PN} with ipset requires kernel version >= 2.6.29" - fi - kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29" - fi -} - -# Helper for maintainer: cheks if all possible MODULES are listed. -XA_qa_check() { - local all_modules - all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig") - if [[ ${all_modules} != ${MODULES} ]]; then - ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild." - ewarn "Please, update MODULES in ebuild." - ewarn "'${all_modules}'" - fi -} - -# Is there any use flag set? -XA_has_something_to_build() { - local mod - for mod in ${MODULES}; do - use xtables_addons_${mod} && return - done - - eerror "All modules are disabled. What do you want me to build?" - eerror "Please, set XTABLES_ADDONS to any combination of" - eerror "${MODULES}" - die "All modules are disabled." -} - -# Parse Kbuid files and generates list of sources -XA_get_module_name() { - [[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument." - local mod objdir build_mod sources_list - mod=${1} - objdir=${S}/extensions - # Take modules name from mconfig - build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig") - # strip .o, = and everything before = and print - sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - - if [[ -d ${S}/extensions/${sources_list} ]]; then - objdir=${S}/extensions/${sources_list} - sources_list=$(sed -n "/^obj-m/\ - {s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \ - "${objdir}/Kbuild") - fi - for mod_src in ${sources_list}; do - has ${mod_src} ${SKIP_IPV6_MODULES} || \ - echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})" - done -} - -src_prepare() { - epatch "${FILESDIR}/${P}-kernel-detection.patch" - epatch "${FILESDIR}/${P}-absolute-M.patch" - eautoreconf - - XA_qa_check - XA_has_something_to_build - - local mod module_name - if use modules; then - MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)" - fi - for mod in ${MODULES}; do - if use xtables_addons_${mod}; then - sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die - if use modules; then - for module_name in $(XA_get_module_name ${mod}); do - MODULE_NAMES+=" ${module_name}" - done - fi - else - sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die - fi - done - einfo "${MODULE_NAMES}" # for debugging - - sed -e 's/depmod -a/true/' -i Makefile.in || die - sed -e '/^all-local:/{s: modules::}' \ - -e '/^install-exec-local:/{s: modules_install::}' \ - -i extensions/Makefile.in || die - - use xtables_addons_geoip || sed -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in -} - -src_configure() { - set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile - econf --prefix="${EPREFIX}/" \ - --libexecdir="${EPREFIX}/$(get_libdir)/" \ - --with-kbuild="${KV_DIR}" -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 - use modules && BUILD_TARGETS="modules" linux-mod_src_compile -} - -src_install() { - emake DESTDIR="${D}" install - use modules && linux-mod_src_install - dodoc -r README doc/* - find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' -} |