From be07168cad2510aeee0dc9d308de5d05eb9770c1 Mon Sep 17 00:00:00 2001 From: sebastia Date: Wed, 15 Oct 2014 10:31:21 +0000 Subject: [PATCH] Update TclUDP to 1.0.11, initial version from me, with lots of discussions and improvements to my version from stu@ and landry@ OK to this version stu@ (and landry@ on my initial version) --- net/tcludp/Makefile | 16 +++++++-------- net/tcludp/distinfo | 7 ++----- net/tcludp/patches/patch-configure | 24 +++++++++++----------- net/tcludp/patches/patch-generic_udp_tcl_c | 14 +++++++++++++ net/tcludp/pkg/PLIST | 4 ++-- 5 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 net/tcludp/patches/patch-generic_udp_tcl_c diff --git a/net/tcludp/Makefile b/net/tcludp/Makefile index 40722b4994e..1edd1385490 100644 --- a/net/tcludp/Makefile +++ b/net/tcludp/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.8 2013/03/11 11:35:57 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2014/10/15 10:31:21 sebastia Exp $ SHARED_ONLY = Yes COMMENT = Tcl UDP extension -DISTNAME = tcludp-1.0.8 -REVISION = 0 -SHARED_LIBS = udp108 0.0 +DISTNAME = tcludp-1.0.11 CATEGORIES = net -HOMEPAGE = http://tcludp.sourceforge.net/ +HOMEPAGE = http://sourceforge.net/projects/tcludp/ MAINTAINER = Sebastian Reitenbach # BSD @@ -18,6 +16,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcludp/} MODULES = lang/tcl BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} +MAKE_FLAGS = DTPLITE=: FAKE_FLAGS = PKG_DIR=tcludp SEPARATE_BUILD =Yes USE_GROFF = Yes @@ -26,10 +25,9 @@ CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --with-tcl=${MODTCL_LIBDIR} \ --libdir=${MODTCL_TCLDIR} \ - --datadir=${PREFIX}/share/examples \ - SHLIB_VERSION=${LIBudp108_VERSION} \ - CFLAGS="${CFLAGS} -pthread" + --datadir=${PREFIX}/share/examples -TEST_TARGET =test +WRKDIST = ${WRKDIR}/tcludp +TEST_TARGET = test .include diff --git a/net/tcludp/distinfo b/net/tcludp/distinfo index d2a4cec1265..cad7bfbcee4 100644 --- a/net/tcludp/distinfo +++ b/net/tcludp/distinfo @@ -1,5 +1,2 @@ -MD5 (tcludp-1.0.8.tar.gz) = YN06VT/I5Xns/WYiJS2i0g== -RMD160 (tcludp-1.0.8.tar.gz) = VRRjhyzhthjt0LQRWXM1XdehIYM= -SHA1 (tcludp-1.0.8.tar.gz) = vZ/M41p1T549+YAm+muAoDtP+oo= -SHA256 (tcludp-1.0.8.tar.gz) = i6gCrrtsor2I4FwxKCf/Xxa3fulNk1X3fihwEa3iyBk= -SIZE (tcludp-1.0.8.tar.gz) = 129410 +SHA256 (tcludp-1.0.11.tar.gz) = qKKdVacY65Cq2mQ4QbPgcVIW0nzqLi3yQ+GE7beAqp0= +SIZE (tcludp-1.0.11.tar.gz) = 147564 diff --git a/net/tcludp/patches/patch-configure b/net/tcludp/patches/patch-configure index eefd800e322..10c5615a807 100644 --- a/net/tcludp/patches/patch-configure +++ b/net/tcludp/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.2 2011/01/05 18:08:46 sebastia Exp $ ---- configure.orig Mon May 15 10:27:16 2006 -+++ configure Fri Dec 17 02:06:17 2010 -@@ -8419,7 +8419,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - DL_LIBS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - echo "$as_me:$LINENO: checking for ELF" >&5 - echo $ECHO_N "checking for ELF... $ECHO_C" >&6 - if test "${tcl_cv_ld_elf+set}" = set; then +$OpenBSD: patch-configure,v 1.3 2014/10/15 10:31:21 sebastia Exp $ +--- configure.orig Thu Oct 9 05:40:11 2014 ++++ configure Thu Oct 9 05:40:23 2014 +@@ -7173,7 +7173,7 @@ fi + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + fi + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' ++ SHARED_LIB_SUFFIX='.so' + LDFLAGS="-Wl,-export-dynamic" + ;; + esac diff --git a/net/tcludp/patches/patch-generic_udp_tcl_c b/net/tcludp/patches/patch-generic_udp_tcl_c new file mode 100644 index 00000000000..6fcf086cdb2 --- /dev/null +++ b/net/tcludp/patches/patch-generic_udp_tcl_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-generic_udp_tcl_c,v 1.1 2014/10/15 10:31:21 sebastia Exp $ + +Nothing to free when getaddrinfo returns error. + +--- generic/udp_tcl.c.orig Thu Oct 9 07:23:05 2014 ++++ generic/udp_tcl.c Thu Oct 9 07:23:25 2014 +@@ -1315,7 +1315,6 @@ UdpMulticast(UdpState *statePtr, Tcl_Interp *interp, + + if (r != 0 ) { + Tcl_SetResult(interp, "invalid group name", TCL_STATIC); +- freeaddrinfo(result); + return TCL_ERROR; + } else { + memcpy(&mreq6.ipv6mr_multiaddr, &((struct sockaddr_in6*)(result->ai_addr))->sin6_addr,sizeof(mreq6.ipv6mr_multiaddr)); diff --git a/net/tcludp/pkg/PLIST b/net/tcludp/pkg/PLIST index 85bd21a799c..5c6299dcffd 100644 --- a/net/tcludp/pkg/PLIST +++ b/net/tcludp/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.2 2011/01/05 18:08:46 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.3 2014/10/15 10:31:21 sebastia Exp $ lib/tcl/tcludp/ -@lib lib/tcl/tcludp/libudp108.so.${LIBudp108_VERSION} +lib/tcl/tcludp/libudp.so lib/tcl/tcludp/pkgIndex.tcl @man man/mann/udp.n share/examples/tcludp/