Add macof IPv4 packet size calculation fix by Jan Starke (bug #538462).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 49a1103f25f569c3bdea1374cc44408a306331b2..da21af510a8cd1cefa2189620fa8cf9f0e73e520 100644 (file)
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/dsniff
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.57 2014/03/14 19:23:53 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.58 2015/02/07 10:16:17 jer Exp $
+
+*dsniff-2.4_beta1-r7 (07 Feb 2015)
+
+  07 Feb 2015; Jeroen Roovers <jer@gentoo.org> +dsniff-2.4_beta1-r7.ebuild,
+  +files/2.4_beta1-macof-size-calculation.patch:
+  Add macof IPv4 packet size calculation fix by Jan Starke (bug #538462).
 
 *dsniff-2.4_beta1-r6 (14 Mar 2014)
 

diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 0c6d13ce17aba240a1f8f8074dbcf2732e6aaaaa..4169a898979cca2c06a3179aa1423ffa608086f1 100644 (file)
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 2.3-makefile.patch 1530 SHA256 e9a8f061a87d07be0ce8958c5695d1bfc05cd5f0f4f55df080c3de752372315c SHA512 4f5721b34f5df8b2c3553ed7fbaab3ecb05763a7124f00f0c5f77afbd542e0eaaf1cd951c566b63ea9fa910521ffb9d1c7516c681175100125a16197f0beb846 WHIRLPOOL bc95f5e36b96f1c0952ab3510b304123d9a1f1763fc61c0dd0f3bbd2e9ed8842ffed6fd4d3b9ff2aac3970ee1833971fbc092c4e6c16d4466fc04f8e3d54fb96
 AUX 2.4_beta1-httppostfix.patch 674 SHA256 3efd6ca2267540016e843af3e8d7720d888fd17a73cba410e2c68022fd3a7baf SHA512 2d47d4efa576203240d94b739cafb982833d52673f42b381cc109e7b44acbf173528a4c5d4dfa1b9b95a21c9e9296db5016946e0b5202f4fcbc67e28152c1068 WHIRLPOOL 865ce69d1774a6a5fcb5f7e3c475e676fe9559fc8dd8a45190d0433b1a573061abb387a41a46a977e63a68c1b66936872e4d32204cd405a4dde777c82559ff32
+AUX 2.4_beta1-macof-size-calculation.patch 369 SHA256 d8f5cc5d14a614410a84a8eaba5a4212ee03466c4fe2fd4a634f5d7c3f688ec7 SHA512 070695aae4a0374f6d073e71f4e9362387b3b6a444058c9371564779b22c2218f32e830c7a1e39879860e956f8c826199ba90a0cb67423379358c1d0dd857ff1 WHIRLPOOL fe7ff614884d0cddd01288ff9abf8beca4076b6e11c6c62ec06073c79686aa226866196a3f75259051d9b19d4f1aa45238b4e99eaafd0cbedc36f6aee337c61f
 AUX 2.4_beta1-make.patch 2158 SHA256 6cf844425aba6884875c0f8b9031b867f6b36e2636a29624115ad56fd0e34cea SHA512 348ef5c4d62efb9f204c67275e3b3d09d32cdd89575b758df1e37d103d6fd7ea9185755389c297b5f8fc545537e3203d488d8f8fb1e38bc6abdd74047b720c5b WHIRLPOOL 7dcf294e796482cdb3b9466c56ca2e4097e7fa1c0181cdca0855c1991e29f022db54545f0e3262237477ca755c9b8cc99c41c30c8b95c401ddc622d316810cb1
 DIST dsniff-2.4b1.tar.gz 131666 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f WHIRLPOOL 10e5187314fe63058a015a3bef159e21a1ff7e0080ea72c8f804621d2b6254b6c05aa7fe2952bec568641a4a8d93eedf5f5407f127ee3464f73931bfe865d100
 DIST dsniff_2.4b1+debian-18.diff.gz 44819 SHA256 a65142b8d2206d3eae5db35d9972f8eac1110d45893d7f2182ca240ecd9b9d25 SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5 WHIRLPOOL 9c6ab2938e139ea5b43319000297d6bdfdd4ab234058baeccc7eccbee0f5a7a5824860b4397421402e1ff1cd5c446ef1d17de6ce7b5ec9244e5770662b2c6f9a
@@ -10,12 +11,13 @@ DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 SHA256 28ddb8514c6a7a17f51f428
 EBUILD dsniff-2.4_beta1-r4.ebuild 1540 SHA256 fac21a206d205619551ba2988cddb65e0f564e1ecc9a39ac686f0ab9a30a93e6 SHA512 46d6b1ea470f15b864297717e10d7d9de1f1fea9449147b16513118a4d54d5bfc994b41796958ef3c9f059ec90c7e014f2309b5cc8f6b6a1ec8bc30779efd457 WHIRLPOOL 114fb2a41b680eabcbd306bbacf529f9818c49a51a006f90415fff30633353fe15c75a05a59b35a46b3c0f85046e867fa6e55297f76634954cdc090d145143b4
 EBUILD dsniff-2.4_beta1-r5.ebuild 1475 SHA256 1d71609f0cf2079e6c736bc31671eeb1c71392163fa640844ad5aa622c964d69 SHA512 525c6918e75fe70eb74157e9de62a2dbb05fe62f9b16c86fb604140d05116fab4c1ff2fea8a212dc6d46d003bc63bf0c943303a3a9a21581867d422bce397529 WHIRLPOOL ba0a69dc9761938329e478122ce8a82c4fa0299a8f7492ed5e6c280a10d7121321c77845afb6b8554c0c2f3517cfe07230477e6c5c85476eafc5e74a70eeb2dd
 EBUILD dsniff-2.4_beta1-r6.ebuild 1560 SHA256 78b385e40cbbf02d274521fbe368c780500ae2764df80b27ae884e35b0bcef2e SHA512 cf95192841bbdd82ee4fc443ca4e111d18597414a6b710e10f8818385eacd386dd05551fa337dfc4cebe1bb2d35cf41526add8e9eb8e95f2c8ba6d204f845236 WHIRLPOOL bd876d7ce6f31a359f4ddbd9ec982adb4136346af42070ed07d8f0c748c80193994f916744ee5370710f03136ef010d00f4bdcd8b56d1c7d31c23d86dac3e2d6
-MISC ChangeLog 8392 SHA256 245a89624b0feb7131618c20a1bebc6d146aa80053a6d5b436c5a1b677f2ee2c SHA512 73ee9932f5af3ab0991205ccb75989991e6018848cf3d192850f93b9825cc68824a40acb5849e2b1c710a7d1a68a445693d15d974131ab22328cb71f5bd92998 WHIRLPOOL f0c8827e9c1612d49781532c8242cb6bb01f5b335d522b426c9b052e4644a07322985442fb34f294217e8b037cdb61b89b490fb8afe1747f84aec2decf7520fb
+EBUILD dsniff-2.4_beta1-r7.ebuild 1633 SHA256 77f78afd55e928b4a7a9d43228823f0acd7c48fb8fda1903f234f20296aabe0e SHA512 8a1df78ae538c5d89594994cea2041798516f791860f3957c0582e1c6cf8b1adcf050c5d87a0d075ab7b2227e027beeba98b625d0889c088b7e4ea096da97657 WHIRLPOOL 175c3bb9541d5b96557e82cf8b1cd7556f721ec66880e42475efabf0bdcc6fbb9d8b51549147603476668a70b03bfcca739ae40ea0f6361cac0ecbca7a544f72
+MISC ChangeLog 8628 SHA256 c5eaa7b8d3a4c10a9ca95339d072fe6420d43d6ad3be87534ee30e887c0a46ef SHA512 1c2e6b77a5e3d40cf1ee51ad218ab82f6d35dc4ddf193c17a913b5e403185a3403805cffc5220a02cbc3d61371d06edeff934a5c759afdfa05a609d1f33f586b WHIRLPOOL 728dc1e31aa74a6405482dd88738fcfde8dd0af4233bd7c2a9f53aa05b3cd89e83a58e0b0a384d1a8548be65978f34f35ef6a9686593295abed159dda8e6f832
 MISC metadata.xml 715 SHA256 38611a21d47773747c46816fcb2cfebe0a3b57fc070876e36f5347e6bcc220a1 SHA512 078d7380c69c7e5e8bf47656ed4916214d856143c170d1b4da51eeacabf20df938d8b2dfdd41ce3ce9d82460ab0d2f91a6ca3c9124f291ab74e12cfdd9cbba29 WHIRLPOOL 69495e490a89d333bed816426c04885eb244d3bcb8733fcf8b25bc8794f9ee6948ff70ff374c1e6a2ab9ebc8661a543b22d0d02557859319e2cae730a447192c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMjV0oACgkQVWmRsqeSphMdRgCaA9YqXQu9MNWIcTcFSac6Rl9L
-76EAnjHQhO6eXjTSJ4yhV+X966EGaSqb
-=+Sok
+iEYEAREIAAYFAlTV5fMACgkQVWmRsqeSphPVfwCdHU/ow5gX7CaYXV0g6cuQPxjO
+ghUAn1O6y1Wzd0my4rtHep3ZPA+vJBC8
+=rMKf
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
new file mode 100644 (file)
index 0000000..4a50ad4
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild,v 1.1 2015/02/07 10:16:17 jer Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="
+       http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+       mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+DEPEND="net-libs/libpcap
+       >=net-libs/libnet-1.1.2.1-r1
+       >=net-libs/libnids-1.21
+       >=dev-libs/openssl-0.9.6e
+       >=sys-libs/db-4.2.52_p4
+       X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+       # Debian patchset, needs to be applied in the exact order that "series"
+       # lists or patching will fail.
+       # Bug #479882
+       epatch $(
+               for file in $(< "${WORKDIR}"/debian/patches/series ); do
+                       printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+               done
+       )
+
+       # Bug 125084
+       epatch "${FILESDIR}"/${PV}-httppostfix.patch
+
+       # various Makefile.in patches
+       epatch "${FILESDIR}"/${PV}-make.patch
+
+       # bug #538462
+       epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_with X x) \
+               || die "econf failed"
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)"
+}
+
+src_install() {
+       emake install install_prefix="${D}"
+       dodir /etc/dsniff
+       cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+               "${D}"/etc/dsniff/
+       dodoc CHANGES README TODO
+}

diff --git a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
new file mode 100644 (file)
index 0000000..068133d
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
@@ -0,0 +1,11 @@
+--- a/macof.c
++++ b/macof.c
+@@ -134,7 +134,7 @@ main(int argc, char *argv[])
+               libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+                                0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+               
+-              libnet_build_ipv4(LIBNET_TCP_H, 0,
++              libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
+                                 libnet_get_prand(LIBNET_PRu16), 0, 64,
+                                 IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+