Attachment 144742 Details for Bug 191913 – polarssl.patch

[patch] polarssl.patch

polarssl.patch (text/plain), 4.78 KB, created by takefu on 2014-07-17 07:43:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-07-17 07:43:32 UTC

Size: 4.78 KB

patch

obsolete

>diff -ruN /usr/ports/security/polarssl/Makefile ./Makefile
>--- /usr/ports/security/polarssl/Makefile	2014-02-21 22:39:24.000000000 +0900
>+++ ./Makefile	2014-07-17 16:20:14.000000000 +0900
>@@ -1,24 +1,19 @@
> # $FreeBSD: head/security/polarssl/Makefile 345433 2014-02-21 13:39:24Z ehaupt $
> 
> PORTNAME=	polarssl
>-PORTVERSION=	1.2.10
>+PORTVERSION=	1.2.11
> DISTVERSIONSUFFIX=	-gpl
> CATEGORIES=	security devel
>-MASTER_SITES=	http://polarssl.org/download/
>-EXTRACT_SUFX=	.tgz
>+MASTER_SITES=	https://polarssl.org/download/
> 
> MAINTAINER=	jase@FreeBSD.org
> COMMENT=	Open Source embedded SSL/TLS cryptographic library
> 
> LICENSE=	GPLv2
> 
>-# bypass the HTML "now downloading..." splash site, code below
>-# .include <bsd.port.pre.mk>
>-URL_SUFFIX=	?do=yes
>-FETCH_ARGS=	-pRro ${DISTFILES}
> ALL_TARGET=	no_test
> 
>-USES=	gmake
>+USES=		gmake tar:tgz
> USE_LDCONFIG=	yes
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>@@ -38,7 +33,7 @@
> 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.0
>+	${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.so ${STAGEDIR}${PREFIX}/lib/libpolarssl.so.0
> 	cd ${STAGEDIR}${PREFIX}/lib/ && ${LN} -sf libpolarssl.so.0 libpolarssl.so
> .for i in ${BINFILES}
> 	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${STAGEDIR}${PREFIX}/bin/polarssl_${i}
>@@ -56,13 +51,8 @@
> .endfor
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-FETCH_CMD=	${SH} ${FILESDIR}/fetchwrapper.sh \
>-			${URL_SUFFIX} ${FETCH_BINARY} ${FETCH_ARGS}
>-
> .if ${ARCH} == "powerpc"
> BROKEN=		Does not compile on powerpc
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN /usr/ports/security/polarssl/distinfo ./distinfo
>--- /usr/ports/security/polarssl/distinfo	2013-10-19 07:18:20.000000000 +0900
>+++ ./distinfo	2014-07-17 14:31:33.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (polarssl-1.2.10-gpl.tgz) = b45a06b2fdeb0833970e6fb69bc331f2757a1b7e85537b02c1f169434ed888fa
>-SIZE (polarssl-1.2.10-gpl.tgz) = 999515
>+SHA256 (polarssl-1.2.11-gpl.tgz) = b3e9d059c687980976b468d8260f658e9003aede1dbc4a918526e90abdaa7d75
>+SIZE (polarssl-1.2.11-gpl.tgz) = 1020170
>diff -ruN /usr/ports/security/polarssl/files/fetchwrapper.sh ./files/fetchwrapper.sh
>--- /usr/ports/security/polarssl/files/fetchwrapper.sh	2013-08-15 02:28:32.000000000 +0900
>+++ ./files/fetchwrapper.sh	1970-01-01 09:00:00.000000000 +0900
>@@ -1,41 +0,0 @@
>-#!/bin/sh
>-
>-# $FreeBSD: head/security/polarssl/files/fetchwrapper.sh 324742 2013-08-14 17:28:32Z mandree $
>-
>-# This script tacks the first argument onto each URL found in the list,
>-# discards and then executes the list.
>-
>-# URL matching is simplistic, a URL is what matches *tp://* (so file:///
>-# is not matched).
>-
>-# For instance, calling:
>-#   fetchwrapper.sh '?do=yes' /usr/bin/fetch -pPr http://example.org/file
>-# will execute:
>-#   /usr/bin/fetch -pPr http://example.org/file?do=yes
>-
>-# The intention is to work around download splash screens on web servers.
>-
>-# (C) Copyright 2013 by Matthias Andree.
>-# Licensed under the 2-clause BSD license.
>-
>-if [ $# -lt 3 ] ; then
>-    echo >&2 "Usage: $0 URLsuffix fetch-command [options] URL [post-options]"
>-    exit 1
>-fi
>-
>-patcharray() {
>-    # based on Rich Felker's "Working with arrays",
>-    # http://www.etalabs.net/sh_tricks.html
>-    for i do
>-	case "$i" in *tp://*) j=$suffix ;; *) j= ;; esac
>-	printf %s%s\\n "$i" "$j" | sed -e "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"
>-    done
>-    echo " "
>-}
>-
>-suffix="$1" ; shift
>-args=$(patcharray "$@")
>-eval "set -- $args"
>-
>-set -x
>-exec "$@"
>diff -ruN /usr/ports/security/polarssl/files/patch-library-Makefile ./files/patch-library-Makefile
>--- /usr/ports/security/polarssl/files/patch-library-Makefile	2012-11-27 04:49:22.000000000 +0900
>+++ ./files/patch-library-Makefile	2014-07-17 14:40:24.000000000 +0900
>@@ -1,6 +1,6 @@
>---- library/Makefile.orig	2012-11-26 19:20:30.821850410 +0000
>-+++ library/Makefile	2012-11-26 19:21:01.534380354 +0000
>-@@ -18,9 +18,7 @@
>+--- library/Makefile.orig	2014-07-11 18:40:35.000000000 +0900
>++++ library/Makefile	2014-07-17 14:39:41.000000000 +0900
>+@@ -18,13 +18,11 @@
>  # CFLAGS += -D_BSD_EXTENSION
>  
>  # To compile as a shared library:
>@@ -8,7 +8,13 @@
>  CFLAGS += -fPIC
> -endif
>  
>- SONAME=libpolarssl.so.0
>+-SONAME=libpolarssl.so.5
>++SONAME=libpolarssl.so.0
>+ 
>+-DLEXT=so.5
>++DLEXT=so.0
>+ # OSX shared library extension:
>+ # DLEXT=dylib
>  
> @@ -53,11 +51,7 @@
>  
>@@ -23,3 +29,12 @@
>  
>  static: libpolarssl.a
>  
>+@@ -71,7 +65,7 @@
>+ 
>+ libpolarssl.${DLEXT}: libpolarssl.a
>+ 	echo "  LD    $@"
>+-	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS)
>++	$(CC) ${LDFLAGS} -shared -Wl,-soname,$(SONAME) -s -o $@ $(OBJS)
>+ 
>+ libpolarssl.so: libpolarssl.${DLEXT}
>+ 	echo "  LN    $@ -> libpolarssl.${DLEXT}"

Actions: View | Diff

Attachments on bug 191913: 144742