[gentoo-commits] repo/gentoo:master commit in: net-analyzer/masscan/files/, net-analyzer/masscan/

2018-03-13 Thread Jeroen Roovers
commit: d71c573e44be04466cff44adcb6d982528db6149
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Mar 13 21:27:48 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Mar 13 21:27:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71c573e

net-analyzer/masscan: Old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/masscan/Manifest  |  1 -
 .../masscan/files/masscan-1.0.3-gcc5.patch | 11 --
 net-analyzer/masscan/masscan-1.0.3-r2.ebuild   | 45 --
 3 files changed, 57 deletions(-)

diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest
index 36558711b2b..a852695a753 100644
--- a/net-analyzer/masscan/Manifest
+++ b/net-analyzer/masscan/Manifest
@@ -1,3 +1,2 @@
-DIST masscan-1.0.3.tar.gz 93 BLAKE2B 
b75cab481b5f87694553f373b8fde82ae4c5e001b98816e41138bda7b682edfbd04bfe419f77021784611982cc41b10694ad412d1c784d41b4ba7a0f0c95031b
 SHA512 
e64b11de71d5be95e8f2b1fdfa679f5c8e8074c97f9d60d57659f33aec0699673c5aab72824f62d1a8b0e8c9188dcf296dd078bc6c2dbdad95c35c3a5f40
 DIST masscan-1.0.4.tar.gz 343513 BLAKE2B 
e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a
 SHA512 
eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b
 DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 
83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b
 SHA512 
55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88

diff --git a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch 
b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
deleted file mode 100644
index 6bf92fd25d1..000
--- a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/string_s.h
-+++ b/src/string_s.h
-@@ -77,7 +77,7 @@
-  typedef int errno_t;
- errno_t fopen_s(FILE **fp, const char *filename, const char *mode);
- 
--#elif defined(__GNUC__) && (__GNUC__ == 4)
-+#elif defined(__GNUC__)
- #include 
- /* GCC 4 */
- # define sprintf_s  snprintf

diff --git a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild 
b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
deleted file mode 100644
index 894968ab55b..000
--- a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Mass IP port scanner"
-HOMEPAGE="https://github.com/robertdavidgraham/masscan;
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-   epatch "${FILESDIR}"/${PN}-1.0.3-gcc5.patch
-
-   sed -i \
-   -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
-   -e '/^GITVER :=/s!= .(.*!=!g' \
-   -e '/^SYS/s|gcc|$(CC)|g' \
-   -e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
-   -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
-   Makefile || die
-}
-
-src_compile() {
-   emake CC="$(tc-getCC)"
-}
-
-src_install() {
-   emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
-
-   insinto /etc/masscan
-   doins data/exclude.conf
-   doins "${FILESDIR}"/masscan.conf
-
-   mv doc/bot.{hml,html} || die
-   dohtml doc/bot.html
-   doman doc/masscan.8
-   dodoc *.md
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/masscan/files/, net-analyzer/masscan/

2015-12-22 Thread Jeroen Roovers
commit: ee4de56a941f01982962502abe6d4d612a9c7ed1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Dec 22 21:44:41 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Dec 22 21:45:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4de56a

net-analyzer/masscan: Fix compiling with gcc-5 (bug #569246 by Toralf Förster).

Package-Manager: portage-2.2.26

 .../masscan/files/masscan-1.0.3-gcc5.patch | 11 ++
 net-analyzer/masscan/masscan-1.0.3-r2.ebuild   | 46 ++
 2 files changed, 57 insertions(+)

diff --git a/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch 
b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
new file mode 100644
index 000..6bf92fd
--- /dev/null
+++ b/net-analyzer/masscan/files/masscan-1.0.3-gcc5.patch
@@ -0,0 +1,11 @@
+--- a/src/string_s.h
 b/src/string_s.h
+@@ -77,7 +77,7 @@
+  typedef int errno_t;
+ errno_t fopen_s(FILE **fp, const char *filename, const char *mode);
+ 
+-#elif defined(__GNUC__) && (__GNUC__ == 4)
++#elif defined(__GNUC__)
+ #include 
+ /* GCC 4 */
+ # define sprintf_s  snprintf

diff --git a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild 
b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
new file mode 100644
index 000..99cb0ee
--- /dev/null
+++ b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Mass IP port scanner"
+HOMEPAGE="https://github.com/robertdavidgraham/masscan;
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+src_prepare(){
+   epatch "${FILESDIR}"/${PN}-1.0.3-gcc5.patch
+
+   sed -i \
+   -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \
+   -e '/^GITVER :=/s!= .(.*!=!g' \
+   -e '/^SYS/s|gcc|$(CC)|g' \
+   -e '/$(CC)/s!-DGIT=\"$(GITVER)\"!!g' \
+   -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \
+   Makefile || die
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)"
+}
+
+src_install() {
+   emake CC="$(tc-getCC)" DESTDIR="${D}" PREFIX=/usr install
+
+   insinto /etc/masscan
+   doins data/exclude.conf
+   doins "${FILESDIR}"/masscan.conf
+
+   mv doc/bot.{hml,html} || die
+   dohtml doc/bot.html
+   doman doc/masscan.8
+   dodoc *.md
+}