From owner-svn-ports-all@FreeBSD.ORG Tue Feb 19 23:53:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 28B9A9B3; Tue, 19 Feb 2013 23:53:12 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 18FDC1B6; Tue, 19 Feb 2013 23:53:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JNrC4H039305; Tue, 19 Feb 2013 23:53:12 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JNr8x0039276; Tue, 19 Feb 2013 23:53:08 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201302192353.r1JNr8x0039276@svn.freebsd.org> From: Florian Smeets Date: Tue, 19 Feb 2013 23:53:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312608 - in head: Mk devel/nspr devel/nspr/files mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files security/ca_root_nss security/ca_root_nss/files se... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 23:53:12 -0000 Author: flo Date: Tue Feb 19 23:53:07 2013 New Revision: 312608 URL: http://svnweb.freebsd.org/changeset/ports/312608 Log: - update firefox to 19.0 - update firefox-esr, thunderbird, linux-firefox, linux-thunderbird to 17.0.3 - update linux-seamonkey to 2.16 - update nspr to 4.9.5 - update nss to 3.14.3 - add DuckDuckGo search plugin to firefox [1] - mark kompozer deprecated - clang fixes for www/libxul19 [2] Security: http://www.vuxml.org/freebsd/e3f0374a-7ad6-11e2-84cd-d43d7e0c7c02.html Submitted by: DuckDuckGo [1], dim [2] In collaboration with: Jan Beich Added: head/devel/nspr/files/patch-.._pr_tests_Makefile (contents, props changed) head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile (contents, props changed) head/mail/thunderbird/files/patch-bug828003 (contents, props changed) head/security/ca_root_nss/files/MAca-bundle.pl.in (contents, props changed) head/security/nss/files/extra-bug835050 (contents, props changed) head/security/nss/files/patch-pr175656 (contents, props changed) head/www/firefox/files/patch-bug817267 (contents, props changed) head/www/firefox/files/patch-content-media-AudioStream.cpp (contents, props changed) head/www/firefox/files/patch-duckduckgo (contents, props changed) head/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h (contents, props changed) head/www/libxul19/files/patch-bug573210 (contents, props changed) head/www/libxul19/files/patch-bug579689 (contents, props changed) head/www/libxul19/files/patch-bug623126 (contents, props changed) head/www/libxul19/files/patch-dom-src-threads-nsDOMWorker.h (contents, props changed) head/www/libxul19/files/patch-dom-src-threads-nsDOMWorkerXHRProxy.h (contents, props changed) head/www/libxul19/files/patch-embedding-browser-gtk-src-EmbedPrivate.cpp (contents, props changed) head/www/libxul19/files/patch-intl-unicharutil-util-nsUnicharUtils.h (contents, props changed) Deleted: head/devel/nspr/files/patch-bug782815 head/mail/thunderbird/files/patch-bug781457 head/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h head/security/ca_root_nss/files/MAca-bundle.pl head/security/nss/files/patch-lib_softoken_manifest.mn head/www/firefox-esr/files/patch-bug781457 head/www/firefox/files/patch-bug732340 head/www/firefox/files/patch-bug778078 head/www/firefox/files/patch-bug781457 head/www/firefox/files/patch-bug783505 head/www/firefox/files/patch-bug788955 head/www/firefox/files/patch-bug798354 head/www/firefox/files/patch-bug800401 head/www/firefox/files/patch-bug806139 head/www/firefox/files/patch-bug815025 head/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h head/www/firefox/files/patch-content-media-nsAudioStream.cpp head/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp head/www/firefox/files/patch-z-bug762445 Modified: head/Mk/bsd.gecko.mk head/devel/nspr/Makefile head/devel/nspr/distinfo head/devel/nspr/files/patch-..::configure head/mail/linux-thunderbird/Makefile head/mail/linux-thunderbird/distinfo head/mail/thunderbird-i18n/Makefile head/mail/thunderbird-i18n/distinfo head/mail/thunderbird/Makefile head/mail/thunderbird/distinfo head/security/ca_root_nss/Makefile head/security/ca_root_nss/distinfo head/security/nss/Makefile head/security/nss/distinfo head/security/nss/files/nss-config.in head/security/nss/files/nss.pc.in (contents, props changed) head/security/nss/files/patch-..::coreconf::FreeBSD.mk (contents, props changed) head/security/nss/files/patch-..::coreconf::rules.mk (contents, props changed) head/security/vuxml/vuln.xml head/www/firefox-esr-i18n/Makefile head/www/firefox-esr-i18n/distinfo head/www/firefox-esr/Makefile head/www/firefox-esr/distinfo head/www/firefox-esr/files/patch-bug828003 head/www/firefox-i18n/Makefile head/www/firefox-i18n/distinfo head/www/firefox/Makefile head/www/firefox/distinfo head/www/firefox/files/patch-bug685258 (contents, props changed) head/www/firefox/files/patch-bug807492 (contents, props changed) head/www/firefox/files/patch-bug828003 head/www/firefox/files/patch-ipc-chromium-Makefile.in (contents, props changed) head/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc (contents, props changed) head/www/firefox/files/pkg-install.in head/www/kompozer/Makefile head/www/libxul19/files/patch-bug778078 (contents, props changed) head/www/linux-firefox/Makefile head/www/linux-firefox/distinfo head/www/linux-seamonkey/Makefile head/www/linux-seamonkey/Makefile.common head/www/linux-seamonkey/distinfo head/www/linux-seamonkey/pkg-plist Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Feb 19 23:07:43 2013 (r312607) +++ head/Mk/bsd.gecko.mk Tue Feb 19 23:53:07 2013 (r312608) @@ -55,12 +55,12 @@ Gecko_Pre_Include= bsd.gecko.mk # user. # # USE_GECKO= libxul19<->libxul -# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure +# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure # if ${GECKO}=="libxul19" # # Example: # USE_GECKO= libxul libxul19 -# +# # post-patch: # @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \ # ${MOZSRC}/configure @@ -70,7 +70,7 @@ Gecko_Pre_Include= bsd.gecko.mk # # Example: # USE_GECKO= libxul libxul19 -# +# # post-patch: # .if ${GECKO}=="libxul19" # @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \ @@ -179,7 +179,7 @@ Gecko_Pre_Include= bsd.gecko.mk # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 17+ 18+ 17 18+ +# Available values: yes 17+ 19+ 17 19+ # NOTE: # default value 17 is used in case of USE_FIREFOX=yes # @@ -187,7 +187,7 @@ Gecko_Pre_Include= bsd.gecko.mk # Available values: see USE_FIREFOX # # USE_SEAMONKEY Add runtime dependency on SeaMonkey. If no -# version is given by the maintainer via the port +# version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. # Available values: yes 15+ 15 @@ -197,9 +197,9 @@ Gecko_Pre_Include= bsd.gecko.mk # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY # -# USE_THUNDERBIRD Add runtime dependency on Thunderbird. If no -# version is given by the maintainer via the port -# or by the user via defined variable try to find +# USE_THUNDERBIRD Add runtime dependency on Thunderbird. If no +# version is given by the maintainer via the port +# or by the user via defined variable try to find # the highest stable installed version. # Available values: yes 10+ 17+ 10 17 # NOTE: @@ -221,11 +221,11 @@ _FIREFOX_BUILD_DEPENDS= yes .endif _FIREFOX_DEFAULT_VERSION= 17 -_FIREFOX_VERSIONS= 17 18 -_FIREFOX_RANGE_VERSIONS= 17+ 18+ +_FIREFOX_VERSIONS= 17 19 +_FIREFOX_RANGE_VERSIONS= 17+ 19+ # For specifying [17, ..]+ -_FIREFOX_18P= 18 ${_FIREFOX_17P} +_FIREFOX_19P= 19 ${_FIREFOX_17P} _FIREFOX_17P= 17 # Set the default Firefox version and check if USE_FIREFOX=yes was given @@ -272,7 +272,7 @@ IGNORE= cannot install: unknown Firefo # Dependence lines for different Firefox versions 17_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -18_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +19_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox # Add dependencies .if defined(USE_FIREFOX) @@ -551,6 +551,29 @@ LDFLAGS+= -Wl,-z,origin -Wl,-rpath,\\\$ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} .endif +.if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} +# prefer clang +. if ${CC} == "cc" && (exists(/usr/bin/clang) || \ + exists(${LOCALBASE}/bin/clang)) +CC= clang +. endif +. if ${CXX} == "c++" && (exists(/usr/bin/clang++) || \ + exists(${LOCALBASE}/bin/clang++)) +CXX= clang++ +. endif +. if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) || \ + exists(${LOCALBASE}/bin/clang-cpp)) +CPP= clang-cpp +. endif +. if ${CC} != "cc" && ${CPP} == "cpp" +CPP= ${CC} -E +. endif +# fallback to gcc otherwise +. if ${CC} == "cc" || ${CXX} == "c++" +USE_GCC?= yes +. endif +.endif + .if ${MOZILLA_VER:R:R} >= 16 || exists(${.CURDIR}/files/patch-bug788955) .if ${OSVERSION} > 1000011 # use jemalloc 3.0.0 API in libc @@ -649,7 +672,7 @@ MOZ_OPTIONS+= --enable-necko-protocols=d .else MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} .endif -# others +# others MOZ_OPTIONS+= --with-system-zlib \ --with-system-bz2 \ --disable-debug-symbols \ @@ -707,7 +730,7 @@ MOZ_OPTIONS+= --enable-gconf MOZ_OPTIONS+= --disable-gconf .endif -.if ${PORT_OPTIONS:MGIO} && ! ${PORT_OPTIONS:MQT4} +.if ${PORT_OPTIONS:MGIO} && ! ${MOZ_TOOLKIT:Mcairo-qt} MOZ_OPTIONS+= --enable-gio .else MOZ_OPTIONS+= --disable-gio @@ -851,18 +874,12 @@ gecko-post-patch: @for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \ done - @${REINPLACE_CMD} -e '/DLL_SUFFIX/s/so\.1$$/so/' \ - ${MOZSRC}/nsprpub/configure .endif .if ${USE_MOZILLA:M-nss} @${ECHO_MSG} "===> Applying NSS patches" @for i in ${.CURDIR}/../../security/nss/files/patch-*; do \ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ done - @${REINPLACE_CMD} -e '/DLL_SUFFIX/d' \ - ${MOZSRC}/security/coreconf/FreeBSD.mk - @${REINPLACE_CMD} -e '/\.so/d' \ - ${MOZSRC}/security/coreconf/rules.mk .endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ @@ -916,8 +933,10 @@ gecko-post-patch: -e 's|mozilla/plugins|browser_plugins|g' \ ${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp - @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ - ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' +.if ${CXX} == "clang++" && ${OSVERSION} < 900506 + @${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -e 's/-mss/-mmmx &/' +.endif .if ${MOZILLA} != "kompozer" @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp Modified: head/devel/nspr/Makefile ============================================================================== --- head/devel/nspr/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/devel/nspr/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -6,7 +6,7 @@ # $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr -DISTVERSION= 4.9.4 +DISTVERSION= 4.9.5 CATEGORIES= devel MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src @@ -23,6 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --srcdir=${WRKSRC:H} \ --with-pthreads +CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} MAKE_ENV= DIST=${WRKSRC}/dist @@ -39,7 +40,7 @@ CONFIGURE_ARGS+=--disable-debug .endif post-patch: - @${REINPLACE_CMD} -e 's,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${MKDIR} ${PREFIX}/include/nspr @@ -63,7 +64,7 @@ do-install: .endfor prtests: - ${GMAKE} -C ${WRKSRC}/pr/tests + ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh Modified: head/devel/nspr/distinfo ============================================================================== --- head/devel/nspr/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/devel/nspr/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,2 +1,2 @@ -SHA256 (nspr-4.9.4.tar.gz) = 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 -SIZE (nspr-4.9.4.tar.gz) = 1160641 +SHA256 (nspr-4.9.5.tar.gz) = 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 +SIZE (nspr-4.9.5.tar.gz) = 1156396 Modified: head/devel/nspr/files/patch-..::configure ============================================================================== --- head/devel/nspr/files/patch-..::configure Tue Feb 19 23:07:43 2013 (r312607) +++ head/devel/nspr/files/patch-..::configure Tue Feb 19 23:53:07 2013 (r312608) @@ -1,11 +1,29 @@ --- ../configure.orig 2012-02-14 20:06:00.000000000 +0100 +++ ../configure 2012-02-17 17:14:27.862323726 +0100 -@@ -4062,7 +4062,7 @@ +@@ -4035,11 +4035,8 @@ EOF + EOF + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" - MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - if test "$MOZ_OBJFORMAT" = "elf"; then +- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` +- if test "$MOZ_OBJFORMAT" = "elf"; then - DLL_SUFFIX=so +- else +- DLL_SUFFIX=so.1.0 ++ if test -z "$MOZILLA_CLIENT"; then + DLL_SUFFIX=so.1 - else - DLL_SUFFIX=so.1.0 fi + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + DSO_CFLAGS=-fPIC +@@ -6271,11 +6271,6 @@ + #define _THREAD_SAFE 1 + EOF + +- if test "$ac_cv_have_dash_pthread" = "yes"; then +- _PTHREAD_LDFLAGS="-pthread" +- else +- _PTHREAD_LDFLAGS="-lc_r" +- fi + ;; + *-netbsd*) + if test "$ac_cv_have_dash_pthread" = "yes"; then + Added: head/devel/nspr/files/patch-.._pr_tests_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/nspr/files/patch-.._pr_tests_Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -0,0 +1,11 @@ +--- ../../nsprpub/pr/tests/Makefile.in.orig Mon Apr 26 00:01:02 2004 ++++ ../../nsprpub/pr/tests/Makefile.in Tue Nov 28 11:08:14 2006 +@@ -418,7 +418,7 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifeq ($(USE_PTHREADS),1) +-LDOPTS += -pthread ++LDOPTS += ${PTHREAD_LIBS} + endif + LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR) + endif Modified: head/mail/linux-thunderbird/Makefile ============================================================================== --- head/mail/linux-thunderbird/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/linux-thunderbird/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -PORTVERSION= 17.0.2 +PORTVERSION= 17.0.3 CATEGORIES= mail MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US DISTNAME= ${PORTNAME}-${DISTVERSION}esr Modified: head/mail/linux-thunderbird/distinfo ============================================================================== --- head/mail/linux-thunderbird/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/linux-thunderbird/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-17.0.2esr.tar.bz2) = 23757b745ab185bcded749377f727e5f0df75daf9df6ea2a1884d26e528aad01 -SIZE (thunderbird-17.0.2esr.tar.bz2) = 21453920 +SHA256 (thunderbird-17.0.3esr.tar.bz2) = d8e599043304b615fd91d8089fcb2e97734db7f324dc507e02706a80c3ed8fd3 +SIZE (thunderbird-17.0.3esr.tar.bz2) = 21453810 Modified: head/mail/thunderbird-i18n/Makefile ============================================================================== --- head/mail/thunderbird-i18n/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/thunderbird-i18n/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 17.0.2 +PORTVERSION= 17.0.3 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= Modified: head/mail/thunderbird-i18n/distinfo ============================================================================== --- head/mail/thunderbird-i18n/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/thunderbird-i18n/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,84 +1,84 @@ -SHA256 (xpi/thunderbird-i18n-17.0.2/ar.xpi) = ef4e2988e46428fca246bffdfc5220cdd8f75e8e99f44db71c24e9e15ed5883f -SIZE (xpi/thunderbird-i18n-17.0.2/ar.xpi) = 445976 -SHA256 (xpi/thunderbird-i18n-17.0.2/br.xpi) = 195486de568516cbb15a99f8dcd4694e9d6d17152ac2cefe31643629b509d897 -SIZE (xpi/thunderbird-i18n-17.0.2/br.xpi) = 417071 -SHA256 (xpi/thunderbird-i18n-17.0.2/ca.xpi) = f224b00e0e3592c69530e672a6652ee3e79028e13e9339353f62eb25769417f3 -SIZE (xpi/thunderbird-i18n-17.0.2/ca.xpi) = 418407 -SHA256 (xpi/thunderbird-i18n-17.0.2/cs.xpi) = d8404401e274340d7426b97f74d32da6dea58d33a6635afa0a405de606fcd519 -SIZE (xpi/thunderbird-i18n-17.0.2/cs.xpi) = 420627 -SHA256 (xpi/thunderbird-i18n-17.0.2/da.xpi) = fc396ea39be93b7f828a75936c79b5c8a7e176f850bcb61708568dfb6bc1dbb5 -SIZE (xpi/thunderbird-i18n-17.0.2/da.xpi) = 398980 -SHA256 (xpi/thunderbird-i18n-17.0.2/de.xpi) = 6b824dcfcdc6e1004d1b17fd4d0995e83b4b31385449a4dc15b0ba5ab734f321 -SIZE (xpi/thunderbird-i18n-17.0.2/de.xpi) = 393632 -SHA256 (xpi/thunderbird-i18n-17.0.2/en-GB.xpi) = 12bf9ef44c9a1fc6b563b05aa11179080a9e61538c257705a77d12af8cf3d169 -SIZE (xpi/thunderbird-i18n-17.0.2/en-GB.xpi) = 390694 -SHA256 (xpi/thunderbird-i18n-17.0.2/en-US.xpi) = 10eb5e3237032c40381d16915f475919a26d3716ef12bfe41622cef6fb43aff3 -SIZE (xpi/thunderbird-i18n-17.0.2/en-US.xpi) = 390780 -SHA256 (xpi/thunderbird-i18n-17.0.2/es-AR.xpi) = bd7800bf23da78d7ea2936e7f7c294f27d8877e47aa8317a0d7414589de3732d -SIZE (xpi/thunderbird-i18n-17.0.2/es-AR.xpi) = 415499 -SHA256 (xpi/thunderbird-i18n-17.0.2/es-ES.xpi) = a2b231f0c69882e72aaa32de8036c5d41c1a3144056863c098619eebb46ef1e6 -SIZE (xpi/thunderbird-i18n-17.0.2/es-ES.xpi) = 356861 -SHA256 (xpi/thunderbird-i18n-17.0.2/et.xpi) = 79e5a2e92ff2077541a4fa70e0a655d34cd9d1891d8be1a3557979571d5fd679 -SIZE (xpi/thunderbird-i18n-17.0.2/et.xpi) = 411892 -SHA256 (xpi/thunderbird-i18n-17.0.2/eu.xpi) = fdd2faa591fa10e3fae22b06ca26a41e86a74cf3d95531dc7a4325126bde6f48 -SIZE (xpi/thunderbird-i18n-17.0.2/eu.xpi) = 407189 -SHA256 (xpi/thunderbird-i18n-17.0.2/fi.xpi) = 3f4e9b70d184ca28f2e88d5dc6600b0a95d559e15c1217d3d21ea31c6a6b3236 -SIZE (xpi/thunderbird-i18n-17.0.2/fi.xpi) = 413620 -SHA256 (xpi/thunderbird-i18n-17.0.2/fr.xpi) = 20ad82d693c4025cb8e98b43953045f174c72c48e015aff57e1c36334c88e43b -SIZE (xpi/thunderbird-i18n-17.0.2/fr.xpi) = 420826 -SHA256 (xpi/thunderbird-i18n-17.0.2/fy-NL.xpi) = 4baf020dede9bd80d6bb7cd3a0ce0ea30281e5b337c5769b2cb62ab3f2484d35 -SIZE (xpi/thunderbird-i18n-17.0.2/fy-NL.xpi) = 415712 -SHA256 (xpi/thunderbird-i18n-17.0.2/ga-IE.xpi) = 1ba6158c558a6f88e330118f461c6e3857efdf53db33f6d96a01f0e6b91ff229 -SIZE (xpi/thunderbird-i18n-17.0.2/ga-IE.xpi) = 425395 -SHA256 (xpi/thunderbird-i18n-17.0.2/gd.xpi) = 91c1e8edf254886939ed40563fad9c977c963cf4df94fd416a8378505a38d38b -SIZE (xpi/thunderbird-i18n-17.0.2/gd.xpi) = 428939 -SHA256 (xpi/thunderbird-i18n-17.0.2/gl.xpi) = 7da4aef8e4e59955707571015909735a51117890f33550e6f21bd28e04f9e15a -SIZE (xpi/thunderbird-i18n-17.0.2/gl.xpi) = 410370 -SHA256 (xpi/thunderbird-i18n-17.0.2/he.xpi) = 9fd86fc3c4c91ca7a54c076d923345897955e8e56a8e1fdc575382d8cde6bb0d -SIZE (xpi/thunderbird-i18n-17.0.2/he.xpi) = 439504 -SHA256 (xpi/thunderbird-i18n-17.0.2/hu.xpi) = e0128bcba2dc7c0b31830f33a1c4155032c5051e117c198d42b8f019aed990f0 -SIZE (xpi/thunderbird-i18n-17.0.2/hu.xpi) = 433186 -SHA256 (xpi/thunderbird-i18n-17.0.2/is.xpi) = a86c39267204b558c3dc44f35d282d2cb982d77917ae2c4fe7f883d72234b34f -SIZE (xpi/thunderbird-i18n-17.0.2/is.xpi) = 414068 -SHA256 (xpi/thunderbird-i18n-17.0.2/it.xpi) = 357fe2553d54dd1dde2ed676fe4387bc0ed16fc740361ecd3d22b3df45a194f6 -SIZE (xpi/thunderbird-i18n-17.0.2/it.xpi) = 348621 -SHA256 (xpi/thunderbird-i18n-17.0.2/ja.xpi) = 63ab723f0b7b14a70a4894651c2bd5632fc51e1a4dc4d975e40795dae23d65de -SIZE (xpi/thunderbird-i18n-17.0.2/ja.xpi) = 463488 -SHA256 (xpi/thunderbird-i18n-17.0.2/ko.xpi) = c71c68566f85fe9e759dc807f2e63cd064155526757cef905d4a15284521b74d -SIZE (xpi/thunderbird-i18n-17.0.2/ko.xpi) = 412964 -SHA256 (xpi/thunderbird-i18n-17.0.2/lt.xpi) = afdf137c7508e1f59008887054f614e714e04db62b3dcf6c0c6e00807981f495 -SIZE (xpi/thunderbird-i18n-17.0.2/lt.xpi) = 519802 -SHA256 (xpi/thunderbird-i18n-17.0.2/nb-NO.xpi) = 99e11c07b3119b4c6f2e9095e1c59bde109f08d9a85a6787cd5b97b980f0d248 -SIZE (xpi/thunderbird-i18n-17.0.2/nb-NO.xpi) = 408519 -SHA256 (xpi/thunderbird-i18n-17.0.2/nl.xpi) = 2b669554db299d0258fc47a7e08dbb95e7be6b68e9e1811ca86979e13ab826a7 -SIZE (xpi/thunderbird-i18n-17.0.2/nl.xpi) = 408527 -SHA256 (xpi/thunderbird-i18n-17.0.2/nn-NO.xpi) = 4f7baa262b9115255867a52b63b2f58ccf4a811aca4e91cb5f987962bfbbfed9 -SIZE (xpi/thunderbird-i18n-17.0.2/nn-NO.xpi) = 431472 -SHA256 (xpi/thunderbird-i18n-17.0.2/pl.xpi) = 54e3058c5ccf3b3042345abb3b3e9239effac79b5cf1133362fa2cd5a1880819 -SIZE (xpi/thunderbird-i18n-17.0.2/pl.xpi) = 402114 -SHA256 (xpi/thunderbird-i18n-17.0.2/pt-BR.xpi) = 3d8768aec5815ffcbc69eadb3b6ec3e477a7a80a7f16bcd2f76f8a6ac1e6d230 -SIZE (xpi/thunderbird-i18n-17.0.2/pt-BR.xpi) = 415778 -SHA256 (xpi/thunderbird-i18n-17.0.2/pt-PT.xpi) = dbfd93512547b93b60d9ca9ccd2d7458973f6b1b424b333d93c57506b84a1e27 -SIZE (xpi/thunderbird-i18n-17.0.2/pt-PT.xpi) = 445754 -SHA256 (xpi/thunderbird-i18n-17.0.2/rm.xpi) = d5d009d2e9f58c91a29d680242f300bf15377748c6af5abcccfca2c0312afd4d -SIZE (xpi/thunderbird-i18n-17.0.2/rm.xpi) = 415531 -SHA256 (xpi/thunderbird-i18n-17.0.2/ru.xpi) = 4fba664e92308de33dd4eed01d8a7b356ebeb940e1a1f7c09cdc5e1dce8cb2ea -SIZE (xpi/thunderbird-i18n-17.0.2/ru.xpi) = 415708 -SHA256 (xpi/thunderbird-i18n-17.0.2/si.xpi) = aaa5dbc8b9a91c3df54eb148523217fe37026321fef1761b5e58939c36b121c5 -SIZE (xpi/thunderbird-i18n-17.0.2/si.xpi) = 494162 -SHA256 (xpi/thunderbird-i18n-17.0.2/sk.xpi) = 6fcb3cad0d9e7b94b1c1147e693b586e4428b58efe4f4fb65d415ad1340b928f -SIZE (xpi/thunderbird-i18n-17.0.2/sk.xpi) = 429756 -SHA256 (xpi/thunderbird-i18n-17.0.2/sl.xpi) = a846b046500e7a121ca77902ff08b9c2ef6aafe9865f4ae3550bbdeafdc7605f -SIZE (xpi/thunderbird-i18n-17.0.2/sl.xpi) = 442096 -SHA256 (xpi/thunderbird-i18n-17.0.2/sq.xpi) = a221465a173659fea362b340e6efd6d1ee2720504e12c53790b0a601be50e1fc -SIZE (xpi/thunderbird-i18n-17.0.2/sq.xpi) = 418780 -SHA256 (xpi/thunderbird-i18n-17.0.2/sv-SE.xpi) = 2d5cfe8e9c7ae90cb18cabfb3f8df09cac83426b1b6b99c6ac2200ee5df909dd -SIZE (xpi/thunderbird-i18n-17.0.2/sv-SE.xpi) = 413218 -SHA256 (xpi/thunderbird-i18n-17.0.2/ta-LK.xpi) = 2b97d2a18027a2be72eecc79fc6b85c8cf955611c38581b634eb29b9ada759c9 -SIZE (xpi/thunderbird-i18n-17.0.2/ta-LK.xpi) = 517912 -SHA256 (xpi/thunderbird-i18n-17.0.2/tr.xpi) = db6f89bfb6b06cc91df648e131a694e78a6d1ab896c744021a58081290e13709 -SIZE (xpi/thunderbird-i18n-17.0.2/tr.xpi) = 444945 -SHA256 (xpi/thunderbird-i18n-17.0.2/uk.xpi) = 6ec02a0eb2565e81c3dda19f1926ca2de3c29d2965beb8b139c8e9c8c213bc9c -SIZE (xpi/thunderbird-i18n-17.0.2/uk.xpi) = 471142 -SHA256 (xpi/thunderbird-i18n-17.0.2/zh-TW.xpi) = 7905ad6d852d8c966ceee842202656c889e9f7b1451c5cb0eee46983690730fb -SIZE (xpi/thunderbird-i18n-17.0.2/zh-TW.xpi) = 437592 +SHA256 (xpi/thunderbird-i18n-17.0.3/ar.xpi) = c53257332d87fb9704eb3ffaa3e146bc77eb8a78b0fb64085457e3169b88d831 +SIZE (xpi/thunderbird-i18n-17.0.3/ar.xpi) = 445976 +SHA256 (xpi/thunderbird-i18n-17.0.3/br.xpi) = 23b55ce5b306ad6ac117cca2c88a9f1d920ba213b92465079ccaf069050ac4c3 +SIZE (xpi/thunderbird-i18n-17.0.3/br.xpi) = 417071 +SHA256 (xpi/thunderbird-i18n-17.0.3/ca.xpi) = 56e5e09dec7e18ad50948d36a20ef8b7f0b9e2ec947b3ec671b7e77d66b832e7 +SIZE (xpi/thunderbird-i18n-17.0.3/ca.xpi) = 418407 +SHA256 (xpi/thunderbird-i18n-17.0.3/cs.xpi) = a3751180dfb2a986c08adb2dc956e5bb0e1c7dcb25fd4b42729be6d15ff45fc7 +SIZE (xpi/thunderbird-i18n-17.0.3/cs.xpi) = 420627 +SHA256 (xpi/thunderbird-i18n-17.0.3/da.xpi) = a7d9d459f67fbe1140bea77bf8371ed28e8463cdc5067a624d75172b1d6e40b4 +SIZE (xpi/thunderbird-i18n-17.0.3/da.xpi) = 398981 +SHA256 (xpi/thunderbird-i18n-17.0.3/de.xpi) = 3af773ddd27026f3342e20fd66d71ca9a39f52d969abb37d6232b546dec8840c +SIZE (xpi/thunderbird-i18n-17.0.3/de.xpi) = 393632 +SHA256 (xpi/thunderbird-i18n-17.0.3/en-GB.xpi) = bc8428499e2d673fd9dc0f94e909d497804e6f33c8298fc7b7048166ecdc3da5 +SIZE (xpi/thunderbird-i18n-17.0.3/en-GB.xpi) = 390694 +SHA256 (xpi/thunderbird-i18n-17.0.3/en-US.xpi) = 035fcdb63a6cd0f349869b677cadc983651ad3aa3880fabee87ebaee7996eb30 +SIZE (xpi/thunderbird-i18n-17.0.3/en-US.xpi) = 390780 +SHA256 (xpi/thunderbird-i18n-17.0.3/es-AR.xpi) = 2bb56d66ef5bf526f4885e379e1637b364739d9295e4fc42f4447f5343b148b6 +SIZE (xpi/thunderbird-i18n-17.0.3/es-AR.xpi) = 415499 +SHA256 (xpi/thunderbird-i18n-17.0.3/es-ES.xpi) = 82e63e426816e7ca378d56e4eaa5292dc5c8f693d6f5b6da7b1c8fac8e8254a9 +SIZE (xpi/thunderbird-i18n-17.0.3/es-ES.xpi) = 356861 +SHA256 (xpi/thunderbird-i18n-17.0.3/et.xpi) = 5b8dcc781afa80dac4a14082bf7b518ded5c99b7224cf761987fce039e56d665 +SIZE (xpi/thunderbird-i18n-17.0.3/et.xpi) = 411892 +SHA256 (xpi/thunderbird-i18n-17.0.3/eu.xpi) = 8bc8b1c5e10e11b4f3fe5115a5349ddb28604896c42fd206930ada87379460a7 +SIZE (xpi/thunderbird-i18n-17.0.3/eu.xpi) = 407189 +SHA256 (xpi/thunderbird-i18n-17.0.3/fi.xpi) = 82f413022916baaaa662e08a52e6ee8bc9a4e0f0d3dba0596ebddc40d46df0a7 +SIZE (xpi/thunderbird-i18n-17.0.3/fi.xpi) = 413620 +SHA256 (xpi/thunderbird-i18n-17.0.3/fr.xpi) = b063f1d09498831389cdf0ca42e2c95544d6f18f5f274a0e5d108d85470505cf +SIZE (xpi/thunderbird-i18n-17.0.3/fr.xpi) = 420825 +SHA256 (xpi/thunderbird-i18n-17.0.3/fy-NL.xpi) = db5f1ea4605b081b5060fe03042e3101490155323007226997f9c3a6c61b71a6 +SIZE (xpi/thunderbird-i18n-17.0.3/fy-NL.xpi) = 415712 +SHA256 (xpi/thunderbird-i18n-17.0.3/ga-IE.xpi) = cf93fa61be3f07be7f5c4d878a2addbb1ceec4febb44c19e6d1fd873446756ee +SIZE (xpi/thunderbird-i18n-17.0.3/ga-IE.xpi) = 425395 +SHA256 (xpi/thunderbird-i18n-17.0.3/gd.xpi) = 48ba05e0d3061510acd3aaa6d8d14e4c50f4b232638a4b41944c4dcffee4d5de +SIZE (xpi/thunderbird-i18n-17.0.3/gd.xpi) = 428939 +SHA256 (xpi/thunderbird-i18n-17.0.3/gl.xpi) = 3a62bf0480c6ef9a4f794c640f2e8c990535590cb0244551ccdb21f30e331d41 +SIZE (xpi/thunderbird-i18n-17.0.3/gl.xpi) = 410370 +SHA256 (xpi/thunderbird-i18n-17.0.3/he.xpi) = db6e71e78e7d95924c4eef5f400392e1c1dc448cbe106a501acf1a0f8710a256 +SIZE (xpi/thunderbird-i18n-17.0.3/he.xpi) = 439504 +SHA256 (xpi/thunderbird-i18n-17.0.3/hu.xpi) = 400f0656ee5912c2b015aaaddb8c09c76d273c11d80c64a1c9b9b6ec2e43a96f +SIZE (xpi/thunderbird-i18n-17.0.3/hu.xpi) = 433187 +SHA256 (xpi/thunderbird-i18n-17.0.3/is.xpi) = 3f7266b270701fde88ff123bf885ba9f88c4e01e6b47bb646279b8ec4112908a +SIZE (xpi/thunderbird-i18n-17.0.3/is.xpi) = 414068 +SHA256 (xpi/thunderbird-i18n-17.0.3/it.xpi) = dd91863bbf56149a18d6462ddaf47011b5b85f09fdc9ff4220b4c0c1eb5362e0 +SIZE (xpi/thunderbird-i18n-17.0.3/it.xpi) = 348621 +SHA256 (xpi/thunderbird-i18n-17.0.3/ja.xpi) = b2ca815c6fd0eea33daac01ab7ed08cbd8f63a73f9cde02d0a78e60fd6fd60aa +SIZE (xpi/thunderbird-i18n-17.0.3/ja.xpi) = 463488 +SHA256 (xpi/thunderbird-i18n-17.0.3/ko.xpi) = d6731bbe490f890dfb8ff8a26f61de3b0ff79963179c57380a05c7de8de84ce0 +SIZE (xpi/thunderbird-i18n-17.0.3/ko.xpi) = 412964 +SHA256 (xpi/thunderbird-i18n-17.0.3/lt.xpi) = a879718aa255cf4074076803a71f980d7ec75793e908d1d011a4e3e04fd9156c +SIZE (xpi/thunderbird-i18n-17.0.3/lt.xpi) = 519802 +SHA256 (xpi/thunderbird-i18n-17.0.3/nb-NO.xpi) = 58e5637842b50d08f5a4ce1083996d7f23c181ea51182db5c8524fcddd51b89b +SIZE (xpi/thunderbird-i18n-17.0.3/nb-NO.xpi) = 408519 +SHA256 (xpi/thunderbird-i18n-17.0.3/nl.xpi) = dc2a5753c1f6d54c48b3766d8ddef6ed8373f0a40254725f63508675213c33f3 +SIZE (xpi/thunderbird-i18n-17.0.3/nl.xpi) = 408527 +SHA256 (xpi/thunderbird-i18n-17.0.3/nn-NO.xpi) = c80480fc1d6b3157066791a52e65e3cd6117e1ebe269f50d753cbbef335d1938 +SIZE (xpi/thunderbird-i18n-17.0.3/nn-NO.xpi) = 431472 +SHA256 (xpi/thunderbird-i18n-17.0.3/pl.xpi) = 7bc4f166e2710971f8d82c0d25a155158ea1bcd6765da1b7d20c581c2db598db +SIZE (xpi/thunderbird-i18n-17.0.3/pl.xpi) = 402114 +SHA256 (xpi/thunderbird-i18n-17.0.3/pt-BR.xpi) = 07296bc8a1311036e40f98866cc90860ced68cf6e349e0960777b70240d241dd +SIZE (xpi/thunderbird-i18n-17.0.3/pt-BR.xpi) = 415778 +SHA256 (xpi/thunderbird-i18n-17.0.3/pt-PT.xpi) = 16b4e6dc8eda63599dadf36b73a95948095e9f6697bf0c8d1d904e2cdaf4abb4 +SIZE (xpi/thunderbird-i18n-17.0.3/pt-PT.xpi) = 445754 +SHA256 (xpi/thunderbird-i18n-17.0.3/rm.xpi) = 94fda0ef47b4f2ad9aec4c737a9e885b02f7be5f2ee4b21dbf65b5d0aebb6474 +SIZE (xpi/thunderbird-i18n-17.0.3/rm.xpi) = 415531 +SHA256 (xpi/thunderbird-i18n-17.0.3/ru.xpi) = c3d93e5295ea0b83802e1ea8b081cc55627a477db78cf373a6b749b7cabe4ee0 +SIZE (xpi/thunderbird-i18n-17.0.3/ru.xpi) = 415709 +SHA256 (xpi/thunderbird-i18n-17.0.3/si.xpi) = 49468e3aa8fafe4f85af3e7dceb2bb3edc07b41950b2491a6cf1bced214936ad +SIZE (xpi/thunderbird-i18n-17.0.3/si.xpi) = 494163 +SHA256 (xpi/thunderbird-i18n-17.0.3/sk.xpi) = 1d0d9d212494620b19084cb3f9bd096014ec631768a44ff453fd46071f3b12c1 +SIZE (xpi/thunderbird-i18n-17.0.3/sk.xpi) = 429756 +SHA256 (xpi/thunderbird-i18n-17.0.3/sl.xpi) = a4f1b2fe620e842d5f353cb9650a4478cdd035ece61375c19950d9c394d73c9b +SIZE (xpi/thunderbird-i18n-17.0.3/sl.xpi) = 442096 +SHA256 (xpi/thunderbird-i18n-17.0.3/sq.xpi) = f67ac1c2467534ce17369a88d2f7eedfceb5a36e978d353a76978cd0d975b549 +SIZE (xpi/thunderbird-i18n-17.0.3/sq.xpi) = 418780 +SHA256 (xpi/thunderbird-i18n-17.0.3/sv-SE.xpi) = def73ff4397b2c6fe8e537aa5bebc00b871656d29a890d4ac437b44642135dbc +SIZE (xpi/thunderbird-i18n-17.0.3/sv-SE.xpi) = 413218 +SHA256 (xpi/thunderbird-i18n-17.0.3/ta-LK.xpi) = d8bd20672ab9a95ae30258e53eeda74b3ddee9270732a2d952f88a29cb84362f +SIZE (xpi/thunderbird-i18n-17.0.3/ta-LK.xpi) = 517913 +SHA256 (xpi/thunderbird-i18n-17.0.3/tr.xpi) = 97ff3b9e4efb89e16b7cfef7bc88b97bcc7b919dcbfb271645915f17bbf43603 +SIZE (xpi/thunderbird-i18n-17.0.3/tr.xpi) = 444945 +SHA256 (xpi/thunderbird-i18n-17.0.3/uk.xpi) = 83b99b56300f261d38a3e4ed5654e9d2ae4242fa8ac4a7539c168187d462fde3 +SIZE (xpi/thunderbird-i18n-17.0.3/uk.xpi) = 471142 +SHA256 (xpi/thunderbird-i18n-17.0.3/zh-TW.xpi) = c7db1bdac02e272427a302b19c1968fe4b22e84c8b22eef4d044afe8c9f6587e +SIZE (xpi/thunderbird-i18n-17.0.3/zh-TW.xpi) = 437591 Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/thunderbird/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -2,29 +2,29 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 17.0.2 +DISTVERSION= 17.0.3 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source +DISTFILES= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \ nss>=3.13.6_1:${PORTSDIR}/security/nss \ - sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.7.13:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -EM_VERSION= 1.4.6 +EM_VERSION= 1.5.1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 USE_GECKO= gecko -CONFLICTS= thunderbird-10.* +CONFLICTS= thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.* USE_MOZILLA= # empty MAKE_JOBS_SAFE= yes @@ -57,7 +57,7 @@ OPTIONS_DEFAULT=ENIGMAIL LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-esr17 MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi @@ -85,6 +85,7 @@ EM_ID= ${PORTNAME}@mozilla-enigmail.org EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ ${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile .endif .if ${PORT_OPTIONS:MLIGHTNING} Modified: head/mail/thunderbird/distinfo ============================================================================== --- head/mail/thunderbird/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/mail/thunderbird/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-17.0.2.source.tar.bz2) = 081b53161750a31f9b43d4ba4ccb496c69fdfaa3430f0ce0798cd5fa3036764c -SIZE (thunderbird-17.0.2.source.tar.bz2) = 113387318 -SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 -SIZE (enigmail-1.4.6.tar.gz) = 1262280 +SHA256 (thunderbird-17.0.3esr.source.tar.bz2) = 96669acfaeaf3c591fbfe1ebe2ea41635e29f25074877148fb1fc7112df0c91c +SIZE (thunderbird-17.0.3esr.source.tar.bz2) = 113057252 +SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 +SIZE (enigmail-1.5.1.tar.gz) = 1213954 Added: head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -0,0 +1,90 @@ +--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~ ++++ mailnews/extensions/enigmail/ipc/src/Makefile.enig +@@ -19,26 +19,26 @@ endif + + ifeq ($(OS_ARCH),NetBSD) + ifeq ($(DLL_SUFFIX),.so.1.0) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),FreeBSD) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + + ifeq ($(OS_ARCH),HP-UX) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),OSF1) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -B symbolic ++LDFLAGS += -shared -B symbolic + CFLAGS += -fPIC + endif + endif +@@ -62,7 +62,11 @@ libs: source + $(CC) $(LDFLAGS) -o $(libname) $(objfiles) + + source: $(source) ++ifneq (,$(filter 4.2.%, $(CC_VERSION))) ++ $(CC) $(CFLAGS) -c -o $(objfiles) $^ ++else + $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ ++endif + + + clean: +--- mailnews/extensions/enigmail/ipc/src/Makefile.in~ ++++ mailnews/extensions/enigmail/ipc/src/Makefile.in +@@ -19,26 +19,26 @@ endif + + ifeq ($(OS_ARCH),NetBSD) + ifeq ($(DLL_SUFFIX),.so.1.0) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),FreeBSD) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + + ifeq ($(OS_ARCH),HP-UX) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -Wl,-Bsymbolic ++LDFLAGS += -shared -Wl,-Bsymbolic + CFLAGS += -fPIC + endif + endif + + ifeq ($(OS_ARCH),OSF1) + ifeq ($(GNU_CC)$(GNU_CXX),) +-LDFLAGS += -B symbolic ++LDFLAGS += -shared -B symbolic + CFLAGS += -fPIC + endif + endif +@@ -62,7 +62,11 @@ libs: source + $(CC) $(LDFLAGS) -o $(libname) $(objfiles) + + source: $(source) ++ifneq (,$(filter 4.2.%, $(CC_VERSION))) ++ $(CC) $(CFLAGS) -c -o $(objfiles) $^ ++else + $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ ++endif + + + clean: Added: head/mail/thunderbird/files/patch-bug828003 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug828003 Tue Feb 19 23:53:07 2013 (r312608) @@ -0,0 +1,36 @@ +--- mozilla/gfx/qcms/qcmstypes.h ++++ mozilla/gfx/qcms/qcmstypes.h +@@ -7,30 +7,12 @@ + #include "mozilla/StandardInteger.h" + + /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */ ++/* StandardInteger.h defines int*_t and uintptr_t */ + +-#if defined (__SVR4) && defined (__sun) +-/* int_types.h gets included somehow, so avoid redefining the types differently */ +-#include +-#elif defined (_AIX) ++#if defined(_AIX) + #include +-#elif defined(__OpenBSD__) +-#include +-#elif !defined(ANDROID) +-typedef int8_t int8_t; +-typedef uint8_t uint8_t; +-typedef int16_t int16_t; +-typedef uint16_t uint16_t; +-typedef int32_t int32_t; +-typedef uint32_t uint32_t; +-typedef int64_t int64_t; +-typedef uint64_t uint64_t; +- +-#ifdef __OS2__ +-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ ++#elif defined(__OS2__) + #include +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) +-typedef PRUptrdiff uintptr_t; +-#endif + #endif + + #else // MOZ_QCMS Modified: head/security/ca_root_nss/Makefile ============================================================================== --- head/security/ca_root_nss/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/security/ca_root_nss/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -5,7 +5,7 @@ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src +MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} MAINTAINER= gecko@FreeBSD.org @@ -25,11 +25,12 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.14.1 -CKBI_VER= 1.93 -NSS_SUFFIX= .with.ckbi.${CKBI_VER} +VERSION_NSS= 3.14.3 +#NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl +SUB_FILES= MAca-bundle.pl +SUB_LIST= VERSION_NSS=${VERSION_NSS} .include @@ -45,14 +46,9 @@ do-extract: @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ ${CERTDATA_TXT_PATH} @${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR} - @${CP} ${FILESDIR}/${BUNDLE_PROCESSOR} ${WRKDIR} @${RM} -rf ${WRKDIR}/nss-${VERSION_NSS} -post-patch: - @${PERL} -pi -e 's,%%VERSION_NSS%%,${VERSION_NSS}${NSS_SUFFIX},g;' \ - ${WRKDIR}/${BUNDLE_PROCESSOR} - -do-build: +do-build: apply-slist @${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt Modified: head/security/ca_root_nss/distinfo ============================================================================== --- head/security/ca_root_nss/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/security/ca_root_nss/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98 -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 +SIZE (nss-3.14.3.tar.gz) = 6189790 Added: head/security/ca_root_nss/files/MAca-bundle.pl.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ca_root_nss/files/MAca-bundle.pl.in Tue Feb 19 23:53:07 2013 (r312608) @@ -0,0 +1,190 @@ +## +## MAca-bundle.pl -- Regenerate ca-root-nss.crt from the Mozilla certdata.txt +## +## Rewritten in September 2011 by Matthias Andree to heed untrust +## + +## Copyright (c) 2011, Matthias Andree +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions are +## met: +## +## * Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## +## * Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in the +## documentation and/or other materials provided with the distribution. +## +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +## FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +## COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +## INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +## BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +## ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +## POSSIBILITY OF SUCH DAMAGE. + +use strict; +use MIME::Base64; + +my $VERSION = '$FreeBSD$'; + +# configuration +print <) { + last if /^END/; + my (undef,@oct) = split /\\/; + my @bin = map(chr(oct), @oct); + $data .= join('', @bin); + } + + return $data; +} + + +sub grabcert() +{ + my $certdata; + my $cka_label; + my $serial; + + while (<>) { + chomp; + last if ($_ eq ''); + + if (/^CKA_LABEL UTF8 "([^"]+)"/) { + $cka_label = $1; + } + + if (/^CKA_VALUE MULTILINE_OCTAL/) { + $certdata = graboct(); + } + + if (/^CKA_SERIAL_NUMBER MULTILINE_OCTAL/) { + $serial = graboct(); + } + } + return ($serial, $cka_label, $certdata); +} + +sub grabtrust() { + my $cka_label; + my $serial; + my $trust = 1; + + while (<>) { + chomp; + last if ($_ eq ''); + + if (/^CKA_LABEL UTF8 "([^"]+)"/) { + $cka_label = $1; + } + + if (/^CKA_SERIAL_NUMBER MULTILINE_OCTAL/) { + $serial = graboct(); + } + + if (/^CKA_TRUST_.*\s.*_(UN|NOT_)TRUSTED/) { + $trust = 0; + } + } + return ($serial, $cka_label, $trust); +} + +while (<>) { + if (/^CKA_CLASS .* CKO_CERTIFICATE/) { + my ($serial, $label, $certdata) = grabcert(); + if (defined $certs{$serial.$label}) { + warn "Certificate $label duplicated!\n"; + } + $certs{$serial.$label} = $certdata; + } elsif (/^CKA_CLASS .* CKO_(NSS|NETSCAPE)_TRUST/) { + my ($serial, $label, $trust) = grabtrust(); + if (defined $trusts{$serial.$label}) { + warn "Trust for $label duplicated!\n"; + } + $trusts{$serial.$label} = $trust; + } elsif (/^CVS_ID.*Revision: ([^ ]*).*/) { + print "## Source: \"certdata.txt\" CVS revision $1\n##\n\n"; + } +} + +# weed out untrusted certificates +my $untrusted = 0; +foreach my $it (keys %trusts) { + if (!$trusts{$it}) { + if (!exists($certs{$it})) { + warn "Found trust for nonexistent certificate\n"; + } else { + delete $certs{$it}; + $untrusted++; + } + } +} + +print "## Untrusted certificates omitted from this bundle: $untrusted\n\n"; + +my $certcount = 0; +foreach my $it (keys %certs) { + if (!exists($trusts{$it})) { + die "Found certificate without trust block,\naborting"; + } + printcert("", $certs{$it}); + print "\n\n\n"; + $certcount++; +} + +print "## Number of certificates: $certcount\n"; +print "## End of file.\n"; Modified: head/security/nss/Makefile ============================================================================== --- head/security/nss/Makefile Tue Feb 19 23:07:43 2013 (r312607) +++ head/security/nss/Makefile Tue Feb 19 23:53:07 2013 (r312608) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} +PORTVERSION= 3.14.3 +#DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src -DISTNAME= nss-${PORTVERSION}.with.ckbi.${CKBI_VER} +MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications @@ -16,11 +16,6 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 -_MAJOR= 3 -_MINOR= 14 -_PATCH= 1 - -CKBI_VER= 1.93 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss MAKE_JOBS_UNSAFE= yes @@ -28,10 +23,15 @@ USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ + SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 ALL_TARGET= nss_build_all CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib +SUB_FILES= nss-config nss.pc +SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ + PORTVERSION=${PORTVERSION} + DIST= ${WRKSRC:H:H}/dist EXTERNALS= CVS dbm security/nss/lib/zlib nsprpub security/dbm @@ -50,6 +50,16 @@ BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif +.include + +.if ${ARCH} == amd64 +USE_BINUTILS= # intel-gcm.s +CFLAGS+= -B${LOCALBASE}/${CONFIGURE_TARGET:S/amd64/x86_64/}/bin +.if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 +EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 +.endif +.endif + check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ @@ -67,23 +77,11 @@ check regression-test test: post-patch: @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk - @${SED} -e 's|@exec_prefix@|${PREFIX}|; \ - s|@includedir@|${PREFIX}/include/nss|; \ - s|@libdir@|${PREFIX}/lib/nss|; \ - s|@prefix@|${PREFIX}|' \ - ${FILESDIR}/nss-config.in >${WRKDIR}/nss-config - @${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \ - ${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc -.for i in MAJOR MINOR PATCH - @${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config -.endfor @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"||' - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/lib/softoken/manifest.mn ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' @@ -104,4 +102,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig -.include +.include Modified: head/security/nss/distinfo ============================================================================== --- head/security/nss/distinfo Tue Feb 19 23:07:43 2013 (r312607) +++ head/security/nss/distinfo Tue Feb 19 23:53:07 2013 (r312608) @@ -1,2 +1,2 @@ -SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98 -SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393 +SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 +SIZE (nss-3.14.3.tar.gz) = 6189790 Added: head/security/nss/files/extra-bug835050 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/extra-bug835050 Tue Feb 19 23:53:07 2013 (r312608) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***