Sat Jun 11 12:59:48 2016 UTC ()
mprotect fixes. Bump PKGREVISION.


(wiz)
diff -r1.7 -r1.8 pkgsrc/security/tor-browser/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2016/04/11 19:02:03 1.7
+++ pkgsrc/security/tor-browser/Makefile 2016/06/11 12:59:48 1.8
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.7 2016/04/11 19:02:03 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2016/06/11 12:59:48 wiz Exp $
2 2
3TORBVER= 5.5.4 3TORBVER= 5.5.4
4 4
5DISTNAME= tor-browser-38.7.1esr-5.5-1 5DISTNAME= tor-browser-38.7.1esr-5.5-1
6PKGNAME= tor-browser-${TORBVER} 6PKGNAME= tor-browser-${TORBVER}
7PKGREVISION= 1 7PKGREVISION= 2
8CATEGORIES= www 8CATEGORIES= www
9MASTER_SITES+= ${MASTER_SITE_LOCAL} 9MASTER_SITES+= ${MASTER_SITE_LOCAL}
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
14COMMENT= Tor Browser based on Firefox 14COMMENT= Tor Browser based on Firefox
15LICENSE= mpl-1.1 15LICENSE= mpl-1.1
16 16
17DEPENDS+= tor-[0-9]*:../../net/tor 17DEPENDS+= tor-[0-9]*:../../net/tor
18 18
19# Remove hardcoded build directory. 19# Remove hardcoded build directory.
20SUBST_CLASSES+= fix-build-dir 20SUBST_CLASSES+= fix-build-dir
@@ -32,26 +32,29 @@ CONFIGURE_ARGS+= --disable-dbus @@ -32,26 +32,29 @@ CONFIGURE_ARGS+= --disable-dbus
32CONFIGURE_ARGS+= --disable-gnomeui 32CONFIGURE_ARGS+= --disable-gnomeui
33CONFIGURE_ARGS+= --disable-libnotify 33CONFIGURE_ARGS+= --disable-libnotify
34CONFIGURE_ARGS+= --enable-pie 34CONFIGURE_ARGS+= --enable-pie
35 35
36# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601 36# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601
37CFLAGS+= -fpermissive 37CFLAGS+= -fpermissive
38 38
39# workaround for link of libxul.so etc. 39# workaround for link of libxul.so etc.
40LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib 40LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib
41LDFLAGS.SunOS+= -lm 41LDFLAGS.SunOS+= -lm
42 42
43ALL_ENV+= MOZILLA_PKG_NAME=tor-browser 43ALL_ENV+= MOZILLA_PKG_NAME=tor-browser
44 44
 45NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox
 46NOT_PAX_MPROTECT_SAFE+= lib/tor-browser/firefox-bin
 47
45# Avoid ld "invalid section index" errors. 48# Avoid ld "invalid section index" errors.
46BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections 49BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections
47BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections 50BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections
48 51
49LDFLAGS.DragonFly= -lplc4 -lnspr4 52LDFLAGS.DragonFly= -lplc4 -lnspr4
50LDFLAGS.FreeBSD= -lplc4 -lnspr4 53LDFLAGS.FreeBSD= -lplc4 -lnspr4
51LDFLAGS.Linux= -lnspr4 54LDFLAGS.Linux= -lnspr4
52 55
53.include "../../www/firefox38/mozilla-common.mk" 56.include "../../www/firefox38/mozilla-common.mk"
54.include "options.mk" 57.include "options.mk"
55 58
56CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py 59CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
57CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py 60CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py