summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-04-08 18:37:48 +0000
committerJeroen Roovers <jer@gentoo.org>2014-04-08 18:37:48 +0000
commit74fc7a1ac48ac740fd123b33633aa574fb097d65 (patch)
tree94c31d82f71e0ce2fa1b3edee3ebb4390347cea4
parentvanilla-3.13.8 + genpatches-3.13-11 + grsecurity-3.0-3.13.9-201404062127 (diff)
downloadgentoo-2-74fc7a1ac48ac740fd123b33633aa574fb097d65.tar.gz
gentoo-2-74fc7a1ac48ac740fd123b33633aa574fb097d65.tar.bz2
gentoo-2-74fc7a1ac48ac740fd123b33633aa574fb097d65.zip
Remove 1.1 SLOT now that nothing depends on it.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
-rw-r--r--net-libs/libnids/ChangeLog7
-rw-r--r--net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch23
-rw-r--r--net-libs/libnids/files/libnids-1.18-elif.patch10
-rw-r--r--net-libs/libnids/libnids-1.18-r2.ebuild37
-rw-r--r--net-libs/libnids/libnids-1.18-r3.ebuild48
-rw-r--r--net-libs/libnids/libnids-1.18-r4.ebuild50
6 files changed, 6 insertions, 169 deletions
diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog
index bc65fdd02c8f..aeb2e49f94de 100644
--- a/net-libs/libnids/ChangeLog
+++ b/net-libs/libnids/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/libnids
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.64 2014/04/08 14:02:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.65 2014/04/08 18:37:48 jer Exp $
+
+ 08 Apr 2014; Jeroen Roovers <jer@gentoo.org> -libnids-1.18-r2.ebuild,
+ -libnids-1.18-r3.ebuild, -libnids-1.18-r4.ebuild,
+ -files/libnids-1.18-chksum.c-ebx.patch, -files/libnids-1.18-elif.patch:
+ Remove 1.1 SLOT now that nothing depends on it.
*libnids-1.24-r5 (08 Apr 2014)
*libnids-1.18-r4 (08 Apr 2014)
diff --git a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch b/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
deleted file mode 100644
index b3e9e2cf4a92..000000000000
--- a/net-libs/libnids/files/libnids-1.18-chksum.c-ebx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/checksum.c
-+++ b/src/checksum.c
-@@ -29,6 +29,7 @@
- movl 16(%esp),%ecx # Function arg: int len
- movl 12(%esp),%esi # Function arg: u_char *buff*/
-
-+" push %%ebx \n"
- " testl $2, %%esi \n"
- " jz 2f \n"
- " subl $2, %%ecx \n"
-@@ -84,10 +85,10 @@
- "5: movb (%%esi),%%cl \n"
- "6: addl %%ecx,%%eax \n"
- " adcl $0, %%eax \n"
--"7: \n"
-+"7: pop %%ebx \n"
- : "=a"(sum)
- : "0"(sum), "c"(len), "S"(buff)
-- : "bx", "dx");
-+ : "dx");
-
- return (sum);
- }
diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch
deleted file mode 100644
index cb7dfe8ee02b..000000000000
--- a/net-libs/libnids/files/libnids-1.18-elif.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/killtcp.c
-+++ b/src/killtcp.c
-@@ -100,6 +100,6 @@
- if (initialized)
- abort();
- }
--#elif
-+#else
- #error Something wrong with LIBNET_VER
- #endif
diff --git a/net-libs/libnids/libnids-1.18-r2.ebuild b/net-libs/libnids/libnids-1.18-r2.ebuild
deleted file mode 100644
index aebf2c8fc915..000000000000
--- a/net-libs/libnids/libnids-1.18-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r2.ebuild,v 1.5 2013/06/29 18:27:09 ago Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-DEPEND="net-libs/libpcap
- >=net-libs/libnet-1.1.0-r3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-chksum.c-ebx.patch \
- "${FILESDIR}"/${P}-elif.patch \
- "${FILESDIR}"/${PN}-1.24-ldflags.patch
-}
-
-src_configure() {
- econf --enable-shared
-}
-
-src_install() {
- emake install_prefix="${D}" install
- use static-libs || rm -f "${D}"/usr/lib*/libnids.a
- dodoc CHANGES CREDITS MISC README
-}
diff --git a/net-libs/libnids/libnids-1.18-r3.ebuild b/net-libs/libnids/libnids-1.18-r3.ebuild
deleted file mode 100644
index 918eb180436a..000000000000
--- a/net-libs/libnids/libnids-1.18-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r3.ebuild,v 1.1 2014/03/19 15:47:03 jer Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND="
- net-libs/libpcap
- >=net-libs/libnet-1.1.0-r3
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-chksum.c-ebx.patch \
- "${FILESDIR}"/${P}-elif.patch \
- "${FILESDIR}"/${PN}-1.24-ldflags.patch \
- "${FILESDIR}"/${PN}-1.24-static-libs.patch
-}
-
-src_configure() {
- tc-export AR
- econf --enable-shared
-}
-
-src_compile() {
- emake shared $(usex static-libs static '')
-}
-
-src_install() {
- local tgt
- for tgt in _installshared $(usex static-libs _install ''); do
- emake install_prefix="${D}" ${tgt}
- done
-
- dodoc CHANGES CREDITS MISC README
-}
diff --git a/net-libs/libnids/libnids-1.18-r4.ebuild b/net-libs/libnids/libnids-1.18-r4.ebuild
deleted file mode 100644
index 9b781f772f49..000000000000
--- a/net-libs/libnids/libnids-1.18-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r4.ebuild,v 1.1 2014/04/08 14:02:10 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://www.packetfactory.net/Projects/libnids/"
-SRC_URI="http://www.packetfactory.net/Projects/libnids/dist/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND="
- net-libs/libpcap
- >=net-libs/libnet-1.1.0-r3
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-chksum.c-ebx.patch \
- "${FILESDIR}"/${P}-elif.patch \
- "${FILESDIR}"/${PN}-1.24-ldflags.patch \
- "${FILESDIR}"/${PN}-1.24-static-libs.patch
-}
-
-src_configure() {
- tc-export AR
- append-flags -fno-strict-aliasing
-
- econf --enable-shared
-}
-
-src_compile() {
- emake shared $(usex static-libs static '')
-}
-
-src_install() {
- local tgt
- for tgt in _installshared $(usex static-libs _install ''); do
- emake install_prefix="${D}" ${tgt}
- done
-
- dodoc CHANGES CREDITS MISC README
-}