mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 12:30:44 +02:00
wireshark: fix btbb to not require external deps for patches
This commit is contained in:
Zero_Chaos
parent
3f716f1116
commit
433222c249
3 changed files with 105 additions and 14 deletions
|
|
@ -1,6 +1,8 @@
|
|||
AUX wireshark-1.6.6-gtk-pcap.patch 841 RMD160 a1b003dcf1deee02fe2c15b96cbfda50c094d64d SHA1 0d8ea55014b696c04d91e73780af2109b86cddaa SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a
|
||||
AUX wireshark-1.8.0-underlinking.patch 239 RMD160 282d69f135255b86efc5fe97df99e649ffca8d1b SHA1 d9de5d6e956d2ec0647ffcd55c4e0a8fbe712076 SHA256 63a0ecdd4b45e048c6f8a3f25c0fe0b7a827df8e7dc2167cc3ad51ab94b8eae7
|
||||
DIST wireshark-1.8.0.tar.bz2 24425043 RMD160 944f2ef662fc432ce0ab22f9efd9195366fc1763 SHA1 d45b2828fc6dfac697f752f146e6cf43f4776047 SHA256 4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62
|
||||
EBUILD wireshark-1.8.0.ebuild 6602 RMD160 0b7c0617755cbcd190613875dbbf279b38c9edee SHA1 038a474ce8042f4b9485de0ad22c86080fea7dc3 SHA256 e337143e7d5c575c7dc402aa6a49775dcc38f384926887d3268e98a0aadfa4ba
|
||||
MISC ChangeLog 51787 RMD160 bb7205eaec0efc65b7847b7a41a5e154011ac9cc SHA1 56f0ea4ebaaeed9cd4a28f3ca18e107a80e696e6 SHA256 326a7534b56331374aa8f9d7f3400769c4a33bc9616ab1eb308b38ede4e94b22
|
||||
MISC metadata.xml 2591 RMD160 7446b0009e5609584b39ed347bb28b6a7afb53ab SHA1 a8031bb85bbdc42ffd6981382985eabebdb9ff9e SHA256 d1e0f669c78c45324dfd09f28c90b53fff9b8f8fa3de3d9304ee2d4cb4573499
|
||||
AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
|
||||
AUX wireshark-1.8-btbb.patch 3759 SHA256 348084d534a7c8ea49270b3fab42409d37a571ef95beb52b2490d732ac71462b SHA512 14b817f57e3c416b56dbe8a59ad34bc23ddba20e493c7a775ddb427cf7c89d44a07e06ef0cb2503520f04b66e0d2e765fac327b4cc8ee40cdb345dfdc9a3943d WHIRLPOOL 7fbf71fbecc52928905ff72558a8e1282c1abf6b8610b6b679359756d9e4ab7baf789a02204eda3c0a4f60c7c981f8195b462eafc395dbd23fc817a014dbd8d7
|
||||
AUX wireshark-1.8.0-underlinking.patch 239 SHA256 63a0ecdd4b45e048c6f8a3f25c0fe0b7a827df8e7dc2167cc3ad51ab94b8eae7 SHA512 df34235187efc9c423acd2b0f14d7ff569db090566abfa8f343a6826afb246f6dbacf84af9d4903f3f2656ed832f8329ae4037536d7be1f18db8e36b1fb4c1c6 WHIRLPOOL 3fda73b9fa6cd6e22201a20f0e4331a610ea13f53a8b352f89f27e89e1a2b4edc16bededa6677892ec65b53c78dbc53ce051082824ddd7e1d823f0001e33faed
|
||||
DIST libbtbb-0.8.tar.gz 70407 SHA256 6ea1aff41be6deec765f10b1b9aba01a88ae0f1eae2d5f617ebd847da72f57dc SHA512 b30fc869eecf718abec1ea54371ecfe4e2b64d394a6c07e6bfdd39b8fc1927aeef55b3cb686b10e0ea0bde054648a7fff13a12bbb2d1a289327a4198854fdfb1 WHIRLPOOL 878c67f934d7f264b81e811ee033dab6e03011ebbed842473911653a95129f286d326a3bfb5e865eaec4400a426c4802555c7a0cb42af81efe65bcd34567a850
|
||||
DIST wireshark-1.8.0.tar.bz2 24425043 SHA256 4cb802f116bbdcfa71afbc842dbfacd8f96594f4b221cbb5616d5c17bc696a62 SHA512 bd2b476dda089d27aba73ae5d5974757ec0fd1f6047adecad9966366cacd6e0565a313be1f14f59e38011cd18331f7cf4aaca69228d9af1201866c5174bf41d4 WHIRLPOOL e1173052180ad8f5634395cbdf5fc57e0339870aedfe7173ea9af44cdf1ec4386cfb314f34c10a37c38aae0fa1808a2ae08d6ae5076d1c9b2d1cfdf319ab784f
|
||||
EBUILD wireshark-1.8.0.ebuild 6647 SHA256 8ce90cc8a249e5e57c6826498e5b97fc04510e763a07c25676433c225dc4d7da SHA512 0730cc1d3376ad4e435ed12213ecdfba7de0f0bb2a8f4ba2b02be5ae10c98dcc555d5a66a5fda3d6157df24d66dd600bd46b18e69ad0d711c5aa590e57a05887 WHIRLPOOL 3a8701ac68bbe2d45fb97a9004fd905df70f89380388e21cc7491b503b6c1895743d6761f8de64936caff940eb94238f9f93b6ba1e658a2026e32e80ca703d1d
|
||||
MISC ChangeLog 51787 SHA256 326a7534b56331374aa8f9d7f3400769c4a33bc9616ab1eb308b38ede4e94b22 SHA512 4fd2b3f0d893c0b4ddc5a0ef3011f4680dec458fe6fd8b191a950a8fe6c89b1c830a8b55255880b84d052e021f81049cf6b1873d7917d06cc82cc7b8a2a6b6b0 WHIRLPOOL 7a982e298109ec50dd3afdce9ffd2f0d787b634356cf49db757739adf3014b644b16d0092e9be7ba0fb8edfb369c602d039992e6142d5fae4a60a4589a6c1359
|
||||
MISC metadata.xml 2591 SHA256 d1e0f669c78c45324dfd09f28c90b53fff9b8f8fa3de3d9304ee2d4cb4573499 SHA512 7c71ea9f31fe9307c422a7fa0c83ac72ca177a5b3a56539d02cff63e9dbfc4938f000ef3ba454558aed3cea3f5932cc788dcc599c4ec1c0e2a736922376732eb WHIRLPOOL 0ac717e4ca0f949333f4d0cff85bd45257da3216a41cd35fcd74358c94067772910785371739995523fb92688318907f3e909261da240b3a4ad32ce51210af05
|
||||
|
|
|
|||
89
net-analyzer/wireshark/files/wireshark-1.8-btbb.patch
Normal file
89
net-analyzer/wireshark/files/wireshark-1.8-btbb.patch
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
diff -urN wireshark-1.8.0.orig//CMakeLists.txt wireshark-1.8.0/CMakeLists.txt
|
||||
--- wireshark-1.8.0.orig//CMakeLists.txt 2012-06-06 00:33:43.000000000 +0800
|
||||
+++ wireshark-1.8.0/CMakeLists.txt 2012-06-25 21:48:57.997186003 +0800
|
||||
@@ -409,6 +409,7 @@
|
||||
set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
|
||||
set(PLUGIN_SRC_DIRS
|
||||
plugins/asn1
|
||||
+ plugins/btbb
|
||||
plugins/docsis
|
||||
plugins/ethercat
|
||||
plugins/gryphon
|
||||
diff -urN wireshark-1.8.0.orig//Makefile.am wireshark-1.8.0/Makefile.am
|
||||
--- wireshark-1.8.0.orig//Makefile.am 2012-06-20 01:47:22.000000000 +0800
|
||||
+++ wireshark-1.8.0/Makefile.am 2012-06-25 21:50:00.721186002 +0800
|
||||
@@ -273,6 +273,7 @@
|
||||
-include plugins/Custom.make
|
||||
plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
|
||||
-dlopen plugins/asn1/asn1.la \
|
||||
+ -dlopen plugins/btbb/btbb.la \
|
||||
-dlopen plugins/docsis/docsis.la \
|
||||
-dlopen plugins/ethercat/ethercat.la \
|
||||
-dlopen plugins/gryphon/gryphon.la \
|
||||
diff -urN wireshark-1.8.0.orig//configure.in wireshark-1.8.0/configure.in
|
||||
--- wireshark-1.8.0.orig//configure.in 2012-06-22 02:21:10.000000000 +0800
|
||||
+++ wireshark-1.8.0/configure.in 2012-06-25 21:51:10.925186002 +0800
|
||||
@@ -2096,6 +2096,7 @@
|
||||
packaging/svr4/pkginfo
|
||||
plugins/Makefile
|
||||
plugins/asn1/Makefile
|
||||
+ plugins/btbb/Makefile
|
||||
plugins/docsis/Makefile
|
||||
plugins/ethercat/Makefile
|
||||
plugins/gryphon/Makefile
|
||||
diff -urN wireshark-1.8.0.orig//epan/Makefile.am wireshark-1.8.0/epan/Makefile.am
|
||||
--- wireshark-1.8.0.orig//epan/Makefile.am 2012-06-09 08:46:54.000000000 +0800
|
||||
+++ wireshark-1.8.0/epan/Makefile.am 2012-06-25 21:51:55.394186002 +0800
|
||||
@@ -209,6 +209,8 @@
|
||||
-include ../plugins/Custom.make
|
||||
plugin_src = \
|
||||
../plugins/asn1/packet-asn1.c \
|
||||
+ ../plugins/btbb/packet-btbb.c \
|
||||
+ ../plugins/btbb/packet-btlmp.c \
|
||||
../plugins/docsis/packet-bintrngreq.c \
|
||||
../plugins/docsis/packet-bpkmattr.c \
|
||||
../plugins/docsis/packet-bpkmreq.c \
|
||||
diff -urN wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake wireshark-1.8.0/packaging/nsis/Makefile.nmake
|
||||
--- wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake 2012-06-20 01:47:22.000000000 +0800
|
||||
+++ wireshark-1.8.0/packaging/nsis/Makefile.nmake 2012-06-25 21:52:34.248186002 +0800
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
PLUGINS= \
|
||||
../../plugins/asn1/asn1.dll \
|
||||
+ ../../plugins/btbb/btbb.dll \
|
||||
../../plugins/docsis/docsis.dll \
|
||||
../../plugins/ethercat/ethercat.dll \
|
||||
../../plugins/gryphon/gryphon.dll \
|
||||
diff -urN wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi wireshark-1.8.0/packaging/nsis/wireshark.nsi
|
||||
--- wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi 2012-06-20 01:47:22.000000000 +0800
|
||||
+++ wireshark-1.8.0/packaging/nsis/wireshark.nsi 2012-06-25 21:54:50.288185993 +0800
|
||||
@@ -806,6 +806,7 @@
|
||||
;-------------------------------------------
|
||||
SetOutPath '$INSTDIR\plugins\${VERSION}'
|
||||
File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
|
||||
+File "${STAGING_DIR}\plugins\${VERSION}\btbb.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
|
||||
File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"
|
||||
diff -urN wireshark-1.8.0.orig//plugins/Makefile.am wireshark-1.8.0/plugins/Makefile.am
|
||||
--- wireshark-1.8.0.orig//plugins/Makefile.am 2012-06-06 00:33:17.000000000 +0800
|
||||
+++ wireshark-1.8.0/plugins/Makefile.am 2012-06-25 21:55:15.766186001 +0800
|
||||
@@ -24,6 +24,7 @@
|
||||
-include Custom.make
|
||||
SUBDIRS = $(_CUSTOM_SUBDIRS_) \
|
||||
asn1 \
|
||||
+ btbb \
|
||||
docsis \
|
||||
ethercat \
|
||||
gryphon \
|
||||
diff -urN wireshark-1.8.0.orig//plugins/Makefile.nmake wireshark-1.8.0/plugins/Makefile.nmake
|
||||
--- wireshark-1.8.0.orig//plugins/Makefile.nmake 2012-06-06 00:33:17.000000000 +0800
|
||||
+++ wireshark-1.8.0/plugins/Makefile.nmake 2012-06-25 21:55:32.469186000 +0800
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
PLUGIN_LIST = \
|
||||
asn1 \
|
||||
+ btbb \
|
||||
docsis \
|
||||
ethercat \
|
||||
gryphon \
|
||||
|
|
@ -9,15 +9,14 @@ inherit autotools eutils flag-o-matic python toolchain-funcs user
|
|||
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
|
||||
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
|
||||
HOMEPAGE="http://www.wireshark.org/"
|
||||
SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
|
||||
|
||||
BTBB="libbtbb-0.8"
|
||||
SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2 \
|
||||
mirror://sourceforge/libbtbb/${BTBB}.tar.gz"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="adns ares btbb doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
|
||||
third-party-plugins profile +pcap portaudio python +caps selinux smi ssl zlib"
|
||||
|
||||
REQUIRED_USE="btbb? ( third-party-plugins )"
|
||||
profile +pcap portaudio python +caps selinux smi ssl zlib"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.14:2
|
||||
zlib? ( sys-libs/zlib
|
||||
|
|
@ -37,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.14:2
|
|||
!ares? ( adns? ( net-libs/adns ) )
|
||||
geoip? ( dev-libs/geoip )
|
||||
lua? ( >=dev-lang/lua-5.1 )
|
||||
btbb? ( >=net-libs/libbtbb-0.8-r1 )
|
||||
btbb? ( >=net-libs/libbtbb-0.8 )
|
||||
selinux? ( sec-policy/selinux-wireshark )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
|
|
@ -108,8 +107,9 @@ pkg_setup() {
|
|||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-underlinking.patch
|
||||
if use btbb; then
|
||||
cp -r "${EROOT}/usr/share/libbtbb/wireshark/." "${S}/" || die
|
||||
epatch "${S}/plugins/btbb/wireshark-1.8-btbb.patch"
|
||||
cp -r "${WORKDIR}/${BTBB}/wireshark/." "${S}/" || die
|
||||
#epatch "${S}/${BTBB}/plugins/btbb/wireshark-1.8-btbb.patch"
|
||||
epatch "${FILESDIR}/wireshark-1.8-btbb.patch"
|
||||
fi
|
||||
eautoreconf
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue