* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/dsniff/files/, net-analyzer/dsniff/
@ 2018-03-02 17:32 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2018-03-02 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 17e48ce1fb4274f1d358b7e37a5c08e7511fd260
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 17:04:28 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 17:31:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e48ce1
net-analyzer/dsniff: Get rid of libtirpc automagic and depend on it instead
Closes: https://bugs.gentoo.org/370645
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild | 83 +++++++++++++++++++++++++
net-analyzer/dsniff/files/2.4_beta1-rpc.patch | 39 ++++++++++++
2 files changed, 122 insertions(+)
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
new file mode 100644
index 00000000000..6cf8570555a
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools 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="libressl X"
+
+DEPEND="net-libs/libpcap
+ >=net-libs/libnet-1.1.2.1-r1
+ >=net-libs/libnids-1.21
+ net-libs/libnsl:0=
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=sys-libs/db-4:*
+ X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+ # replace Debian patch 23 with a simpler one (bug #506076)
+ mv -v \
+ "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
+ cp -v \
+ "${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
+ "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
+
+ # Debian patchset, needs to be applied in the exact order that "series"
+ # lists or patching will fail.
+ # Bug #479882
+ eapply $(
+ for file in $(< "${WORKDIR}"/debian/patches/series ); do
+ printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+ done
+ )
+
+ # Bug 125084
+ eapply "${FILESDIR}"/${PV}-httppostfix.patch
+
+ # various Makefile.in patches
+ eapply "${FILESDIR}"/${PV}-make.patch
+
+ # bug #538462
+ eapply "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+ # libtirpc support
+ eapply "${FILESDIR}"/${PV}-rpc.patch
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-libtirpc \
+ $(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/ || die
+ dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
new file mode 100644
index 00000000000..b43c91d9581
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,8 +37,8 @@
+ X11INC = @X_CFLAGS@
+ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+
+-INCS = -I. $(X11INC) -I$(srcdir)/missing
+-LIBS = @LIBS@ -L$(srcdir) -lmissing
++INCS = -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@
++LIBS = @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- a/configure.in
++++ b/configure.in
+@@ -337,4 +337,23 @@
+ AC_SUBST(SSLINC)
+ AC_SUBST(SSLLIB)
+
++AC_ARG_WITH([libtirpc],
++ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++ [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno],
++ [PKG_CHECK_MODULES([TIRPC],
++ [libtirpc],
++ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++ )],
++ [AC_CHECK_HEADER(rpc/rpc.h,
++ [RPC_CFLAGS=""; RPC_LIBS="";],
++ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++ )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_OUTPUT(Makefile)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/dsniff/files/, net-analyzer/dsniff/
@ 2019-05-02 18:50 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2019-05-02 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 1aa904188ff115f14f6d5fac4e0483152a08ed37
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 18:50:01 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 2 18:50:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa90418
sci-chemistry/ball: remove last rited package
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-analyzer/dsniff/Manifest | 3 -
net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild | 83 ---------------------
net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild | 59 ---------------
net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild | 68 -----------------
net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild | 86 ----------------------
net-analyzer/dsniff/files/2.3-makefile.patch | 29 --------
.../dsniff/files/2.4_beta1-httppostfix.patch | 20 -----
net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch | 22 ------
.../files/2.4_beta1-macof-size-calculation.patch | 11 ---
net-analyzer/dsniff/files/2.4_beta1-make.patch | 62 ----------------
net-analyzer/dsniff/files/2.4_beta1-rpc.patch | 39 ----------
.../files/2.4_beta1-urlsnarf-pcap_timestamps.patch | 15 ----
net-analyzer/dsniff/metadata.xml | 17 -----
13 files changed, 514 deletions(-)
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
deleted file mode 100644
index 67ce02cb7fd..00000000000
--- a/net-analyzer/dsniff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dsniff-2.4b1.tar.gz 131666 BLAKE2B f0cc3c875ed37ee573a28d2c54e7dc89bd14df233b047273ebb054820c2f8c61be22b0310c9354446a9ca6e99fdcd7f027fa7a122da667d4a809362dcb8c957f SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f
-DIST dsniff_2.4b1+debian-18.diff.gz 44819 BLAKE2B 79b5614cbe4f36c2d321cd392cbfd2db94530680fbbab35f5069850ab6bda0fab6b7a2a93a983773793b9f645499c24393d6c652f0aba6c48651ae17ff4b24fe SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5
-DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 BLAKE2B 88333aad1498cb5b4fd68776f8e0599672c9c69ee5b0d5424f0a8e9f0958412fb420a6d6ae6d46dc5e6c73c4ab39b1fedbef1a4c6879bb4c2bd363271cb6d98b SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
deleted file mode 100644
index e8040b8990e..00000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
- https://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="libressl X"
-
-DEPEND="net-libs/libpcap
- >=net-libs/libnet-1.1.2.1-r1
- >=net-libs/libnids-1.21
- net-libs/libnsl:0=
- net-libs/libtirpc
- net-libs/rpcsvc-proto
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=sys-libs/db-4:*
- X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_prepare() {
- # replace Debian patch 23 with a simpler one (bug #506076)
- mv -v \
- "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
- cp -v \
- "${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
- "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
-
- # Debian patchset, needs to be applied in the exact order that "series"
- # lists or patching will fail.
- # Bug #479882
- eapply $(
- for file in $(< "${WORKDIR}"/debian/patches/series ); do
- printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
- done
- )
-
- # Bug 125084
- eapply "${FILESDIR}"/${PV}-httppostfix.patch
-
- # various Makefile.in patches
- eapply "${FILESDIR}"/${PV}-make.patch
-
- # bug #538462
- eapply "${FILESDIR}"/${PV}-macof-size-calculation.patch
-
- # libtirpc support
- eapply "${FILESDIR}"/${PV}-rpc.patch
-
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-libtirpc \
- $(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/ || die
- dodoc CHANGES README TODO
-}
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
deleted file mode 100644
index 30f23c56ef4..00000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="https://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
- mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-18.diff.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
- sys-apps/sed
- X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Debian's patchset
- epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
- epatch "${S}"/dsniff-2.4b1+debian/debian/patches/*.dpatch
-
- sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
- epatch "${FILESDIR}"/2.3-makefile.patch
-
- # Bug 125084
- epatch "${FILESDIR}"/${PV}-httppostfix.patch
-
- eautoreconf
-}
-
-src_compile() {
- econf \
- $(use_with X x) \
- || die "econf failed"
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
- emake install install_prefix="${D}" || die "emake install failed"
- 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/dsniff-2.4_beta1-r7.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
deleted file mode 100644
index 2a0d40b9f9b..00000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
- https://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="libressl X"
-
-DEPEND="net-libs/libpcap
- >=net-libs/libnet-1.1.2.1-r1
- >=net-libs/libnids-1.21
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=sys-libs/db-4:*
- 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/dsniff-2.4_beta1-r9.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
deleted file mode 100644
index cb6eecff826..00000000000
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A collection of tools for network auditing and penetration testing"
-HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
-SRC_URI="
- https://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="libressl X"
-
-DEPEND="net-libs/libpcap
- >=net-libs/libnet-1.1.2.1-r1
- >=net-libs/libnids-1.21
- net-libs/libnsl:0=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=sys-libs/db-4:*
- || ( <sys-libs/glibc-2.26[rpc]
- (
- >=sys-libs/glibc-2.26
- net-libs/rpcsvc-proto
- net-libs/libtirpc
- )
- )
- X? ( x11-libs/libXmu )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_beta1/}"
-
-src_prepare() {
- # replace Debian patch 23 with a simpler one (bug #506076)
- mv -v \
- "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
- cp -v \
- "${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
- "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
-
- # 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
-
- # allow building against libtirpc, needed for glibc-2.26, bug 381391
- epatch "${FILESDIR}"/${PV}-libtirpc.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.3-makefile.patch b/net-analyzer/dsniff/files/2.3-makefile.patch
deleted file mode 100644
index 6225ec2f447..00000000000
--- a/net-analyzer/dsniff/files/2.3-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile.in 2003-08-25 18:07:17.000000000 +1200
-+++ b/Makefile.in 2003-08-25 18:29:13.000000000 +1200
-@@ -94,7 +94,7 @@
- $(RANLIB) $@
-
- dsniff: $(HDRS) $(SRCS) $(OBJS)
-- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
-
- arpspoof: arpspoof.o arp.o
- $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -115,7 +115,7 @@
- $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-
- sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
-- $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
-
- tcpkill: tcpkill.o pcaputil.o
- $(CC) $(LDFLAGS) -o $@ tcpkill.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -130,7 +130,7 @@
- $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-
- webmitm: webmitm.o base64.o buf.o decode_http.o record.o
-- $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
-
- webspy: webspy.o base64.o buf.o remote.o
- $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch b/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
deleted file mode 100644
index 62c9a90fe8e..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-httppostfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/decode_http.c 2000-12-19 07:38:05.000000000 +0800
-+++ b/decode_http.c 2006-03-05 22:32:14.000000000 +0800
-@@ -139,14 +139,14 @@
- host = p;
- }
- else if (req[0] == 'P') {
-- if (strncmp(p, "Content-type: ", 14) == 0) {
-- if (strncmp(p + 14, "application/"
-+ if (strncasecmp(p, "Content-type: ", 14) == 0) {
-+ if (strncasecmp(p + 14, "application/"
- "x-www-form-urlencoded",
- 33) != 0) {
- query = NULL;
- }
- }
-- else if (strncmp(p, "Content-length: ", 16) == 0) {
-+ else if (strncasecmp(p, "Content-length: ", 16) == 0) {
- p += 16;
- i = atoi(p);
- if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch b/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
deleted file mode 100644
index 00c271ab9f9..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-libtirpc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -37,8 +37,8 @@
- X11INC = @X_CFLAGS@
- X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
-
--INCS = -I. $(X11INC) -I$(srcdir)/missing
--LIBS = @LIBS@ -L$(srcdir) -lmissing
-+INCS = -I. $(X11INC) -I$(srcdir)/missing @TIRPC_CFLAGS@
-+LIBS = @LIBS@ -L$(srcdir) -lmissing @TIRPC_LIBS@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
---- a/configure.in
-+++ b/configure.in
-@@ -338,4 +338,6 @@
- AC_SUBST(SSLINC)
- AC_SUBST(SSLLIB)
-
-+PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [AC_MSG_NOTICE([Using glibc rpc support])])
-+
- AC_OUTPUT(Makefile)
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
deleted file mode 100644
index 068133de2e4..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-macof-size-calculation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
-
diff --git a/net-analyzer/dsniff/files/2.4_beta1-make.patch b/net-analyzer/dsniff/files/2.4_beta1-make.patch
deleted file mode 100644
index 29964eb28ac..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-make.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,7 +16,7 @@
- mandir = @mandir@
-
- CC = @CC@
--CFLAGS = @CFLAGS@ -DDSNIFF_LIBDIR=\"$(libdir)/\"
-+CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-
- PCAPINC = @PCAPINC@
-@@ -75,12 +75,20 @@
- .c.o:
- $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
-
--all: libmissing.a $(PROGS)
-+all: $(PROGS)
-+
-+$(PROGS): libmissing.a
-+
-+$(OBJS): $(GEN)
-
-+mount.h: mount.x
-+ rpcgen -h mount.x -o mount.h
-+
- mount.c: mount.x
-- rpcgen -h mount.x -o mount.h
- rpcgen -c mount.x -o mount.c
-
-+nfs_prot.h: nfs_prot.x
-+ rpcgen -h nfs_prot.x -o nfs_prot.h
-+
- nfs_prot.c: nfs_prot.x
-- rpcgen -h nfs_prot.x -o nfs_prot.h
- rpcgen -c nfs_prot.x -o nfs_prot.c
-@@ -93,7 +97,7 @@
- $(RANLIB) $@
-
- dsniff: $(HDRS) $(SRCS) $(OBJS)
-- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(DBLIB) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(SSLLIB)
-
- arpspoof: arpspoof.o arp.o
- $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB)
-@@ -114,7 +118,7 @@
- $(CC) $(LDFLAGS) -o $@ msgsnarf.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-
- sshmitm: sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o
-- $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ sshmitm.o buf.o hex.o record.o ssh.o sshcrypto.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
-
- sshow: sshow.o pcaputil.o
- $(CC) $(LDFLAGS) -o $@ sshow.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-@@ -132,7 +136,7 @@
- $(CC) $(LDFLAGS) -o $@ urlsnarf.o base64.o buf.o pcaputil.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB)
-
- webmitm: webmitm.o base64.o buf.o decode_http.o record.o
-- $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(LNETLIB) $(DBLIB) $(SSLLIB)
-+ $(CC) $(LDFLAGS) -o $@ webmitm.o base64.o buf.o decode_http.o record.o $(LIBS) $(DBLIB) $(LNETLIB) $(SSLLIB)
-
- webspy: webspy.o base64.o buf.o remote.o
- $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
deleted file mode 100644
index b43c91d9581..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -37,8 +37,8 @@
- X11INC = @X_CFLAGS@
- X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
-
--INCS = -I. $(X11INC) -I$(srcdir)/missing
--LIBS = @LIBS@ -L$(srcdir) -lmissing
-+INCS = -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@
-+LIBS = @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
---- a/configure.in
-+++ b/configure.in
-@@ -337,4 +337,23 @@
- AC_SUBST(SSLINC)
- AC_SUBST(SSLLIB)
-
-+AC_ARG_WITH([libtirpc],
-+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+ [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno],
-+ [PKG_CHECK_MODULES([TIRPC],
-+ [libtirpc],
-+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+ )],
-+ [AC_CHECK_HEADER(rpc/rpc.h,
-+ [RPC_CFLAGS=""; RPC_LIBS="";],
-+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+ )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- AC_OUTPUT(Makefile)
diff --git a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch b/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
deleted file mode 100644
index a2a7a36966a..00000000000
--- a/net-analyzer/dsniff/files/2.4_beta1-urlsnarf-pcap_timestamps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Hilko Bengen <bengen@debian.org>
-Description: urlsnarf: use timestamps from pcap file if available. Closes: #573365
-Index: dsniff-2.4b1+debian/urlsnarf.c
-===================================================================
---- a/urlsnarf.c
-+++ b/urlsnarf.c
-@@ -57,7 +57,7 @@
- {
- static char tstr[32], sign;
- struct tm *t, gmt;
-- time_t tt = time(NULL);
-+ time_t tt = nids_last_pcap_header->ts.tv_sec;
- int days, hours, tz, len;
-
- gmt = *gmtime(&tt);
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
deleted file mode 100644
index 87cd1022ae1..00000000000
--- a/net-analyzer/dsniff/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription>
-dsniff is a collection of tools for network auditing and penetration testing.
-dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
-network for interesting data (passwords, e-mail, files, etc.). arpspoof,
-dnsspoof, and macof facilitate the interception of network traffic normally
-unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
-implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
-sessions by exploiting weak bindings in ad-hoc PKI.
-</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/dsniff/files/, net-analyzer/dsniff/
@ 2021-12-07 6:44 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-12-07 6:44 UTC (permalink / raw
To: gentoo-commits
commit: ffd19f440039ff1c2b4e4e1234c1f9c89a7ae806
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 02:56:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 06:44:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd19f44
net-analyzer/dsniff: initial import (revival)
Removed in 1aa904188ff115f14f6d5fac4e0483152a08ed37. Now
using (substantial) Debian patchset.
Closes: https://bugs.gentoo.org/643460
Closes: https://bugs.gentoo.org/674192
Closes: https://bugs.gentoo.org/571446
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/dsniff/Manifest | 2 +
net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild | 73 ++++++++++++++
.../files/dsniff-2.4_beta1_p30-httppostfix.patch | 21 +++++
.../dsniff-2.4_beta1_p30-libdir-configure.patch | 105 +++++++++++++++++++++
.../files/dsniff-2.4_beta1_p30-respect-AR.patch | 22 +++++
net-analyzer/dsniff/metadata.xml | 17 ++++
6 files changed, 240 insertions(+)
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
new file mode 100644
index 000000000000..cd9131c35ad9
--- /dev/null
+++ b/net-analyzer/dsniff/Manifest
@@ -0,0 +1,2 @@
+DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
+DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
new file mode 100644
index 000000000000..adb46e181081
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p*/}"
+MY_PV="$(ver_rs 1 '.' "${MY_PV}")"
+# 2.4_beta1_p30 -> 2.4beta1-30
+MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)"
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz
+ mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_beta1*/}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# There's a berkdb configure option but we get a build failure if
+# we try to disable it. Not clear how useful the package is
+# without it anyway.
+RDEPEND="net-libs/libpcap
+ >=net-libs/libnet-1.1.2.1-r1
+ >=net-libs/libnids-1.21
+ net-libs/libnsl:=
+ net-libs/libtirpc:=
+ dev-libs/openssl:=
+ >=sys-libs/db-4:=
+ X? ( x11-libs/libXmu )"
+DEPEND="${DEPEND}
+ net-libs/rpcsvc-proto"
+# Calls rpcgen during build
+BDEPEND="net-libs/rpcsvc-proto"
+
+PATCHES=(
+ "${WORKDIR}"/debian/patches/
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR
+
+ econf \
+ $(use_with X x)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install install_prefix="${D}"
+
+ dodir /etc/dsniff
+ cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+ "${ED}"/etc/dsniff/ || die
+ dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
new file mode 100644
index 000000000000..487e45321662
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
@@ -0,0 +1,21 @@
+Allow mixed case in some fields.
+--- a/decode_http.c
++++ b/decode_http.c
+@@ -139,14 +139,14 @@
+ host = p;
+ }
+ else if (req[0] == 'P') {
+- if (strncmp(p, "Content-type: ", 14) == 0) {
+- if (strncmp(p + 14, "application/"
++ if (strncasecmp(p, "Content-type: ", 14) == 0) {
++ if (strncasecmp(p + 14, "application/"
+ "x-www-form-urlencoded",
+ 33) != 0) {
+ query = NULL;
+ }
+ }
+- else if (strncmp(p, "Content-length: ", 16) == 0) {
++ else if (strncasecmp(p, "Content-length: ", 16) == 0) {
+ p += 16;
+ i = atoi(p);
+ if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
new file mode 100644
index 000000000000..a2309cd836e8
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
@@ -0,0 +1,105 @@
+Respect libdir rather than always using 'lib'.
+--- a/configure.in
++++ b/configure.in
+@@ -127,13 +127,13 @@ AC_ARG_WITH(db,
+ if test -f ${dir}/include/db_185.h; then
+ AC_DEFINE(HAVE_DB_185_H)
+ DBINC="-I${dir}/include"
+- DBLIB="-L${dir}/lib -ldb"
++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+ have_db=yes
+ break
+ elif test -f ${dir}/include/db.h; then
+ AC_DEFINE(HAVE_DB_H)
+ DBINC="-I${dir}/include"
+- DBLIB="-L${dir}/lib -ldb"
++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+ have_db=yes
+ break
+ fi
+@@ -178,11 +178,11 @@ AC_ARG_WITH(libpcap,
+ PCAPLIB="-L$withval -lpcap"
+ elif test -f $withval/include/pcap.h -a \
+ -f $withval/include/net/bpf.h -a \
+- -f $withval/lib/libpcap.a; then
++ -f $withval/${libdir#${prefix}}/libpcap.a; then
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ PCAPINC="-I$withval/include"
+- PCAPLIB="-L$withval/lib -lpcap"
++ PCAPLIB="-L$withval/${libdir#${prefix}} -lpcap"
+ else
+ AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+ fi
+@@ -190,7 +190,7 @@ AC_ARG_WITH(libpcap,
+ esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+ PCAPINC="-I${prefix}/include"
+- PCAPLIB="-L${prefix}/lib -lpcap"
++ PCAPLIB="-L${prefix}/${libdir#${prefix}} -lpcap"
+ elif test -f /usr/include/pcap/pcap.h; then
+ PCAPINC="-I/usr/include/pcap"
+ PCAPLIB="-lpcap"
+@@ -226,7 +226,7 @@ AC_ARG_WITH(libnet,
+ CFLAGS="$CFLAGS `libnet-config --defines`"
+ fi
+ LNETINC="-I$withval/include"
+- LNETLIB="-L$withval/lib -lnet"
++ LNETLIB="-L$withval/${libdir#${prefix}} -lnet"
+ else
+ AC_ERROR(libnet.h or libnet.a not found in $withval)
+ fi
+@@ -235,7 +235,7 @@ AC_ARG_WITH(libnet,
+ [ if test -f ${prefix}/include/libnet.h; then
+ CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+ LNETINC="-I${prefix}/include"
+- LNETLIB="-L${prefix}/lib -lnet"
++ LNETLIB="-L${prefix}/${libdir#${prefix}} -lnet"
+ elif test -f /usr/include/libnet.h; then
+ CFLAGS="$CFLAGS `libnet-config --defines`"
+ LNETLIB="-lnet"
+@@ -267,7 +267,7 @@ AC_ARG_WITH(libnids,
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ NIDSINC="-I$withval/include"
+- NIDSLIB="-L$withval/lib -lnids"
++ NIDSLIB="-L$withval/${libdir#${prefix}} -lnids"
+ else
+ AC_ERROR(nids.h or libnids.a not found in $withval)
+ fi
+@@ -275,7 +275,7 @@ AC_ARG_WITH(libnids,
+ esac ],
+ [ if test -f ${prefix}/include/nids.h; then
+ NIDSINC="-I${prefix}/include"
+- NIDSLIB="-L${prefix}/lib -lnids"
++ NIDSLIB="-L${prefix}/${libdir#${prefix}} -lnids"
+ elif test -f /usr/include/nids.h; then
+ NIDSLIB="-lnids"
+ else
+@@ -309,11 +309,11 @@ AC_ARG_WITH(openssl,
+ SSLINC="-I$withval/include"
+ SSLLIB="-L$withval -lssl -lcrypto"
+ elif test -f $withval/include/openssl/ssl.h -a \
+- -f $withval/lib/libssl.a; then
++ -f $withval/${libdir#${prefix}}/libssl.a; then
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ SSLINC="-I$withval/include"
+- SSLLIB="-L$withval/lib -lssl -lcrypto"
++ SSLLIB="-L$withval/${libdir#${prefix}} -lssl -lcrypto"
+ else
+ AC_ERROR(ssl.h or libssl.a not found in $withval)
+ fi
+@@ -322,10 +322,10 @@ AC_ARG_WITH(openssl,
+ esac ],
+ [ if test -f ${prefix}/include/openssl/ssl.h; then
+ SSLINC="-I${prefix}/include"
+- SSLLIB="-L${prefix}/lib -lssl -lcrypto"
++ SSLLIB="-L${prefix}/${libdir#${prefix}} -lssl -lcrypto"
+ elif test -f ${prefix}/ssl/include/openssl/ssl.h; then
+ SSLINC="-I${prefix}/ssl/include"
+- SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto"
++ SSLLIB="-L${prefix}/ssl/${libdir#${prefix}} -lssl -lcrypto"
+ elif test -f /usr/include/openssl/ssl.h; then
+ SSLLIB="-lssl -lcrypto"
+ else
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
new file mode 100644
index 000000000000..fd2235fada7d
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
@@ -0,0 +1,22 @@
+Respect the 'AR' environment variable.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -103,7 +103,7 @@ $(LIBOBJS):
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+
+ libmissing.a: $(LIBOBJS)
+- ar -cr $@ $(LIBOBJS)
++ $(AR) -cr $@ $(LIBOBJS)
+ $(RANLIB) $@
+
+ dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_PROG(AR,ar,ar)
+
+ dnl Checks for header files.
+ AC_PATH_XTRA
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
new file mode 100644
index 000000000000..32fb662b8379
--- /dev/null
+++ b/net-analyzer/dsniff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <longdescription>
+ dsniff is a collection of tools for network auditing and penetration testing.
+ dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
+ network for interesting data (passwords, e-mail, files, etc.). arpspoof,
+ dnsspoof, and macof facilitate the interception of network traffic normally
+ unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
+ implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
+ sessions by exploiting weak bindings in ad-hoc PKI.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/dsniff/files/, net-analyzer/dsniff/
@ 2023-12-15 3:25 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-12-15 3:25 UTC (permalink / raw
To: gentoo-commits
commit: f69e68db135958c271d24c5bb9277671e2910605
Author: Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Wed Dec 13 02:37:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:15:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69e68db
net-analyzer/dsniff: add 2.4_beta1_p31, fix GCC 14 compile
Patch attached fixes compilation on GCC 14 and some warnings about print
formatting.
Closes: https://bugs.gentoo.org/919503
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34258
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/dsniff/Manifest | 1 +
net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild | 74 ++++++++++++++++++++++
.../files/dsniff-2.4_beta1_p31-c99-fixes.patch | 36 +++++++++++
3 files changed, 111 insertions(+)
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index cd9131c35ad9..f299e852f03d 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -1,2 +1,3 @@
DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
+DIST dsniff_2.4b1+debian-31.debian.tar.xz 30848 BLAKE2B 46bdfa08170fbfbba35fcc67340fc35352ef276dd5e8e00a540da39d28364c3198198eefeb6b85cb05e74d3785fc61c7e8e58d6ce37e0b62e6018e4842d938ad SHA512 da927bb887db6761a07dc2460bdeb834b386ccc5b8aa50ebce804ee130f89379268412cddd83ad64cc763e98e2f42a7efc23b7ca77db59445533272cb408088f
DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild
new file mode 100644
index 000000000000..f7cbbc6b9514
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p*/}"
+MY_PV="$(ver_rs 1 '.' "${MY_PV}")"
+# 2.4_beta1_p30 -> 2.4beta1-30
+MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)"
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz
+ mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_beta1*/}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# There's a berkdb configure option but we get a build failure if
+# we try to disable it. Not clear how useful the package is
+# without it anyway.
+RDEPEND="net-libs/libpcap
+ >=net-libs/libnet-1.1.2.1-r1
+ >=net-libs/libnids-1.21
+ net-libs/libnsl:=
+ net-libs/libtirpc:=
+ dev-libs/openssl:=
+ >=sys-libs/db-4:=
+ X? ( x11-libs/libXmu )"
+DEPEND="${DEPEND}
+ net-libs/rpcsvc-proto"
+# Calls rpcgen during build
+BDEPEND="net-libs/rpcsvc-proto"
+
+PATCHES=(
+ "${WORKDIR}"/debian/patches/
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch
+ "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch
+ "${FILESDIR}"/${PN}-2.4_beta1_p31-c99-fixes.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR
+
+ econf \
+ $(use_with X x)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install install_prefix="${D}"
+
+ dodir /etc/dsniff
+ cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+ "${ED}"/etc/dsniff/ || die
+ dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch
new file mode 100644
index 000000000000..f77d21ea9510
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch
@@ -0,0 +1,36 @@
+# Gentoo bug: https://bugs.gentoo.org/919503
+
+diff --git a/tcpkill.c b/tcpkill.c
+index 1a64d40..de7ad00 100644
+--- a/tcpkill.c
++++ b/tcpkill.c
+@@ -19,6 +19,7 @@
+ #include <err.h>
+ #include <libnet.h>
+ #include <pcap.h>
++#include <inttypes.h>
+
+ #include "pcaputil.h"
+ #include "version.h"
+@@ -84,7 +85,7 @@ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ if (libnet_write(l) < 0)
+ warn("write");
+
+- fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq);
++ fprintf(stderr, "%s R %"PRIu32":%"PRIu32"(0) win 0\n", ctext, seq, seq);
+ }
+ }
+
+diff --git a/urlsnarf.c b/urlsnarf.c
+index f46ccf8..d57b9dd 100644
+--- a/urlsnarf.c
++++ b/urlsnarf.c
+@@ -341,7 +341,7 @@ main(int argc, char *argv[])
+ }
+
+ struct pcap_pkthdr *h;
+- u_char *d;
++ const u_char *d;
+ int rc;
+ while ((rc = pcap_next_ex(p, &h, &d)) == 1) {
+ tt = h->ts.tv_sec;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-15 3:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-15 3:25 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/dsniff/files/, net-analyzer/dsniff/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-12-07 6:44 Sam James
2019-05-02 18:50 Mikle Kolyada
2018-03-02 17:32 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox