diff --git a/net/socat/Makefile b/net/socat/Makefile index cfce97b60993..895ea0eb7f0d 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= socat -PORTVERSION= 1.7.4.0 +PORTVERSION= 1.7.4.1 CATEGORIES= net MASTER_SITES= http://www.dest-unreach.org/socat/download/ \ LOCAL/ehaupt diff --git a/net/socat/distinfo b/net/socat/distinfo index 75d25036895b..1c25df50bc96 100644 --- a/net/socat/distinfo +++ b/net/socat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609754594 -SHA256 (socat-1.7.4.0.tar.bz2) = c8273b30e933be0ad8d509ae75e19ecedf1a60081bb942ed36f2dd8950de3d58 -SIZE (socat-1.7.4.0.tar.bz2) = 509023 +TIMESTAMP = 1610295740 +SHA256 (socat-1.7.4.1.tar.bz2) = 3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9 +SIZE (socat-1.7.4.1.tar.bz2) = 510101 diff --git a/net/socat/files/patch-compat.h b/net/socat/files/patch-compat.h deleted file mode 100644 index 1d99b092e441..000000000000 --- a/net/socat/files/patch-compat.h +++ /dev/null @@ -1,40 +0,0 @@ ---- compat.h.orig 2021-01-03 18:23:22 UTC -+++ compat.h -@@ -134,6 +134,8 @@ typedef int sig_atomic_t; - # define F_uint64_t "%u" - # elif HAVE_BASIC_UINT64_T==6 - # define F_uint64_t "%lu" -+# elif HAVE_BASIC_UINT64_T==8 -+# define F_uint64_t "%llu" - # else - # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T - # endif -@@ -147,7 +149,7 @@ typedef int sig_atomic_t; - # elif HAVE_BASIC_INT16_T==3 - # define F_int16_t "%d" - # elif HAVE_BASIC_INT16_T==5 --# define F_int16_t "%l" -+# define F_int16_t "%ld" - # else - # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T - # endif -@@ -161,7 +163,7 @@ typedef int sig_atomic_t; - # elif HAVE_BASIC_INT32_T==3 - # define F_int32_t "%d" - # elif HAVE_BASIC_INT32_T==5 --# define F_int32_t "%l" -+# define F_int32_t "%ld" - # else - # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T - # endif -@@ -175,7 +177,9 @@ typedef int sig_atomic_t; - # elif HAVE_BASIC_INT64_T==3 - # define F_int64_t "%d" - # elif HAVE_BASIC_INT64_T==5 --# define F_int64_t "%l" -+# define F_int64_t "%ld" -+# elif HAVE_BASIC_INT64_T==7 -+# define F_int64_t "%lld" - # else - # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T - # endif