Attachment #154801 for bug #198903

View | Details | Raw Unified | Return to bug 198903
Collapse All | Expand All





PORTNAME=	libsrtp
DISTVERSIONPREFIX=	v
DISTVERSION=	1.5.2
PORTREVISION=	1
CATEGORIES=	net

MAINTAINER=	alexander@brovikov.ru


GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-openssl
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} '/pkg-config.*openssl/d' ${WRKSRC}/configure
		-e 's/@LDFLAGS@ -L\./-L. @LDFLAGS@/' \
		-e 's/libsrtp.so/&.0/g' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} '/pkg-config/s/openssl/libcrypto/' \
		${WRKSRC}/configure

post-build:
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		${MAKEFILE} ${MAKE_ARGS} shared_library)

post-install:
	${LN} -s libsrtp.so.0 ${STAGEDIR}${PREFIX}/lib/libsrtp.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net/libsrtp/distinfo (-2 / +2 lines)
1	SHA256 (libsrtp-v1.5.0_GH0.tar.gz) = ecf5e9be5a6ec3c73841977dc2e059c69209849f2e500269fa133d4c654f1b47	1	SHA256 (libsrtp-v1.5.2_GH0.tar.gz) = 86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda
2	SIZE (libsrtp-v1.5.0_GH0.tar.gz) = 1687709	2	SIZE (libsrtp-v1.5.2_GH0.tar.gz) = 1690272




--- 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 =




--- 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;

Lines 6-10 Link Here

(-)net/libsrtp/files/patch-libsrtp.pc.in (-1 / +1 lines)
6		6
7	-Libs: -L${libdir} -lsrtp @LIBS@	7	-Libs: -L${libdir} -lsrtp @LIBS@
8	+Libs: -L${libdir} -lsrtp	8	+Libs: -L${libdir} -lsrtp
9	+Requires.private: libcrypto	9	+Libs.private: -lcrypto
10	Cflags: -I${includedir}	10	Cflags: -I${includedir}

Lines 37-41 include/srtp/ut_sim.h Link Here

(-)net/libsrtp/pkg-plist (-1 / +1 lines)
37	include/srtp/xfm.h	37	include/srtp/xfm.h
38	lib/libsrtp.a	38	lib/libsrtp.a
39	lib/libsrtp.so	39	lib/libsrtp.so
40	lib/libsrtp.so.0	40	lib/libsrtp.so.1
41	libdata/pkgconfig/libsrtp.pc	41	libdata/pkgconfig/libsrtp.pc

Return to bug 198903

Lines 3-10 Link Here

(-)net/libsrtp/Makefile (-14 / +11 lines)
3		3
4	PORTNAME= libsrtp	4	PORTNAME= libsrtp
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 1.5.0	6	DISTVERSION= 1.5.2
7	PORTREVISION= 1
8	CATEGORIES= net	7	CATEGORIES= net
9		8
10	MAINTAINER= alexander@brovikov.ru	9	MAINTAINER= alexander@brovikov.ru
Lines 18-46 GH_ACCOUNT= cisco Link Here
18		17
19	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --enable-openssl	19	CONFIGURE_ARGS= --enable-openssl
21	CFLAGS+= -fPIC # Taken from configure script	20	CPPFLAGS+= -I${OPENSSLBASE}/include
		21	LIBS+= -L${OPENSSLBASE}/lib
22	USES= gmake pathfix pkgconfig	22	USES= gmake pathfix pkgconfig
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	USE_OPENSSL= yes	24	USE_OPENSSL= yes
25	WITH_OPENSSL_PORT= yes
26		25
27	.if ! defined(WITH_DEBUG)	26	.if ! defined(WITH_DEBUG)
28	CONFIGURE_ARGS+=--disable-debug	27	CONFIGURE_ARGS+=--disable-debug
29	.endif	28	.endif
30		29
		30	.include <bsd.port.options.mk>
		31
		32	.if ${OPSYS} != FreeBSD \|\| ${OSVERSION} < 1000015
		33	WITH_OPENSSL_PORT= yes
		34	.endif
		35
31	post-patch:	36	post-patch:
32	@${REINPLACE_CMD} \	37	@${REINPLACE_CMD} '/pkg-config.*openssl/d' ${WRKSRC}/configure
33	-e 's/@LDFLAGS@ -L\./-L. @LDFLAGS@/' \
34	-e 's/libsrtp.so/&.0/g' \
35	${WRKSRC}/Makefile.in
36	@${REINPLACE_CMD} '/pkg-config/s/openssl/libcrypto/' \
37	${WRKSRC}/configure
38		38
39	post-build:	39	post-build:
40	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \	40	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
41	${MAKEFILE} ${MAKE_ARGS} libsrtp.so.0)	41	${MAKEFILE} ${MAKE_ARGS} shared_library)
42
43	post-install:
44	${LN} -s libsrtp.so.0 ${STAGEDIR}${PREFIX}/lib/libsrtp.so
45		42
46	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Line 0 Link Here

(-)net/libsrtp/files/patch-Makefile.in (+16 lines)
	1	--- Makefile.in.orig 2015-03-11 14:02:12 UTC
	2	+++ Makefile.in
	3	@@ -84,12 +84,11 @@ pkgconfig_DATA = libsrtp.pc
	4	endif
	5
	6	SHAREDLIBVERSION = 1
	7	-ifeq (linux,$(findstring linux,@host@))
	8	SHAREDLIB_DIR = $(libdir)
	9	SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
	10	SHAREDLIBSUFFIXNOVER = so
	11	SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION)
	12	-else ifeq (mingw,$(findstring mingw,@host@))
	13	+ifeq (mingw,$(findstring mingw,@host@))
	14	SHAREDLIB_DIR = $(bindir)
	15	SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a
	16	SHAREDLIBVERSION =

Lines 1-23 Link Here

(-)net/libsrtp/files/patch-crypto-include-sha1.h (-23 lines)
1	--- crypto/include/sha1.h.orig 2014-10-13 14:35:33 UTC
2	+++ crypto/include/sha1.h
3	@@ -68,17 +68,20 @@ typedef EVP_MD_CTX sha1_ctx_t;
4	*
5	*/
6
7	+static
8	void inline sha1_init (sha1_ctx_t *ctx)
9	{
10	EVP_MD_CTX_init(ctx);
11	EVP_DigestInit(ctx, EVP_sha1());
12	}
13
14	+static
15	void inline sha1_update (sha1_ctx_t ctx, const uint8_t M, int octets_in_msg)
16	{
17	EVP_DigestUpdate(ctx, M, octets_in_msg);
18	}
19
20	+static
21	void inline sha1_final (sha1_ctx_t ctx, uint32_t output)
22	{
23	unsigned int len = 0;