diff --git a/net-analyzer/ucsniff/Manifest b/net-analyzer/ucsniff/Manifest index b7d09fa2d..c4db42286 100644 --- a/net-analyzer/ucsniff/Manifest +++ b/net-analyzer/ucsniff/Manifest @@ -1,10 +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-autoreconf_fix.patch 3774 RMD160 799331f47951afa6e0d8f031c90bddca07f3c231 SHA1 d6652c4f83f19bc70c3d243cd9cd25f184feaebf SHA256 aa77120b66b2c4d7b3665c45eca085948b42d09ef65b41a6568447c736e16d89 +AUX ucsniff-autoreconf_fix.patch 3571 RMD160 f9bb6015d35f42a2764764d8d3770495d5ab12b2 SHA1 b564b5a6cdc3847cddaa4e340745af560582a28d SHA256 cc5e3f2bbf2c3149a2caa389757b22cbb0704276e519e2c1887b43c8ee5d2868 +AUX ucsniff-mixed_types.patch 381 RMD160 84cf837a3f4c0f506e5a2adda830606aed907f85 SHA1 4120c2056c36f8162c6988fd801f8349a7150b8d SHA256 965120a916c6b0937b924d7ba4bfcb5d25a6496ff9dc263a40d1562a00eaf7e1 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 +EBUILD ucsniff-3.10.ebuild 1495 RMD160 4c7bd9b085e7e1673ac2c577cf8a898a1a4504ec SHA1 a89b91185cfcaa80ef99b20b12bf46fa97bbbf6e SHA256 ec38daf1f75dcb7539913c466b85e9ca20532e9bfb6f6d29d40291f1c9064279 diff --git a/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch b/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch index f7565c1b0..d3ac84bd9 100644 --- a/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch +++ b/net-analyzer/ucsniff/files/ucsniff-autoreconf_fix.patch @@ -6,18 +6,6 @@ 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 diff --git a/net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch b/net-analyzer/ucsniff/files/ucsniff-mixed_types.patch similarity index 65% rename from net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch rename to net-analyzer/ucsniff/files/ucsniff-mixed_types.patch index c50113908..49c09f7b3 100644 --- a/net-analyzer/ucsniff/files/pointers_and_ints_dont_mix.patch +++ b/net-analyzer/ucsniff/files/ucsniff-mixed_types.patch @@ -1,5 +1,5 @@ ---- ec_tcp.c.orig 2012-03-28 11:18:32.916135702 +0800 -+++ ec_tcp.c 2012-03-28 11:19:05.257132398 +0800 +--- src/protocols/ec_tcp.c.orig 2012-03-28 11:18:32.916135702 +0800 ++++ src/protocols/ec_tcp.c 2012-03-28 11:19:05.257132398 +0800 @@ -116,7 +116,7 @@ tcp = (struct tcp_header *)DECODE_DATA; diff --git a/net-analyzer/ucsniff/ucsniff-3.10.ebuild b/net-analyzer/ucsniff/ucsniff-3.10.ebuild index 9b0654d9e..d1560bf85 100644 --- a/net-analyzer/ucsniff/ucsniff-3.10.ebuild +++ b/net-analyzer/ucsniff/ucsniff-3.10.ebuild @@ -33,7 +33,7 @@ RDEPEND="${DEPEND}" pkg_setup() { #need to verify if plugins working if use plugins ; then - plugins? append-flags "-DLTDL_SHLIB_EXT='\".so\"'" + append-flags "-DLTDL_SHLIB_EXT='\".so\"'" fi } @@ -42,6 +42,7 @@ src_prepare () { epatch "${FILESDIR}"/$PN-rename-config.patch epatch "${FILESDIR}"/$PN-autoreconf_fix.patch epatch "${FILESDIR}"/$PN-plugins_shlib.patch + epatch "${FILESDIR}"/$PN-mixed_types.patch eautoreconf mv share/etter.conf share/ucsniff.conf }