From 513b85f79250c44e2648b328259b45bc1d4dba58 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 1 Feb 2010 11:15:04 +0000 Subject: [PATCH] ported smtpmap to 64bit + various cleanups --- net-analyzer/smtpmap/Manifest | 12 ++------- .../smtpmap/files/digest-smtpmap-0.8.234_beta | 3 --- .../smtpmap/files/smtpmap-64bit.patch | 11 ++++++++ .../smtpmap/smtpmap-0.8.234_beta.ebuild | 25 +++++++++++++------ 4 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 net-analyzer/smtpmap/files/digest-smtpmap-0.8.234_beta create mode 100644 net-analyzer/smtpmap/files/smtpmap-64bit.patch diff --git a/net-analyzer/smtpmap/Manifest b/net-analyzer/smtpmap/Manifest index 49fd746a8..0f26da840 100644 --- a/net-analyzer/smtpmap/Manifest +++ b/net-analyzer/smtpmap/Manifest @@ -1,12 +1,4 @@ AUX gcc-3.4.patch 2891 RMD160 39ee04483d4f086409dc92458d14f08e005a5e8e SHA1 0acb55a6f4619ebda44b51f26deaa35d9d84d8a0 SHA256 b11da87d931b251417e0c792ddd1a1163649c8128ae452e692164d5770bfd9f8 -MD5 5ae7a4a427926d64f31073470ababf66 files/gcc-3.4.patch 2891 -RMD160 39ee04483d4f086409dc92458d14f08e005a5e8e files/gcc-3.4.patch 2891 -SHA256 b11da87d931b251417e0c792ddd1a1163649c8128ae452e692164d5770bfd9f8 files/gcc-3.4.patch 2891 +AUX smtpmap-64bit.patch 557 RMD160 ffb526367c860af42c7727b57001f56a3491f2f2 SHA1 27bbea58b2440e41b63bdb98edba181e15fc48e0 SHA256 63b176ded524ca57bc1c648f9ab402a513ca13bf45252594b3edbb8a6c9247e8 DIST smtpmap-0.8.234-BETA.tar.bz2 84923 RMD160 19edb786d43ff87b35a510125bc3ab65d19fc5cb SHA1 0efd069cb1257e9603f5e8571e5c35ed103b8a46 SHA256 09fb1aa68a67032dd4ec8816d45ea5fc48796d4b4c11350f3f593fdf307559c2 -EBUILD smtpmap-0.8.234_beta.ebuild 759 RMD160 f02d6253afdbaa86d70af1a313c6d49c1a28028a SHA1 184b26c7e86959297dbcd7442a4166b987babc19 SHA256 92a65814e2983ba2205849334d1a935963dad31759888d86d8f674229e7b9733 -MD5 f4781b619c8c4484bdee106d4170ba37 smtpmap-0.8.234_beta.ebuild 759 -RMD160 f02d6253afdbaa86d70af1a313c6d49c1a28028a smtpmap-0.8.234_beta.ebuild 759 -SHA256 92a65814e2983ba2205849334d1a935963dad31759888d86d8f674229e7b9733 smtpmap-0.8.234_beta.ebuild 759 -MD5 9e6a2f4782cf4016b13216d026284b96 files/digest-smtpmap-0.8.234_beta 262 -RMD160 1e9a5f23404fa2c26dd0f312aec57f5fc02c0ceb files/digest-smtpmap-0.8.234_beta 262 -SHA256 3b143df71ab9ca6c21fb8d015e3b4322eab07d5f31de250060188739669a1c3d files/digest-smtpmap-0.8.234_beta 262 +EBUILD smtpmap-0.8.234_beta.ebuild 903 RMD160 fa052325e34474520a5012057539af5d6079f906 SHA1 f24eb29c82084885fd765e0d6ce8b6ee29ed1021 SHA256 64503d203649f39962e0569b7e60604d1ef9fad3d89037b068236657ecc69b68 diff --git a/net-analyzer/smtpmap/files/digest-smtpmap-0.8.234_beta b/net-analyzer/smtpmap/files/digest-smtpmap-0.8.234_beta deleted file mode 100644 index d491511b5..000000000 --- a/net-analyzer/smtpmap/files/digest-smtpmap-0.8.234_beta +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ed748597a1368388844e8bba6e9d4721 smtpmap-0.8.234-BETA.tar.bz2 84923 -RMD160 19edb786d43ff87b35a510125bc3ab65d19fc5cb smtpmap-0.8.234-BETA.tar.bz2 84923 -SHA256 09fb1aa68a67032dd4ec8816d45ea5fc48796d4b4c11350f3f593fdf307559c2 smtpmap-0.8.234-BETA.tar.bz2 84923 diff --git a/net-analyzer/smtpmap/files/smtpmap-64bit.patch b/net-analyzer/smtpmap/files/smtpmap-64bit.patch new file mode 100644 index 000000000..5599a88c5 --- /dev/null +++ b/net-analyzer/smtpmap/files/smtpmap-64bit.patch @@ -0,0 +1,11 @@ +--- src/mstring.cpp 2010-02-01 12:02:19.972249219 +0100 ++++ src/mstring.cpp 2010-02-01 12:03:33.158999955 +0100 +@@ -546,7 +546,7 @@ + cout << "begin + to_st.leng : " << (void*) (begin + to_st.leng) << endl; + cout << "begin + to_st.leng : " << (begin + to_st.leng) << endl; + */ +- int mv = leng - (int)begin + (int)stripped - to_st.leng + 1; ++ unsigned long mv = leng - (unsigned long)begin + (unsigned long)stripped - to_st.leng + 1; + // cout << "mv : " << mv << endl; + memmove ( begin, begin + to_st.leng , mv ); + begin = strstr ( stripped, to_st.sp ); diff --git a/net-analyzer/smtpmap/smtpmap-0.8.234_beta.ebuild b/net-analyzer/smtpmap/smtpmap-0.8.234_beta.ebuild index 87e3aed95..c4db52c50 100644 --- a/net-analyzer/smtpmap/smtpmap-0.8.234_beta.ebuild +++ b/net-analyzer/smtpmap/smtpmap-0.8.234_beta.ebuild @@ -1,25 +1,36 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + inherit eutils + MY_P=${P/_beta/-BETA} -DESCRIPTION="Smtpmap is a very complete and well done fingerprinter for SMTP, FTP and POP3 fingerprinter" + +DESCRIPTION="a very complete and well done fingerprinter for SMTP, FTP and POP3 fingerprinter" HOMEPAGE="http://www.projectiwear.org/~plasmahh/software.html" SRC_URI="http://www.projectiwear.org/~plasmahh/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" - +KEYWORDS="~x86 ~amd64" IUSE="" + DEPEND="" +RDEPEND="" + S=${WORKDIR}/${MY_P} -src_compile(){ - epatch ${FILESDIR}/gcc-3.4.patch +src_configure(){ + epatch "${FILESDIR}"/gcc-3.4.patch + epatch "${FILESDIR}"/smtpmap-64bit.patch + sed -i "s|-O -Wall|$CFLAGS|g" makefile.conf || die "sed failed" +} + +src_compile() { ./configure -# It has is own configuration script... maybe some sed here after needs to be done + # It has is own configuration script... maybe some sed here after needs to be done emake || die "make failed" }