Date: Tue, 11 Aug 2015 21:32:26 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r393974 - in branches/2015Q3: mail/thunderbird mail/thunderbird/files multimedia/openh264 multimedia/openh264/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files w... Message-ID: <201508112132.t7BLWQct049381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Aug 11 21:32:26 2015 New Revision: 393974 URL: https://svnweb.freebsd.org/changeset/ports/393974 Log: MFH: r393941 Switch OpenH264 plugin to use environment variable files/patch-system-openh264 causes patch churn on updates and hits assertion with DEBUG=on[1]. Rework to use MOZ_GMP_PATH instead. While here populate Last Updated field to avoid falling back to Epoch start and disable Automatic Updates in an unlikely case of - Cisco & Mozilla providing prebuilt version for FreeBSD - Firefox running with root priveleges i.e., write permission under /usr/local PR: 202218 [1] Reported by: kib, pi [1] Inspired by: Gentoo Approved by: ports-secteam (feld) Deleted: branches/2015Q3/mail/thunderbird/files/patch-system-openh264 branches/2015Q3/www/firefox-esr/files/patch-system-openh264 branches/2015Q3/www/firefox/files/patch-system-openh264 branches/2015Q3/www/libxul/files/patch-system-openh264 branches/2015Q3/www/seamonkey/files/patch-system-openh264 Modified: branches/2015Q3/mail/thunderbird/Makefile branches/2015Q3/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp branches/2015Q3/multimedia/openh264/Makefile branches/2015Q3/multimedia/openh264/files/gmpopenh264.js.in branches/2015Q3/www/firefox-esr/Makefile branches/2015Q3/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp branches/2015Q3/www/firefox/Makefile branches/2015Q3/www/firefox/files/patch-browser-app-nsBrowserApp.cpp branches/2015Q3/www/libxul/Makefile branches/2015Q3/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp branches/2015Q3/www/seamonkey/Makefile branches/2015Q3/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/mail/thunderbird/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 38.1.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2015Q3/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp ============================================================================== --- branches/2015Q3/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Tue Aug 11 21:32:26 2015 (r393974) @@ -1,10 +1,12 @@ --- mail/app/nsMailApp.cpp~ +++ mail/app/nsMailApp.cpp -@@ -320,6 +320,7 @@ int main(int argc, char* argv[]) +@@ -320,6 +320,9 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif ++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); ++ int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: branches/2015Q3/multimedia/openh264/Makefile ============================================================================== --- branches/2015Q3/multimedia/openh264/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/multimedia/openh264/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -3,7 +3,7 @@ PORTNAME= openh264 PORTVERSION= 1.4.0 DISTVERSIONPREFIX=v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org @@ -35,7 +35,7 @@ PLUGINS_USES= webplugin:gecko WEBPLUGIN_NAME= gmp-gmp${PORTNAME} WEBPLUGIN_FILES=gmp${PORTNAME}.info libgmp${PORTNAME}.so SUB_FILES+= gmp${PORTNAME}.js -SUB_LIST+= PORTVERSION=${PORTVERSION} WEBPLUGIN_DIR="${WEBPLUGIN_DIR}" +SUB_LIST+= PORTVERSION=${PORTVERSION} TIMESTAMP="`date +%s`" TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest TEST_CFLAGS= -I${LOCALBASE}/include Modified: branches/2015Q3/multimedia/openh264/files/gmpopenh264.js.in ============================================================================== --- branches/2015Q3/multimedia/openh264/files/gmpopenh264.js.in Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/multimedia/openh264/files/gmpopenh264.js.in Tue Aug 11 21:32:26 2015 (r393974) @@ -1,2 +1,3 @@ -pref("media.gmp-gmpopenh264.path", "%%WEBPLUGIN_DIR%%"); +pref("media.gmp-gmpopenh264.autoupdate", false); +pref("media.gmp-gmpopenh264.lastUpdate", %%TIMESTAMP%%); pref("media.gmp-gmpopenh264.version", "%%PORTVERSION%%"); Modified: branches/2015Q3/www/firefox-esr/Makefile ============================================================================== --- branches/2015Q3/www/firefox-esr/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/firefox-esr/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 38.2.0 DISTVERSIONSUFFIX=esr.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Modified: branches/2015Q3/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- branches/2015Q3/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Tue Aug 11 21:32:26 2015 (r393974) @@ -1,9 +1,10 @@ --- browser/app/nsBrowserApp.cpp~ +++ browser/app/nsBrowserApp.cpp -@@ -334,6 +334,7 @@ int main(int argc, char* argv[]) +@@ -417,6 +417,8 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif ++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) Modified: branches/2015Q3/www/firefox/Makefile ============================================================================== --- branches/2015Q3/www/firefox/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/firefox/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 40.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Modified: branches/2015Q3/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- branches/2015Q3/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Tue Aug 11 21:32:26 2015 (r393974) @@ -1,9 +1,10 @@ --- browser/app/nsBrowserApp.cpp~ +++ browser/app/nsBrowserApp.cpp -@@ -334,6 +334,7 @@ int main(int argc, char* argv[]) +@@ -417,6 +417,8 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif ++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) Modified: branches/2015Q3/www/libxul/Makefile ============================================================================== --- branches/2015Q3/www/libxul/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/libxul/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -3,6 +3,7 @@ PORTNAME= libxul DISTVERSION= 38.2.0 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source Modified: branches/2015Q3/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp ============================================================================== --- branches/2015Q3/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Tue Aug 11 21:32:26 2015 (r393974) @@ -1,9 +1,10 @@ --- xulrunner/stub/nsXULStub.cpp~ +++ xulrunner/stub/nsXULStub.cpp -@@ -202,6 +202,8 @@ main(int argc, char **argv) +@@ -160,6 +160,9 @@ main(int argc, char **argv) char greDir[MAXPATHLEN]; bool greFound = false; ++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + #if defined(XP_MACOSX) Modified: branches/2015Q3/www/seamonkey/Makefile ============================================================================== --- branches/2015Q3/www/seamonkey/Makefile Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/seamonkey/Makefile Tue Aug 11 21:32:26 2015 (r393974) @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.33.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Modified: branches/2015Q3/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp ============================================================================== --- branches/2015Q3/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Tue Aug 11 20:51:54 2015 (r393973) +++ branches/2015Q3/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Tue Aug 11 21:32:26 2015 (r393974) @@ -1,11 +1,21 @@ --- suite/app/nsSuiteApp.cpp~ +++ suite/app/nsSuiteApp.cpp -@@ -215,6 +215,8 @@ int main(int argc, char* argv[]) - #ifdef XP_MACOSX +@@ -331,6 +331,9 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif -+ + ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); - - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { ++ + int gotCounters; + #if defined(XP_UNIX) + struct rusage initialRUsage; +@@ -339,7 +342,7 @@ int main(int argc, char* argv[]) + IO_COUNTERS ioCounters; + gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters); + #endif +- ++ + nsIFile *xreDirectory; + + #ifdef HAS_DLL_BLOCKLIST
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508112132.t7BLWQct049381>