Index: head/net/socat/Makefile =================================================================== --- head/net/socat/Makefile (revision 560280) +++ head/net/socat/Makefile (revision 560281) @@ -1,55 +1,54 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= socat -PORTVERSION= 1.7.3.4 -PORTREVISION= 1 +PORTVERSION= 1.7.4.0 CATEGORIES= net MASTER_SITES= http://www.dest-unreach.org/socat/download/ \ LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Multipurpose relay and more LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler cpe ssl tar:bzip2 USE_RC_SUBR= socat GNU_CONFIGURE= yes CPE_VENDOR= dest-unreach PORTSCOUT= skipv:2.0.0-b2 PLIST_FILES= bin/filan bin/procan bin/socat man/man1/socat.1.gz \ "@sample etc/socat-instances.conf.sample" PORTDOCS= EXAMPLES README SECURITY FAQ OPTIONS_DEFINE= DOCS READLINE READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline .include .if ${SSL_DEFAULT} != base CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif .if ${COMPILER_TYPE} == "clang" CFLAGS+= -Wno-unused-comparison .endif do-install: .for f in filan procan socat ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${FILESDIR}/socat-instances.conf.sample ${STAGEDIR}${PREFIX}/etc .include Index: head/net/socat/distinfo =================================================================== --- head/net/socat/distinfo (revision 560280) +++ head/net/socat/distinfo (revision 560281) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578296334 -SHA256 (socat-1.7.3.4.tar.bz2) = 972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc -SIZE (socat-1.7.3.4.tar.bz2) = 490552 +TIMESTAMP = 1609754594 +SHA256 (socat-1.7.4.0.tar.bz2) = c8273b30e933be0ad8d509ae75e19ecedf1a60081bb942ed36f2dd8950de3d58 +SIZE (socat-1.7.4.0.tar.bz2) = 509023 Index: head/net/socat/files/patch-procan.c =================================================================== --- head/net/socat/files/patch-procan.c (revision 560280) +++ head/net/socat/files/patch-procan.c (nonexistent) @@ -1,11 +0,0 @@ ---- procan.c.orig 2017-01-06 20:58:40 UTC -+++ procan.c -@@ -21,7 +21,7 @@ - - /* dirty workaround so we dont get an error on AIX when getting linked with - libwrap */ --int allow_severity, deny_severity; -+//int allow_severity, deny_severity; - - - int procan(FILE *outfile) { Property changes on: head/net/socat/files/patch-procan.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/socat/files/patch-filan.c =================================================================== --- head/net/socat/files/patch-filan.c (revision 560280) +++ head/net/socat/files/patch-filan.c (nonexistent) @@ -1,11 +0,0 @@ ---- filan.c.orig 2020-01-01 13:02:06 UTC -+++ filan.c -@@ -30,7 +30,7 @@ static int filan_streams_analyze(int fd, FILE *outfile - - /* dirty workaround so we dont get an error on AIX when being linked with - libwrap */ --int allow_severity, deny_severity; -+//int allow_severity, deny_severity; - - /* global variables for configuring filan */ - bool filan_followsymlinks; Property changes on: head/net/socat/files/patch-filan.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/socat/files/patch-compat.h =================================================================== --- head/net/socat/files/patch-compat.h (nonexistent) +++ head/net/socat/files/patch-compat.h (revision 560281) @@ -0,0 +1,40 @@ +--- 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 Property changes on: head/net/socat/files/patch-compat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property