diff options
-rw-r--r-- | net/asterisk/Makefile | 1 | ||||
-rw-r--r-- | net/asterisk11/Makefile | 1 | ||||
-rw-r--r-- | net/asterisk13/Makefile | 1 | ||||
-rw-r--r-- | net/libsrtp/Makefile | 25 | ||||
-rw-r--r-- | net/libsrtp/distinfo | 4 | ||||
-rw-r--r-- | net/libsrtp/files/patch-Makefile.in | 16 | ||||
-rw-r--r-- | net/libsrtp/files/patch-crypto-include-sha1.h | 23 | ||||
-rw-r--r-- | net/libsrtp/files/patch-libsrtp.pc.in | 2 | ||||
-rw-r--r-- | net/libsrtp/pkg-plist | 2 | ||||
-rw-r--r-- | net/ortp/Makefile | 2 |
10 files changed, 35 insertions, 42 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 1a9419893e8b..c34cf2403a08 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile index 0eb3b6ff04cc..0966ad64dadd 100644 --- a/net/asterisk11/Makefile +++ b/net/asterisk11/Makefile @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.17.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index fd40735b51f8..492d8a1e8b2f 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.3.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ diff --git a/net/libsrtp/Makefile b/net/libsrtp/Makefile index 72775f43e482..007687de9bc4 100644 --- a/net/libsrtp/Makefile +++ b/net/libsrtp/Makefile @@ -3,8 +3,7 @@ PORTNAME= libsrtp DISTVERSIONPREFIX= v -DISTVERSION= 1.5.0 -PORTREVISION= 1 +DISTVERSION= 1.5.2 CATEGORIES= net MAINTAINER= alexander@brovikov.ru @@ -18,29 +17,27 @@ GH_ACCOUNT= cisco GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-openssl -CFLAGS+= -fPIC # Taken from configure script +CPPFLAGS+= -I${OPENSSLBASE}/include +LIBS+= -L${OPENSSLBASE}/lib USES= gmake pathfix pkgconfig USE_LDCONFIG= yes USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes .if ! defined(WITH_DEBUG) CONFIGURE_ARGS+=--disable-debug .endif +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015 +WITH_OPENSSL_PORT= yes +.endif + post-patch: - @${REINPLACE_CMD} \ - -e 's/@LDFLAGS@ -L\./-L. @LDFLAGS@/' \ - -e 's/libsrtp.so/&.0/g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} '/pkg-config/s/openssl/libcrypto/' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure post-build: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} libsrtp.so.0) - -post-install: - ${LN} -s libsrtp.so.0 ${STAGEDIR}${PREFIX}/lib/libsrtp.so + ${MAKEFILE} ${MAKE_ARGS} shared_library) .include <bsd.port.mk> diff --git a/net/libsrtp/distinfo b/net/libsrtp/distinfo index 881e4cb6d2d5..a3d67339536d 100644 --- a/net/libsrtp/distinfo +++ b/net/libsrtp/distinfo @@ -1,2 +1,2 @@ -SHA256 (libsrtp-v1.5.0_GH0.tar.gz) = ecf5e9be5a6ec3c73841977dc2e059c69209849f2e500269fa133d4c654f1b47 -SIZE (libsrtp-v1.5.0_GH0.tar.gz) = 1687709 +SHA256 (libsrtp-v1.5.2_GH0.tar.gz) = 86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda +SIZE (libsrtp-v1.5.2_GH0.tar.gz) = 1690272 diff --git a/net/libsrtp/files/patch-Makefile.in b/net/libsrtp/files/patch-Makefile.in new file mode 100644 index 000000000000..a7f41da3be0a --- /dev/null +++ b/net/libsrtp/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig 2015-03-11 14:02:12 UTC ++++ Makefile.in +@@ -84,12 +84,11 @@ pkgconfig_DATA = libsrtp.pc + endif + + SHAREDLIBVERSION = 1 +-ifeq (linux,$(findstring linux,@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@)) + SHAREDLIB_DIR = $(bindir) + SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a + SHAREDLIBVERSION = diff --git a/net/libsrtp/files/patch-crypto-include-sha1.h b/net/libsrtp/files/patch-crypto-include-sha1.h deleted file mode 100644 index a2857a7f68c3..000000000000 --- a/net/libsrtp/files/patch-crypto-include-sha1.h +++ /dev/null @@ -1,23 +0,0 @@ ---- crypto/include/sha1.h.orig 2014-10-13 14:35:33 UTC -+++ crypto/include/sha1.h -@@ -68,17 +68,20 @@ typedef EVP_MD_CTX sha1_ctx_t; - * - */ - -+static - void inline sha1_init (sha1_ctx_t *ctx) - { - EVP_MD_CTX_init(ctx); - EVP_DigestInit(ctx, EVP_sha1()); - } - -+static - void inline sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) - { - EVP_DigestUpdate(ctx, M, octets_in_msg); - } - -+static - void inline sha1_final (sha1_ctx_t *ctx, uint32_t *output) - { - unsigned int len = 0; diff --git a/net/libsrtp/files/patch-libsrtp.pc.in b/net/libsrtp/files/patch-libsrtp.pc.in index a954489a06b6..2b44f02ce08e 100644 --- a/net/libsrtp/files/patch-libsrtp.pc.in +++ b/net/libsrtp/files/patch-libsrtp.pc.in @@ -6,5 +6,5 @@ -Libs: -L${libdir} -lsrtp @LIBS@ +Libs: -L${libdir} -lsrtp -+Requires.private: libcrypto ++Libs.private: -lcrypto Cflags: -I${includedir} diff --git a/net/libsrtp/pkg-plist b/net/libsrtp/pkg-plist index eea0ce3ca8cd..e0f3d0050d52 100644 --- a/net/libsrtp/pkg-plist +++ b/net/libsrtp/pkg-plist @@ -37,5 +37,5 @@ include/srtp/ut_sim.h include/srtp/xfm.h lib/libsrtp.a lib/libsrtp.so -lib/libsrtp.so.0 +lib/libsrtp.so.1 libdata/pkgconfig/libsrtp.pc diff --git a/net/ortp/Makefile b/net/ortp/Makefile index 256381d723d7..4ced62b13772 100644 --- a/net/ortp/Makefile +++ b/net/ortp/Makefile @@ -3,7 +3,7 @@ PORTNAME= ortp PORTVERSION= 0.23.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SAVANNAH/linphone/ortp/sources |