Date: Sun, 10 Jun 2018 14:46:31 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472142 - in head/net: . libsrtp2 libsrtp2/files Message-ID: <201806101446.w5AEkV9p064841@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Jun 10 14:46:30 2018 New Revision: 472142 URL: https://svnweb.freebsd.org/changeset/ports/472142 Log: Add net/libsrtp2 2.2.0 (API not compatible with net/libsrtp). PR: 228866 Added: head/net/libsrtp2/ - copied from r472134, head/net/libsrtp/ head/net/libsrtp2/files/patch-libsrtp2.pc.in - copied, changed from r472134, head/net/libsrtp/files/patch-libsrtp.pc.in Deleted: head/net/libsrtp2/files/patch-libsrtp.pc.in Modified: head/net/Makefile head/net/libsrtp2/Makefile head/net/libsrtp2/distinfo head/net/libsrtp2/files/patch-Makefile.in head/net/libsrtp2/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Sun Jun 10 14:29:44 2018 (r472141) +++ head/net/Makefile Sun Jun 10 14:46:30 2018 (r472142) @@ -423,6 +423,7 @@ SUBDIR += libsignal SUBDIR += libsocket++ SUBDIR += libsrtp + SUBDIR += libsrtp2 SUBDIR += libstorj SUBDIR += libtnl SUBDIR += libtrace Modified: head/net/libsrtp2/Makefile ============================================================================== --- head/net/libsrtp/Makefile Sun Jun 10 13:03:20 2018 (r472134) +++ head/net/libsrtp2/Makefile Sun Jun 10 14:46:30 2018 (r472142) @@ -1,10 +1,10 @@ -# Created by: Alexander Brovikov <alexander@brovikov.ru> # $FreeBSD$ PORTNAME= libsrtp DISTVERSIONPREFIX= v -DISTVERSION= 1.6.0 +DISTVERSION= 2.2.0 CATEGORIES= net +PKGNAMESUFFIX= 2 MAINTAINER= tijl@FreeBSD.org COMMENT= Secure RTP (SRTP) Reference Implementation @@ -12,16 +12,14 @@ COMMENT= Secure RTP (SRTP) Reference Implementation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= openssl-devel - -PORTSCOUT= limit:^1\. - USE_GITHUB= yes GH_ACCOUNT= cisco GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-openssl -USES= cpe localbase gmake pathfix pkgconfig ssl +CONFIGURE_ARGS= --enable-openssl \ + crypto_CFLAGS="-I${OPENSSLINC}" \ + crypto_LIBS="${OPENSSLLIB}/libcrypto.so" +USES= cpe gmake pkgconfig ssl CPE_VENDOR= cisco USE_LDCONFIG= yes @@ -29,11 +27,7 @@ ALL_TARGET= all shared_library TEST_TARGET= runtest TEST_ENV= LD_LIBRARY_PATH=${WRKSRC} -.if ! defined(WITH_DEBUG) -CONFIGURE_ARGS+=--disable-debug -.endif - post-patch: - @${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure + @${REINPLACE_CMD} '/supported_cflags=.*-fPIC/d' ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/net/libsrtp2/distinfo ============================================================================== --- head/net/libsrtp/distinfo Sun Jun 10 13:03:20 2018 (r472134) +++ head/net/libsrtp2/distinfo Sun Jun 10 14:46:30 2018 (r472142) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517320244 -SHA256 (cisco-libsrtp-v1.6.0_GH0.tar.gz) = 1a3e7904354d55e45b3c5c024ec0eab1b8fa76fdbf4dd2ea2625dad2b3c6edde -SIZE (cisco-libsrtp-v1.6.0_GH0.tar.gz) = 1648862 +TIMESTAMP = 1528637386 +SHA256 (cisco-libsrtp-v2.2.0_GH0.tar.gz) = 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b +SIZE (cisco-libsrtp-v2.2.0_GH0.tar.gz) = 308469 Modified: head/net/libsrtp2/files/patch-Makefile.in ============================================================================== --- head/net/libsrtp/files/patch-Makefile.in Sun Jun 10 13:03:20 2018 (r472134) +++ head/net/libsrtp2/files/patch-Makefile.in Sun Jun 10 14:46:30 2018 (r472142) @@ -1,29 +1,20 @@ ---- Makefile.in 2015-03-11 14:02:12 UTC -+++ Makefile.in 2015-04-14 17:56:33 -0400 -@@ -44,7 +44,7 @@ - CC = @CC@ - INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include - DEFS = @DEFS@ --CPPFLAGS= -fPIC @CPPFLAGS@ -+CPPFLAGS= @CPPFLAGS@ - CFLAGS = @CFLAGS@ - LIBS = @LIBS@ - LDFLAGS = -L. @LDFLAGS@ -@@ -84,12 +84,11 @@ - endif +--- Makefile.in.orig 2018-05-15 19:33:24 UTC ++++ Makefile.in +@@ -82,12 +82,11 @@ pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libsrtp2.pc SHAREDLIBVERSION = 1 --ifeq (linux,$(findstring linux,@host@)) +-ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@))) SHAREDLIB_DIR = $(libdir) SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ SHAREDLIBSUFFIXNOVER = so SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) --else ifeq (mingw,$(findstring mingw,@host@)) -+ifeq (mingw,$(findstring mingw,@host@)) +-else ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) ++ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) SHAREDLIB_DIR = $(bindir) - SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a + SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp2.dll.a SHAREDLIBVERSION = -@@ -108,6 +107,9 @@ +@@ -106,6 +105,9 @@ endif %.o: %.c $(COMPILE) -c $< -o $@ @@ -33,12 +24,12 @@ %$(EXE): %.c $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) -@@ -143,7 +145,7 @@ - ar cr libsrtp.a $^ - $(RANLIB) libsrtp.a +@@ -137,7 +139,7 @@ libsrtp2.a: $(srtpobj) $(cryptobj) $(gdoi) + $(AR) cr libsrtp2.a $^ + $(RANLIB) libsrtp2.a --libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) -+libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) +-libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) ++libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ - $^ $(LDFLAGS) $(LIBS) + $^ $(LDFLAGS) $(LIBS) if [ -n "$(SHAREDLIBVERSION)" ]; then \ Copied and modified: head/net/libsrtp2/files/patch-libsrtp2.pc.in (from r472134, head/net/libsrtp/files/patch-libsrtp.pc.in) ============================================================================== --- head/net/libsrtp/files/patch-libsrtp.pc.in Sun Jun 10 13:03:20 2018 (r472134, copy source) +++ head/net/libsrtp2/files/patch-libsrtp2.pc.in Sun Jun 10 14:46:30 2018 (r472142) @@ -1,10 +1,10 @@ ---- libsrtp.pc.in.orig 2014-12-30 16:27:06 UTC -+++ libsrtp.pc.in +--- libsrtp2.pc.in.orig 2014-12-30 16:27:06 UTC ++++ libsrtp2.pc.in @@ -7,5 +7,6 @@ Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Description: Library for SRTP (Secure Realtime Transport Protocol) --Libs: -L${libdir} -lsrtp @LIBS@ -+Libs: -L${libdir} -lsrtp +-Libs: -L${libdir} -lsrtp2 @LIBS@ ++Libs: -L${libdir} -lsrtp2 +Libs.private: -lcrypto Cflags: -I${includedir} Modified: head/net/libsrtp2/pkg-plist ============================================================================== --- head/net/libsrtp/pkg-plist Sun Jun 10 13:03:20 2018 (r472134) +++ head/net/libsrtp2/pkg-plist Sun Jun 10 14:46:30 2018 (r472142) @@ -1,41 +1,8 @@ -include/srtp/aes.h -include/srtp/aes_cbc.h -include/srtp/aes_gcm_ossl.h -include/srtp/aes_icm.h -include/srtp/aes_icm_ossl.h -include/srtp/alloc.h -include/srtp/auth.h -include/srtp/cipher.h -include/srtp/config.h -include/srtp/crypto.h -include/srtp/crypto_kernel.h -include/srtp/crypto_math.h -include/srtp/crypto_types.h -include/srtp/cryptoalg.h -include/srtp/datatypes.h -include/srtp/ekt.h -include/srtp/err.h -include/srtp/getopt_s.h -include/srtp/gf2_8.h -include/srtp/hmac.h -include/srtp/integers.h -include/srtp/kernel_compat.h -include/srtp/key.h -include/srtp/null_auth.h -include/srtp/null_cipher.h -include/srtp/prng.h -include/srtp/rand_source.h -include/srtp/rdb.h -include/srtp/rdbx.h -include/srtp/rtp.h -include/srtp/rtp_priv.h -include/srtp/sha1.h -include/srtp/srtp.h -include/srtp/srtp_priv.h -include/srtp/stat.h -include/srtp/ut_sim.h -include/srtp/xfm.h -lib/libsrtp.a -lib/libsrtp.so -lib/libsrtp.so.1 -libdata/pkgconfig/libsrtp.pc +include/srtp2/auth.h +include/srtp2/cipher.h +include/srtp2/crypto_types.h +include/srtp2/srtp.h +lib/libsrtp2.a +lib/libsrtp2.so +lib/libsrtp2.so.1 +libdata/pkgconfig/libsrtp2.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806101446.w5AEkV9p064841>