From 0f894eebe6a4fadaff35d9218062231087c9a01a Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 4 Jun 2013 15:31:24 +0200 Subject: net-firewall/rtsp-conntrack: Now included upstream, #376155, still keeping 3.3 for LTS kernel Package-Manager: portage-2.1.12.2 --- net-firewall/rtsp-conntrack/ChangeLog | 8 +++- net-firewall/rtsp-conntrack/Manifest | 12 +----- .../rtsp-conntrack/rtsp-conntrack-2.6.26.ebuild | 44 --------------------- .../rtsp-conntrack/rtsp-conntrack-2.6.36.ebuild | 44 --------------------- .../rtsp-conntrack/rtsp-conntrack-3.3.ebuild | 46 +++++++++------------- .../rtsp-conntrack/rtsp-conntrack-3.6.ebuild | 44 --------------------- .../rtsp-conntrack/rtsp-conntrack-3.7.ebuild | 44 --------------------- 7 files changed, 28 insertions(+), 214 deletions(-) delete mode 100644 net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.26.ebuild delete mode 100644 net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.36.ebuild delete mode 100644 net-firewall/rtsp-conntrack/rtsp-conntrack-3.6.ebuild delete mode 100644 net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild (limited to 'net-firewall') diff --git a/net-firewall/rtsp-conntrack/ChangeLog b/net-firewall/rtsp-conntrack/ChangeLog index b062d80b..6dfca51d 100644 --- a/net-firewall/rtsp-conntrack/ChangeLog +++ b/net-firewall/rtsp-conntrack/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Jun 2013; Bertrand Jacquin + -rtsp-conntrack-2.6.26.ebuild, -rtsp-conntrack-2.6.36.ebuild, + -rtsp-conntrack-3.6.ebuild, -rtsp-conntrack-3.7.ebuild, + rtsp-conntrack-3.3.ebuild: + net-firewall/rtsp-conntrack: Now included upstream, #376155, still keeping 3.3 + for LTS kernel + 28 May 2013; Bertrand Jacquin +metadata.xml: Add missing metadata.xml @@ -22,4 +29,3 @@ +rtsp-conntrack-2.6.26.ebuild, +rtsp-conntrack-2.6.36.ebuild: 376155 https://bugs.gentoo.org/show_bug.cgi?id=376155 - diff --git a/net-firewall/rtsp-conntrack/Manifest b/net-firewall/rtsp-conntrack/Manifest index 6dbf0b24..61c2db26 100644 --- a/net-firewall/rtsp-conntrack/Manifest +++ b/net-firewall/rtsp-conntrack/Manifest @@ -1,12 +1,4 @@ -DIST rtsp-module-2.6.26.tar.gz 11459 SHA256 2d1371512aeeea49910caf9f8213d1a9667b8042628f734dc2efa03d56b3c8fc -DIST rtsp-module-2.6.36.tar.gz 11453 SHA256 6d7a3d4436acad83432ab64a956caf065a542e554a70e098ff95500b7e786275 DIST rtsp-module-3.3.tar.gz 11472 SHA256 ed3abca83d0d273986550a72c024e77094c0a78518b827e5a8e1b014235ac8be SHA512 d455c0d6e5db2feea34083fc4554b0a66602f0e917672a38eaebf8581b4dd9fbfe20e89128d794e778ac3e1ae1615948e7ccb95d17ef616ba32b258fcfb351b4 WHIRLPOOL 86c84e46b7c5033473d2df844513e6202933d5ee27c44d1ae3a87829208d7df912a458340a43bb832ac91c1299cf396e59c451f6c05699daab95e38f96e4d52b -DIST rtsp-module-3.6.tar.gz 11483 SHA256 4a0cb05df118931066922304f266d0a9df2c6052583b68b7307a33227a6faa57 SHA512 1d18dba7039e65662b9a8f6cadd71bf8c7bf431a3daa9500b049990c1f4a66a6b7de4121ba3fd1e85d4634599afa105068abf5d10147bf3b44d714e330645664 WHIRLPOOL 648ebc8b1317850e98d9557833f737f5882b6121a8908f914493e77439aeab06301ac82edf5884b91a22247746c9fa70a4f3744b5fc4b6ec32f2c0b1828766a4 -DIST rtsp-module-3.7.tar.gz 11474 SHA256 a8333924e9553ec25ed0707b8e78637bf055e654a888ff7e40634f356102068a SHA512 480316f41f7e9a2a75b73b3edcbbdc98bf293f013a5549c6829659e601d2d1ec0ac94f7a2519cd6e40d41cbd02cf64f81fe2a371c703c3b0ba36d200fe29a3c1 WHIRLPOOL c76f20fb016a11c036d452998a6892af055247dccb7fa6e35c5c4bd2954fcc2a7b2d1403612d05c19d278ff4222faaaaa31284e81d7c135ed7cac47f2b3c69d3 -EBUILD rtsp-conntrack-2.6.26.ebuild 976 SHA256 8e622cfe06fe39892f220c550b16903e35a914b53b10280892cad4e883ce76e0 WHIRLPOOL c276e2f9bd99b904a7ea32799bfae5fdfa47219c597a3a8fdcbb6dc6d28d37ed8d10b260b8cb760f8dff7d3a14e87b25dbc61615d5cb3024a14d04ea2d05663b -EBUILD rtsp-conntrack-2.6.36.ebuild 987 SHA256 ee5469d6496b59ec1cbba51b88e51cc35645d1c749d1219305d606b059a90e02 WHIRLPOOL 2ccb9632987e1c269ffc096eedd22c19b9ea79f52b0bb30791a3f7a71c9f090bb622ddd67865a6e539df79a142210a0aed24ea226724e30465a5ee7efaa06de3 -EBUILD rtsp-conntrack-3.3.ebuild 982 SHA256 a6383eb596900639e85c79aa2392ec5edf96aa8dc34e46ccf0f2ce73217dd4c7 WHIRLPOOL 60906a8aaca7340fe2ba665d93e549e6f1ba1b707aa1eff72d597a46a7727e18ca7f01d5852182553b418f321cc47081dc6cd5a3380d07e5f9e407292bf0f33c -EBUILD rtsp-conntrack-3.6.ebuild 984 SHA256 70e91c749c5289d884232978de6309a31c300ae370782afc1633221bc18131a3 WHIRLPOOL c7b45134bd61d3e54407f0abd59fff22525d9535d1b8ab95ad1fc3fc708c9271f1abfab26e07c0e946187193c055262b6fa17eee7c0fa02cd0ffa9bdb479c38f -EBUILD rtsp-conntrack-3.7.ebuild 976 SHA256 8e622cfe06fe39892f220c550b16903e35a914b53b10280892cad4e883ce76e0 WHIRLPOOL c276e2f9bd99b904a7ea32799bfae5fdfa47219c597a3a8fdcbb6dc6d28d37ed8d10b260b8cb760f8dff7d3a14e87b25dbc61615d5cb3024a14d04ea2d05663b -MISC ChangeLog 813 SHA256 ef6aa2b195c78611704306fd614e5fbfb36b31a286603a6d2159ed4d7883e125 WHIRLPOOL 40e377e6898922a140a8d0e8082de62b038649367b2a34b8ba06f60d4653772a2065cebbc92174ba66e43b851de7f9ea01d31c7e1ecca4ebbca341d0f3b3799f +EBUILD rtsp-conntrack-3.3.ebuild 867 SHA256 5aace33f3ac54497a00589b716fce65f53494ccf965896d9d618b61928ea30f4 WHIRLPOOL c76eb59200fe01984e58e0842fa9eccda3764af35e0662f436204681b733002913c8b2f149cdcabcbc8dfff96d094a7bbfb28ed4124fd2f3b889263ce7d15c56 +MISC ChangeLog 1115 SHA256 8c211798a3ad97e81c3697cb98eac1bbc9e1145debf5b233c420637c7dcd11cc WHIRLPOOL bef6f91685e1946e53d1725aa0442f7b1963bbbe48c80784a5571bcf93dd151e0279abf3b7bc453223a01593198addba9f96e28ad11b0b3de97c47a325497cae MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630 diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.26.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.26.ebuild deleted file mode 100644 index 0fa4da79..00000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.26.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-mod - -DESCRIPTION="RTSP module for netfilter/conntrack" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="${PV}" -KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND="net-firewall/iptables - || ( - >=sys-kernel/stable-sources-${PV} - >=sys-kernel/longterm-sources-${PV} - >=sys-kernel/gentoo-sources-${PV} - >=sys-kernel/hardened-sources-${PV} - >=sys-kernel/mips-sources-${PV} - )" -RDEPEND="net-firewall/iptables" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You need to enable NF_CONNTRACK in your kernel" - -if use !debug ; then - BUILD_TARGETS="all" -else - BUILD_TARGETS="debug" -fi -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" - -MODULE_NAMES=" - nf_conntrack_rtsp(rtsp::) - nf_nat_rtsp(rtsp::)" - -MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" - -S="${WORKDIR}/rtsp" diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.36.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.36.ebuild deleted file mode 100644 index 45c8f93c..00000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-2.6.36.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-mod - -DESCRIPTION="RTSP module for netfilter/conntrack" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="${PV}" -KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND="net-firewall/iptables - || ( - >=sys-kernel/stable-sources-${PV} - >=sys-kernel/longterm-sources-${PV} - >=sys-kernel/gentoo-sources-${PV} - >=sys-kernel/hardened-sources-${PV} - >=sys-kernel/mips-sources-${PV} - )" -RDEPEND="net-firewall/iptables" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You need to enable NF_CONNTRACK in your kernel" - -if use !debug ; then - BUILD_TARGETS="all" -else - BUILD_TARGETS="debug" -fi -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" - -MODULE_NAMES=" - nf_conntrack_rtsp(rtsp::) - nf_nat_rtsp(rtsp::)" - -MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" - -S="${WORKDIR}/rtsp-linux-v2.6" diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.3.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.3.ebuild index 1cf63751..83117683 100644 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.3.ebuild +++ b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.3.ebuild @@ -1,44 +1,36 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI=5 +inherit eutils linux-mod versionator -inherit eutils linux-mod - -DESCRIPTION="RTSP module for netfilter/conntrack" +DESCRIPTION="RTSP module for Netfilter" HOMEPAGE="http://mike.it-loops.com/rtsp" SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz" LICENSE="GPL-2" SLOT="${PV}" KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND="net-firewall/iptables - || ( - >=sys-kernel/stable-sources-${PV} - >=sys-kernel/longterm-sources-${PV} - >=sys-kernel/gentoo-sources-${PV} - >=sys-kernel/hardened-sources-${PV} - >=sys-kernel/mips-sources-${PV} - )" -RDEPEND="net-firewall/iptables" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You need to enable NF_CONNTRACK in your kernel" -if use !debug ; then - BUILD_TARGETS="all" -else - BUILD_TARGETS="debug" -fi -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" +S="${WORKDIR}/linux-rtsp" +BUILD_TARGETS="all" MODULE_NAMES=" nf_conntrack_rtsp(rtsp::) nf_nat_rtsp(rtsp::)" - MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" -S="${WORKDIR}/linux-rtsp" +CONFIG_CHECK="NF_CONNTRACK" +WARNING_NF_CONNTRACK="You must enable NF_CONNTRACK in your kernel, otherwise ${PN} would not work" + +BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1" + +pkg_setup() { + inux-mod_pkg_setup + ernel_is -lt $(get_version_components) && die "This version of ${PN} would not work on kernels <= ${PV}" +} + +src_prepare() { + epatch_user +} diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.6.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.6.ebuild deleted file mode 100644 index e2c5e768..00000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.6.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-mod - -DESCRIPTION="RTSP module for netfilter/conntrack" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="net-firewall/iptables - || ( - >=sys-kernel/stable-sources-${PV} - >=sys-kernel/longterm-sources-${PV} - >=sys-kernel/gentoo-sources-${PV} - >=sys-kernel/hardened-sources-${PV} - >=sys-kernel/mips-sources-${PV} - )" -RDEPEND="net-firewall/iptables" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You need to enable NF_CONNTRACK in your kernel" - -if use !debug ; then - BUILD_TARGETS="all" -else - BUILD_TARGETS="debug" -fi -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" - -MODULE_NAMES=" - nf_conntrack_rtsp(rtsp::) - nf_nat_rtsp(rtsp::)" - -MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" - -S="${WORKDIR}/linux-rtsp" diff --git a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild b/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild deleted file mode 100644 index 0fa4da79..00000000 --- a/net-firewall/rtsp-conntrack/rtsp-conntrack-3.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-mod - -DESCRIPTION="RTSP module for netfilter/conntrack" -HOMEPAGE="http://mike.it-loops.com/rtsp" -SRC_URI="http://mike.it-loops.com/rtsp/rtsp-module-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="${PV}" -KEYWORDS="amd64 x86" -IUSE="debug" - -DEPEND="net-firewall/iptables - || ( - >=sys-kernel/stable-sources-${PV} - >=sys-kernel/longterm-sources-${PV} - >=sys-kernel/gentoo-sources-${PV} - >=sys-kernel/hardened-sources-${PV} - >=sys-kernel/mips-sources-${PV} - )" -RDEPEND="net-firewall/iptables" - -CONFIG_CHECK="NF_CONNTRACK" -WARNING_NF_CONNTRACK="You need to enable NF_CONNTRACK in your kernel" - -if use !debug ; then - BUILD_TARGETS="all" -else - BUILD_TARGETS="debug" -fi -BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}" - -MODULE_NAMES=" - nf_conntrack_rtsp(rtsp::) - nf_nat_rtsp(rtsp::)" - -MODULESD_NF_CONNTRACK_RTSP_DOCS="README.rst" - -S="${WORKDIR}/rtsp" -- cgit v1.2.3