commit: 118a1b83a6822c9d4cd5bf4fe487dffff503e695
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 18:03:32 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 18:05:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118a1b83
net-analyzer/netsniff-ng: Version bump (bug 565834, thanks Manuel Rüger), drop
old.
Package-Manager: portage-2.2.21
net-analyzer/netsniff-ng/Manifest | 3 +-
.../files/netsniff-ng-0.5.6-man-no-compress.patch | 41 ----------------------
.../netsniff-ng/netsniff-ng-0.5.7-r1.ebuild | 30 ----------------
...g-0.5.9_rc3.ebuild => netsniff-ng-0.6.0.ebuild} | 12 +++----
4 files changed, 6 insertions(+), 80 deletions(-)
diff --git a/net-analyzer/netsniff-ng/Manifest
b/net-analyzer/netsniff-ng/Manifest
index 31dd32d..c39b824 100644
--- a/net-analyzer/netsniff-ng/Manifest
+++ b/net-analyzer/netsniff-ng/Manifest
@@ -1,4 +1,3 @@
-DIST netsniff-ng-0.5.7-r1.tar.gz 2957112 SHA256
ab4e1ef6aadb00b998349aff66e4e1cec53910113344c53ac8eb947fd46b5e89 SHA512
b400d8b21edb4395b946ac105bbb25a83330151e09d1efd130537375930ea03b928c166b792f44ccbacfa72f9de818c37553a0be98970c26da5ba255a1f2d6c1
WHIRLPOOL
b83e1351e60fdaa076e611fd308b61be549a1cc6663f6039affd3fa3be002ec485776f67ceba54879584fc1822a9ad178141833ac5522d2444e67859cf8fbe58
DIST netsniff-ng-0.5.8.tar.xz 523616 SHA256
c413e7f34bd9bd80937cd8d4bcd6780e126e2ffccc3dc34b271f105efd622e44 SHA512
1d58cf7a5388b8adb4512d97150992d6b8ebe43910442b952cecd8d03898a2e51f721711f2d1b406cbd00b4ccb548e33da4cb95530d7e92f082eea6b08efec99
WHIRLPOOL
a73b8d67d5ca2cc40d5c9e1535f0a50a7968f102a1a5684f8bec0e7079140c0605dace126de23abca3f53a31db90da8f5fedeca0eea27621983743d88d74d416
-DIST netsniff-ng-0.5.9-rc3.tar.xz 525204 SHA256
dba8aaefbb1cf59e629e4fcb369be22e4817e132e0e0cca781c424b46b67d87c SHA512
060e356cd7d80bd9ab163a7474a0718d2429ae88711bb6ae804a2fe3c8afc052d115412aa5cb324bbeb1ef49bdfcf257b0016c7b8051056c339124272bf1311d
WHIRLPOOL
2c19c706346b1ab0dc9dcd81217ac3fd27495ae7a94aac9185f9cfe412614a494dc3442d47ce35ec4bca4b8d1813504cebc406081c3b1ed2a5f3ae561350eaf7
DIST netsniff-ng-0.5.9.tar.xz 541304 SHA256
e0156074bdd146dd71edcd63fa3944b658a3bce5279e0a4128578636a9700b6c SHA512
ebcfc1569f6c2380ebd4f797614da37eaba08991478d776b547c5f68f0f2df0548339c30f9487f73f1963b71eb4b4fccf3d2bd87d5574893494f0ca0534eb0d8
WHIRLPOOL
e8f9d973e50eca1dcf21faf17ab351d8e92e32464878a2bdd0d0ff633c6a33aee4be8e765e24996dc81441139587092da374a34b41437af838aab08512d18eae
+DIST netsniff-ng-0.6.0.tar.xz 554612 SHA256
f2e77d49e2f3aed78838827695bb2efade79e8d7126c7d81656425fd1bd56159 SHA512
a77d548cc16ef175b120945428e07e8ff2aaabba6add239b7f42429811bbb6e024ace92a15944551c45025b185f1df5aa3dee4500ff9ecb30536ec9a8deded74
WHIRLPOOL
33abcec54c5839332deb4ea06d687ed4748d25cdb2842a8d193176db369dff52c773bbcefed76d3cfe926152dcbc5f87553e7b9c1c29dbc84014f4a4e27d8f79
diff --git
a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
b/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
deleted file mode 100644
index 5c4f66e..0000000
--- a/net-analyzer/netsniff-ng/files/netsniff-ng-0.5.6-man-no-compress.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
-+++ netsniff-ng-0.5.6/src/cmake/modules/Pod2Man.cmake
-@@ -12,16 +12,11 @@
-
- MACRO(POD2MAN PODFILE MANFILE SECTION)
- FIND_PROGRAM(POD2MAN pod2man)
-- FIND_PROGRAM(GZIP gzip)
-
- IF(NOT POD2MAN)
- MESSAGE(FATAL ERROR "Need pod2man installed to generate man
page")
- ENDIF(NOT POD2MAN)
-
-- IF(NOT GZIP)
-- MESSAGE(FATAL ERROR "Need gzip installed to compress man page")
-- ENDIF(NOT GZIP)
--
- IF(NOT EXISTS ${PODFILE})
- MESSAGE(FATAL ERROR "Could not find pod file ${PODFILE} to
generate man page")
- ENDIF(NOT EXISTS ${PODFILE})
-@@ -34,19 +29,13 @@
- ${PODFILE} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
- )
-
-- ADD_CUSTOM_COMMAND(
-- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-- COMMAND ${GZIP} -c
${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} >
${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
-- )
--
- SET(MANPAGE_TARGET "man-${MANFILE}")
-
-- ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
-+ ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION})
- ADD_DEPENDENCIES(man ${MANPAGE_TARGET})
-
- INSTALL(
-- FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
- DESTINATION share/man/man${SECTION}
- )
- ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild
b/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild
deleted file mode 100644
index bfbed42..0000000
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.7-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils eutils
-
-DESCRIPTION="high performance network sniffer for packet inspection"
-HOMEPAGE="http://netsniff-ng.org/";
-SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:1.1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.5.6-man-no-compress.patch
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc ../{AUTHORS,README,REPORTING-BUGS}
-}
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
similarity index 85%
rename from net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
rename to net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
index b82c678..90f7145 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.5.9_rc3.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,8 +8,7 @@ inherit eutils multilib toolchain-funcs
DESCRIPTION="high performance network sniffer for packet inspection"
HOMEPAGE="http://netsniff-ng.org/";
-MY_P=${P/_rc/-rc}
-SRC_URI="http://pub.${PN}.org/${PN}/${MY_P}.tar.xz";
+SRC_URI="http://pub.${PN}.org/${PN}/${P}.tar.xz";
LICENSE="GPL-2"
SLOT="0"
@@ -31,12 +30,11 @@ DEPEND="${RDEPEND}
=net-libs/nacl-0_p20110221*
virtual/pkgconfig"
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
sed -e '/CFLAGS/s:?=:+=:' \
+ -e '/CPPFLAGS/s:?=:+=:' \
-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
- -i Makefile || die
+ -i Makefile || die
if ! grep nacl-20110221 curvetun/nacl_build.sh >/dev/null ; then
die "have nacl-20110221, expected $(grep ${MY_NACL_P}
curvetun/nacl_build.sh)"
@@ -50,7 +48,7 @@ src_prepare() {
src_compile() {
emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
- LEX=lex YAAC=bison STRIP=@true \
+ LEX=lex YAAC=bison STRIP=true \
Q= HARDENING=1
}
