Attachment 157680 Details for Bug 200816 – patch

[patch] patch

patch-polarssl13.txt (text/plain), 3.38 KB, created by FreeBSD Ports on 2015-06-12 14:24:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: FreeBSD Ports

Created: 2015-06-12 14:24:04 UTC

Size: 3.38 KB

patch

obsolete

>Index: polarssl13/Makefile
>===================================================================
>--- polarssl13/Makefile	(revision 389273)
>+++ polarssl13/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	polarssl
>-PORTVERSION=	1.3.10
>+PORTVERSION=	1.3.11
> DISTVERSIONSUFFIX=	-gpl
> #PORTREVISION=	1
> CATEGORIES=	security devel
>@@ -33,11 +33,11 @@
> do-install:
> 	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include "! -name *.orig"
> 	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${STAGEDIR}${PREFIX}/lib/
>-	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.8
>-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libpolarssl.so)
>-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.8 libmbedtls.so.8)
>-	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.8 libmbedtls.so)
>+	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.9
>+	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libpolarssl.so)
>+	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.9 libmbedtls.so.9)
>+	(cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libmbedtls.so.9 libmbedtls.so)
> .for i in ${BINFILES}
> 	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
> .endfor
>Index: polarssl13/distinfo
>===================================================================
>--- polarssl13/distinfo	(revision 389273)
>+++ polarssl13/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mbedtls-1.3.10-gpl.tgz) = 746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e
>-SIZE (mbedtls-1.3.10-gpl.tgz) = 1709888
>+SHA256 (mbedtls-1.3.11-gpl.tgz) = 67a593027b6a442a4fa5b6c224c4ac8cdae5be721f5a28a11d34f10dcda441cb
>+SIZE (mbedtls-1.3.11-gpl.tgz) = 1731809
>Index: polarssl13/files/patch-library-Makefile
>===================================================================
>--- polarssl13/files/patch-library-Makefile	(revision 389273)
>+++ polarssl13/files/patch-library-Makefile	(working copy)
>@@ -1,16 +1,21 @@
>---- library/Makefile.orig	2015-02-11 01:00:42.000000000 +0900
>-+++ library/Makefile	2015-02-18 12:47:25.000000000 +0900
>-@@ -18,9 +18,7 @@
>- # CFLAGS += -D_BSD_EXTENSION
>+--- library/Makefile.orig	2015-06-12 04:52:45.541565710 -0700
>++++ library/Makefile	2015-06-12 04:54:29.037559649 -0700
>+@@ -24,12 +24,12 @@
>+ endif
>  
>  # To compile as a shared library:
> -ifdef SHARED
>- CFLAGS += -fPIC
>++#ifdef SHARED
>+ # all code is position-indep with mingw, avoid warning about useless flag
>+ ifndef WINDOWS_BUILD
>+ LOCAL_CFLAGS += -fPIC -fpic
>+ endif
> -endif
>++#endif
>  
>- SONAME=libmbedtls.so.8
>+ SOEXT=so.9
>  
>-@@ -65,11 +63,7 @@
>+@@ -73,11 +73,11 @@
>  
>  .SILENT:
>  
>@@ -17,8 +22,12 @@
> -ifndef SHARED
> -all: static
> -else
>++#ifndef SHARED
>++#all: static
>++#else
>  all: shared static
> -endif
>++#endif
>  
>  static: libpolarssl.a
>  
>Index: polarssl13/pkg-plist
>===================================================================
>--- polarssl13/pkg-plist	(revision 389273)
>+++ polarssl13/pkg-plist	(working copy)
>@@ -84,9 +84,9 @@
> include/polarssl/xtea.h
> lib/libpolarssl.a
> lib/libpolarssl.so
>-lib/libpolarssl.so.8
>+lib/libpolarssl.so.9
> lib/libmbedtls.so
>-lib/libmbedtls.so.8
>+lib/libmbedtls.so.9
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/README.rst
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE

Actions: View | Diff

Attachments on bug 200816: 157675 | 157676 | 157679 | 157680 | 157681