diff options
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/siphon/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/siphon/Manifest | 16 | ||||
| -rw-r--r-- | net-analyzer/siphon/files/siphon-666-gentoo.patch | 19 | ||||
| -rw-r--r-- | net-analyzer/siphon/files/siphon-666-log.patch | 46 | ||||
| -rw-r--r-- | net-analyzer/siphon/metadata.xml | 1 | ||||
| -rw-r--r-- | net-analyzer/siphon/siphon-666-r1.ebuild | 28 |
6 files changed, 91 insertions, 28 deletions
diff --git a/net-analyzer/siphon/ChangeLog b/net-analyzer/siphon/ChangeLog index bbfd592d810c..939ec2b1bd9f 100644 --- a/net-analyzer/siphon/ChangeLog +++ b/net-analyzer/siphon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/siphon -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.19 2012/12/05 16:28:50 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.20 2014/07/17 01:09:22 jer Exp $ + + 17 Jul 2014; Jeroen Roovers <jer@gentoo.org> siphon-666-r1.ebuild, + +files/siphon-666-gentoo.patch, +files/siphon-666-log.patch, metadata.xml: + EAPI bump. Fix compiler warning. Convert sed scripts to patches. Remove short + <longdescription>. 05 Dec 2012; Jeroen Roovers <jer@gentoo.org> -siphon-666.ebuild, siphon-666-r1.ebuild: diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest index 0fceaf2a82b0..eb77ef5b6ece 100644 --- a/net-analyzer/siphon/Manifest +++ b/net-analyzer/siphon/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX siphon-666-gentoo.patch 441 SHA256 044a0d7c2ca58f63024f3e5dda998e392ede3bb20453b35bf81ac7ade7fd71e4 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5 WHIRLPOOL 31722e133e09827ca63078d1e08bbf903bfe36e7f14931d5c4e5339c3ccc1a81ec743786a5a913bae0dab749405e26b5cb479d27d292bcc69f74009bbce54ab4 +AUX siphon-666-log.patch 1177 SHA256 0b0c724de8aee69e79f7b4039b0363918c26837971f33cd3981722c4cd784879 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce WHIRLPOOL 0d87dcc647e4798dc9809972c695490309a1504babd52fefd6d348493d8a5eac49a89a96b5e6c4440fb03d24c44bda3a0007815a0793c376882ef4a0560134fc DIST siphon-v.666.tar.gz 6951 SHA256 797063d1d38017aef05b78d7e475cc5fbbb3c7efebb62fdda8eb38a6271ec297 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a WHIRLPOOL 7aa1faea6d9e486afc337b66c34e605f3ccabe0d2f7f8aa580e751e08efa9237d5b5f2744d9a66e9b9db32dd5c086fcfc3149a650771474fbdf8c668b9c1ec18 -EBUILD siphon-666-r1.ebuild 925 SHA256 45876c676c3aee71018fe918e7e19b3a5a9c08e0b405bae2fb74fcc11a8a2536 SHA512 fe2cff1bacf8b73e759eed3ea55246e326e00d82be03d95ab28ee0bbba724b63a8146a31e6e58ac6ff126e141561093646a478156dd81d8a4184f187535b326e WHIRLPOOL efb6b21b96cd358ba4d5c7eed088f23d00be542396a741f30994c17a1573fd004ad241a22c29ae63fbda51c4ff65051aa41a5923c3be96d3feb5ca19f9780d4b -MISC ChangeLog 2227 SHA256 5b8b00252dcccb4af913fca247df916747145d845645e8afe1434e2c4e7011b1 SHA512 8b3abcc7720762babe0938f0595141cf4293f959117b3c29c71ea227c1a19187156fdd9adae81e1a32022770da3c36bd47dbab5ebaaaca31c6498e8c041cb591 WHIRLPOOL f4f5f5635fddd984cce2d4337b6cba70624b26802d0239e1cdf8a97bafe305c09ab684fbd1cd7ef64f4ebe879dde4a7774a8107e986350d190824ab0b80bf2ef -MISC metadata.xml 235 SHA256 e454f5b1e76985e87d3e4e00b173f6edfd39dd5fa716813ae68dd114f0984ce9 SHA512 e3bcef7b81d84cf387233aa97456d483f49293174326a0c8111c7e750a21b44331be6d1c5ee92e1c8f8e00427834421c3bc61c447a8cd3e2bf654452400bcb4d WHIRLPOOL 815f74f8743cb738edff5dd32784aed36bafd08d91f6ef75b9f12edbc43649445d7c477d4919383f7341cfa9955e9325e87e7d627b71a7129f482707024c3e20 +EBUILD siphon-666-r1.ebuild 749 SHA256 f4dafd4166d435f91c872b849d2fd9c8320e670d27aa28071097bcb81ff402d9 SHA512 2e4b8d0190c459e3bdc05c15e7a6a9134066344c78b142737be6709e236c029674e8a50d4ee7b2c110b885ebd36235b8b767cdfdc1a0fc522da8e3b74266aaf9 WHIRLPOOL e58ade8dc25116e8d1ea598795da5c9ffa34bc3d094d80d59c783f928a117ca8acc65c144a7e6407f8d436d289d158b1ec30026d05a1672b19c66f5dcada0043 +MISC ChangeLog 2475 SHA256 0aa5b58accc35dced57a587dd23fef7599fcd1632091343dd11540801b2dce91 SHA512 495bba2eca4123de7d0406be06b088f4ee33cfd4f83d7a4a716f48985386f3e81cd863be5a459dbcb5a363961cac90fc26073ec2f37bc7326f3ca4ffec873db1 WHIRLPOOL b199660f9a267bb83cb99b6f01c33870a67422441867a5e4b1f84baada19532eb586dd54d5ba7b0bf30ea11123a1c8fa43c2fb38f6a0dcb063689d37878cbec7 +MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlC/dkMACgkQVWmRsqeSphMLCwCeNOQMpWkouikSy8b8ZNw8zpEB -6OoAn2w86gADrVs8yx2ON3r4v9eedMlf -=fRut +iEYEAREIAAYFAlPHIkMACgkQVWmRsqeSphP+kwCfZVjqGyT6PM3yGdZn3LlivbU/ +3McAnjdKWyx3CMlrle8+R9sbWKXi7CLa +=q6Rq -----END PGP SIGNATURE----- diff --git a/net-analyzer/siphon/files/siphon-666-gentoo.patch b/net-analyzer/siphon/files/siphon-666-gentoo.patch new file mode 100644 index 000000000000..eea6d93b802e --- /dev/null +++ b/net-analyzer/siphon/files/siphon-666-gentoo.patch @@ -0,0 +1,19 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + CC = gcc + CCFLAGS = -Wall -pthread -ggdb +-CFLAGS = -Wall -O2 -pthread -ggdb -I. ++CFLAGS += -pthread -Wall -I. + LIBS = -lpcap + OBJS = parse.o sniff.o main.o log.o + SRCS = ${OBJS:.o=.c} +@@ -9,7 +9,7 @@ + all: $(TARGET) + + $(TARGET): $(OBJS) +- $(CC) $(CCFLAGS) -o $(TARGET) $(OBJS) $(LIBS) ++ $(CC) $(CCFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) + + clean: + rm -f $(OBJS) *~ *.core core siphon diff --git a/net-analyzer/siphon/files/siphon-666-log.patch b/net-analyzer/siphon/files/siphon-666-log.patch new file mode 100644 index 000000000000..07d2de4d4d12 --- /dev/null +++ b/net-analyzer/siphon/files/siphon-666-log.patch @@ -0,0 +1,46 @@ +--- a/main.c ++++ b/main.c +@@ -98,7 +98,7 @@ + pti_parse.pti_pd[1] = pd_parse2log[1]; + + pthread_create (&parse_thread, NULL, (void *) parse, &pti_parse); +- pthread_create(&log_thread,NULL,(void *)log, (void *)pd_parse2log[0]); ++ pthread_create(&log_thread,NULL,(void *)siphon_log, (void *)pd_parse2log[0]); + pthread_create (&sniff_thread, NULL, (void *) sniff_network, + &pd_sniff2parse[1]); + +--- a/log.c ++++ b/log.c +@@ -19,7 +19,7 @@ + + int tag = 0; + +-void *log(void *pipe) ++void *siphon_log(void *pipe) + { + struct parse2log *info; + char hashed[100], buf[1024], *os, *proto = NULL, *df; +@@ -137,10 +137,10 @@ + FILE *osprints; + static char line[80], *oswin, *osttl, *osdf, *os, hexed[10]; + static int check = 0; +- osprints = fopen("osprints.conf","r"); ++ osprints = fopen("/etc/osprints.conf","r"); + + if(!osprints) { +- perror("Unable to find osprints.conf\n"); ++ perror("Unable to find /etc/osprints.conf\n"); + return "Unknown"; + } + +--- a/siphon.h ++++ b/siphon.h +@@ -49,7 +49,7 @@ + + void *sniff_network (void *); + void *parse (void *); +-void *log(void *); ++void *siphon_log(void *); + + char *device, *logfile; + int verbose, back; diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml index 7b7dc6840d0c..03aa50bab7e3 100644 --- a/net-analyzer/siphon/metadata.xml +++ b/net-analyzer/siphon/metadata.xml @@ -2,5 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>netmon</herd> -<longdescription>A portable passive network mapping suite</longdescription> </pkgmetadata> diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild index 62028cb36f6f..c9714eb29b04 100644 --- a/net-analyzer/siphon/siphon-666-r1.ebuild +++ b/net-analyzer/siphon/siphon-666-r1.ebuild @@ -1,43 +1,35 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/siphon-666-r1.ebuild,v 1.5 2012/12/05 16:28:50 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/siphon-666-r1.ebuild,v 1.6 2014/07/17 01:09:22 jer Exp $ -EAPI="2" - -inherit toolchain-funcs +EAPI=5 +inherit eutils toolchain-funcs MY_P=${PN}-v.${PV} DESCRIPTION="A portable passive network mapping suite" -SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz" HOMEPAGE="http://siphon.datanerds.net/" - -SLOT="0" +SRC_URI="${HOMEPAGE}${MY_P}.tar.gz" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~ppc x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" -IUSE="" S=${WORKDIR}/${MY_P} src_prepare() { - sed -i log.c \ - -e 's:osprints\.conf:/etc/osprints.conf:' \ - || die "sed log.c" - sed -i Makefile \ - -e '/^CFLAGS/s:=.*:+= -pthread -Wall -I.:g' \ - -e 's: -o : $(LDFLAGS)&:g' \ - || die "sed Makefile" + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-log.patch } src_compile() { - emake CC=$(tc-getCC) || die + emake CC="$(tc-getCC)" } src_install() { - dobin ${PN} || die "dobin ${PN}" + dobin ${PN} insinto /etc doins osprints.conf dodoc README |