From 513ae3f2cc02666d89220b5cf89b55c105ff8726 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Wed, 28 Mar 2012 06:39:16 +0000 Subject: [PATCH] ucsniff: version dump with the proper fix for the autoreconf and ucsniff.conf --- net-analyzer/ucsniff/Manifest | 7 +- .../files/pointers_and_ints_dont_mix.patch | 11 ++ .../files/ucsniff-autoreconf_fix.patch | 101 ++++++++++++++++++ .../ucsniff/files/ucsniff-plugins_shlib.patch | 15 +++ .../ucsniff/files/ucsniff-rename-config.patch | 13 +++ net-analyzer/ucsniff/ucsniff-3.10.ebuild | 61 +++++++++++ 6 files changed, 207 insertions(+), 1 deletion(-) create mode 100644 net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch create mode 100644 net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch create mode 100644 net-analyzer/ucsniff/files/ucsniff-plugins_shlib.patch create mode 100644 net-analyzer/ucsniff/ucsniff-3.10.ebuild diff --git a/net-analyzer/ucsniff/Manifest b/net-analyzer/ucsniff/Manifest index 19bc2febe..b7d09fa2d 100644 --- a/net-analyzer/ucsniff/Manifest +++ b/net-analyzer/ucsniff/Manifest @@ -1,5 +1,10 @@ +AUX pointers_and_ints_dont_mix.patch 353 RMD160 8a672f89ab2b90e84b83dbfe5dbd450e484b634b SHA1 f72d0db8adc8f46d1e1d1e2bbe251849dbc86fbc SHA256 8a2ff4afc5652546b06c9c5bf154197d9e559657cfcc56e2ab86c18c6edd6a2a AUX ucsniff-as-needed.patch 667 RMD160 00b49e6429ed89caf82353e09f9b697d89caba71 SHA1 a419ad3ab0ce2f898e2a9829cdc8c0619a6042cf SHA256 2016fd16041387236333c87b765695937afd71395b936aa369fe48cd1c19c0d9 -AUX ucsniff-rename-config.patch 483 RMD160 5daf2453a09f8739a634316563ad25a298ed4be2 SHA1 849f3ce510553edc60ccd346687232ce45fce137 SHA256 8105d1394ffba58b258c28ed11e4c29156af4b7a21627ac58e9b604342d789de +AUX ucsniff-autoreconf_fix.patch 3774 RMD160 799331f47951afa6e0d8f031c90bddca07f3c231 SHA1 d6652c4f83f19bc70c3d243cd9cd25f184feaebf SHA256 aa77120b66b2c4d7b3665c45eca085948b42d09ef65b41a6568447c736e16d89 +AUX ucsniff-plugins_shlib.patch 445 RMD160 29fc5d7375f5232994eaf7573b7ca9de5ec9e9cc SHA1 e9b189799495947611cfd9d6e4a5457244e73737 SHA256 c63a5d7787a769d28c883ab3f9d13b1b49e5fe3a00fa57e28dbaf3ad44efc8e5 +AUX ucsniff-rename-config.patch 858 RMD160 9765d2b1ba0542bd78454104919a9bc7935ff51b SHA1 24277efd56065dd0ec7664e7ceb5a1e5294fa578 SHA256 f1b5356965d489d11b7a8cf5a3ff30526b8c82e8243507dec4638cef35c4de75 DIST ucsniff-3.08.tar.gz 4204027 RMD160 4b16246748f03d728b9108e5a16283cb18451d59 SHA1 da2881b5342f40efa3390eb525933499f15d2099 SHA256 1a0ddc9ba4372a13f8904f49ca1ca5c31239aaf3691817f332a5aad95639db73 +DIST ucsniff-3.10.tar.gz 18841423 RMD160 2c19649bb9db94308d65b4274c7ebe5fba8c5798 SHA1 4f3cef48f385144280214823d2cfbba3f9d15448 SHA256 27ff14377bd6b348fad27ace470a0a8be9fb32fb146373c3fc57a6467e5e9d26 EBUILD ucsniff-3.08-r1.ebuild 1237 RMD160 ddefcce32ae5f2c97f87abb34c4e62fd1d235e18 SHA1 53b370dc20b0ee6a604bd9acf9998171909d5b0a SHA256 81084b7f2fd21c134b521e900ab7c60fb8b852ec3506774baf319fa7e21e1143 EBUILD ucsniff-3.08-r2.ebuild 1328 RMD160 7dfcbcc75c83a3332729311ab76bf9975b23252b SHA1 ae9fad5d9c32435c01f364374b752f2b38037b71 SHA256 591159ebd9f88c1d8754ff64a73eb7a996982bb08490fe87b8f1c7730d3f776f +EBUILD ucsniff-3.10.ebuild 1460 RMD160 549e6bc17f2e938978923b4e8d5d911876f622fc SHA1 a3ef81380a6e50fdbc0811d22ac56e75d8b2215d SHA256 a534317f4ec15dcbc975fb77f565f765bc7bbfe719a6100ff8daf1095a6c03dc diff --git a/net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch b/net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch new file mode 100644 index 000000000..c50113908 --- /dev/null +++ b/net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch @@ -0,0 +1,11 @@ +--- ec_tcp.c.orig 2012-03-28 11:18:32.916135702 +0800 ++++ ec_tcp.c 2012-03-28 11:19:05.257132398 +0800 +@@ -116,7 +116,7 @@ + tcp = (struct tcp_header *)DECODE_DATA; + + opt_start = (u_char *)(tcp + 1); +- opt_end = (u_char *)((int)tcp + tcp->off * 4); ++ opt_end = (u_char *)(tcp + tcp->off * 4); + + DECODED_LEN = (u_int32)(tcp->off * 4); + diff --git a/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch b/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch new file mode 100644 index 000000000..f7565c1b0 --- /dev/null +++ b/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch @@ -0,0 +1,101 @@ +--- configure.in.orig 2011-06-03 07:08:20.000000000 +0800 ++++ configure.in 2012-03-28 13:06:53.512838200 +0800 +@@ -1,4 +1,4 @@ +-fdnl ++dnl + dnl ucsniff -- configure script + dnl + dnl Copyright (C) ALoR & NaGA +@@ -29,6 +29,11 @@ + dnl Force automake 1.7 or better + dnl AM_INIT_AUTOMAKE(1.7.0) + ++dnl fixes ++AC_PROG_CXX ++ ++AC_PROG_LIBTOOL ++ + dnl Do not recompile configure Makefile et similia + AM_MAINTAINER_MODE + +@@ -202,6 +207,7 @@ + + AC_PROG_CC + AM_PROG_CC_STDC ++AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_GCC_TRADITIONAL +@@ -322,16 +328,16 @@ + + dnl AC_REPLACE_FUNCS(strlcpy) + +-AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(missing/strlcpy) AM_CONDITIONAL(MISSING_STRLCPY, true)]) +-AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(missing/strlcat) AM_CONDITIONAL(MISSING_STRLCAT, true)]) +-AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(missing/strsep) AM_CONDITIONAL(MISSING_STRSEP, true)]) +-AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(missing/memmem) AM_CONDITIONAL(MISSING_MEMMEM, true)]) +-AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(missing/memcmp) AM_CONDITIONAL(MISSING_MEMCMP, true)]) +-AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(missing/basename) AM_CONDITIONAL(MISSING_BASENAME, true)]) +-AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(missing/getopt) AM_CONDITIONAL(MISSING_GETOPT_LONG, true)]) +-AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(missing/strcasestr) AM_CONDITIONAL(MISSING_STRCASESTR, true)]) +-AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(missing/scandir) AM_CONDITIONAL(MISSING_SCANDIR, true)]) +-AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(missing/inet_aton) AM_CONDITIONAL(MISSING_INET_ATON, true)]) ++AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(strlcpy) AM_CONDITIONAL(MISSING_STRLCPY, true)]) ++AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(strlcat) AM_CONDITIONAL(MISSING_STRLCAT, true)]) ++AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(strsep) AM_CONDITIONAL(MISSING_STRSEP, true)]) ++AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(memmem) AM_CONDITIONAL(MISSING_MEMMEM, true)]) ++AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(memcmp) AM_CONDITIONAL(MISSING_MEMCMP, true)]) ++AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(basename) AM_CONDITIONAL(MISSING_BASENAME, true)]) ++AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(getopt) AM_CONDITIONAL(MISSING_GETOPT_LONG, true)]) ++AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(strcasestr) AM_CONDITIONAL(MISSING_STRCASESTR, true)]) ++AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(scandir) AM_CONDITIONAL(MISSING_SCANDIR, true)]) ++AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(inet_aton) AM_CONDITIONAL(MISSING_INET_ATON, true)]) + + AC_CHECK_LIB(resolv, inet_aton, + AM_CONDITIONAL(INET_ATON_WANTS_RESOLV, true), +@@ -530,6 +536,7 @@ + dnl ================== + + dnl FFMpeg library and LibVlc cannot be compiled together. Linking issue. Until then enable either libvlc or ffmpeg libraries. ++AH_TEMPLATE(HAVE_VIDEO_DECODER, [have video decoder]) + AC_DEFINE(HAVE_VIDEO_DECODER, 1) + ac_ec_video_decoder=yes + if test "$ac_ec_video_decoder" = "yes"; then +--- src/Makefile.am.orig 2011-06-03 07:08:23.000000000 +0800 ++++ src/Makefile.am 2012-03-28 13:08:58.979832331 +0800 +@@ -3,6 +3,8 @@ + + include $(top_srcdir)/Makefile.am.common + ++AUTOMAKE_OPTIONS = subdir-objects ++ + SUBDIRS = os interfaces + + bin_PROGRAMS = ucsniff +--- man/Makefile.am.orig 2011-06-03 07:08:19.000000000 +0800 ++++ man/Makefile.am 2012-03-28 13:24:19.541790450 +0800 +@@ -13,15 +13,15 @@ + + CLEANFILES = *.8 *.5 *.ps *.pdf + +-pdf: $(man_MANS:.8=.ps) $(man_MANS:.5=.ps) ++# pdf: $(man_MANS:.8=.ps) $(man_MANS:.5=.ps) + +-%.ps: %.8 +- groff -mandoc -Tps $< > $@; +- ps2pdf13 $@ $(*F).pdf; +- rm -f *.ps ++#%.ps: %.8 ++# groff -mandoc -Tps $< > $@; ++# ps2pdf13 $@ $(*F).pdf; ++# rm -f *.ps + +-%.ps: %.5 +- groff -mandoc -Tps $< > $@; +- ps2pdf13 $@ $(*F).pdf; +- rm -f *.ps ++#%.ps: %.5 ++# groff -mandoc -Tps $< > $@; ++# ps2pdf13 $@ $(*F).pdf; ++# rm -f *.ps + diff --git a/net-analyzer/ucsniff/files/ucsniff-plugins_shlib.patch b/net-analyzer/ucsniff/files/ucsniff-plugins_shlib.patch new file mode 100644 index 000000000..572cf34c3 --- /dev/null +++ b/net-analyzer/ucsniff/files/ucsniff-plugins_shlib.patch @@ -0,0 +1,15 @@ +--- src/vc_plugins.c.orig 2012-03-28 12:50:38.576882855 +0800 ++++ src/vc_plugins.c 2012-03-28 13:31:35.717770627 +0800 +@@ -131,7 +131,12 @@ + int plugin_filter(const struct dirent *d) + #endif + { ++/* ++ the following fails to compile: + if ( match_pattern(d->d_name, PLUGIN_PATTERN LTDL_SHLIB_EXT) ) ++ Also, we look for *.so instead of *.dll here ++*/ ++ if ( match_pattern(d->d_name, PLUGIN_PATTERN ".so") ) + return 1; + + return 0; diff --git a/net-analyzer/ucsniff/files/ucsniff-rename-config.patch b/net-analyzer/ucsniff/files/ucsniff-rename-config.patch index a585aac45..ff13d4abd 100644 --- a/net-analyzer/ucsniff/files/ucsniff-rename-config.patch +++ b/net-analyzer/ucsniff/files/ucsniff-rename-config.patch @@ -9,3 +9,16 @@ #define ETTER_DNS "etter.dns" #define ETTER_FIELDS "etter.fields" #define CERT_FILE "etter.ssl.crt" +--- share/Makefile.am.orig 2011-06-03 07:08:54.000000000 +0800 ++++ share/Makefile.am 2012-03-28 13:52:40.853712634 +0800 +@@ -17,8 +17,8 @@ + etterfilter.cnt \ + etterfilter.tbl \ + etterlog.dtd \ +- ettercap.png ++ ettercap.png + +-sysconf_DATA = etter.conf ++sysconf_DATA = ucsniff.conf + + EXTRA_DIST = etter* diff --git a/net-analyzer/ucsniff/ucsniff-3.10.ebuild b/net-analyzer/ucsniff/ucsniff-3.10.ebuild new file mode 100644 index 000000000..9b0654d9e --- /dev/null +++ b/net-analyzer/ucsniff/ucsniff-3.10.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# most of the god-awful ugly stuff in here is due to ettercap +# workarounds and patches stolen from the ettercap ebuilds +WANT_AUTOMAKE="1.11" + +EAPI="4" + +inherit flag-o-matic eutils autotools + +DESCRIPTION="ip video sniffer" +HOMEPAGE="http://ucsniff.sourceforge.net" +SRC_URI="mirror://sourceforge/$PN/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~x86" +IUSE="debug plugins vlc X ffmpeg x264" + +DEPEND="X? ( x11-libs/libXext + media-libs/freetype ) + sys-libs/zlib + net-libs/libpcap + net-libs/libnet + media-libs/alsa-lib + vlc? ( media-video/vlc ) + ffmpeg? ( media-video/ffmpeg ) + x264? ( media-video/ffmpeg[x264] )" +RDEPEND="${DEPEND}" + +pkg_setup() { + #need to verify if plugins working + if use plugins ; then + plugins? append-flags "-DLTDL_SHLIB_EXT='\".so\"'" + fi +} + +src_prepare () { + epatch "${FILESDIR}"/$PN-as-needed.patch + epatch "${FILESDIR}"/$PN-rename-config.patch + epatch "${FILESDIR}"/$PN-autoreconf_fix.patch + epatch "${FILESDIR}"/$PN-plugins_shlib.patch + eautoreconf + mv share/etter.conf share/ucsniff.conf +} + +src_configure() { + econf \ + $(use_enable X gui) \ + $(use_enable vlc libvlc) \ + $(use_enable debug) \ + $(use_enable plugins) +} + +src_install() { + DESTDIR="${D}" emake install || die + rm -r "${D}"/usr/share/man/man8 || die + mv "${D}"/usr/share/man/man5/etter.conf.5 "${D}"/usr/share/man/man5/ucsniff.conf.5 || die +}