Index: head/net/socat/Makefile =================================================================== --- head/net/socat/Makefile (revision 498298) +++ head/net/socat/Makefile (revision 498299) @@ -1,54 +1,54 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= socat -PORTVERSION= 1.7.3.2 -PORTREVISION= 4 +PORTVERSION= 1.7.3.3 CATEGORIES= net ipv6 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 -GNU_CONFIGURE= yes 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 498298) +++ head/net/socat/distinfo (revision 498299) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485420160 -SHA256 (socat-1.7.3.2.tar.bz2) = e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251 -SIZE (socat-1.7.3.2.tar.bz2) = 493324 +TIMESTAMP = 1554656689 +SHA256 (socat-1.7.3.3.tar.bz2) = 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a +SIZE (socat-1.7.3.3.tar.bz2) = 489901 Index: head/net/socat/files/patch-Makefile.in =================================================================== --- head/net/socat/files/patch-Makefile.in (revision 498298) +++ head/net/socat/files/patch-Makefile.in (nonexistent) @@ -1,14 +0,0 @@ ---- Makefile.in.orig 2017-01-06 20:58:40 UTC -+++ Makefile.in -@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o proca - procan: $(PROCAN_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) - --filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) -+FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o -+filan: $(FILAN_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS) - - libxio.a: $(XIOOBJS) $(UTLOBJS) - $(AR) r $@ $(XIOOBJS) $(UTLOBJS) Property changes on: head/net/socat/files/patch-Makefile.in ___________________________________________________________________ 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-xioopts.c =================================================================== --- head/net/socat/files/patch-xioopts.c (revision 498298) +++ head/net/socat/files/patch-xioopts.c (nonexistent) @@ -1,73 +0,0 @@ ---- xioopts.c.orig 2015-01-24 10:15:22 UTC -+++ xioopts.c -@@ -2971,6 +2971,25 @@ int retropt_bind(struct opt *opts, - OFUNC_TERMIOS_FLAG, OFUNC_TERMIOS_PATTERN, and some OFUNC_SPEC */ - int applyopts(int fd, struct opt *opts, enum e_phase phase) { - struct opt *opt; -+#ifdef HAVE_TERMIOS_ISPEED -+ int ispeed_major = -1, ospeed_major = -1; -+ unsigned int ispeed_value, ospeed_value; -+ bool speed_done = false; -+ -+ opt = opts; while (opt && opt->desc != ODESC_END) { -+ if (opt->desc == ODESC_DONE || -+ (phase != PH_ALL && opt->desc->phase != phase)) { -+ ++opt; continue; } -+ if (opt->desc->optcode == OPT_ISPEED) { -+ ispeed_major = opt->desc->major; -+ ispeed_value = opt->value.u_uint; } -+ if (opt->desc->optcode == OPT_OSPEED) { -+ ospeed_major = opt->desc->major; -+ ospeed_value = opt->value.u_uint; } -+ ++opt; -+ continue; -+ } -+#endif /* HAVE_TERMIOS_ISPEED */ - - opt = opts; while (opt && opt->desc != ODESC_END) { - if (opt->desc == ODESC_DONE || -@@ -3605,21 +3624,29 @@ int applyopts(int fd, struct opt *opts, - - #ifdef HAVE_TERMIOS_ISPEED - } else if (opt->desc->func == OFUNC_TERMIOS_SPEED) { -- union { -- struct termios termarg; -- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; -- } tdata; -- if (Tcgetattr(fd, &tdata.termarg) < 0) { -- Error3("tcgetattr(%d, %p): %s", -- fd, &tdata.termarg, strerror(errno)); -- opt->desc = ODESC_ERROR; ++opt; continue; -- } -- tdata.speeds[opt->desc->major] = opt->value.u_uint; -- if (Tcsetattr(fd, TCSADRAIN, &tdata.termarg) < 0) { -- Error3("tcsetattr(%d, TCSADRAIN, %p): %s", -- fd, &tdata.termarg, strerror(errno)); -- opt->desc = ODESC_ERROR; ++opt; continue; -- } -+ if (speed_done == false) { -+ union { -+ struct termios termarg; -+ speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; -+ } tdata; -+ if (Tcgetattr(fd, &tdata.termarg) < 0) { -+ Error3("tcgetattr(%d, %p): %s", -+ fd, &tdata.termarg, strerror(errno)); -+ opt->desc = ODESC_ERROR; ++opt; continue; -+ } -+ if (ispeed_major < 0 || ospeed_major < 0) -+ tdata.speeds[opt->desc->major] = opt->value.u_uint; -+ else{ -+ tdata.speeds[ispeed_major] = ispeed_value; -+ tdata.speeds[ospeed_major] = ospeed_value; -+ speed_done = true; -+ } -+ if (Tcsetattr(fd, TCSADRAIN, &tdata.termarg) < 0) { -+ Error3("tcsetattr(%d, TCSADRAIN, %p): %s", -+ fd, &tdata.termarg, strerror(errno)); -+ opt->desc = ODESC_ERROR; ++opt; continue; -+ } -+ } - #endif /* HAVE_TERMIOS_ISPEED */ - - } else if (opt->desc->func == OFUNC_TERMIOS_SPEC) { Property changes on: head/net/socat/files/patch-xioopts.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