masscan: Update to 1.3.2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: masscan: Update to 1.3.2
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Wed, 10 Feb 2021 17:02:57 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Feb 10 18:02:57 2021 +0100
Changeset:	2721f05a29e1ad9106d65a68a9dd2fe361cd8ece

Modified Files:
	masscan/Makefile
	masscan/distinfo
Removed Files:
	masscan/patches/patch-Makefile
	masscan/patches/patch-src_pixie-threads.c
	masscan/patches/patch-src_rawsock-getif.c
	masscan/patches/patch-src_rawsock-getroute.c

Log Message:
masscan: Update to 1.3.2

pkgsrc changes:
 - Remove patches: applied upstream differently

Changes:
1.3.2
-----
 - Support for some VPNs
 - Fixes

1.3.1
-----
 - Version 1.3.0 was the initial IPv6 release, which was a massive change to
   the code.  This release is full of fixes for all the small problems this
   introduced.

1.3.0
-----
 - Add support for IPv6

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2721f05a29e1ad9106d65a68a9dd2fe361cd8ece

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 masscan/Makefile                             |  2 +-
 masscan/distinfo                             | 12 ++++------
 masscan/patches/patch-Makefile               | 27 -----------------------
 masscan/patches/patch-src_pixie-threads.c    | 33 ----------------------------
 masscan/patches/patch-src_rawsock-getif.c    | 15 -------------
 masscan/patches/patch-src_rawsock-getroute.c | 15 -------------
 6 files changed, 5 insertions(+), 99 deletions(-)

diffs:
diff --git a/masscan/Makefile b/masscan/Makefile
index 8699b8b62b..44eea40234 100644
--- a/masscan/Makefile
+++ b/masscan/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	masscan-1.0.5
+DISTNAME=	masscan-1.3.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=robertdavidgraham/}
 
diff --git a/masscan/distinfo b/masscan/distinfo
index e4ff9d67d5..80fcf064a5 100644
--- a/masscan/distinfo
+++ b/masscan/distinfo
@@ -1,10 +1,6 @@
 $NetBSD$
 
-SHA1 (masscan-1.0.5.tar.gz) = fbe0a87f355688bf7b38bf3ba64f0902c6dda50b
-RMD160 (masscan-1.0.5.tar.gz) = d3b86be1ac263a592e846405ab2705bd7358b1aa
-SHA512 (masscan-1.0.5.tar.gz) = 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88
-Size (masscan-1.0.5.tar.gz) = 353901 bytes
-SHA1 (patch-Makefile) = 7233a8c919c85d029bc4e215f0993084fbcc78bc
-SHA1 (patch-src_pixie-threads.c) = 0790a0898605d1d7ada27c9b0370d790a7347934
-SHA1 (patch-src_rawsock-getif.c) = 19194dfc5c4689db2c05272b32af7a0f281cef7a
-SHA1 (patch-src_rawsock-getroute.c) = 85b538570f1436fdde2ef1474ffa4da77517df01
+SHA1 (masscan-1.3.2.tar.gz) = 554d9a56a1fdbda9c9a65261a59f1167c971a8df
+RMD160 (masscan-1.3.2.tar.gz) = 1173b20a382ee8daeaea574fcac200d1266ea06e
+SHA512 (masscan-1.3.2.tar.gz) = b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27
+Size (masscan-1.3.2.tar.gz) = 463449 bytes
diff --git a/masscan/patches/patch-Makefile b/masscan/patches/patch-Makefile
deleted file mode 100644
index 1c4755d64c..0000000000
--- a/masscan/patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-- Treats NetBSD like {Free,Open}BSD
-- Do not force optimizations in CFLAGS and honor user-defined CFLAGS
-
---- Makefile.orig	2018-03-08 11:45:23.000000000 +0000
-+++ Makefile
-@@ -65,11 +65,18 @@ INCLUDES = -I.
- FLAGS2 =
- endif
- 
-+# NetBSD
-+ifneq (, $(findstring netbsd, $(SYS)))
-+LIBS = -lm -pthread
-+INCLUDES = -I.
-+FLAGS2 =
-+endif
-+
- # this works on llvm or real gcc
- CC = clang
- 
- DEFINES = 
--CFLAGS = -g -ggdb $(FLAGS2) $(INCLUDES) $(DEFINES) -Wall -O3
-+CFLAGS += $(FLAGS2) $(INCLUDES) $(DEFINES) -Wall
- .SUFFIXES: .c .cpp
- 
- all: bin/masscan 
diff --git a/masscan/patches/patch-src_pixie-threads.c b/masscan/patches/patch-src_pixie-threads.c
deleted file mode 100644
index 171fbf1a95..0000000000
--- a/masscan/patches/patch-src_pixie-threads.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Treats NetBSD like {Free,Open}BSD
-
---- src/pixie-threads.c.orig	2017-06-06 03:59:39.000000000 +0000
-+++ src/pixie-threads.c
-@@ -12,7 +12,7 @@
- #include <errno.h>
- #endif
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-@@ -122,7 +122,7 @@ pixie_cpu_get_count(void)
-         return 1;
-     else
-         return count;
--#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-     /* BSD - use sysctl() function */
-         int x;
-         int mib[2];
-@@ -180,7 +180,7 @@ pixie_begin_thread(
- #if defined(WIN32)
-     UNUSEDPARM(flags);
-     return _beginthread(worker_thread, 0, worker_data);
--#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__kFreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__kFreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 
-     typedef void *(*PTHREADFUNC)(void*);
-     pthread_t thread_id = 0;
diff --git a/masscan/patches/patch-src_rawsock-getif.c b/masscan/patches/patch-src_rawsock-getif.c
deleted file mode 100644
index 4326218175..0000000000
--- a/masscan/patches/patch-src_rawsock-getif.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Treats NetBSD like {Free,Open}BSD
-
---- src/rawsock-getif.c.orig	2017-06-06 03:59:39.000000000 +0000
-+++ src/rawsock-getif.c
-@@ -9,7 +9,7 @@
- 
- #include "ranges.h" /*for parsing IPv4 addresses */
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <unistd.h>
- #include <sys/socket.h>
- #include <net/route.h>
diff --git a/masscan/patches/patch-src_rawsock-getroute.c b/masscan/patches/patch-src_rawsock-getroute.c
deleted file mode 100644
index cba48bb97a..0000000000
--- a/masscan/patches/patch-src_rawsock-getroute.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Treats NetBSD like {Free,Open}BSD
-
---- src/rawsock-getroute.c.orig	2017-06-06 03:59:39.000000000 +0000
-+++ src/rawsock-getroute.c
-@@ -10,7 +10,7 @@
- #include "ranges.h" /*for parsing IPv4 addresses */
- 
- 
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <unistd.h>
- #include <sys/socket.h>
- #include <net/route.h>
Prev by Date: nagios-plugin-printer: remove, imported to pkgsrc/net
Next by Date: masscan: Add a TODO about possible ctype(3) misuse
Previous by Thread: nagios-plugin-printer: remove, imported to pkgsrc/net
Next by Thread: masscan: Add a TODO about possible ctype(3) misuse
Indexes:
Home | Main Index | Thread Index | Old Index