From 8434e6892554c6e705c680265e3f410547ecb59e Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 7 Jan 2012 18:27:29 +0000 Subject: [PATCH] Fix bug #397881, thanks to Agostino Sarubbo. Shorten DESCRIPTION to something more fitting. Set RDEPEND. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- net-libs/libnids/ChangeLog | 9 +++++++-- net-libs/libnids/Manifest | 17 ++++++++++++++--- net-libs/libnids/files/libnids-1.18-elif.patch | 10 ++++++++++ net-libs/libnids/libnids-1.18-r1.ebuild | 8 +++++--- net-libs/libnids/libnids-1.24-r1.ebuild | 6 +++--- 5 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 net-libs/libnids/files/libnids-1.18-elif.patch diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog index 0850b2dfedd9..af95110e6ef7 100644 --- a/net-libs/libnids/ChangeLog +++ b/net-libs/libnids/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/libnids -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.43 2010/09/06 17:42:40 jer Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.44 2012/01/07 18:27:28 jer Exp $ + + 07 Jan 2012; Jeroen Roovers libnids-1.18-r1.ebuild, + +files/libnids-1.18-elif.patch, libnids-1.24-r1.ebuild: + Fix bug #397881, thanks to Agostino Sarubbo. Shorten DESCRIPTION to something + more fitting. Set RDEPEND. 06 Sep 2010; Jeroen Roovers libnids-1.18.ebuild, libnids-1.18-r1.ebuild, libnids-1.24.ebuild, libnids-1.24-r1.ebuild: diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest index 3a1e6b9b9c06..dbdb9f2cd9a6 100644 --- a/net-libs/libnids/Manifest +++ b/net-libs/libnids/Manifest @@ -1,10 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libnids-1.18-chksum.c-ebx.patch 615 RMD160 53ba9fe99c2175ff64277f485887d68a4695d1c2 SHA1 5dbf69478187792dc824366cf29ae74846c95a78 SHA256 7d092dfa010001e5935c1f1104a34cec061f813664501566a504b942d2232c78 +AUX libnids-1.18-elif.patch 230 RMD160 a7ec3357d13245bc54c8d2e1cd16d1630020856e SHA1 d33dc9026533d975a1799e1b422eabe10583026c SHA256 77bf2c870f012111c894ce7749f4fb5082484b196daa49b20c87fb019124480d AUX libnids-1.24-ldflags.patch 494 RMD160 d838d04e2ab8021eabfc7560315e71a48cec13e5 SHA1 ecdeec72628a325c9c838751e0d33f4ef312182b SHA256 e1d61d854398cd23570fb81cba078449d6c74a61644a3451b3f9c19d37c68ef9 DIST libnids-1.18.tar.gz 114013 RMD160 b33ba8237ba0bb31d2515bd5b7552449cfcca8f3 SHA1 3494e614e5e5d2f60f2ffe738307e60e77e04a81 SHA256 b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd DIST libnids-1.24.tar.gz 151021 RMD160 66a1a332a70b316fd83905887dc731b5bf28d715 SHA1 9a421df05cefdc4f5f7db95efc001b3c2b5249ce SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 -EBUILD libnids-1.18-r1.ebuild 941 RMD160 258f97552a8e1c05e29a81a9bbdd86d4bdee9265 SHA1 66cfe1da730573c04218b2aaa6fdeedfb0a6f3e1 SHA256 fc43c3858272fd54763a367c03765e32c9091cd44c7e834ae836c7d7042528f7 +EBUILD libnids-1.18-r1.ebuild 952 RMD160 08d27b97e12d8eff6deadc92fd5138a08586c43e SHA1 6b858e07b0fbe65a4052a4e7d54a296708c70e6f SHA256 89bd32fa40150df2841430f0dad930cb67f3f9bd6056787b9652ec38ae3dcea0 EBUILD libnids-1.18.ebuild 924 RMD160 598b3f1bdf06f3141b22a22fc4266eba2e4566fc SHA1 877996426d4d7f81ebe9d6a375246bbfb2f7ba0e SHA256 ade236a62537e98377ec2d83bcfe833db7089cb09acd0ab5cd3393874d729482 -EBUILD libnids-1.24-r1.ebuild 1081 RMD160 0756f82e2445c230ff180aa4a6675e0b27e6364a SHA1 c9ae0a5b0661118f6f423b092cbdb6ce50aa027a SHA256 6851f6385e7eb06deccc19e014a1f37c5a9c765527ce42b016b39952036bb0cb +EBUILD libnids-1.24-r1.ebuild 1038 RMD160 68701f474b43e99d1c8afd2bb0d6b76cdd449bdf SHA1 0b06a36e343c4c9cc941bcdd3f1df9734ef24158 SHA256 b8b5a14203a0be03b0b48f9a0ff483ec7dcaddbe256ab92a8b37b1dc995a484f EBUILD libnids-1.24.ebuild 908 RMD160 baa92d3b240e1830bbd4aa8cd671f60dc63d903c SHA1 c07e5c2841ddf7190ad93fe02e10344580561b0e SHA256 8efa40e07fdc808ac97ff56cb8b0dd04f4b90eaef3dfa70bbf03edf7f94a395b -MISC ChangeLog 6507 RMD160 46640f65a8e0721c81cfb0a3f190a16247c83e50 SHA1 1a611b95f6332c5f4ebbb085d42896baf7ed059a SHA256 74fe4d145fa5e202d53c8a423e813ecf405cabea38eb75f25216e75b345a3398 +MISC ChangeLog 6746 RMD160 cdf28e1cc506a00bc8a4c90af022d54dbb435791 SHA1 c3888fa7c446d88ea6a08297f73a54671b020443 SHA256 3d79c4446083cb4e38fda5d2abfc97648944cb8232a5743ac1d11fe57684cecd MISC metadata.xml 483 RMD160 2735c54f423a6bdd2d47536a7d22eec3b2717e2f SHA1 3012df70c36825300e4e78c707ccd4414b53db7d SHA256 fea8cd5f14b2ecdcb26227be10d73862452542ea2ac9e41738c8dd1a1a093015 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk8IjpYACgkQVWmRsqeSphPC0wCdEE4pwrJzcRdAVsDytIOrKQ6R +0yQAn2VonqvC5QmMbPRcRpT4S6eEf7oK +=WdXv +-----END PGP SIGNATURE----- diff --git a/net-libs/libnids/files/libnids-1.18-elif.patch b/net-libs/libnids/files/libnids-1.18-elif.patch new file mode 100644 index 000000000000..cabb883569e3 --- /dev/null +++ b/net-libs/libnids/files/libnids-1.18-elif.patch @@ -0,0 +1,10 @@ +--- src/killtcp.c.org 2002-08-21 18:19:40.000000000 +0200 ++++ src/killtcp.c 2012-01-07 19:15:45.451020838 +0100 +@@ -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-r1.ebuild b/net-libs/libnids/libnids-1.18-r1.ebuild index 6cca1126b56c..29d23aa08189 100644 --- a/net-libs/libnids/libnids-1.18-r1.ebuild +++ b/net-libs/libnids/libnids-1.18-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.18-r1.ebuild,v 1.3 2012/01/07 18:27:28 jer Exp $ EAPI="2" inherit eutils -DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection." +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" @@ -17,10 +17,12 @@ IUSE="" 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 } diff --git a/net-libs/libnids/libnids-1.24-r1.ebuild b/net-libs/libnids/libnids-1.24-r1.ebuild index 47b7832451fe..5df738bf48c6 100644 --- a/net-libs/libnids/libnids-1.24-r1.ebuild +++ b/net-libs/libnids/libnids-1.24-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r1.ebuild,v 1.2 2010/09/06 17:42:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r1.ebuild,v 1.3 2012/01/07 18:27:28 jer Exp $ EAPI="2" inherit eutils -DESCRIPTION="emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection." +DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System" HOMEPAGE="http://libnids.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -- 2.26.2