Attachment 150932 Details for Bug 196248 – Switch libsrtp to today's version from GitHub

[patch] Switch libsrtp to today's version from GitHub

libsrtp-upgrade.patch (text/plain), 3.65 KB, created by Mikhail T. on 2014-12-24 07:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2014-12-24 07:30:00 UTC

Size: 3.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 375385)
>+++ Makefile	(working copy)
>@@ -2,21 +2,33 @@
> # $FreeBSD$
> 
> PORTNAME=	libsrtp
>-PORTVERSION=	1.4.4
>-PORTREVISION=	1
>+PORTVERSION=	20141224
> CATEGORIES=	net
>-MASTER_SITES=	SF/${ORIGNAME}/${ORIGNAME}/${PORTVERSION}
>-DISTNAME=	${ORIGNAME}-${PORTVERSION}
> 
> MAINTAINER=	alexander@brovikov.ru
> COMMENT=	Library implementing Secure RTP
> 
>-WRKSRC=		${WRKDIR}/${ORIGNAME}
> ORIGNAME=	srtp
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake tar:tgz
>-USE_CSTD=	gnu89
>-CFLAGS+=	-fPIC
>+CONFIGURE_ARGS+=--enable-openssl --enable-generic-aesicm --enable-syslog
>+USES=		gmake pkgconfig
>+ALL_TARGET=	all shared_library
>+USE_LDCONFIG=	yes
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	cisco
>+GH_PROJECT=	${PORTNAME}
>+GH_TAGNAME=	${GH_COMMIT}
>+GH_COMMIT=	be155db
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsrtp.so.1
>+	${LN} -sf libsrtp.so.1 ${STAGEDIR}${PREFIX}/lib/libsrtp.so
>+	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* \
>+		${STAGEDIR}${PREFIX}/libdata/pkgconfig
>+
>+test runtest check regression-test: build
>+	${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${GMAKE} -C ${WRKSRC} runtest
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 375385)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (srtp-1.4.4.tgz) = d9c2cbb1c95172ed2dc963eff0d6ce1072326dc81cb1dd38414e9f0e430af314
>-SIZE (srtp-1.4.4.tgz) = 502890
>+SHA256 (libsrtp-20141224.tar.gz) = 03cc7299caef41dc124d8d8872114740062c9d9886fc2e6c93bbcb397524e278
>+SIZE (libsrtp-20141224.tar.gz) = 1688384
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 0)
>+++ files/patch-Makefile.in	(working copy)
>@@ -0,0 +1,31 @@
>+--- Makefile.in	2014-12-04 08:48:49.000000000 -0500
>++++ Makefile.in	2014-12-24 01:47:40.000000000 -0500
>+@@ -45,5 +45,5 @@
>+ INCDIR	= -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include
>+ DEFS	= @DEFS@
>+-CPPFLAGS= -fPIC @CPPFLAGS@
>++CPPFLAGS= @CPPFLAGS@
>+ CFLAGS	= @CFLAGS@
>+ LIBS	= @LIBS@
>+@@ -85,5 +85,5 @@
>+ 
>+ SHAREDLIBVERSION = 1
>+-ifeq (linux,$(findstring linux,@host@))
>++ifneq ("", $(filter %bsd% %linux%, @host@))
>+ SHAREDLIB_DIR = $(libdir)
>+ SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
>+@@ -109,4 +109,7 @@
>+ 	$(COMPILE) -c $< -o $@
>+ 
>++%.So: %.c
>++	$(COMPILE) -fPIC -DPIC -c $< -o $@
>++
>+ %$(EXE): %.c
>+ 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
>+@@ -144,5 +147,5 @@
>+ 	$(RANLIB) libsrtp.a
>+ 
>+-libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi)
>++libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So)
>+ 	$(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \
>+                 $^ $(LDFLAGS) $(LIBS)
>
>Property changes on: files/patch-Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 375385)
>+++ pkg-plist	(working copy)
>@@ -1,7 +1,12 @@
> lib/libsrtp.a
>+lib/libsrtp.so.1
>+lib/libsrtp.so
>+libdata/pkgconfig/libsrtp.pc
> 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
>@@ -12,6 +17,7 @@
> 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

Actions: View | Diff

Attachments on bug 196248: 150932 | 150933 | 151190