From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 06:21:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59E99E3A; Mon, 8 Dec 2014 06:21:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D578CC4; Mon, 8 Dec 2014 06:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB86LEjT003986; Mon, 8 Dec 2014 06:21:14 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB86LDov003983; Mon, 8 Dec 2014 06:21:13 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201412080621.sB86LDov003983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 8 Dec 2014 06:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374233 - in branches/2014Q4/audio/rawrec: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 06:21:14 -0000 Author: riggs Date: Mon Dec 8 06:21:13 2014 New Revision: 374233 URL: https://svnweb.freebsd.org/changeset/ports/374233 QAT: https://qat.redports.org/buildarchive/r374233/ Log: MFH: r374223 Fix signal handling (runtime exit with invalid argument) on 10.1 - Add missing sa_flags in main.c - Bump PORTREVISION While on it: - Add LICENSE* PR: 195284 Submitted by: antonfb@hesiod.org Approved by: ports-secteam (delphij) Modified: branches/2014Q4/audio/rawrec/Makefile branches/2014Q4/audio/rawrec/files/patch-main.c Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/audio/rawrec/Makefile ============================================================================== --- branches/2014Q4/audio/rawrec/Makefile Mon Dec 8 02:42:48 2014 (r374232) +++ branches/2014Q4/audio/rawrec/Makefile Mon Dec 8 06:21:13 2014 (r374233) @@ -3,6 +3,7 @@ PORTNAME= rawrec PORTVERSION= 0.9.991 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%SUBDIR%/apps\/sound\/recorders/} \ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -10,6 +11,9 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:S/%S MAINTAINER= ports@FreeBSD.org COMMENT= Utility to record and playback raw audio data +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKDIR}/${DISTNAME}/copyright + WRKSRC= ${WRKDIR}/${DISTNAME}/src USES= gmake Modified: branches/2014Q4/audio/rawrec/files/patch-main.c ============================================================================== --- branches/2014Q4/audio/rawrec/files/patch-main.c Mon Dec 8 02:42:48 2014 (r374232) +++ branches/2014Q4/audio/rawrec/files/patch-main.c Mon Dec 8 06:21:13 2014 (r374233) @@ -1,5 +1,5 @@ ---- main.c.orig Wed May 10 17:27:08 2006 -+++ main.c Wed May 10 17:30:21 2006 +--- main.c.orig 2006-01-22 03:40:17.000000000 +0100 ++++ main.c 2014-12-07 19:14:39.778784753 +0100 @@ -14,6 +14,12 @@ #include "rawrec.h" @@ -13,3 +13,11 @@ int main(int argc, char *argv[]) { /* Action for ignoring signals we don't want to deal with. */ +@@ -118,6 +124,7 @@ + strncpy(cnst_dflt_format, "s16_le", (size_t) (MAX_FORMAT_STRING_LENGTH + 1)); + + /* at the moment, this application goes with the default for most signals */ ++ ignorer_act.sa_flags = 0; + ignorer_act.sa_handler = SIG_IGN; + /* because I'm unclear on how SIGIO is supposed to work, it's not + applicable here, and I'm paranoid */ From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 08:49:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8EB41F14; Mon, 8 Dec 2014 08:49:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A878E88; Mon, 8 Dec 2014 08:49:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB88nuuW073210; Mon, 8 Dec 2014 08:49:56 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB88nuPO073209; Mon, 8 Dec 2014 08:49:56 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201412080849.sB88nuPO073209@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 8 Dec 2014 08:49:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374238 - branches/2014Q4/net/krdc/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 08:49:56 -0000 Author: rakuco Date: Mon Dec 8 08:49:55 2014 New Revision: 374238 URL: https://svnweb.freebsd.org/changeset/ports/374238 QAT: https://qat.redports.org/buildarchive/r374238/ Log: MFH: r374162 Add local patch to fix the build on FreeBSD 8. FreeBSD 8 does not have support for the TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT options (the values are always hardcoded). We can fix it by only calling setsockopt(2) with those options if they are defined. At least for now, I have decided not to upstream this change because it basically affects only FreeBSD 8 these days (the other BSDs, Linux and OS X have had support for those options for many years). Approved by: ports-secteam (delphij) Added: branches/2014Q4/net/krdc/files/ - copied from r374162, head/net/krdc/files/ Modified: Directory Properties: branches/2014Q4/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 15:10:22 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 385818AE; Mon, 8 Dec 2014 15:10:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24C41E3E; Mon, 8 Dec 2014 15:10:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8FAMKs057685; Mon, 8 Dec 2014 15:10:22 GMT (envelope-from beat@FreeBSD.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8FAMMZ057684; Mon, 8 Dec 2014 15:10:22 GMT (envelope-from beat@FreeBSD.org) Message-Id: <201412081510.sB8FAMMZ057684@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: beat set sender to beat@FreeBSD.org using -f From: Beat Gaetzi Date: Mon, 8 Dec 2014 15:10:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374271 - in branches/2014Q4/multimedia: . gmp-api X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 15:10:22 -0000 Author: beat Date: Mon Dec 8 15:10:21 2014 New Revision: 374271 URL: https://svnweb.freebsd.org/changeset/ports/374271 QAT: https://qat.redports.org/buildarchive/r374271/ Log: MFH: r370909 Gecko Media Plugins API from mozilla-central. WWW: https://wiki.mozilla.org/GeckoMediaPlugins PR: 194356 Submitted by: Jan Beich Approved by: portmgr (bapt) Added: branches/2014Q4/multimedia/gmp-api/ - copied from r370909, head/multimedia/gmp-api/ Modified: branches/2014Q4/multimedia/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/Makefile ============================================================================== --- branches/2014Q4/multimedia/Makefile Mon Dec 8 14:48:19 2014 (r374270) +++ branches/2014Q4/multimedia/Makefile Mon Dec 8 15:10:21 2014 (r374271) @@ -79,6 +79,7 @@ SUBDIR += gmerlin SUBDIR += gmerlin-avdecoder SUBDIR += gmimms + SUBDIR += gmp-api SUBDIR += gmtk SUBDIR += gnome-mplayer SUBDIR += gnome-subtitles From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 15:11:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73FAEAE9; Mon, 8 Dec 2014 15:11:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60629EE2; Mon, 8 Dec 2014 15:11:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8FBui5059201; Mon, 8 Dec 2014 15:11:56 GMT (envelope-from beat@FreeBSD.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8FBuiC059200; Mon, 8 Dec 2014 15:11:56 GMT (envelope-from beat@FreeBSD.org) Message-Id: <201412081511.sB8FBuiC059200@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: beat set sender to beat@FreeBSD.org using -f From: Beat Gaetzi Date: Mon, 8 Dec 2014 15:11:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374272 - in branches/2014Q4/multimedia: . openh264 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 15:11:56 -0000 Author: beat Date: Mon Dec 8 15:11:55 2014 New Revision: 374272 URL: https://svnweb.freebsd.org/changeset/ports/374272 QAT: https://qat.redports.org/buildarchive/r374272/ Log: MFH: r370910 OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC. WWW: http://www.openh264.org/ PR: 194356 Submitted by: Jan Beich Approved by: portmgr (bapt) Added: branches/2014Q4/multimedia/openh264/ - copied from r370910, head/multimedia/openh264/ Modified: branches/2014Q4/multimedia/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/Makefile ============================================================================== --- branches/2014Q4/multimedia/Makefile Mon Dec 8 15:10:21 2014 (r374271) +++ branches/2014Q4/multimedia/Makefile Mon Dec 8 15:11:55 2014 (r374272) @@ -255,6 +255,7 @@ SUBDIR += ogmrip SUBDIR += ogmtools SUBDIR += opencinematools + SUBDIR += openh264 SUBDIR += openquicktime SUBDIR += openshot SUBDIR += oqtencoder From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 15:19:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4DBDCA3; Mon, 8 Dec 2014 15:19:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE458F55; Mon, 8 Dec 2014 15:19:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8FJke2061097; Mon, 8 Dec 2014 15:19:46 GMT (envelope-from beat@FreeBSD.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8FJg16061079; Mon, 8 Dec 2014 15:19:42 GMT (envelope-from beat@FreeBSD.org) Message-Id: <201412081519.sB8FJg16061079@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: beat set sender to beat@FreeBSD.org using -f From: Beat Gaetzi Date: Mon, 8 Dec 2014 15:19:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374273 - in branches/2014Q4: Mk Mk/Uses mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files multimedia/gmp-api multimedia/openh264 multimedia/openh264/... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 15:19:46 -0000 Author: beat Date: Mon Dec 8 15:19:42 2014 New Revision: 374273 URL: https://svnweb.freebsd.org/changeset/ports/374273 QAT: https://qat.redports.org/buildarchive/r374273/ Log: MFH: r373830 - Update Thunderbird to 31.3.0 - Update gmp-api to 35.0 - Update openh264 to 1.2 - Update NSS to 3.17.3 - Update Firefox to 34.0.5 - Update Firefox ESR 31.3.0 - Update libxul to 31.3.0 - Improve CONFIGURE_TARGET handling - Always build using client.mk - Switch to clang by default on systems without libc++ (/stable/8 and /stable/9) - Drop lang/python2 dependency, only lang/python27 is required to build - Use DuckDuckGo searchplugin from upstream (has suggestions and purposes) - Backport a few about:memory fixes - Backport Web Notifications libnotify integration - Add GTK3 option for www/firefox. Adwaita is a bit broken since Gtk 3.14, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1073117 PR: 195559 Submitted by: Jan Beich Security: http://vuxml.org/freebsd/7ae61870-9dd2-4884-a2f2-f19bb5784d09.html Approved by: portmgr (bapt) Added: branches/2014Q4/mail/thunderbird/files/patch-bug1082199 - copied unchanged from r373830, head/mail/thunderbird/files/patch-bug1082199 branches/2014Q4/mail/thunderbird/files/patch-bug1103858 - copied unchanged from r373830, head/mail/thunderbird/files/patch-bug1103858 branches/2014Q4/mail/thunderbird/files/patch-bug858919 - copied unchanged from r373830, head/mail/thunderbird/files/patch-bug858919 branches/2014Q4/www/firefox-esr/files/patch-bug1061736 - copied unchanged from r373830, head/www/firefox-esr/files/patch-bug1061736 branches/2014Q4/www/firefox-esr/files/patch-bug1082199 - copied unchanged from r373830, head/www/firefox-esr/files/patch-bug1082199 branches/2014Q4/www/firefox-esr/files/patch-bug1103858 - copied unchanged from r373830, head/www/firefox-esr/files/patch-bug1103858 branches/2014Q4/www/firefox-esr/files/patch-bug858919 - copied unchanged from r373830, head/www/firefox-esr/files/patch-bug858919 branches/2014Q4/www/firefox/files/patch-bug1082199 - copied unchanged from r373830, head/www/firefox/files/patch-bug1082199 branches/2014Q4/www/firefox/files/patch-bug1097592 - copied unchanged from r373830, head/www/firefox/files/patch-bug1097592 branches/2014Q4/www/firefox/files/patch-bug1103858 - copied unchanged from r373830, head/www/firefox/files/patch-bug1103858 branches/2014Q4/www/firefox/files/patch-bug858919 - copied unchanged from r373830, head/www/firefox/files/patch-bug858919 branches/2014Q4/www/firefox/files/patch-bug877605 - copied unchanged from r373830, head/www/firefox/files/patch-bug877605 branches/2014Q4/www/firefox/files/patch-bug899126 - copied unchanged from r373830, head/www/firefox/files/patch-bug899126 branches/2014Q4/www/libxul/files/patch-bug1061736 - copied unchanged from r373830, head/www/libxul/files/patch-bug1061736 branches/2014Q4/www/libxul/files/patch-bug1082199 - copied unchanged from r373830, head/www/libxul/files/patch-bug1082199 branches/2014Q4/www/libxul/files/patch-bug1103858 - copied unchanged from r373830, head/www/libxul/files/patch-bug1103858 branches/2014Q4/www/libxul/files/patch-bug858919 - copied unchanged from r373830, head/www/libxul/files/patch-bug858919 Deleted: branches/2014Q4/mail/thunderbird/files/patch-bug1076983 branches/2014Q4/www/firefox-esr/files/patch-bug1076983 branches/2014Q4/www/firefox-esr/files/patch-duckduckgo branches/2014Q4/www/firefox/files/patch-bug1041381 branches/2014Q4/www/firefox/files/patch-bug1046224 branches/2014Q4/www/firefox/files/patch-bug1076983 branches/2014Q4/www/firefox/files/patch-duckduckgo branches/2014Q4/www/libxul/files/patch-bug1076983 branches/2014Q4/www/libxul/files/patch-duckduckgo Modified: branches/2014Q4/Mk/Uses/gecko.mk branches/2014Q4/Mk/bsd.gecko.mk branches/2014Q4/mail/linux-thunderbird/Makefile branches/2014Q4/mail/linux-thunderbird/distinfo branches/2014Q4/mail/thunderbird-i18n/Makefile branches/2014Q4/mail/thunderbird-i18n/distinfo branches/2014Q4/mail/thunderbird/Makefile branches/2014Q4/mail/thunderbird/distinfo branches/2014Q4/multimedia/gmp-api/Makefile branches/2014Q4/multimedia/gmp-api/distinfo branches/2014Q4/multimedia/openh264/Makefile branches/2014Q4/multimedia/openh264/distinfo branches/2014Q4/multimedia/openh264/files/patch-Makefile branches/2014Q4/security/ca_root_nss/Makefile branches/2014Q4/security/ca_root_nss/distinfo branches/2014Q4/security/nss/Makefile branches/2014Q4/security/nss/distinfo branches/2014Q4/www/firefox-esr-i18n/Makefile branches/2014Q4/www/firefox-esr-i18n/distinfo branches/2014Q4/www/firefox-esr/Makefile branches/2014Q4/www/firefox-esr/distinfo branches/2014Q4/www/firefox-i18n/Makefile branches/2014Q4/www/firefox-i18n/Makefile.lang branches/2014Q4/www/firefox-i18n/Makefile.option branches/2014Q4/www/firefox-i18n/distinfo branches/2014Q4/www/firefox/Makefile branches/2014Q4/www/firefox/distinfo branches/2014Q4/www/firefox/files/patch-bug1021761 branches/2014Q4/www/firefox/files/patch-bug702179 branches/2014Q4/www/firefox/files/patch-bug826985 branches/2014Q4/www/firefox/files/patch-bug847568 branches/2014Q4/www/firefox/files/patch-system-openh264 branches/2014Q4/www/firefox/files/patch-z-bug517422 branches/2014Q4/www/libxul/Makefile branches/2014Q4/www/libxul/distinfo branches/2014Q4/www/linux-firefox/Makefile branches/2014Q4/www/linux-firefox/distinfo branches/2014Q4/www/linux-firefox/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2014Q4/Mk/Uses/gecko.mk Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/Mk/Uses/gecko.mk Mon Dec 8 15:19:42 2014 (r374273) @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 31 -_GECKO_VERSIONS= 31 33 +_GECKO_VERSIONS= 31 34 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 31_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -33_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +34_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null @@ -94,7 +94,7 @@ _GECKO_WANTED_VERSIONS:= ${_GECKO_VERSIO _GECKO_WANTED_VERSIONS?= ${_GECKO_DEFAULT_VERSION} .if defined(_GECKO_MIN_VERSION) -. for _v in _GECKO_VERSIONS +. for _v in ${_GECKO_VERSIONS} . if ${_GECKO_MIN_VERSION} <= ${_v} _GECKO_WANTED_VERSIONS+= ${_v} . endif Modified: branches/2014Q4/Mk/bsd.gecko.mk ============================================================================== --- branches/2014Q4/Mk/bsd.gecko.mk Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/Mk/bsd.gecko.mk Mon Dec 8 15:19:42 2014 (r374273) @@ -85,8 +85,8 @@ MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} -USES+= cpe compiler:c++11-lib gmake iconv perl5 pkgconfig \ - python:2,build desktop-file-utils +USES+= cpe compiler:c++11-lang gmake iconv perl5 pkgconfig \ + python:2.7,build desktop-file-utils CPE_VENDOR?=mozilla USE_PERL5= build USE_XORG= xext xrender xt @@ -96,10 +96,14 @@ MOZSRC?= ${WRKSRC} WRKSRC?= ${WRKDIR}/mozilla PLISTF?= ${WRKDIR}/plist_files +MOZ_OBJDIR?= ${WRKSRC}/obj-${CONFIGURE_TARGET} + MOZ_PIS_DIR?= lib/${MOZILLA}/init.d PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig +# XXX Not ?= because fmake uses MAKEFILE internally +MAKEFILE= ${WRKSRC}/client.mk MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall @@ -109,9 +113,13 @@ PKGDEINSTALL_INC?= ${.CURDIR}/../../www/ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin +ALL_TARGET?= build + +CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} MOZ_EXPORT+= ${CONFIGURE_ENV} \ PERL="${PERL}" -MOZ_OPTIONS+= --prefix="${PREFIX}" +MOZ_OPTIONS+= ${CONFIGURE_TARGET} --prefix="${PREFIX}" +MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA} @@ -330,8 +338,6 @@ MOZ_OPTIONS+= --disable-libproxy USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} USE_DISPLAY=yes -.undef GNU_CONFIGURE -MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ_PGO_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" .endif @@ -428,7 +434,6 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAG MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} .if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-unknown-${OPSYS:tl}${OSREL} . if ${USE_MOZILLA:M-nss} USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin @@ -450,17 +455,6 @@ CFLAGS+= -mminimal-toc MOZ_OPTIONS+= --disable-v1-string-abi .endif -.if defined(OBJDIR_BUILD) -CONFIGURE_SCRIPT=../configure - -MOZ_OBJDIR= ${WRKSRC}/obj-${CONFIGURE_TARGET} -CONFIGURE_WRKSRC=${MOZ_OBJDIR} -BUILD_WRKSRC= ${MOZ_OBJDIR} -INSTALL_WRKSRC= ${MOZ_OBJDIR} -.else -MOZ_OBJDIR= ${WRKSRC} -.endif - .else # bsd.port.post.mk pre-extract: gecko-pre-extract @@ -566,17 +560,14 @@ gecko-moz-pis-patch: @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} .endfor -pre-configure: gecko-pre-configure - -gecko-pre-configure: -.if defined(OBJDIR_BUILD) - ${MKDIR} ${MOZ_OBJDIR} -.endif - -post-configure: gecko-post-configure +do-configure: gecko-do-configure -gecko-post-configure: - @${ECHO_CMD} "#define JNIIMPORT" >> ${MOZSRC}/mozilla-config.h +gecko-do-configure: + @(if ! ${CONFIGURE_ENV} ${DO_MAKE_BUILD} configure; then \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + ${FALSE}; \ + fi) pre-install: gecko-moz-pis-pre-install post-install-script: gecko-create-plist Modified: branches/2014Q4/mail/linux-thunderbird/Makefile ============================================================================== --- branches/2014Q4/mail/linux-thunderbird/Makefile Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/linux-thunderbird/Makefile Mon Dec 8 15:19:42 2014 (r374273) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.2.0 +DISTVERSION= 31.3.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US Modified: branches/2014Q4/mail/linux-thunderbird/distinfo ============================================================================== --- branches/2014Q4/mail/linux-thunderbird/distinfo Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/linux-thunderbird/distinfo Mon Dec 8 15:19:42 2014 (r374273) @@ -1,5 +1,5 @@ -SHA256 (thunderbird-31.2.0.tar.bz2) = 4c4da90f383d7b43e97e471656a6cfbbd44d1b80d57b8b2405497678aced46b5 -SIZE (thunderbird-31.2.0.tar.bz2) = 33559450 +SHA256 (thunderbird-31.3.0.tar.bz2) = fe6ade66ad90c811a5c3832bd9b0bb61f25835f43acdf150d9dda866fbe331dd +SIZE (thunderbird-31.3.0.tar.bz2) = 33397719 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2014Q4/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2014Q4/mail/thunderbird-i18n/Makefile Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/thunderbird-i18n/Makefile Mon Dec 8 15:19:42 2014 (r374273) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 31.2.0 +PORTVERSION= 31.3.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= Modified: branches/2014Q4/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2014Q4/mail/thunderbird-i18n/distinfo Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/thunderbird-i18n/distinfo Mon Dec 8 15:19:42 2014 (r374273) @@ -1,110 +1,110 @@ -SHA256 (xpi/thunderbird-i18n-31.2.0/ar.xpi) = de2222b5edbe334c323086d2f4742b3d89abf53ea9d04e7b145b56e06203490a -SIZE (xpi/thunderbird-i18n-31.2.0/ar.xpi) = 472812 -SHA256 (xpi/thunderbird-i18n-31.2.0/ast.xpi) = 5d8a3d7cf8a8777595d9427f9ef9fa50af9e42d3c02fb0eaf23bc98ee5fc673d -SIZE (xpi/thunderbird-i18n-31.2.0/ast.xpi) = 393049 -SHA256 (xpi/thunderbird-i18n-31.2.0/be.xpi) = f8228331079c95d98aff60c49039b41bc494c10074b19d92850d0abc88b94da2 -SIZE (xpi/thunderbird-i18n-31.2.0/be.xpi) = 427488 -SHA256 (xpi/thunderbird-i18n-31.2.0/bg.xpi) = 4c7ec26c111e810476f8308a2b65c1fd754c9a970eec04440a186cab9487dd5b -SIZE (xpi/thunderbird-i18n-31.2.0/bg.xpi) = 493734 -SHA256 (xpi/thunderbird-i18n-31.2.0/bn-BD.xpi) = 41cd06883895d4813f140aeb2c9592ded5c1971e035373a79ff9484dc731e8de -SIZE (xpi/thunderbird-i18n-31.2.0/bn-BD.xpi) = 555613 -SHA256 (xpi/thunderbird-i18n-31.2.0/br.xpi) = a4fbe64d4b4e2c4a0c92a1679459b774b6f19838203661c97bfdd4bd132e0918 -SIZE (xpi/thunderbird-i18n-31.2.0/br.xpi) = 441444 -SHA256 (xpi/thunderbird-i18n-31.2.0/ca.xpi) = ff37b69e48d8fe429a981bce805cf6470f21ccfb9718762aa49fbe16246e0e6a -SIZE (xpi/thunderbird-i18n-31.2.0/ca.xpi) = 441713 -SHA256 (xpi/thunderbird-i18n-31.2.0/cs.xpi) = 11c4d4d9aa51b4db454ea0aa3164d62ed17c6b108be18b28bf2eacf626546737 -SIZE (xpi/thunderbird-i18n-31.2.0/cs.xpi) = 444701 -SHA256 (xpi/thunderbird-i18n-31.2.0/da.xpi) = c11a949b9e20375542b72dfd631091db3ae29040cf32f15cf661c141b72d9503 -SIZE (xpi/thunderbird-i18n-31.2.0/da.xpi) = 422051 -SHA256 (xpi/thunderbird-i18n-31.2.0/de.xpi) = c5a529579a4884a9efd7dade99fda51fb17f1918e68439719c4d4cb9f303d908 -SIZE (xpi/thunderbird-i18n-31.2.0/de.xpi) = 424665 -SHA256 (xpi/thunderbird-i18n-31.2.0/el.xpi) = 3a60bd9b6d3806794ae7a45f5ed51ddaed0cc7d3d4eefb32e1a048e92e3bd617 -SIZE (xpi/thunderbird-i18n-31.2.0/el.xpi) = 484855 -SHA256 (xpi/thunderbird-i18n-31.2.0/en-GB.xpi) = 2d96c8962746fe12c42d6d161d0993c317344b6ce236689a33554f432832922b -SIZE (xpi/thunderbird-i18n-31.2.0/en-GB.xpi) = 412515 -SHA256 (xpi/thunderbird-i18n-31.2.0/en-US.xpi) = b3ce584db1780e96d42284945d5accde989ee747bbe5d56fa26df500a4f8655d -SIZE (xpi/thunderbird-i18n-31.2.0/en-US.xpi) = 413660 -SHA256 (xpi/thunderbird-i18n-31.2.0/es-AR.xpi) = 24b5ce7d75676056103ae24c589b19e707c94ad1e79dc5cb8d9aa85abeef40a2 -SIZE (xpi/thunderbird-i18n-31.2.0/es-AR.xpi) = 438531 -SHA256 (xpi/thunderbird-i18n-31.2.0/es-ES.xpi) = 2d879a455caac1fb21cf7f4cbedd0a685e8a13c4048d9182c0027ee7b947f398 -SIZE (xpi/thunderbird-i18n-31.2.0/es-ES.xpi) = 374979 -SHA256 (xpi/thunderbird-i18n-31.2.0/et.xpi) = 1f7a2196700782542290c7c28d0da7c6f9e958f8ff9c2e00318c4bfe4fa26f97 -SIZE (xpi/thunderbird-i18n-31.2.0/et.xpi) = 434364 -SHA256 (xpi/thunderbird-i18n-31.2.0/eu.xpi) = 006bc0dad91e8ed9d5b1b0b812171a147bc34fb5b8159f5b990a14b34e426941 -SIZE (xpi/thunderbird-i18n-31.2.0/eu.xpi) = 431448 -SHA256 (xpi/thunderbird-i18n-31.2.0/fi.xpi) = 0ee12f069f1ca5e36873b5ed7ddf42539358dbee321dd2c60c9d86c0b099ad87 -SIZE (xpi/thunderbird-i18n-31.2.0/fi.xpi) = 435632 -SHA256 (xpi/thunderbird-i18n-31.2.0/fr.xpi) = db6cc05b0c2ba94130cf065e4ee9c0440c5583bed557e46453a1cbc0df3c2cb4 -SIZE (xpi/thunderbird-i18n-31.2.0/fr.xpi) = 444144 -SHA256 (xpi/thunderbird-i18n-31.2.0/fy-NL.xpi) = 041ade3e98acdcb4ef5589aea49c9c8cd49730fd117d7fc0f45c4a24db9235d9 -SIZE (xpi/thunderbird-i18n-31.2.0/fy-NL.xpi) = 438545 -SHA256 (xpi/thunderbird-i18n-31.2.0/ga-IE.xpi) = f25ca1b71b9ab326a08a74492de3bf7ab276751e79ac3bba97e017b6d63b35a0 -SIZE (xpi/thunderbird-i18n-31.2.0/ga-IE.xpi) = 449362 -SHA256 (xpi/thunderbird-i18n-31.2.0/gd.xpi) = f520c4ffff9903ae8277f59c90e3d0a8f7c3dbdfcf08f7a09eed5e52be28ab75 -SIZE (xpi/thunderbird-i18n-31.2.0/gd.xpi) = 453171 -SHA256 (xpi/thunderbird-i18n-31.2.0/gl.xpi) = 49e151a0e9fb797534095177a36c8323f4b21af7c3b0cd119cddb5c8c3991a38 -SIZE (xpi/thunderbird-i18n-31.2.0/gl.xpi) = 446788 -SHA256 (xpi/thunderbird-i18n-31.2.0/he.xpi) = db3ec6a406074229b5d470147ed18c195d1c83ff002c9c6692e5a974fce68109 -SIZE (xpi/thunderbird-i18n-31.2.0/he.xpi) = 476111 -SHA256 (xpi/thunderbird-i18n-31.2.0/hr.xpi) = a79194cb6a188515b02591bb4d10aab2f0a4f51ad7d9de880e5f97b0d824b6bb -SIZE (xpi/thunderbird-i18n-31.2.0/hr.xpi) = 436980 -SHA256 (xpi/thunderbird-i18n-31.2.0/hu.xpi) = 57ee1d724aed1a7afc67fcc58905f74c2d5694602ccc54218266a608611e90b8 -SIZE (xpi/thunderbird-i18n-31.2.0/hu.xpi) = 454542 -SHA256 (xpi/thunderbird-i18n-31.2.0/hy-AM.xpi) = 2626af0ff4cd8023c599abb158a5f61e4e507112f1c7ccf470bef16896a3224c -SIZE (xpi/thunderbird-i18n-31.2.0/hy-AM.xpi) = 492765 -SHA256 (xpi/thunderbird-i18n-31.2.0/id.xpi) = a053c4935b4088c8fbb0850a73b4177ae854462f8ad37d130581879969fad498 -SIZE (xpi/thunderbird-i18n-31.2.0/id.xpi) = 475876 -SHA256 (xpi/thunderbird-i18n-31.2.0/is.xpi) = 63a39a88a75fabc271e09f8a8bed08388a1c3aa1fbb6b8a3e2946f7ba3ba008d -SIZE (xpi/thunderbird-i18n-31.2.0/is.xpi) = 437959 -SHA256 (xpi/thunderbird-i18n-31.2.0/it.xpi) = b7a9c9454d038bda5138bbf73c30af650d79aa5de017c3d4eefd039cbfa6ca27 -SIZE (xpi/thunderbird-i18n-31.2.0/it.xpi) = 368001 -SHA256 (xpi/thunderbird-i18n-31.2.0/ja.xpi) = 128c6413771d621a80840f26d9248f52ca6d16456e032f2f754058dca233eab3 -SIZE (xpi/thunderbird-i18n-31.2.0/ja.xpi) = 489267 -SHA256 (xpi/thunderbird-i18n-31.2.0/ko.xpi) = 949d6bbc2c35c4fa2751a4efdd21d253f60c30e7ff975fd4b5806d89d1737a3c -SIZE (xpi/thunderbird-i18n-31.2.0/ko.xpi) = 448920 -SHA256 (xpi/thunderbird-i18n-31.2.0/lt.xpi) = c6eb3433657dab7ebb01cbb86d0024aa49598a4fca61f500ed9e44c4e74fdc95 -SIZE (xpi/thunderbird-i18n-31.2.0/lt.xpi) = 456351 -SHA256 (xpi/thunderbird-i18n-31.2.0/nb-NO.xpi) = 2779fff656aaebaa852aa79c0685a801159a5d5b296bc239a871e0ca3b77558f -SIZE (xpi/thunderbird-i18n-31.2.0/nb-NO.xpi) = 430941 -SHA256 (xpi/thunderbird-i18n-31.2.0/nl.xpi) = 21da7b7403d3c3746ff560a541dc87fdce9537fd14bfaee3904e936c426d4400 -SIZE (xpi/thunderbird-i18n-31.2.0/nl.xpi) = 431888 -SHA256 (xpi/thunderbird-i18n-31.2.0/nn-NO.xpi) = c79700f36907cde8d2a5788b121a7d0118f8b2471c72eda8f6aaf41f6049293b -SIZE (xpi/thunderbird-i18n-31.2.0/nn-NO.xpi) = 433198 -SHA256 (xpi/thunderbird-i18n-31.2.0/pa-IN.xpi) = 899c8f1dc900280a44869bd5c4be649f30186c361b717a9e996d269c744fce7e -SIZE (xpi/thunderbird-i18n-31.2.0/pa-IN.xpi) = 525323 -SHA256 (xpi/thunderbird-i18n-31.2.0/pl.xpi) = 489f30d45340cc7fdfc3a84d7459f464404ad5abd4cc72d4091c1e1c167f2533 -SIZE (xpi/thunderbird-i18n-31.2.0/pl.xpi) = 410872 -SHA256 (xpi/thunderbird-i18n-31.2.0/pt-BR.xpi) = 2459b15a8277d9c636f7380201f9636a98f7be66e695567bb545af21bed3f581 -SIZE (xpi/thunderbird-i18n-31.2.0/pt-BR.xpi) = 450477 -SHA256 (xpi/thunderbird-i18n-31.2.0/pt-PT.xpi) = f44efe77338e3bac23eb4e266a22e7e21c977db0b1740e2e2bb8978cb2724d75 -SIZE (xpi/thunderbird-i18n-31.2.0/pt-PT.xpi) = 439604 -SHA256 (xpi/thunderbird-i18n-31.2.0/rm.xpi) = b0f7e929ebe3e1c88b304e7df9cc3f5fc185effe1666bf5bebaab5874d1706d7 -SIZE (xpi/thunderbird-i18n-31.2.0/rm.xpi) = 439185 -SHA256 (xpi/thunderbird-i18n-31.2.0/ro.xpi) = 4c60b7a9233ed19b79f38f2c1acdd3c3c421e83866986720d36bc2dd5852c5ab -SIZE (xpi/thunderbird-i18n-31.2.0/ro.xpi) = 479747 -SHA256 (xpi/thunderbird-i18n-31.2.0/ru.xpi) = 8098a2085dc282b70d5f2ec44a51676086d7e930c45056b8be8225529c0a93bd -SIZE (xpi/thunderbird-i18n-31.2.0/ru.xpi) = 436156 -SHA256 (xpi/thunderbird-i18n-31.2.0/si.xpi) = 07a599cddff30ebdb245b03cf7fb3f10fd7dab77c7d5f72043a348147d9561b1 -SIZE (xpi/thunderbird-i18n-31.2.0/si.xpi) = 528812 -SHA256 (xpi/thunderbird-i18n-31.2.0/sk.xpi) = c2a10018d3a697735368112b957f84bfb1033567a04897e744e1a4d25cb91e1b -SIZE (xpi/thunderbird-i18n-31.2.0/sk.xpi) = 452995 -SHA256 (xpi/thunderbird-i18n-31.2.0/sl.xpi) = 03391be8d12577f9e733e137818fdda4f4f28724ddbd4d9548e4ad26da94296a -SIZE (xpi/thunderbird-i18n-31.2.0/sl.xpi) = 433874 -SHA256 (xpi/thunderbird-i18n-31.2.0/sq.xpi) = be5ba55ce94531b3dc84056e0433f78d341fe3b4f8ba5c68f67795aca44c8490 -SIZE (xpi/thunderbird-i18n-31.2.0/sq.xpi) = 454694 -SHA256 (xpi/thunderbird-i18n-31.2.0/sr.xpi) = e8f23cffa3b76f867dd0209f1f65a2b55d3f80245dbba9946b0f1993c1759791 -SIZE (xpi/thunderbird-i18n-31.2.0/sr.xpi) = 537335 -SHA256 (xpi/thunderbird-i18n-31.2.0/sv-SE.xpi) = 1760e8023cb00f33111279f25b60604613b682385aa735c2286fdd3d909853e2 -SIZE (xpi/thunderbird-i18n-31.2.0/sv-SE.xpi) = 436105 -SHA256 (xpi/thunderbird-i18n-31.2.0/ta-LK.xpi) = 1fe61ab35f687cd2389296783b7896b191bcc3ce02f7229404e1adc46360fe0e -SIZE (xpi/thunderbird-i18n-31.2.0/ta-LK.xpi) = 553508 -SHA256 (xpi/thunderbird-i18n-31.2.0/tr.xpi) = a44cfd98890ab255a21b54991de71eca5f06a17e5cf825c01f8b7874ff2b2edd -SIZE (xpi/thunderbird-i18n-31.2.0/tr.xpi) = 457360 -SHA256 (xpi/thunderbird-i18n-31.2.0/uk.xpi) = 7942f621505ce2270dbac9aecded2be7457aedf8ae345ffa776dfa5f3e524cb6 -SIZE (xpi/thunderbird-i18n-31.2.0/uk.xpi) = 499656 -SHA256 (xpi/thunderbird-i18n-31.2.0/vi.xpi) = 132981f1bdcf48ffb630965052713425d93fed862d0a87e9878c2196f64fd684 -SIZE (xpi/thunderbird-i18n-31.2.0/vi.xpi) = 513835 -SHA256 (xpi/thunderbird-i18n-31.2.0/zh-CN.xpi) = d6382bf21c901de5301a2ce4f2aaba839ba4ea3171bb2b965fca6876703c79cf -SIZE (xpi/thunderbird-i18n-31.2.0/zh-CN.xpi) = 462668 -SHA256 (xpi/thunderbird-i18n-31.2.0/zh-TW.xpi) = 7704b9a4ed6f20c94b1390349614e18af643bf6d58b9cef38664afcc7048346f -SIZE (xpi/thunderbird-i18n-31.2.0/zh-TW.xpi) = 463408 +SHA256 (xpi/thunderbird-i18n-31.3.0/ar.xpi) = 961c958edcb33301c6459c12a2589333c6e993cdd93be4511ecaf9ea575f8bf3 +SIZE (xpi/thunderbird-i18n-31.3.0/ar.xpi) = 472812 +SHA256 (xpi/thunderbird-i18n-31.3.0/ast.xpi) = 1582a7be9ac87115d5866ca72559018b7ce93ef6ffc3accc6c347d38dbb22bc4 +SIZE (xpi/thunderbird-i18n-31.3.0/ast.xpi) = 393049 +SHA256 (xpi/thunderbird-i18n-31.3.0/be.xpi) = e2c9c3d0ab8ce123d388aabe8b075805c95f4733dca1ae9eff7464eb23aed083 +SIZE (xpi/thunderbird-i18n-31.3.0/be.xpi) = 427488 +SHA256 (xpi/thunderbird-i18n-31.3.0/bg.xpi) = 37ce4d7cc4012171b26d83a5d77f30838e9d5a4058b18c7796da3c78cf3fcec9 +SIZE (xpi/thunderbird-i18n-31.3.0/bg.xpi) = 493734 +SHA256 (xpi/thunderbird-i18n-31.3.0/bn-BD.xpi) = 0d8a5ae252428c229c0c949d59e206d2fc82382a7128425a0194af6459f29ab2 +SIZE (xpi/thunderbird-i18n-31.3.0/bn-BD.xpi) = 555613 +SHA256 (xpi/thunderbird-i18n-31.3.0/br.xpi) = b9ad663e315abe792fc034e46f7cc01d690249d5f600ad860f73929d521619de +SIZE (xpi/thunderbird-i18n-31.3.0/br.xpi) = 441444 +SHA256 (xpi/thunderbird-i18n-31.3.0/ca.xpi) = 396760bcb133041e1b52acba598941ff627bd6fd7c1632b129a545418755f845 +SIZE (xpi/thunderbird-i18n-31.3.0/ca.xpi) = 441713 +SHA256 (xpi/thunderbird-i18n-31.3.0/cs.xpi) = 8895b7c250f5f270c6e34e109b9e9b7b795d0a0855050af2c56adc89e2b9d1d1 +SIZE (xpi/thunderbird-i18n-31.3.0/cs.xpi) = 444701 +SHA256 (xpi/thunderbird-i18n-31.3.0/da.xpi) = e9a75204f486a49599d8570423365517d4df7c497150cee8d95574982a47885f +SIZE (xpi/thunderbird-i18n-31.3.0/da.xpi) = 422051 +SHA256 (xpi/thunderbird-i18n-31.3.0/de.xpi) = 5773e8a308e6b30974e9eb3fa40b5b11d9fa9ace480686f86a5654f72c84a373 +SIZE (xpi/thunderbird-i18n-31.3.0/de.xpi) = 424665 +SHA256 (xpi/thunderbird-i18n-31.3.0/el.xpi) = 68b5c38d0c58283acb5f2f6b574bcc2573a47e7371f66b1e6b4c6bac3e29cd52 +SIZE (xpi/thunderbird-i18n-31.3.0/el.xpi) = 484855 +SHA256 (xpi/thunderbird-i18n-31.3.0/en-GB.xpi) = cb9c5f83e7925181c75065a8eb2db466641219e02ffae9f38c9c5532a422d53c +SIZE (xpi/thunderbird-i18n-31.3.0/en-GB.xpi) = 412515 +SHA256 (xpi/thunderbird-i18n-31.3.0/en-US.xpi) = 87235667cfb9c91186f551f0113410fefca3eac6d42e42715423c6a1fc93964d +SIZE (xpi/thunderbird-i18n-31.3.0/en-US.xpi) = 413660 +SHA256 (xpi/thunderbird-i18n-31.3.0/es-AR.xpi) = 57d4d3385193bd1c3b9c479efbbc3b01c53981e1824a7373841fa13f53ac5de0 +SIZE (xpi/thunderbird-i18n-31.3.0/es-AR.xpi) = 438531 +SHA256 (xpi/thunderbird-i18n-31.3.0/es-ES.xpi) = 6d35a449cffec11afe297e8084e75ca073acaec6b12a187128eac45a7fa7abb4 +SIZE (xpi/thunderbird-i18n-31.3.0/es-ES.xpi) = 374979 +SHA256 (xpi/thunderbird-i18n-31.3.0/et.xpi) = 008116d438ce76722ed9b466aa4d822b5c073ca063b4b25539d8690c92e1cfff +SIZE (xpi/thunderbird-i18n-31.3.0/et.xpi) = 434364 +SHA256 (xpi/thunderbird-i18n-31.3.0/eu.xpi) = 666528eb407334a4e8a6b3b00b2ccc9f3586f81bcb7ac80374823b65f9ac6742 +SIZE (xpi/thunderbird-i18n-31.3.0/eu.xpi) = 431448 +SHA256 (xpi/thunderbird-i18n-31.3.0/fi.xpi) = bfdcbcaaba90a65b5aa37c4feb37d6026ff1cbe915924abfe4c150f0d9c55430 +SIZE (xpi/thunderbird-i18n-31.3.0/fi.xpi) = 435632 +SHA256 (xpi/thunderbird-i18n-31.3.0/fr.xpi) = e7896408afc9c68eef3194ad512929c4b61d60ab2287e1ef9464d1de29ed6f1f +SIZE (xpi/thunderbird-i18n-31.3.0/fr.xpi) = 444144 +SHA256 (xpi/thunderbird-i18n-31.3.0/fy-NL.xpi) = d3552a76b606e12e4f524458376deeff330194b332b17ccf8d853b5b77357d68 +SIZE (xpi/thunderbird-i18n-31.3.0/fy-NL.xpi) = 438545 +SHA256 (xpi/thunderbird-i18n-31.3.0/ga-IE.xpi) = 502302b8177fbd196fde6ad0ff65367c3a5940d944e593adc20072bbbe1dfda6 +SIZE (xpi/thunderbird-i18n-31.3.0/ga-IE.xpi) = 449362 +SHA256 (xpi/thunderbird-i18n-31.3.0/gd.xpi) = b052fdb7a37c5082844fd7a136d5db3eab616f096e11e0f56158554be52c1da9 +SIZE (xpi/thunderbird-i18n-31.3.0/gd.xpi) = 453171 +SHA256 (xpi/thunderbird-i18n-31.3.0/gl.xpi) = ceffb5e73f89001b46b82fde8f42aac548214148ce7bb480a1824a6cf452e781 +SIZE (xpi/thunderbird-i18n-31.3.0/gl.xpi) = 446788 +SHA256 (xpi/thunderbird-i18n-31.3.0/he.xpi) = 879efda7c448bff7b93757e0edbf983021f190dc8f1cccdf1d03141a39b1596d +SIZE (xpi/thunderbird-i18n-31.3.0/he.xpi) = 476111 +SHA256 (xpi/thunderbird-i18n-31.3.0/hr.xpi) = 4263d0bc96b51c93a2ac69e5b0707c755f592e656ab1a827bec0f823c2d58c4e +SIZE (xpi/thunderbird-i18n-31.3.0/hr.xpi) = 436980 +SHA256 (xpi/thunderbird-i18n-31.3.0/hu.xpi) = 237941d22d98607fcbc40a1abed257fdcc93cae8fea799e90de29895c936bbdf +SIZE (xpi/thunderbird-i18n-31.3.0/hu.xpi) = 454542 +SHA256 (xpi/thunderbird-i18n-31.3.0/hy-AM.xpi) = ca895d9350a24d3fed16c6743ced1526e6a2cf0dbf24cb3f740a841d5cf203a3 +SIZE (xpi/thunderbird-i18n-31.3.0/hy-AM.xpi) = 492765 +SHA256 (xpi/thunderbird-i18n-31.3.0/id.xpi) = 55257017268da8bc3ad47cf754d3e943a96c1d1e5966aa9b12e312991322e4b4 +SIZE (xpi/thunderbird-i18n-31.3.0/id.xpi) = 475876 +SHA256 (xpi/thunderbird-i18n-31.3.0/is.xpi) = 986bf8d578652c00ba1735f714cc52632044d655263c3a408c804729b874e373 +SIZE (xpi/thunderbird-i18n-31.3.0/is.xpi) = 437959 +SHA256 (xpi/thunderbird-i18n-31.3.0/it.xpi) = ee00ccf84f655d57ec7622f1b8b52f22d0fe7d1313115a09a2c5377285e286dc +SIZE (xpi/thunderbird-i18n-31.3.0/it.xpi) = 368001 +SHA256 (xpi/thunderbird-i18n-31.3.0/ja.xpi) = 6fb40bcc1a2a3d1c18c298a8c582a7940201baafa1d0c15d46cd819990c200b4 +SIZE (xpi/thunderbird-i18n-31.3.0/ja.xpi) = 489267 +SHA256 (xpi/thunderbird-i18n-31.3.0/ko.xpi) = 1af67a385b3d4dfeb99ba57851ed113b6d10e1eb48aadcd1d03510c8faef9aea +SIZE (xpi/thunderbird-i18n-31.3.0/ko.xpi) = 448920 +SHA256 (xpi/thunderbird-i18n-31.3.0/lt.xpi) = 3415f9915ecce765d0104f8f37c85346579e55e2edc4f75955e9acb4e4599755 +SIZE (xpi/thunderbird-i18n-31.3.0/lt.xpi) = 456351 +SHA256 (xpi/thunderbird-i18n-31.3.0/nb-NO.xpi) = 7c58e207a9e627ea7e74b5126df4f1495170602217b12ba83ba6cb454b5648e8 +SIZE (xpi/thunderbird-i18n-31.3.0/nb-NO.xpi) = 430941 +SHA256 (xpi/thunderbird-i18n-31.3.0/nl.xpi) = fb0934635ce55901c9c43382ab2214952b926e1d5ee2c966c44ab883ee5adcb3 +SIZE (xpi/thunderbird-i18n-31.3.0/nl.xpi) = 431888 +SHA256 (xpi/thunderbird-i18n-31.3.0/nn-NO.xpi) = e2c3077b6497c153f581b24b1ca1b4bec27687c4d328c477484357aec295f42a +SIZE (xpi/thunderbird-i18n-31.3.0/nn-NO.xpi) = 433198 +SHA256 (xpi/thunderbird-i18n-31.3.0/pa-IN.xpi) = 7dc4048eb5e9166a855e4c819380036354841173a77c2a68a1784c3bf31b9949 +SIZE (xpi/thunderbird-i18n-31.3.0/pa-IN.xpi) = 525323 +SHA256 (xpi/thunderbird-i18n-31.3.0/pl.xpi) = 90533d8a111ada96d263d6125baf273fe1410c22c272e7170274b0c11e98c45a +SIZE (xpi/thunderbird-i18n-31.3.0/pl.xpi) = 410872 +SHA256 (xpi/thunderbird-i18n-31.3.0/pt-BR.xpi) = 2e8a412d12a850e3f011533287245cf5a6a3a124e85ac0c651057605d12d2b12 +SIZE (xpi/thunderbird-i18n-31.3.0/pt-BR.xpi) = 450477 +SHA256 (xpi/thunderbird-i18n-31.3.0/pt-PT.xpi) = 0c70f96167c6d84dccf933af218f5eeae218c0f2cb991dd084481e0a2e7905f3 +SIZE (xpi/thunderbird-i18n-31.3.0/pt-PT.xpi) = 439604 +SHA256 (xpi/thunderbird-i18n-31.3.0/rm.xpi) = cec2dd8a3a4ac8c74e36b1faa2487a93f9550f35f2476c0f048d825c2088bc8c +SIZE (xpi/thunderbird-i18n-31.3.0/rm.xpi) = 439185 +SHA256 (xpi/thunderbird-i18n-31.3.0/ro.xpi) = 6aa936dfe30286ebfecfd19255017e1456ac43ae02a7cef033ca3f744fff366c +SIZE (xpi/thunderbird-i18n-31.3.0/ro.xpi) = 479747 +SHA256 (xpi/thunderbird-i18n-31.3.0/ru.xpi) = 6f1c9f2810d42a9167fe0b74139d5a0df7695db1fb720b6e0b776997e807284e +SIZE (xpi/thunderbird-i18n-31.3.0/ru.xpi) = 436156 +SHA256 (xpi/thunderbird-i18n-31.3.0/si.xpi) = 0583537d4cda5b5ba01bdf76004de491e18475c8f19d9d0d419be155abb0365d +SIZE (xpi/thunderbird-i18n-31.3.0/si.xpi) = 528812 +SHA256 (xpi/thunderbird-i18n-31.3.0/sk.xpi) = 6342d9f60ee5a7e378e31e0c46784bc68e2f021913e9286366f15093e9cd6246 +SIZE (xpi/thunderbird-i18n-31.3.0/sk.xpi) = 452995 +SHA256 (xpi/thunderbird-i18n-31.3.0/sl.xpi) = 8abad28471f5838d775d7b5c23ef01cd1443b265ba8a957f96653bebfc96309f +SIZE (xpi/thunderbird-i18n-31.3.0/sl.xpi) = 433874 +SHA256 (xpi/thunderbird-i18n-31.3.0/sq.xpi) = e695bfe8c3b397d82253c6e933b3bf4c60adbd4c184250d73f5f307ffe045df6 +SIZE (xpi/thunderbird-i18n-31.3.0/sq.xpi) = 454694 +SHA256 (xpi/thunderbird-i18n-31.3.0/sr.xpi) = 8a05e47be44411d349f56fc72f81b1b95106c92628a906aa9b5d43282e81b977 +SIZE (xpi/thunderbird-i18n-31.3.0/sr.xpi) = 537335 +SHA256 (xpi/thunderbird-i18n-31.3.0/sv-SE.xpi) = 1039ad1c9c8f038a079d64f688e3da7a708e7dd5854dbe8aaf49fb9589e93d50 +SIZE (xpi/thunderbird-i18n-31.3.0/sv-SE.xpi) = 436105 +SHA256 (xpi/thunderbird-i18n-31.3.0/ta-LK.xpi) = 0eb91f1a539dab98b005210c06f4db9f628cc3bba9e2dabc82451c6e4a5c29c6 +SIZE (xpi/thunderbird-i18n-31.3.0/ta-LK.xpi) = 553508 +SHA256 (xpi/thunderbird-i18n-31.3.0/tr.xpi) = 7353950261d2272cd79a7d81e1f1d144fd1060c8c179dcb13b1f89c2dbd7d71e +SIZE (xpi/thunderbird-i18n-31.3.0/tr.xpi) = 457360 +SHA256 (xpi/thunderbird-i18n-31.3.0/uk.xpi) = 59450065564a275731211b1372329c1e7719dafeb185999d36dededcc112c7f4 +SIZE (xpi/thunderbird-i18n-31.3.0/uk.xpi) = 499656 +SHA256 (xpi/thunderbird-i18n-31.3.0/vi.xpi) = c2a3399b1853884cdfb8ba64366210c48ec32b3f7ff03eaf0368b7cfe0b79f99 +SIZE (xpi/thunderbird-i18n-31.3.0/vi.xpi) = 513835 +SHA256 (xpi/thunderbird-i18n-31.3.0/zh-CN.xpi) = 77b77f0d9f537a302c2f7868a962ff4178480247dc6253ff107fa9595adbed8b +SIZE (xpi/thunderbird-i18n-31.3.0/zh-CN.xpi) = 462668 +SHA256 (xpi/thunderbird-i18n-31.3.0/zh-TW.xpi) = 884e3ada592a3c543b3b03d0d185e20a9bf86aa9a2e8809df9e9e5e7316a9d53 +SIZE (xpi/thunderbird-i18n-31.3.0/zh-TW.xpi) = 463408 Modified: branches/2014Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2014Q4/mail/thunderbird/Makefile Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/thunderbird/Makefile Mon Dec 8 15:19:42 2014 (r374273) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.2.0 +DISTVERSION= 31.3.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -31,18 +31,14 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.3.2 +L_VERSION= 3.3.3 SSP_UNSAFE= yes -USE_AUTOTOOLS= autoconf213:env -OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko USE_MOZILLA= # empty -WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= default USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -63,11 +59,6 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= ENIGMAIL LIGHTNING OPTIONS_DEFAULT=ENIGMAIL LIGHTNING -# non-client.mk objdir build broken after bug 846540 -.undef GNU_CONFIGURE -ALL_TARGET= build -MAKEFILE= ${WRKSRC}/client.mk - .include "${.CURDIR}/../../www/firefox/Makefile.options" OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GSTREAMER//} @@ -79,21 +70,9 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi -# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1> -# To be removed when 9.2R goes EOL. http://llvm.org/PR15840 -.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION:M3[23]} -. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \ - a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \ - use FAVORITE_COMPILER=gcc in Makefile.local/make.conf -# apply workaround only for -O2 or greater -. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]} -. if ${MACHINE_CPU:Msse2} -CXXFLAGS+= -msse2 -. else -CXXFLAGS+= -O1 -. endif -. endif +.if ${PORTVERSION:R:R} < 33 +CONFIGURE_TARGET:=${CONFIGURE_TARGET:S/portbld/unknown/} +MOZ_OPTIONS:= ${MOZ_OPTIONS:S/${CONFIGURE_TARGET}//} .endif .if ${PORT_OPTIONS:MALSA} @@ -163,7 +142,7 @@ pre-configure: .if ${PORT_OPTIONS:MENIGMAIL} post-configure: cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${MAKE_ENV} ./configure + ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure post-build: ${DO_MAKE_BUILD:S/${MAKEFILE}/Makefile/} all xpi \ Modified: branches/2014Q4/mail/thunderbird/distinfo ============================================================================== --- branches/2014Q4/mail/thunderbird/distinfo Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/mail/thunderbird/distinfo Mon Dec 8 15:19:42 2014 (r374273) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-31.2.0.source.tar.bz2) = 48130bbd9102303167aa832ea80970201777ee65b91fbab515332527850749b4 -SIZE (thunderbird-31.2.0.source.tar.bz2) = 171047372 +SHA256 (thunderbird-31.3.0.source.tar.bz2) = b742782965ce9c65b69c1dc470497ea456f11caeb8fda3ea593ee31ad496f556 +SIZE (thunderbird-31.3.0.source.tar.bz2) = 171213377 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 Copied: branches/2014Q4/mail/thunderbird/files/patch-bug1082199 (from r373830, head/mail/thunderbird/files/patch-bug1082199) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/mail/thunderbird/files/patch-bug1082199 Mon Dec 8 15:19:42 2014 (r374273, copy of r373830, head/mail/thunderbird/files/patch-bug1082199) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Copied: branches/2014Q4/mail/thunderbird/files/patch-bug1103858 (from r373830, head/mail/thunderbird/files/patch-bug1103858) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/mail/thunderbird/files/patch-bug1103858 Mon Dec 8 15:19:42 2014 (r374273, copy of r373830, head/mail/thunderbird/files/patch-bug1103858) @@ -0,0 +1,42 @@ +diff --git configure.in configure.in +index b2b45e7..dcfdfb7 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -8346,7 +8346,7 @@ case "$OS_TARGET" in + NECKO_WIFI=1 + fi + ;; +- Darwin|FreeBSD|SunOS|WINNT) ++ Darwin|DragonFly|FreeBSD|SunOS|WINNT) + NECKO_WIFI=1 + ;; + Linux) +diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build +index d4de063..3949380 100644 +--- mozilla/netwerk/wifi/moz.build ++++ mozilla/netwerk/wifi/moz.build +@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': + UNIFIED_SOURCES += [ + 'osx_corewlan.mm', + ] +-elif CONFIG['OS_ARCH'] == 'FreeBSD': ++elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'): + UNIFIED_SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] +diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp +index bdf171e..4185d69 100644 +--- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp ++++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp +@@ -13,7 +13,11 @@ + #include + #include + #include ++#ifdef __DragonFly__ ++#include ++#else + #include ++#endif + + #include + #include Copied: branches/2014Q4/mail/thunderbird/files/patch-bug858919 (from r373830, head/mail/thunderbird/files/patch-bug858919) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/mail/thunderbird/files/patch-bug858919 Mon Dec 8 15:19:42 2014 (r374273, copy of r373830, head/mail/thunderbird/files/patch-bug858919) @@ -0,0 +1,391 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- mozilla/toolkit/components/alerts/nsAlertsService.cpp ++++ mozilla/toolkit/components/alerts/nsAlertsService.cpp +@@ -100,9 +100,11 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- mozilla/toolkit/system/gnome/moz.build ++++ mozilla/toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void +diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h +new file mode 100644 +index 0000000..ac96db9 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif +diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp +index 5ccc8e5..f893893 100644 +--- mozilla/toolkit/system/gnome/nsGnomeModule.cpp ++++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + +diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp +new file mode 100644 +index 0000000..b91b402 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,53 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} +diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h +new file mode 100644 +index 0000000..b0bd625 +--- /dev/null ++++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ Modified: branches/2014Q4/multimedia/gmp-api/Makefile ============================================================================== --- branches/2014Q4/multimedia/gmp-api/Makefile Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/multimedia/gmp-api/Makefile Mon Dec 8 15:19:42 2014 (r374273) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gmp-api -PORTVERSION= 33.0 +PORTVERSION= 35.0 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org @@ -13,7 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= mozilla GH_PROJECT= ${PORTNAME} GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 92ac670 +GH_COMMIT= f582a56 NO_BUILD= yes NO_ARCH= yes Modified: branches/2014Q4/multimedia/gmp-api/distinfo ============================================================================== --- branches/2014Q4/multimedia/gmp-api/distinfo Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/multimedia/gmp-api/distinfo Mon Dec 8 15:19:42 2014 (r374273) @@ -1,2 +1,2 @@ -SHA256 (gmp-api-33.0.tar.gz) = 6e3e63746680fc867c359605c321bb7b6a6ea9b992760aa36dab6cef9dabbf20 -SIZE (gmp-api-33.0.tar.gz) = 12769 +SHA256 (gmp-api-35.0.tar.gz) = 450c4d4b48cb525a62012ee470062918b6bdaa7e13200071159832cc7a5c91ec +SIZE (gmp-api-35.0.tar.gz) = 14652 Modified: branches/2014Q4/multimedia/openh264/Makefile ============================================================================== --- branches/2014Q4/multimedia/openh264/Makefile Mon Dec 8 15:11:55 2014 (r374272) +++ branches/2014Q4/multimedia/openh264/Makefile Mon Dec 8 15:19:42 2014 (r374273) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openh264 -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org @@ -13,7 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= cisco GH_PROJECT= ${PORTNAME} GH_TAGNAME= ${GH_COMMIT} # v${PORTVERSION} -GH_COMMIT= c79be44 # v1.1-Firefox33 +GH_COMMIT= ca0ed2a # openh264v1.2 USES= gmake USE_LDCONFIG= yes @@ -26,8 +26,8 @@ OPTIONS_DEFINE= PLUGINS TEST OPTIONS_DEFAULT=PLUGINS OPTIONS_SUB= yes -PLUGINS_BUILD_DEPENDS=gmp-api>=33.0:${PORTSDIR}/multimedia/gmp-api \ - gmp-api<34.0:${PORTSDIR}/multimedia/gmp-api +PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api +# gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api PLUGINS_CFLAGS= -I${LOCALBASE}/include/gmp-api PLUGINS_MAKE_ARGS=HAVE_GMP_API=Yes PLUGINS_ALL_TARGET=plugin *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Mon Dec 8 15:21:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 96D45DB4; Mon, 8 Dec 2014 15:21:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 813F68; Mon, 8 Dec 2014 15:21:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB8FLk3r065218; Mon, 8 Dec 2014 15:21:46 GMT (envelope-from beat@FreeBSD.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB8FLgJv065194; Mon, 8 Dec 2014 15:21:42 GMT (envelope-from beat@FreeBSD.org) Message-Id: <201412081521.sB8FLgJv065194@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: beat set sender to beat@FreeBSD.org using -f From: Beat Gaetzi Date: Mon, 8 Dec 2014 15:21:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374274 - in branches/2014Q4: Mk/Uses www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 15:21:46 -0000 Author: beat Date: Mon Dec 8 15:21:41 2014 New Revision: 374274 URL: https://svnweb.freebsd.org/changeset/ports/374274 QAT: https://qat.redports.org/buildarchive/r374274/ Log: MFH: r373997 - Update to 2.31 PR: 195559 Submitted by: Jan Beich Security: http://vuxml.org/freebsd/7ae61870-9dd2-4884-a2f2-f19bb5784d09.html Approved by: portmgr (bapt) Added: branches/2014Q4/www/seamonkey/files/patch-bug1061736 - copied unchanged from r373997, head/www/seamonkey/files/patch-bug1061736 branches/2014Q4/www/seamonkey/files/patch-bug1082199 - copied unchanged from r373997, head/www/seamonkey/files/patch-bug1082199 branches/2014Q4/www/seamonkey/files/patch-bug1103858 - copied unchanged from r373997, head/www/seamonkey/files/patch-bug1103858 branches/2014Q4/www/seamonkey/files/patch-bug858919 - copied unchanged from r373997, head/www/seamonkey/files/patch-bug858919 branches/2014Q4/www/seamonkey/files/patch-bug899126 - copied unchanged from r373997, head/www/seamonkey/files/patch-bug899126 Deleted: branches/2014Q4/www/seamonkey/files/patch-bug1041381 branches/2014Q4/www/seamonkey/files/patch-bug1046224 branches/2014Q4/www/seamonkey/files/patch-bug1076983 branches/2014Q4/www/seamonkey/files/patch-duckduckgo branches/2014Q4/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in Modified: branches/2014Q4/Mk/Uses/gecko.mk branches/2014Q4/www/linux-seamonkey/Makefile branches/2014Q4/www/linux-seamonkey/distinfo branches/2014Q4/www/linux-seamonkey/pkg-plist branches/2014Q4/www/seamonkey-i18n/Makefile branches/2014Q4/www/seamonkey-i18n/distinfo branches/2014Q4/www/seamonkey/Makefile branches/2014Q4/www/seamonkey/distinfo branches/2014Q4/www/seamonkey/files/patch-bug1021761 branches/2014Q4/www/seamonkey/files/patch-bug702179 branches/2014Q4/www/seamonkey/files/patch-bug826985 branches/2014Q4/www/seamonkey/files/patch-bug847568 branches/2014Q4/www/seamonkey/files/patch-system-openh264 branches/2014Q4/www/seamonkey/files/patch-z-bug517422 Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2014Q4/Mk/Uses/gecko.mk Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/Mk/Uses/gecko.mk Mon Dec 8 15:21:41 2014 (r374274) @@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .elif ${gecko_ARGS:Mseamonkey} -_GECKO_DEFAULT_VERSION= 30 -_GECKO_VERSIONS= 30 +_GECKO_DEFAULT_VERSION= 31 +_GECKO_VERSIONS= 31 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) @@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Seamonkey versions -30_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +31_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey .elif ${gecko_ARGS:Mthunderbird} Modified: branches/2014Q4/www/linux-seamonkey/Makefile ============================================================================== --- branches/2014Q4/www/linux-seamonkey/Makefile Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/linux-seamonkey/Makefile Mon Dec 8 15:21:41 2014 (r374274) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.30 +DISTVERSION= 2.31 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US Modified: branches/2014Q4/www/linux-seamonkey/distinfo ============================================================================== --- branches/2014Q4/www/linux-seamonkey/distinfo Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/linux-seamonkey/distinfo Mon Dec 8 15:21:41 2014 (r374274) @@ -1,5 +1,5 @@ -SHA256 (seamonkey-2.30.tar.bz2) = 629d3ab73a1fdbe2650ac2cda75c7c30fbed8eada52d05f2f88e5321b97b4fca -SIZE (seamonkey-2.30.tar.bz2) = 39998490 +SHA256 (seamonkey-2.31.tar.bz2) = d6f3fe75bf9605c06bcb47be2d1ef004525e27e8326b05ab88d5fe4a6eaaf4c4 +SIZE (seamonkey-2.31.tar.bz2) = 40638305 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2014Q4/www/linux-seamonkey/pkg-plist ============================================================================== --- branches/2014Q4/www/linux-seamonkey/pkg-plist Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/linux-seamonkey/pkg-plist Mon Dec 8 15:21:41 2014 (r374274) @@ -53,7 +53,6 @@ lib/%%APP_NAME%%/chrome/icons/default/se lib/%%APP_NAME%%/components/components.manifest lib/%%APP_NAME%%/components/libdbusservice.so lib/%%APP_NAME%%/components/libmozgnome.so -lib/%%APP_NAME%%/components/libnkgnomevfs.so lib/%%APP_NAME%%/components/libsuite.so lib/%%APP_NAME%%/crashreporter lib/%%APP_NAME%%/crashreporter-override.ini @@ -63,7 +62,6 @@ lib/%%APP_NAME%%/defaults/pref/browser-p lib/%%APP_NAME%%/defaults/pref/channel-prefs.js lib/%%APP_NAME%%/defaults/profile/chrome/userChrome-example.css lib/%%APP_NAME%%/defaults/profile/chrome/userContent-example.css -lib/%%APP_NAME%%/defaults/profile/localstore.rdf lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf lib/%%APP_NAME%%/defaults/profile/panels.rdf lib/%%APP_NAME%%/dependentlibs.list @@ -90,6 +88,7 @@ lib/%%APP_NAME%%/libfreebl3.so lib/%%APP_NAME%%/libldap60.so lib/%%APP_NAME%%/libldif60.so lib/%%APP_NAME%%/libmozalloc.so +lib/%%APP_NAME%%/libmozsandbox.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so lib/%%APP_NAME%%/libnss3.so Modified: branches/2014Q4/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2014Q4/www/seamonkey-i18n/Makefile Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey-i18n/Makefile Mon Dec 8 15:21:41 2014 (r374274) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.30 +PORTVERSION= 2.31 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= Modified: branches/2014Q4/www/seamonkey-i18n/distinfo ============================================================================== --- branches/2014Q4/www/seamonkey-i18n/distinfo Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey-i18n/distinfo Mon Dec 8 15:21:41 2014 (r374274) @@ -1,54 +1,54 @@ -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.be.langpack.xpi) = 942e41816717417241480048c5bdb3359050170d5d1373baac60637072125318 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.be.langpack.xpi) = 841428 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ca.langpack.xpi) = f1885b21616e0c0598b5209a64ab6c709b6a38e6c87d7e7dc46bbb5a080d220f -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ca.langpack.xpi) = 834809 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.cs.langpack.xpi) = 1d27172ba95f2604b33e108c3d3121ea24c019c2a29cdc23905bc6a88558783e -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.cs.langpack.xpi) = 836086 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.de.langpack.xpi) = d0af448d7eb0994eb6bcb21e6fdeaede037b91fd74558743b2212629304ecb82 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.de.langpack.xpi) = 840719 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.en-GB.langpack.xpi) = 54b6ddc03323c03e1ff7651941ac30d7723ff7a16efefc34c31f40a9418273d3 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.en-GB.langpack.xpi) = 805934 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.en-US.langpack.xpi) = 8a28853922139e19db1b1e5ab64ff555d40710b202259b58d8ed74769d49d330 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.en-US.langpack.xpi) = 805932 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.es-AR.langpack.xpi) = e2c138ef0a4a7fa0dc4cba91fea2e52c6f580bbe1bcbba1e929ef133ca1892e8 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.es-AR.langpack.xpi) = 854761 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.es-ES.langpack.xpi) = 34e7b38ef23dcef4b6279a155aef5e33abd2d9f7f39c54970ccb4e86a0236e0d -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.es-ES.langpack.xpi) = 831828 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.fi.langpack.xpi) = f08ad7cb30ef288ee023fff77c1d9f7daf92e27f6b046aaacb39f5bc77d21f86 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.fi.langpack.xpi) = 802428 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.fr.langpack.xpi) = d4b8853961ff4040124b74657c052944e1fb34ce155a57b63802a36104c1b18a -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.fr.langpack.xpi) = 813379 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.gl.langpack.xpi) = 085312f4d6e0da8c6dc05ee976eb73c64f8db5deea94e93e51094af2c612daf9 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.gl.langpack.xpi) = 815086 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.hu.langpack.xpi) = d8e348427de7fc4a12b29eebb242d85f2a783155ee1980115a12ea18c20b3a76 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.hu.langpack.xpi) = 846944 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.it.langpack.xpi) = 7cfbf41c51267252e948c726d82c99f1dd08b41e0824c4b3aee3745139bf6aea -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.it.langpack.xpi) = 744667 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ja-JP-mac.langpack.xpi) = 2b637b618da5dccf98fd9cac168e943a3327aa96e94493af8ebc58aabdd96322 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ja-JP-mac.langpack.xpi) = 901956 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ja.langpack.xpi) = 310b1915fddd645ef599c4ccd43a012d7ad5b6dcd8b9ee1ed55314dfe1b84d50 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ja.langpack.xpi) = 886414 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.lt.langpack.xpi) = cf3f171f9b322f463d4776118f91e9213efc47d9da311e9666b0134956c9f9d5 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.lt.langpack.xpi) = 852885 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.nb-NO.langpack.xpi) = 4174506d5b648bd3a32860d7f1a13f38acc8efd4add445654c39d148d8bd579a -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.nb-NO.langpack.xpi) = 825465 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.nl.langpack.xpi) = 65d96aa66d3d5e7df067a24af45ac1642d402df0d83b3ad62566de8b1341ef52 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.nl.langpack.xpi) = 799416 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.pl.langpack.xpi) = 7c0ec1aee1224a271ed7f8bdb65cc661ac1896492c40a560c703e0bf41409f2c -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.pl.langpack.xpi) = 871070 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.pt-PT.langpack.xpi) = a199d31a141a793468315c4b8e2af945dad65300af3dc08ecf6e46cc8a268e94 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.pt-PT.langpack.xpi) = 839078 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ru.langpack.xpi) = 2de977bae6270ab0a81de79f83f1fbd193d0a34b5522ce58f08d7e0437267db1 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.ru.langpack.xpi) = 908478 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.sk.langpack.xpi) = 3171795cb2b8d38cb2efd2a0c92cf9b9292cedae910630b76b82c49dc6965424 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.sk.langpack.xpi) = 863112 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.sv-SE.langpack.xpi) = a8be050ec15e4c73ae2b91bcdbbd7d1b49f10606f3dcd8507ff3716c8ea738cb -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.sv-SE.langpack.xpi) = 827757 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.tr.langpack.xpi) = e21d7da74395703daada431cf7cabc4dde2368aa6f3acff689a3ff95c3c986c7 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.tr.langpack.xpi) = 811821 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.uk.langpack.xpi) = cc18e2c32851c0672505c3afa93503b87c7f176ff10115f378c52499d9119113 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.uk.langpack.xpi) = 874148 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.zh-CN.langpack.xpi) = e61da8c2d17b9afa0aad1d41910f00c785f618bb457cb9590176d4e5447cf6ad -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.zh-CN.langpack.xpi) = 837222 -SHA256 (xpi/seamonkey-i18n-2.30/seamonkey-2.30.zh-TW.langpack.xpi) = 29993aeafcf649561008394400cad3e9cb053891af1f69709aff4d2ce5ca90c0 -SIZE (xpi/seamonkey-i18n-2.30/seamonkey-2.30.zh-TW.langpack.xpi) = 863385 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = c685778c26e42914713f248af13531746a893775b690c851276c5dbac6c42673 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = 842987 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 64e11f5088be84b21c5fe22605b754c246ff86142a22b680599e8c138784f1c2 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 836129 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 00a70a450997b8598970089c8d67f1d77da9cd94a31db297eefcd7fe42e76b71 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 837401 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 1b9cb19e1618eb146ae52875f700def9c130b293f03e57ffd61abe7d262c8791 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 841321 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = fb5c13e0a92bcf94589dd68ac27d6d91d5eb3dd445b78eb77258956849650de0 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = 806393 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = cd9916784e258990bee4a4b92353da0f7c015a99e29ce1b19d518e843bcb2f7a +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = 806393 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 789cb938c4473fe4f7c9661d8e0a3974b5f627460e0a3d66f43a2d4c02b3ba76 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 855419 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 93ca568a07923605613d2df703a712b95c5364c3e67487d64e05b1dd6c2124fe +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 832275 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = d904b42fef7cb6e7537e8ce0b97c1fae7902cecab24c44eaa0a24bbeecc34275 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = 803753 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = e58ad8812caa8ee5762cb80869d517c70a0ea6c22e780a5b9561ab06e4b30c35 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = 813901 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 7015eed1fc8f47ec11bfb22435682ed1053b4d3e0939a8442c27f1b23113b0ee +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 815951 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 88a8aded02ebfc926caff925cffbf3659d03c7923c25917a4d945047ec13a948 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 847393 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 7b61f752a6981983d53155f09b14043bc1ae30335d58bc2cd2469b7b2205f85f +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 744925 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = e94c36f9e5c342b33f778be5880106b5d45f4f2b0aef36c604c3a6ffeeba24d7 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = 903849 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 833a41fea45be480338a86a51163959886f1e4b443ee61cbf09ba68e61255874 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 888311 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 9e44994780eb3efe7dc46a4742cf24bcd6cf41d045d8fadbf9eccc28fe03bb50 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 854172 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = eea41ed25941cc479c6f92b2ebdc668182bb5f42f4bbeacf96008c4469cbd834 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = 825996 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = c399ab8412e7e44100c08df9a8362cf7e74c79a8277e8dba6a1856fc79df2b4d +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = 799921 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = f37cd7f58a28991b156efad2bf439df3d584c0724dae3050121893ef4624c1d8 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = 871193 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 59d671a4ebed43eaeedd84aa6dad3d92c5bde0fa60d2419df0d16f9b08312650 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 840381 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 2aed82158ef7feed0beea74e337c91a72f5c6b56e04d33027214f2dcc1bee3e8 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 903117 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 59e3d10e170484dc36e7db9361ced649fea50ca2ca203ece2dad32cf2923d146 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 864480 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 44b550171164b290bb5af66f34930a9da187d54fb8ea37e7f91026966dc8b149 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 828261 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 856ea876142e409caf81423da627f002664054f546df7839663f3c8a56a727ef +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 813160 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 6a70dc6b9832960216725889ca341d8d4ae2f3a80723d8b5a48c470c58a9d6fe +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 875357 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 2a378781a7a13ef0b8ec3758633ecf3d55f99d5439f8ee2d3a0a6ae4106f2aa3 +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 838609 +SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 4032cd3e4aff64f7c84258da2387857046bcb015ce3d13aed8ae61b2eeee1bbb +SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 863793 Modified: branches/2014Q4/www/seamonkey/Makefile ============================================================================== --- branches/2014Q4/www/seamonkey/Makefile Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/Makefile Mon Dec 8 15:21:41 2014 (r374274) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.30 +DISTVERSION= 2.31 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -13,7 +13,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ - nss>=3.16:${PORTSDIR}/security/nss \ + nss>=3.17.2:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ @@ -22,7 +22,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ - sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ zip:${PORTSDIR}/archivers/zip \ @@ -31,17 +31,12 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.5 +L_VERSION= 3.6 SSP_UNSAFE= yes -USE_AUTOTOOLS= autoconf213:env -OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko -WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -WANT_PERL= yes -ALL_TARGET= default USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -57,18 +52,13 @@ MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS -OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module LDAP_DESC?= LDAP support for Mailnews MAILNEWS_DESC?= Mail and News modules -# non-client.mk objdir build broken after bug 846540 -.undef GNU_CONFIGURE -ALL_TARGET= build -MAKEFILE= ${WRKSRC}/client.mk - .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -83,23 +73,6 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi -# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1> -# To be removed when 9.2R goes EOL. http://llvm.org/PR15840 -.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION:M3[23]} -. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \ - a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \ - use FAVORITE_COMPILER=gcc in Makefile.local/make.conf -# apply workaround only for -O2 or greater -. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]} -. if ${MACHINE_CPU:Msse2} -CXXFLAGS+= -msse2 -. else -CXXFLAGS+= -O1 -. endif -. endif -.endif - .if ${PORT_OPTIONS:MALSA} RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib .endif @@ -115,6 +88,8 @@ MOZ_OPTIONS+= --disable-ldap --disable-m .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else +BROKEN= XPCOMGlueLoad error for file ${LOCALBASE}/lib/${MOZILLA}/libxul.so: \ + Cannot open "../../ldap/sdks/c-sdk/ldap/libraries/libldap/libldap60.so" MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .if ${PORT_OPTIONS:MENIGMAIL} @@ -140,7 +115,7 @@ MOZ_OPTIONS+= --disable-composer MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else @@ -159,7 +134,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/mozilla/modules/libpref/src/init/all.js + ${WRKSRC}/mozilla/modules/libpref/init/all.js @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop @@ -184,7 +159,7 @@ pre-configure: .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} post-configure: cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${MAKE_ENV} ./configure + ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure .endif .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL} Modified: branches/2014Q4/www/seamonkey/distinfo ============================================================================== --- branches/2014Q4/www/seamonkey/distinfo Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/distinfo Mon Dec 8 15:21:41 2014 (r374274) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.30.source.tar.bz2) = 613eb08d80bf671b390869e9682810d7ae312a9858f6b69da76155f42ff1d516 -SIZE (seamonkey-2.30.source.tar.bz2) = 178435927 +SHA256 (seamonkey-2.31.source.tar.bz2) = 9c4dd82f776780b99b70be0b6b944ada218e4356ec8dd059a63d4c260a04ee28 +SIZE (seamonkey-2.31.source.tar.bz2) = 187731254 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 Modified: branches/2014Q4/www/seamonkey/files/patch-bug1021761 ============================================================================== --- branches/2014Q4/www/seamonkey/files/patch-bug1021761 Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/files/patch-bug1021761 Mon Dec 8 15:21:41 2014 (r374274) @@ -235,12 +235,12 @@ index a962553..1f780f4 100644 assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -313,10 +360,10 @@ alsa_refill_stream(cubeb_stream * stm) - return ERROR; - } - if (got > 0) { -- snd_pcm_sframes_t wrote = snd_pcm_writei(stm->pcm, p, got); -+ snd_pcm_sframes_t wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); +@@ -327,10 +374,10 @@ alsa_refill_stream(cubeb_stream * stm) + b[i] *= stm->volume; + } + } +- wrote = snd_pcm_writei(stm->pcm, p, got); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); if (wrote == -EPIPE) { - snd_pcm_recover(stm->pcm, wrote, 1); - wrote = snd_pcm_writei(stm->pcm, p, got); @@ -660,7 +660,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,399 @@ +@@ -0,0 +1,404 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -1058,7 +1058,12 @@ index 0000000..5e38e27 + .stream_start = oss_stream_start, + .stream_stop = oss_stream_stop, + .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency ++ .stream_get_latency = oss_stream_get_latency, ++ .stream_set_volume = oss_stream_set_volume, ++ .stream_set_panning = oss_stream_set_panning, ++ .stream_get_current_device = NULL, ++ .stream_device_destroy = NULL, ++ .stream_register_device_changed_callback = NULL +}; diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build index 8b7a0dd..31212ce 100644 @@ -1084,18 +1089,17 @@ index 8b7a0dd..31212ce 100644 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] -diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk +diff --git toolkit/library/moz.build toolkit/library/moz.build index e191f13..4fb268a 100644 ---- mozilla/toolkit/library/libxul.mk -+++ mozilla/toolkit/library/libxul.mk -@@ -146,6 +146,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 - endif - endif - -+ifdef MOZ_OSS -+EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) -+endif -+ - ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif +--- mozilla/toolkit/library/moz.build ++++ mozilla/toolkit/library/moz.build +@@ -239,6 +239,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] ++ + if CONFIG['MOZ_ALSA']: + OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + Copied: branches/2014Q4/www/seamonkey/files/patch-bug1061736 (from r373997, head/www/seamonkey/files/patch-bug1061736) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/seamonkey/files/patch-bug1061736 Mon Dec 8 15:21:41 2014 (r374274, copy of r373997, head/www/seamonkey/files/patch-bug1061736) @@ -0,0 +1,50 @@ +commit a7add79 +Author: Gavin Sharp +Date: Mon Oct 27 18:43:51 2014 -0700 + + Bug 1061736: add DuckDuckGo as a search engine option in Firefox. r=dolske +--- + browser/locales/Makefile.in | 2 +- + browser/locales/en-US/searchplugins/ddg.xml | 21 +++++++++++++++++++++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +diff --git browser/locales/Makefile.in browser/locales/Makefile.in +index eb3c30b..b172876 100644 +--- suite/locales/Makefile.in ++++ suite/locales/Makefile.in +@@ -118,7 +118,7 @@ libs:: $(addprefix generic/profile/,$(PR + libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome + +-SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt)) ++SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt)) ddg + + libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins +diff --git browser/locales/en-US/searchplugins/ddg.xml browser/locales/en-US/searchplugins/ddg.xml +new file mode 100644 +index 0000000..d68deb4 +--- /dev/null ++++ suite/locales/en-US/searchplugins/ddg.xml +@@ -0,0 +1,21 @@ ++ ++ ++ DuckDuckGo ++ Search DuckDuckGo ++ UTF-8 ++ data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/ zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC! BAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAA oSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/ JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8m! Str/Jkra/! yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33 AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H /JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zA! lUOLvJVDi! /yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA ///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/ ++ data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3 JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7hxyCFAAAF4UlEQVR42tSZa2wUVRTH/3dmp92+tnRpCiUgxFoKCDQplsRIfZSgCEHSapBGBCURQvCLWkkQg9GYGNDwTYlGUCMoCA2EtEpEq1KjRJCA9EEElba2FajbN213d+b6vzOzZZfi99mb/DJ3d/aczD33vO6skFLCq6O9YubYXChE4n1+LublaVJO5hLDvRUhjaSefMolno+XU0uOX7WG5BxLSBsXc448Qo6SFWSuywr3O3XvnPqtK3PbkWxGUL5whHzN7WyAZeWQRZBWFz+v4v6+w3sKztFFFpEc0mDLOLJinNIkCocMXppJLhdcCssMw4zu5fOX2XGi6RAa91Rot8aNMsB6kkJOk24yh6seSjZPEHzoZmlfZaaU1pqR/Dsv+XfVlQXf/QbZ67dBz5sKKzxK20TpGBbU5qrtJWXkEllDMqWrK94jPG0ESzpwPTUkl8yQFvZL09oaLlqIG1LDQFoA6Y9vxJQ9Dch+bjus4WEaIwxpmjSGdJKgw1ay39bh6KqJ6U8GTyjnc1aQheQ1UqV2Of3LPTBPfI40RkVsEdmVGzClphmZy9bAitAQlhnvEbBlHR1KV4VbVbydE66sLFI+e8mN5e1Qc7o6IqMIr3sVhVUb/le2e1c1Bk8cgvAxFWjj9rqQvA7HGIVeN4LqA1SJm0i Oci/LQDc3aZrg4RZkpBgYHY4iK8OXIHetz4RPi6K/ao4! b9PrtkuVKElL9hafDgfuzjrQQk5QxH9hxPphfgAy/gYHByDgDqJGXrSOYlYrAo1WQUTc32LJj+aHM1dlEnvK2EYClpIasiotrmL5URE2JiQEDuw+ewunGjgS5hrNtWLp5P/QHKhk9lh1BDuKmIYAnyWGyxNuJUWI2+ZncG5/djKF+DA45ZX7Hh9/j2HdNCWKzC/JRsXg+sgrmQ4aFjS/LQvqsYejpqiTYepTOn8g8n8c9QQ21zdPiDxD+620IhULIC2TiYl01/CmJy8jNNrCxMh/hjiMIVvYioziK1BlRQJcIHc1B6KscqpLTXN2pPo/nhNjwxR2jIFgdBtouAzPuSDSAZLPUXgX0HYFgLjRIcLnO3sFAb33AJnLdYFNp9w/6Lco97Qm57o7dbKC5wpHffgHuL09srjo22AYY/tOPoQsBiFRgtJ3zljQqo/HoCfbSnULR6eq2vJ4TWskCcnYsJ9hGYIz/1YQR65bTYOARe5FW2EDfqQD+rQ1iqDkN/qlhTHhwAJnFQ6oxiuUWpfMe0uzpPuH3ZUV7eZlFVpPWsRjh+WA4OAV579UiPzghQaajuhgZc1qRWTIKnQ4g0i27N77RlI5rXwQR/seI9cnTyWfkvNfDYR8v35K/iSoBd8eSY8r1doR6escZYfRqLvrPDEDsM+ALWNADJiLdBttoYXuJEPamK13t5D6y1evNUj3pJzvIJqfRYV5XyZGFf/CPlnEy6UXzoLEZYDqEHBCIdBpsmFSsODEgHb1K105Xd4PnD1B86M2kmjSSA/Yi6AlSaBhtPG3/5mTXcTT3nLPnwYcq4KP7X52cgvc3TcWvpQFVDu1UIoWt74CrS+nc7P3qIO00rkLiBfcQdReZCamVqAqRcuUiolzJDx11aO4+gxxjOnqtbmhvzITO+6Yh0DthhF4jYmeHs4Q1FJfd+T6ZLC9VpHOcnk7qyQJSqzzB39WKnr5h+HhS1DUfOvs64RNRVgATlnDawoghYoWl 1pWtd3WVJ0WfEDf6pGqhnTdCTGqihCw3urt2h0LdecH0ydB1Aw8XLkfPjRGUTixB4JUtuDDXj0nXokMmsJbyddJJiOoYPZuO0ZdsRlDjsnTa5x/JCDTxEnPfpIH6Y28uXvHYttUFzyNb1cTY+4TyC8ezD37wltT1k5YmXmRkjbhhMI2BcTVpXrS2LJ011jmO/VfgPO7L/GKnfSQ0zU+EaR2SlnWGN53FaRpdw1cKTX+Cxlrr5oMt5G2713Kq7NhLxmQ1gpPvpXyWs2f4oSz+oHHznxrRwOvHnHwkYpK3McJ/AgwADmrfhvtTyFYAAAAASUVORK5CYII= ++ data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b 3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7NVVBAAAAO30lEQVR42uxdCXRU1Rn+3nszk5nJhmEJAYKyJJJAWFyqUqwWwaJi0aKA9bh0USwunEo9UGmrHG0Vj3LUUoEqFQGXciqgiFCoVtsKeBAJS9JWtrAmIUxmkpnJJDNv6X/fu5O8mUwmkwkoPef9Od/cN/ct9593v/vf//73vhdB0zRY0nU5dktxuzxBMG3zD6GD84XYHYMI1xMuJZQQ2MWzCS6+P0TwE74i/Juwi7CFcCR6gY6qUeMf5t2JjhUsInxjRBhJyUOEewn2NNWIEFYQFlM17rWI8P9FhJsILxGGdHDpOsJ+wmlCA8/LJfQhjCD07uC8Q4TZhI3pEMFmVenXJqMJ7xIGx+UfJawivEf4IsVrXUaYQriLcCHPY8T6gHCYMJVQ3hXlLIvw9ViE1wg/iTt8JeFpuvsHYs4BehLKCAWEHnyXj1BN2EfwmGuMzimi5FeEu+Ouv5zwU6trOD+IUEif/zS1WiZvEWZSzQT4gQ5WYbwVj0+x+I+5dXmNrhPm18miz6WEO+OszdV0zHGLCN8cEZj53mnaXUO4ke72blYTArRS+r6QMLnVFggmu5C6sO5gLl23kp/NuqBNhL6mYy7XTN1OoioXrSo9JzKJ7vVOjTtrhLWEAoMEag5UZaMmyxVqJDKZAFUmKDJBpd0Eqi nTuZ1hMqGCV34ObZfzstaajmGEnGT5CF+vRbg0zul7kr! CAN8Ufa6K0vLnkCmSXXQ5nuBmavx6qtw4t+3dC9p6GIJH/LkkQRMm4oNBlC8F8kT/x7Sd4+WYnc5c1ajj3UhBHgofppi/mdbmGmHA75DDC9afh63cxSr4zMeZk+Uw1Au+/jsCGN6C2NEGw2clmk9EWumS4l/PWP43KXkBle2j793wf060fdzwti3CuLAIfy0eHhwtMrZE5jONAZl+lSrUvXI/+w0qTXF1D/Su/QeP65RDsDrISkkGGrlmHf+mOYptVeoJvH04Uw7CIkKYcjSMCVdESSh7gX1lM4JYYEuj1qyKU1w/eUdcC3jPQMnNh65UP9+Dh6FFUin79+8e4ioG/vYszCx80uguyDkLUOqROCDMZ1vPYA5OlVOs/s4hw9onAmncF32YRwXy+/TZhRsy4TVWoD4gAkTA0RYHjuh/Adc0tyBhcAme/iyDGVXLk5GE0bfsr/NRlsK7DIITUFTK8Q7iDb9fCiFAyGQ4+0rCIcPaIUMHJwORb0ISddGfv4kGj2AE8jQ4QaUFkwh3o9/OFcNtSd9M8L8+D/8PVeneBrpHhbtJpFelkHtJWcjJYw8duiSZEMYFQyrfX8BudQ9srTceQJaBclYgQURCc/hiGPPZCl0jApOcjzyJz3GRodA39WubrJ8dKXSfmLDIdjbxSrrt+jGUR0pSqKRdHN9msXxnfvgBGOHiDESgyE4eYIMvwFw5D8bJNyOiOozrjEiiNXmNUkbpVYIGnm2GErb08j4WsR1oWoftSbCLBW5wERe1IYOoW5HseT4sEClmAWk8zzgQ19H7kd5RBfoaqInYWIalM5rr5uK7guhdbROhOz6DpmMVThqd5usiUZ4AqUVNUBHsVIm9oiX5+U4uCpavLsWTVbmz6+FCn5R2vDuhRR7+vCdLYSbAVFpHfqeiGpl15HSOq21OmPP03WF1DmnLk+3rXECS4eYCGBWokFhdKxBqBRgqnR30Xg+e/jF7ZWXjng68wdkwBBvbPTqt 8/+a3UbdoLgQHdxxTF+aYkJOBk1xn9huyLIuQvhRyEjB5jaf3dRQgYmi5oC8k0bjl024qSpsETLIn3UHugabPS6BrjTmq43KeZjJCWERIt2sAbjBN6mzSjDn/25JNEKk2B+RIxBiumZw8D5n7lKJDX1bhqjtfwUtvbde/u0aPNSapgK7gNq7rJlPe9RYR0mfCVaa7u53nXZesBgRNQSgUirnM4y9uxogpi/DE4q3kN0SSFrlszQ4cPeXFF/tOwNcCOMuuNBxGVTOxLQFi9biO67rdlHe5RYT0ZQRP63jap+NDBR32gA/+QDBmz5sby2G3iThe68O2L48mLXDGDaPhsElgk9Q9aOiRMbi0HQk0VSDHlCBzqEIbGdqkd5zupRYR0u8ahvH7X8HTkUlNMnUFTs8peLz1Mde5+doShGVVb+VXjipMWuZN1wxD1dZ5WP3MNCPDmWUYBBZfokpXIoJelnt0ED1vrUfeFC/cw5uIK0K8PqN4up+nxdY0dPqSxdNTPO2X3CAQEWqP4nhDY8yuxfOnYM49V2NA3x66ZehSbMHfAi0iwd5XRmZJE1zDQ3BfHIJg582fzU/ZNNQsy0dwj8u8+KmApyd5mmsRoRtxBC7RJec5yboGtjjNUX8aQpMfTeEI3I62RxkGDchLrVD5DJl9sihyNYRwBSTtVQx64RRsubrJIZ2MmmZdgyBqeur7KAeBclfb4IVXPE+jrMy0iNB9CfO0k4dUBDZU0K2C1+uDO793aldXybSfmgOt/nWqyBazywFHL2Mlk6aIrfmMAEqTiMbPcuH9KBtqQNIjB2yoaRJ7nO7WCqWzID2jMZ7OeMC6B3dtFbw+H/qnQAQtuA3q4QlEhpCxUkm00SWiC12FVnLprZ9FKytdaNyejWC522j9ktE1RIljjkfF6R62iJC+syjzhtQjzgPvmAmCCFcNWYQGX+cFRKqhHvi2UYGiHYIkEh9ERBpt1BUokHIUqC0iQv/JgH93JoJ7 3VACkk4K3TcQDAJoieekorpGdQ9YREifCWzJF5uwGcZz! KjpjDqsZZ! 3UVTsQ5jAkPD+3h/DGWqWmyiCO/LtTNfusSRr2la8Z3xjNJayssebAxqmsJT49Yw8f0ZR9Ph/L0YHKDYKxIdjTUQQg2ItjSkvzw7Al6VwBB1U9Vmw2LIHBz3wqJE4JVvMIcRUKExxJYDCExIQ7G6V5pESH9rqHcNC4fzPMqk4aY2ehBZN1Dle4wJmeCDeKgNYaJFxXYesgYMKcGrqJmvuJN0GMHKlU6iBDOoc3oMaERBffXYcjCEyhaUgV7fjiRHpVc18GmvL1W15A+EzbT51P8G5t3+AOMBaKlnfkKTt1PaMCAvvmdWIVbUbtxKpwFW5B9WRiZpSEdbFpb9lHVUYsX3Sokl9o6nNV9SOoiGj/LRrjWET9aYLKe59xgyttqESF9i2B+fmE6DCK8Sni8U4eRRg6eem9K5QT/G0T9h70hrpaQNaoZWWVNcBc3w5EvG6Fj3qoZAeSAiACNGLyf5KD5uIMZlUTyqknnqOyxiNA9YUvS2PIvtmScRW2qYDzdXJRsCOk8dRgn/P6UChAzaMRgU/WxIKtk/263bgmkbBkZ/WXYsmSoYQGR03a0kAWIOo+6/9B+2HiA6+hC2zL3DXo5Vl12S5aYtmdz8zw3uUUQYPd7IQYa4G8KdVqAY8CFdJaqDwtZ5Yp2Sh0qOY8SQgdp6FhOQ8dKN8Ieux5a1vdLbSOJOJnLdZwd/xssIqTbNRjrQdg6hObo8i+ev45woqPlYvoEkMAdRl/n8QTn0BFQ2VI30ySj4QtorYCoz3HraHUA25fNdFrHdYwuVWvmv8EiwlmQ+Txl3eyjWvv+N8EwUtS7B6+vodOLZ44Za0wv8poz6p1aPpFD4hBTW6A0nR/2KNoiyvNbuyCrHtN2FqNYxKKMfPsF3v9uo+1VyaakXdWH4fF27jA6i8tgc+eyZcwspABBocqn0o4OdOKP9w/A+1P6UL4Wr1M82Kt5tjHdmI48T+a668dYRDg7Yl6ruJbPArJX2RxP5CYYRK hCYyDQmv3+oZX44ear8NwXj2JX7T9iTuk5/lbYI0QAIoFiF7B2al+svKc/avpm4MBQt24dhI7XLTId7uY6re1AZ2vSKX2TEOOJreAmlz0nwB5Jn0k3fhkdMYa2T7CGHTt0oBbY1AS7tw4NgSbkZrnpcmTiaWSw37ML+zw70dPZB9cXTseO2h04ekkl1CuK4WzW4AxrCGRJsMlGxbNtmU1IaUg0sdBMGKMZpc6k/ZNMUdEVMaMTq0bPWlcx0WSK2buMLtOMF1+VEVpiuwaCaMw71PPuQSC/QRSogkU7HGIGGsM+vLhjCU4E9xA9FDhY2MAmoMkt6pbBsAKGjxhyiom6gxZetofrstS0b2K7YapVhWdN2JPGU03f2TOQF9FdP6inxhNGsYEl8hPq+cjBJbn5HoEIQZVNpBA0I5XYs4m84hPNHdjldpm+uLLN73KaynW1iHAOZS3d/CdNzZLNUJZR911D23mEv7eNAUVknGwbOWTY3K0ntf7RiSp7uQb/kwUFClt4IpF1IIuish5BbGcKWBl5epmsq9JwyLTvyTg/wSLCOZQFdM+Xta5gNx6SncKH8+MJP6IGrqj6GsZjCAQNh7GXKx+qpkIhyKqMiBpGVoYbh2tCOF4XQq1Xw3TvtXjouUMY94kXeZ4wIuQ4OshnsBPoeop+baMMjZe5l0cZWMYyRN/llEAsZzFNUZOP3R/g5jkaZVzPI3iz6LQVZOhXkFPwjBCJzHOcqYbPH0J+1kDI9McmlAbmFGFG8QMY1etK1ARrdZ8hz2WsITn05gaM++g0vkNk8OfY0ewSmWV4lnb9UmsLJrJ5j1kmfdhr/OZFX76JBD2M9exjmlLxvWGpOJCzeKVExasHmzRsNcKMMjzjb19aMO2+mcVFQ7Du2EqUXDAGw7LLOrxmw5b1OPbb2RBtjs8FUWTkekN/a6Mxr8CcwD/DeDw/Kg/Srlc609UiwrklAvtgD8J8SjAvVd5LRHiE8Gn0NTqZKz6 92aGq853ZOSMycnIzJWcGbHx5e0RWEGluQaTB63H7z7z! tfe/Nh71b! 1vE3ruk24BrCy+DvOuBSr+cL2J/KGxQsIpx7IkTlecKc2AO0esJiqMrrUJQq5hgyS2HUidY+EiUK+pPPomRjaxgH0cjjXhiv+o9fD88inL9oHaBYRDiviMA22aNMiwi3xRGCgU0oUJehB3vY01M0xNP4ZITAnkPIp8Y/nLZHkhWYqAce2stfWGBLMEc0LSKcl0SISj5vsewVd5ndVCXIHdHno/EBIc6QWEQ4f4nQaghIriDcCOMfelyaYvHsX/mwf9DxIeHz+NcopUOE/wkwAAeR3z4C+zelAAAAAElFTkSuQmCC ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Copied: branches/2014Q4/www/seamonkey/files/patch-bug1082199 (from r373997, head/www/seamonkey/files/patch-bug1082199) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/seamonkey/files/patch-bug1082199 Mon Dec 8 15:21:41 2014 (r374274, copy of r373997, head/www/seamonkey/files/patch-bug1082199) @@ -0,0 +1,26 @@ +commit 258ec90 +Author: Guilherme Goncalves +Date: Fri Oct 17 15:55:00 2014 +0200 + + Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium +--- + memory/build/mozjemalloc_compat.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 78bb13a..70265a7 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); Copied: branches/2014Q4/www/seamonkey/files/patch-bug1103858 (from r373997, head/www/seamonkey/files/patch-bug1103858) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/seamonkey/files/patch-bug1103858 Mon Dec 8 15:21:41 2014 (r374274, copy of r373997, head/www/seamonkey/files/patch-bug1103858) @@ -0,0 +1,42 @@ +diff --git configure.in configure.in +index b2b45e7..dcfdfb7 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -8346,7 +8346,7 @@ case "$OS_TARGET" in + NECKO_WIFI=1 + fi + ;; +- Darwin|FreeBSD|SunOS|WINNT) ++ Darwin|DragonFly|FreeBSD|SunOS|WINNT) + NECKO_WIFI=1 + ;; + Linux) +diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build +index d4de063..3949380 100644 +--- mozilla/netwerk/wifi/moz.build ++++ mozilla/netwerk/wifi/moz.build +@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': + UNIFIED_SOURCES += [ + 'osx_corewlan.mm', + ] +-elif CONFIG['OS_ARCH'] == 'FreeBSD': ++elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'): + UNIFIED_SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] +diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp +index bdf171e..4185d69 100644 +--- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp ++++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp +@@ -13,7 +13,11 @@ + #include + #include + #include ++#ifdef __DragonFly__ ++#include ++#else + #include ++#endif + + #include + #include Modified: branches/2014Q4/www/seamonkey/files/patch-bug702179 ============================================================================== --- branches/2014Q4/www/seamonkey/files/patch-bug702179 Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/files/patch-bug702179 Mon Dec 8 15:21:41 2014 (r374274) @@ -4,45 +4,21 @@ Date: Wed Nov 30 07:23:46 2011 +0800 Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium --- - configure.in | 2 +- - js/src/Makefile.in | 2 -- - 2 files changed, 1 insertion(+), 3 deletions(-) + js/src/Makefile.in | 3 --- + toolkit/library/moz.build | 5 ----- + 2 files changed, 8 deletions(-) -diff --git configure.in configure.in -index 66549c1..75b848d 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)' - MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation - MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' - --MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' -+MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' - MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' - MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' - XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' diff --git js/src/Makefile.in js/src/Makefile.in -index e28160a..28ca5e8 100644 +index 62bbfa0..90400cb 100644 --- mozilla/js/src/Makefile.in +++ mozilla/js/src/Makefile.in -@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') - STATIC_LIBRARY_NAME = js_static - LIBS = $(NSPR_LIBS) +@@ -17,9 +17,6 @@ TOPLEVEL_BUILD := 1 + run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') + EXTRA_LIBS += $(NSPR_LIBS) -DIST_INSTALL = 1 +-NO_EXPAND_LIBS = 1 - - ifdef JS_STANDALONE - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) - ifndef MOZ_NATIVE_ZLIB -diff --git suite/build/Makefile.in suite/build/Makefile.in -index e28160a..28ca5e8 100644 ---- suite/build/Makefile.in -+++ suite/build/Makefile.in -@@ -28,6 +28,7 @@ EXTRA_DSO_LDOPTS += \ - $(LIBS_DIR) \ - $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ - $(MOZ_JS_LIBS) \ -+ $(MOZ_ZLIB_LIBS) \ - $(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \ - $(MOZ_COMPONENT_LIBS) \ - $(TK_LIBS) \ + ifdef JS_HAS_CTYPES + ifdef MOZ_NATIVE_FFI + LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) Modified: branches/2014Q4/www/seamonkey/files/patch-bug826985 ============================================================================== --- branches/2014Q4/www/seamonkey/files/patch-bug826985 Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/files/patch-bug826985 Mon Dec 8 15:21:41 2014 (r374274) @@ -38,18 +38,18 @@ index b483cd1..f1dd1f0 100644 # basic stuff for everything 'include_internal_video_render': 0, 'clang_use_chrome_plugins': 0, -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build index b483cd1..f1dd1f0 100644 ---- mozilla/media/webrtc/signaling/test/Makefile.in -+++ mozilla/media/webrtc/signaling/test/Makefile.in -@@ -7,6 +7,7 @@ LIBS = \ - $(NSPR_LIBS) \ - $(NSS_LIBS) \ - $(REALTIME_LIBS) \ -+ $(MOZ_LIBV4L2_LIBS) \ - $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ - $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ +--- mozilla/media/webrtc/signaling/test/moz.build ++++ mozilla/media/webrtc/signaling/test/moz.build +@@ -122,6 +122,7 @@ if CONFIG['JS_SHARED_LIBRARY']: + 'js', + ] + ++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['REALTIME_LIBS'] + diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc index 239a292..bab496c 100644 --- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -152,18 +152,15 @@ index d46b5aa..e452223 100644 }], # linux ['OS=="mac"', { 'sources': [ -diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +diff --git toolkit/library/moz.build toolkit/library/moz.build index 9c16ffa..1db3794 100644 ---- mozilla/toolkit/library/libxul.mk -+++ mozilla/toolkit/library/libxul.mk -@@ -182,6 +182,10 @@ endif - - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) - -+ifdef MOZ_LIBV4L2_LIBS -+EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS) -+endif -+ - ifdef MOZ_WEBRTC - ifeq (WINNT,$(OS_TARGET)) - EXTRA_DSO_LDOPTS += \ +--- mozilla/toolkit/library/moz.build ++++ mozilla/toolkit/library/moz.build +@@ -163,6 +163,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF + ] + + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] ++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS'] + Modified: branches/2014Q4/www/seamonkey/files/patch-bug847568 ============================================================================== --- branches/2014Q4/www/seamonkey/files/patch-bug847568 Mon Dec 8 15:19:42 2014 (r374273) +++ branches/2014Q4/www/seamonkey/files/patch-bug847568 Mon Dec 8 15:21:41 2014 (r374274) @@ -4,7 +4,7 @@ diff --git config/Makefile.in config/Mak index 14bfc0d..5383399 100644 --- mozilla/config/Makefile.in +++ mozilla/config/Makefile.in -@@ -77,6 +77,8 @@ export:: $(export-preqs) +@@ -75,6 +75,8 @@ export:: $(export-preqs) -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ @@ -17,7 +17,7 @@ diff --git config/system-headers config/ index 18e8703..bdc5f82 100644 --- mozilla/config/system-headers +++ mozilla/config/system-headers -@@ -1145,3 +1145,11 @@ unicode/utypes.h +@@ -1357,3 +1357,11 @@ unicode/utypes.h #endif libutil.h unwind.h @@ -33,7 +33,7 @@ diff --git configure.in configure.in index ac38f40..87536b7 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -8032,6 +8032,52 @@ if test "$USE_FC_FREETYPE"; then +@@ -7986,6 +7986,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -50,12 +50,11 @@ index ac38f40..87536b7 100644 +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) -+AC_SUBST(MOZ_HARFBUZZ_CFLAGS) -+AC_SUBST(MOZ_HARFBUZZ_LIBS) + +dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== ++ +MOZ_ARG_WITH_BOOL(system-graphite2, +[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)], +MOZ_NATIVE_GRAPHITE2=1, @@ -79,27 +78,58 @@ index ac38f40..87536b7 100644 +fi + +AC_SUBST(MOZ_NATIVE_GRAPHITE2) -+AC_SUBST(MOZ_GRAPHITE2_CFLAGS) -+AC_SUBST(MOZ_GRAPHITE2_LIBS) + +dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== diff --git content/base/src/moz.build content/base/src/moz.build -index d4f6380..0ee55df 100644 +index a660ba4..6b2f602 100644 --- mozilla/content/base/src/moz.build +++ mozilla/content/base/src/moz.build -@@ -179,6 +179,9 @@ SOURCES += [ +@@ -196,6 +196,9 @@ SOURCES += [ 'nsObjectLoadingContent.cpp', ] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: -+ SOURCES['nsContentUtils.cpp'].flags += [CONFIG['MOZ_HARFBUZZ_CFLAGS']] ++ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + EXTRA_COMPONENTS += [ 'contentAreaDropListener.js', 'contentAreaDropListener.manifest', +diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh +index f3d76ea..a9e7fb6 100644 +--- mozilla/gfx/graphite2/moz-gr-update.sh ++++ mozilla/gfx/graphite2/moz-gr-update.sh +@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n" >> gfx/graphite2/README.mozilla + find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + ++# closest tag/release to require for system version ++TAG=$(cd ../graphitedev/ && hg parents --template {latesttag}) ++ ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \ ++ if /GR2_VERSION_REQUIRE/" configure.in ++ + # summarize what's been touched +-echo Updated to $CHANGESET. ++echo Updated to $CHANGESET \($TAG for --with-system-graphite2\) + echo Here is what changed in the gfx/graphite2 directory: + echo + +diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla +index ca57d16..1ce21fe 100644 +--- mozilla/gfx/harfbuzz/README-mozilla ++++ mozilla/gfx/harfbuzz/README-mozilla +@@ -21,3 +21,8 @@ In addition, the src/Makefile.in file here is NOT from upstream, nor is it + generated from src/Makefile.am (the original harfbuzz version); it is a mozilla- + specific makefile that is maintained by hand. It should only need updating when + new source files or exported headers are added in harfbuzz. ++ ++The in-tree copy may be omitted during build by --with-system-harfbuzz. ++Make sure to keep pkg-config version check within configure.in in sync ++with checkout version or increment latest tag by one if it's not based ++on upstream release. diff --git gfx/moz.build gfx/moz.build index 519aa46..6929751 100644 --- mozilla/gfx/moz.build @@ -126,83 +156,87 @@ index 519aa46..6929751 100644 'ots/src', 'thebes', 'ipc', -diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in -index ee0efb2..98e169d6f 100644 ---- mozilla/gfx/skia/Makefile.in -+++ mozilla/gfx/skia/Makefile.in -@@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) - OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS) - endif - -+ifdef MOZ_NATIVE_HARFBUZZ -+OS_CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ - include $(topsrcdir)/config/rules.mk - - ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) -diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in -index 45c36ae..79d32cf 100644 ---- mozilla/gfx/thebes/Makefile.in -+++ mozilla/gfx/thebes/Makefile.in -@@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES)) - CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) - CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) - -+ifdef MOZ_NATIVE_GRAPHITE2 -+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ - ifeq ($(MOZ_WIDGET_TOOLKIT),android) - CXXFLAGS += $(CAIRO_FT_CFLAGS) - endif -diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in -index f6b9f7c..60863f4 100644 ---- mozilla/intl/unicharutil/util/Makefile.in -+++ mozilla/intl/unicharutil/util/Makefile.in -@@ -15,3 +15,7 @@ include $(topsrcdir)/config/rules.mk - ifdef ENABLE_INTL_API - LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) - endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in -index 1cacbd7..f5d72bb 100644 ---- mozilla/netwerk/dns/Makefile.in -+++ mozilla/netwerk/dns/Makefile.in -@@ -5,6 +5,10 @@ - - include $(topsrcdir)/config/rules.mk - -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ - # Generate the include file containing compact, static definitions - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat -diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk +diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py +index 28fa6b5..240dced 100755 +--- mozilla/gfx/skia/generate_mozbuild.py ++++ mozilla/gfx/skia/generate_mozbuild.py +@@ -140,6 +140,9 @@ if CONFIG['GNU_CXX']: + if not CONFIG['CLANG_CXX']: + CXXFLAGS += ['-Wno-logical-op'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +diff --git gfx/skia/moz.build gfx/skia/moz.build +index 1d0c2f9..adb8941 100644 +--- mozilla/gfx/skia/moz.build ++++ mozilla/gfx/skia/moz.build +@@ -968,6 +968,9 @@ if CONFIG['GNU_CXX']: + if not CONFIG['CLANG_CXX']: + CXXFLAGS += ['-Wno-logical-op'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +diff --git gfx/thebes/moz.build gfx/thebes/moz.build +index d5852fa..aeeab25 100644 +--- mozilla/gfx/thebes/moz.build ++++ mozilla/gfx/thebes/moz.build +@@ -278,6 +278,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] + CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CFLAGS += CONFIG['TK_CFLAGS'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_GRAPHITE2']: ++ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] + +diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build +index d736943..41a931f 100644 +--- mozilla/intl/unicharutil/util/moz.build ++++ mozilla/intl/unicharutil/util/moz.build +@@ -37,3 +37,6 @@ if CONFIG['_MSC_VER']: + + if CONFIG['ENABLE_INTL_API']: + CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] +diff --git netwerk/dns/moz.build netwerk/dns/moz.build +index 0b0717a..2e665c9 100644 +--- mozilla/netwerk/dns/moz.build ++++ mozilla/netwerk/dns/moz.build +@@ -63,3 +63,6 @@ GENERATED_FILES = [ + LOCAL_INCLUDES += [ + '../base/src', + ] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] +diff --git toolkit/library/moz.build toolkit/library/moz.build index 67f0db9..d42137a 100644 ---- mozilla/toolkit/library/libxul.mk -+++ mozilla/toolkit/library/libxul.mk -@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN - EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) - endif - -+ifdef MOZ_NATIVE_GRAPHITE2 -+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+EXTRA_DSO_LDOPTS += $(MOZ_HARFBUZZ_LIBS) -+endif -+ - ifdef MOZ_DMD - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib) - endif +--- mozilla/toolkit/library/moz.build ++++ mozilla/toolkit/library/moz.build +@@ -187,6 +187,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + ++if CONFIG['MOZ_NATIVE_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_ALSA']: + OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + Copied: branches/2014Q4/www/seamonkey/files/patch-bug858919 (from r373997, head/www/seamonkey/files/patch-bug858919) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/seamonkey/files/patch-bug858919 Mon Dec 8 15:21:41 2014 (r374274, copy of r373997, head/www/seamonkey/files/patch-bug858919) @@ -0,0 +1,394 @@ +commit a33d4f7 +Author: Martin Stransky +Date: Fri Nov 14 04:04:00 2014 +0100 + + Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt +--- + toolkit/components/alerts/nsAlertsService.cpp | 10 +-- + toolkit/system/gnome/moz.build | 2 + + toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ + toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ + toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ + toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ + toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ + 7 files changed, 226 insertions(+), 25 deletions(-) + +diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp +index 93f4536..f8b5e07 100644 +--- mozilla/toolkit/components/alerts/nsAlertsService.cpp ++++ mozilla/toolkit/components/alerts/nsAlertsService.cpp +@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl + nsCOMPtr sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, aData, +- IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, aData, ++ IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { +diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build +index c033f8b..9242209 100644 +--- mozilla/toolkit/system/gnome/moz.build ++++ mozilla/toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp +index f39335e..55f4356 100644 +--- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ++++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 9 08:52:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D48928ED; Tue, 9 Dec 2014 08:52:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A737A277; Tue, 9 Dec 2014 08:52:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB98qiFa021791; Tue, 9 Dec 2014 08:52:44 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB98qhVh021788; Tue, 9 Dec 2014 08:52:43 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201412090852.sB98qhVh021788@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Tue, 9 Dec 2014 08:52:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374353 - branches/2014Q4/print/freetype2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2014 08:52:44 -0000 Author: kwm Date: Tue Dec 9 08:52:43 2014 New Revision: 374353 URL: https://svnweb.freebsd.org/changeset/ports/374353 QAT: https://qat.redports.org/buildarchive/r374353/ Log: MFH: r374190 Update freetype2 to 2.5.4. Security: 567beb1e-7e0a-11e4-b9cc-bcaec565249c Approved by: ports-secteam (delphij@) Modified: branches/2014Q4/print/freetype2/Makefile branches/2014Q4/print/freetype2/distinfo branches/2014Q4/print/freetype2/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/print/freetype2/Makefile ============================================================================== --- branches/2014Q4/print/freetype2/Makefile Tue Dec 9 08:34:26 2014 (r374352) +++ branches/2014Q4/print/freetype2/Makefile Tue Dec 9 08:52:43 2014 (r374353) @@ -3,8 +3,7 @@ # $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $ PORTNAME= freetype2 -PORTVERSION= 2.5.3 -PORTREVISION= 2 +PORTVERSION= 2.5.4 CATEGORIES= print MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \ SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ Modified: branches/2014Q4/print/freetype2/distinfo ============================================================================== --- branches/2014Q4/print/freetype2/distinfo Tue Dec 9 08:34:26 2014 (r374352) +++ branches/2014Q4/print/freetype2/distinfo Tue Dec 9 08:52:43 2014 (r374353) @@ -1,2 +1,2 @@ -SHA256 (freetype-2.5.3.tar.bz2) = c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e -SIZE (freetype-2.5.3.tar.bz2) = 1703842 +SHA256 (freetype-2.5.4.tar.bz2) = 3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb +SIZE (freetype-2.5.4.tar.bz2) = 1726105 Modified: branches/2014Q4/print/freetype2/pkg-plist ============================================================================== --- branches/2014Q4/print/freetype2/pkg-plist Tue Dec 9 08:34:26 2014 (r374352) +++ branches/2014Q4/print/freetype2/pkg-plist Tue Dec 9 08:52:43 2014 (r374353) @@ -54,7 +54,7 @@ lib/libfreetype.a lib/libfreetype.la lib/libfreetype.so lib/libfreetype.so.6 -lib/libfreetype.so.6.11.2 +lib/libfreetype.so.6.11.3 libdata/pkgconfig/freetype2.pc man/man1/freetype-config.1.gz share/aclocal/freetype2.m4 From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 10 21:44:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 248995C2; Wed, 10 Dec 2014 21:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FBF591B; Wed, 10 Dec 2014 21:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBALi7PT035072; Wed, 10 Dec 2014 21:44:07 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBALi3ZP035048; Wed, 10 Dec 2014 21:44:03 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201412102144.sBALi3ZP035048@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 10 Dec 2014 21:44:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374490 - in branches/2014Q4/x11-servers/xorg-server: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 21:44:07 -0000 Author: kwm Date: Wed Dec 10 21:44:02 2014 New Revision: 374490 URL: https://svnweb.freebsd.org/changeset/ports/374490 QAT: https://qat.redports.org/buildarchive/r374490/ Log: MFH: r374489 Fix multiple xserver security advisories in the 1.12.4 xserver. The patches where not ported to 1.7.7 so mark it forbidden. This version is not default anymore and will be removed in the 1.14 update that currently being tested. Obtained from: xserver upstream Security: 27b9b2f0-8081-11e4-b4ca-bcaec565249c Approved by: portmgr (bapt) Added: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8094 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8094 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8095 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8095 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8096 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8096 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8097 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8097 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8097-pt2 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8097-pt2 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-1-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-1-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-2-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-2-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-3-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-3-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-4-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-4-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-6-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-6-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-7-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8098-8-8 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8098-8-8 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8099 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8099 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8100-2-2 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8100-2-2 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8101 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8101 branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8102 - copied unchanged from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8102 Modified: branches/2014Q4/x11-servers/xorg-server/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2014Q4/x11-servers/xorg-server/Makefile Wed Dec 10 21:35:13 2014 (r374489) +++ branches/2014Q4/x11-servers/xorg-server/Makefile Wed Dec 10 21:44:02 2014 (r374490) @@ -35,13 +35,14 @@ OPTIONS_EXCLUDE_sparc64= HAL .if defined(WITH_NEW_XORG) XORG_VERSION= 1.12.4 -XORG_REVISION= 9 +XORG_REVISION= 10 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-clang \ ${FILESDIR}/extra-configure \ ${FILESDIR}/extra-new-bad-impl \ ${FILESDIR}/extra-new-dix_dixfonts.c .else +FORBIDDEN= unfixed security issues XORG_VERSION= 1.7.7 XORG_REVISION= 14 PLIST_SUB+= OLD="" NEW="@comment " Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-1-4) @@ -0,0 +1,37 @@ +From eeae42d60bf3d5663ea088581f6c28a82cd17829 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 22 Jan 2014 21:11:16 -0800 +Subject: [PATCH 01/40] dix: integer overflow in ProcPutImage() [CVE-2014-8092 + 1/4] + +ProcPutImage() calculates a length field from a width, left pad and depth +specified by the client (if the specified format is XYPixmap). + +The calculations for the total amount of memory the server needs for the +pixmap can overflow a 32-bit number, causing out-of-bounds memory writes +on 32-bit systems (since the length is stored in a long int variable). + +Reported-by: Ilja Van Sprundel +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +--- + dix/dispatch.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/dix/dispatch.c b/dix/dispatch.c +index d844a09..55b978d 100644 +--- dix/dispatch.c ++++ dix/dispatch.c +@@ -2000,6 +2000,9 @@ ProcPutImage(ClientPtr client) + tmpImage = (char *) &stuff[1]; + lengthProto = length; + ++ if (lengthProto >= (INT32_MAX / stuff->height)) ++ return BadLength; ++ + if ((bytes_to_int32(lengthProto * stuff->height) + + bytes_to_int32(sizeof(xPutImageReq))) != client->req_len) + return BadLength; +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-2-4) @@ -0,0 +1,49 @@ +From bc8e20430b6f6378daf6ce4329029248a88af08b Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Mon, 6 Jan 2014 23:30:14 -0800 +Subject: [PATCH 02/40] dix: integer overflow in GetHosts() [CVE-2014-8092 2/4] + +GetHosts() iterates over all the hosts it has in memory, and copies +them to a buffer. The buffer length is calculated by iterating over +all the hosts and adding up all of their combined length. There is a +potential integer overflow, if there are lots and lots of hosts (with +a combined length of > ~4 gig). This should be possible by repeatedly +calling ProcChangeHosts() on 64bit machines with enough memory. + +This patch caps the list at 1mb, because multi-megabyte hostname +lists for X access control are insane. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +--- + os/access.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/os/access.c b/os/access.c +index 5c510de..f393c8d 100644 +--- os/access.c ++++ os/access.c +@@ -1296,6 +1296,10 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled) + for (host = validhosts; host; host = host->next) { + nHosts++; + n += pad_to_int32(host->len) + sizeof(xHostEntry); ++ /* Could check for INT_MAX, but in reality having more than 1mb of ++ hostnames in the access list is ridiculous */ ++ if (n >= 1048576) ++ break; + } + if (n) { + *data = ptr = malloc(n); +@@ -1304,6 +1308,8 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled) + } + for (host = validhosts; host; host = host->next) { + len = host->len; ++ if ((ptr + sizeof(xHostEntry) + len) > (data + n)) ++ break; + ((xHostEntry *) ptr)->family = host->family; + ((xHostEntry *) ptr)->length = len; + ptr += sizeof(xHostEntry); +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-3-4) @@ -0,0 +1,128 @@ +From 97015a07b9e15d8ec5608b95d95ec0eb51202acb Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 22 Jan 2014 22:37:15 -0800 +Subject: [PATCH 03/40] dix: integer overflow in RegionSizeof() [CVE-2014-8092 + 3/4] + +RegionSizeof contains several integer overflows if a large length +value is passed in. Once we fix it to return 0 on overflow, we +also have to fix the callers to handle this error condition + +v2: Fixed limit calculation in RegionSizeof as pointed out by jcristau. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +Reviewed-by: Julien Cristau +--- + dix/region.c | 20 +++++++++++++------- + include/regionstr.h | 10 +++++++--- + 2 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/dix/region.c b/dix/region.c +index ce1014e..04e5901 100644 +--- dix/region.c ++++ dix/region.c +@@ -169,7 +169,6 @@ Equipment Corporation. + ((r1)->y1 <= (r2)->y1) && \ + ((r1)->y2 >= (r2)->y2) ) + +-#define xallocData(n) malloc(RegionSizeof(n)) + #define xfreeData(reg) if ((reg)->data && (reg)->data->size) free((reg)->data) + + #define RECTALLOC_BAIL(pReg,n,bail) \ +@@ -205,8 +204,9 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ + #define DOWNSIZE(reg,numRects) \ + if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \ + { \ +- RegDataPtr NewData; \ +- NewData = (RegDataPtr)realloc((reg)->data, RegionSizeof(numRects)); \ ++ size_t NewSize = RegionSizeof(numRects); \ ++ RegDataPtr NewData = \ ++ (NewSize > 0) ? realloc((reg)->data, NewSize) : NULL ; \ + if (NewData) \ + { \ + NewData->size = (numRects); \ +@@ -345,17 +345,20 @@ Bool + RegionRectAlloc(RegionPtr pRgn, int n) + { + RegDataPtr data; ++ size_t rgnSize; + + if (!pRgn->data) { + n++; +- pRgn->data = xallocData(n); ++ rgnSize = RegionSizeof(n); ++ pRgn->data = (rgnSize > 0) ? malloc(rgnSize) : NULL; + if (!pRgn->data) + return RegionBreak(pRgn); + pRgn->data->numRects = 1; + *RegionBoxptr(pRgn) = pRgn->extents; + } + else if (!pRgn->data->size) { +- pRgn->data = xallocData(n); ++ rgnSize = RegionSizeof(n); ++ pRgn->data = (rgnSize > 0) ? malloc(rgnSize) : NULL; + if (!pRgn->data) + return RegionBreak(pRgn); + pRgn->data->numRects = 0; +@@ -367,7 +370,8 @@ RegionRectAlloc(RegionPtr pRgn, int n) + n = 250; + } + n += pRgn->data->numRects; +- data = (RegDataPtr) realloc(pRgn->data, RegionSizeof(n)); ++ rgnSize = RegionSizeof(n); ++ data = (rgnSize > 0) ? realloc(pRgn->data, rgnSize) : NULL; + if (!data) + return RegionBreak(pRgn); + pRgn->data = data; +@@ -1312,6 +1316,7 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype) + { + + RegionPtr pRgn; ++ size_t rgnSize; + RegDataPtr pData; + BoxPtr pBox; + int i; +@@ -1338,7 +1343,8 @@ RegionFromRects(int nrects, xRectangle *prect, int ctype) + } + return pRgn; + } +- pData = xallocData(nrects); ++ rgnSize = RegionSizeof(nrects); ++ pData = (rgnSize > 0) ? malloc(rgnSize) : NULL; + if (!pData) { + RegionBreak(pRgn); + return pRgn; +diff --git a/include/regionstr.h b/include/regionstr.h +index 515e93f..079375d 100644 +--- include/regionstr.h ++++ include/regionstr.h +@@ -127,7 +127,10 @@ RegionEnd(RegionPtr reg) + static inline size_t + RegionSizeof(size_t n) + { +- return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec))); ++ if (n < ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec))) ++ return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec))); ++ else ++ return 0; + } + + static inline void +@@ -138,9 +141,10 @@ RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size) + (_pReg)->data = (RegDataPtr) NULL; + } + else { ++ size_t rgnSize; + (_pReg)->extents = RegionEmptyBox; +- if (((_size) > 1) && ((_pReg)->data = +- (RegDataPtr) malloc(RegionSizeof(_size)))) { ++ if (((_size) > 1) && ((rgnSize = RegionSizeof(_size)) > 0) && ++ (((_pReg)->data = malloc(rgnSize)) != NULL)) { + (_pReg)->data->size = (_size); + (_pReg)->data->numRects = 0; + } +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-4-4) @@ -0,0 +1,34 @@ +From e0e11644622a589129a01e11e5d105dc74a098de Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 22 Jan 2014 23:44:46 -0800 +Subject: [PATCH 04/40] dix: integer overflow in REQUEST_FIXED_SIZE() + [CVE-2014-8092 4/4] + +Force use of 64-bit integers when evaluating data provided by clients +in 32-bit fields which can overflow when added or multiplied during +checks. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +--- + include/dix.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/dix.h b/include/dix.h +index 991a3ce..e0c6ed8 100644 +--- include/dix.h ++++ include/dix.h +@@ -76,7 +76,8 @@ SOFTWARE. + + #define REQUEST_FIXED_SIZE(req, n)\ + if (((sizeof(req) >> 2) > client->req_len) || \ +- (((sizeof(req) + (n) + 3) >> 2) != client->req_len)) \ ++ ((n >> 2) >= client->req_len) || \ ++ ((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \ + return(BadLength) + + #define LEGAL_NEW_RESOURCE(id,client)\ +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt5) @@ -0,0 +1,32 @@ +From 9802a0162f738de03585ca3f3b8a8266494f7d45 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 9 Dec 2014 09:30:59 -0800 +Subject: [PATCH 38/40] Missing parens in REQUEST_FIXED_SIZE macro + [CVE-2014-8092 pt. 5] + +The 'n' parameter must be surrounded by parens in both places to +prevent precedence from mis-computing things. + +Signed-off-by: Keith Packard +Reviewed-by: Alan Coopersmith +Signed-off-by: Alan Coopersmith +--- + include/dix.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/dix.h b/include/dix.h +index 21176a8..921156b 100644 +--- include/dix.h ++++ include/dix.h +@@ -80,7 +80,7 @@ SOFTWARE. + + #define REQUEST_FIXED_SIZE(req, n)\ + if (((sizeof(req) >> 2) > client->req_len) || \ +- ((n >> 2) >= client->req_len) || \ ++ (((n) >> 2) >= client->req_len) || \ + ((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \ + return(BadLength) + +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8092-pt6) @@ -0,0 +1,35 @@ +From 1559a94395258fd73e369f1a2c98a44bfe21a486 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 9 Dec 2014 09:31:00 -0800 +Subject: [PATCH 39/40] dix: GetHosts bounds check using wrong pointer value + [CVE-2014-8092 pt. 6] + +GetHosts saves the pointer to allocated memory in *data, and then +wants to bounds-check writes to that region, but was mistakenly using +a bare 'data' instead of '*data'. Also, data is declared as void **, +so we need a cast to turn it into a byte pointer so we can actually do +pointer comparisons. + +Signed-off-by: Keith Packard +Reviewed-by: Alan Coopersmith +Signed-off-by: Alan Coopersmith +--- + os/access.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os/access.c b/os/access.c +index f393c8d..28f2d32 100644 +--- os/access.c ++++ os/access.c +@@ -1308,7 +1308,7 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled) + } + for (host = validhosts; host; host = host->next) { + len = host->len; +- if ((ptr + sizeof(xHostEntry) + len) > (data + n)) ++ if ((ptr + sizeof(xHostEntry) + len) > ((unsigned char *) *data + n)) + break; + ((xHostEntry *) ptr)->family = host->family; + ((xHostEntry *) ptr)->length = len; +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-1-6) @@ -0,0 +1,47 @@ +From 23fe7718bb171e71db2d1a30505c2ca2988799d9 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 10 Nov 2014 12:13:36 -0500 +Subject: [PATCH 19/40] glx: Be more paranoid about variable-length requests + [CVE-2014-8093 1/6] + +If the size computation routine returns -1 we should just reject the +request outright. Clamping it to zero could give an attacker the +opportunity to also mangle cmdlen in such a way that the subsequent +length check passes, and the request would get executed, thus passing +data we wanted to reject to the renderer. + +Reviewed-by: Keith Packard +Reviewed-by: Julien Cristau +Reviewed-by: Michal Srb +Reviewed-by: Andy Ritger +Signed-off-by: Adam Jackson +Signed-off-by: Alan Coopersmith +--- + glx/glxcmds.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glx/glxcmds.c b/glx/glxcmds.c +index 009fd9b..ea42e2a 100644 +--- glx/glxcmds.c ++++ glx/glxcmds.c +@@ -2062,7 +2062,7 @@ __glXDisp_Render(__GLXclientState * cl, GLbyte * pc) + extra = (*entry.varsize) (pc + __GLX_RENDER_HDR_SIZE, + client->swapped); + if (extra < 0) { +- extra = 0; ++ return BadLength; + } + if (cmdlen != __GLX_PAD(entry.bytes + extra)) { + return BadLength; +@@ -2179,7 +2179,7 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc) + extra = (*entry.varsize) (pc + __GLX_RENDER_LARGE_HDR_SIZE, + client->swapped); + if (extra < 0) { +- extra = 0; ++ return BadLength; + } + /* large command's header is 4 bytes longer, so add 4 */ + if (cmdlen != __GLX_PAD(entry.bytes + 4 + extra)) { +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-2-6) @@ -0,0 +1,165 @@ +From ab2ba9338aa5e85b4487bc7fbe69985c76483e01 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 10 Nov 2014 12:13:37 -0500 +Subject: [PATCH 20/40] glx: Be more strict about rejecting invalid image sizes + [CVE-2014-8093 2/6] + +Before this we'd just clamp the image size to 0, which was just +hideously stupid; if the parameters were such that they'd overflow an +integer, you'd allocate a small buffer, then pass huge values into (say) +ReadPixels, and now you're scribbling over arbitrary server memory. + +Reviewed-by: Keith Packard +Reviewed-by: Julien Cristau +Reviewed-by: Michal Srb +Reviewed-by: Andy Ritger +Signed-off-by: Adam Jackson +Signed-off-by: Alan Coopersmith +--- + glx/singlepix.c | 16 ++++++++-------- + glx/singlepixswap.c | 16 ++++++++-------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/glx/singlepix.c b/glx/singlepix.c +index 506fdaa..8b6c261 100644 +--- glx/singlepix.c ++++ glx/singlepix.c +@@ -65,7 +65,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc) + lsbFirst = *(GLboolean *) (pc + 25); + compsize = __glReadPixels_size(format, type, width, height); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst); +@@ -124,7 +124,7 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc) + compsize = + __glGetTexImage_size(target, level, format, type, width, height, depth); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -218,9 +218,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1); + + if (compsize < 0) +- compsize = 0; ++ return BadLength; + if (compsize2 < 0) +- compsize2 = 0; ++ return BadLength; + compsize = __GLX_PAD(compsize); + compsize2 = __GLX_PAD(compsize2); + +@@ -296,7 +296,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -365,7 +365,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -426,7 +426,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + + compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -491,7 +491,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c +index 8469101..8dc304f 100644 +--- glx/singlepixswap.c ++++ glx/singlepixswap.c +@@ -75,7 +75,7 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc) + lsbFirst = *(GLboolean *) (pc + 25); + compsize = __glReadPixels_size(format, type, width, height); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst); +@@ -144,7 +144,7 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc) + compsize = + __glGetTexImage_size(target, level, format, type, width, height, depth); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -252,9 +252,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1); + + if (compsize < 0) +- compsize = 0; ++ return BadLength; + if (compsize2 < 0) +- compsize2 = 0; ++ return BadLength; + compsize = __GLX_PAD(compsize); + compsize2 = __GLX_PAD(compsize2); + +@@ -338,7 +338,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -415,7 +415,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -483,7 +483,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + + compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +@@ -554,7 +554,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag) + */ + compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1); + if (compsize < 0) +- compsize = 0; ++ return BadLength; + + glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); + __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1); +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-3-6) @@ -0,0 +1,59 @@ +From 717a1b37767b41e14859e5022ae9e679152821a9 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 10 Nov 2014 12:13:38 -0500 +Subject: [PATCH 21/40] glx: Additional paranoia in __glXGetAnswerBuffer / + __GLX_GET_ANSWER_BUFFER (v2) [CVE-2014-8093 3/6] + +If the computed reply size is negative, something went wrong, treat it +as an error. + +v2: Be more careful about size_t being unsigned (Matthieu Herrb) +v3: SIZE_MAX not SIZE_T_MAX (Alan Coopersmith) + +Reviewed-by: Julien Cristau +Reviewed-by: Michal Srb +Reviewed-by: Andy Ritger +Signed-off-by: Adam Jackson +Signed-off-by: Alan Coopersmith +--- + glx/indirect_util.c | 7 ++++++- + glx/unpack.h | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/glx/indirect_util.c b/glx/indirect_util.c +index 926e57c..de81491 100644 +--- glx/indirect_util.c ++++ glx/indirect_util.c +@@ -76,9 +76,14 @@ __glXGetAnswerBuffer(__GLXclientState * cl, size_t required_size, + const unsigned mask = alignment - 1; + + if (local_size < required_size) { +- const size_t worst_case_size = required_size + alignment; ++ size_t worst_case_size; + intptr_t temp_buf; + ++ if (required_size < SIZE_MAX - alignment) ++ worst_case_size = required_size + alignment; ++ else ++ return NULL; ++ + if (cl->returnBufSize < worst_case_size) { + void *temp = realloc(cl->returnBuf, worst_case_size); + +diff --git a/glx/unpack.h b/glx/unpack.h +index 52fba74..2b1ebcf 100644 +--- glx/unpack.h ++++ glx/unpack.h +@@ -83,7 +83,8 @@ extern xGLXSingleReply __glXReply; + ** pointer. + */ + #define __GLX_GET_ANSWER_BUFFER(res,cl,size,align) \ +- if ((size) > sizeof(answerBuffer)) { \ ++ if (size < 0) return BadLength; \ ++ else if ((size) > sizeof(answerBuffer)) { \ + int bump; \ + if ((cl)->returnBufSize < (size)+(align)) { \ + (cl)->returnBuf = (GLbyte*)realloc((cl)->returnBuf, \ +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-4-6) @@ -0,0 +1,82 @@ +From 2a5cbc17fc72185bf0fa06fef26d1f782de72595 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 10 Nov 2014 12:13:40 -0500 +Subject: [PATCH 23/40] glx: Add safe_{add,mul,pad} (v3) [CVE-2014-8093 4/6] + +These are paranoid about integer overflow, and will return -1 if their +operation would overflow a (signed) integer or if either argument is +negative. + +Note that RenderLarge requests are sized with a uint32_t so in principle +this could be sketchy there, but dix limits bigreqs to 128M so you +shouldn't ever notice, and honestly if you're sending more than 2G of +rendering commands you're already doing something very wrong. + +v2: Use INT_MAX for consistency with the rest of the server (jcristau) +v3: Reject negative arguments (anholt) + +Reviewed-by: Keith Packard +Reviewed-by: Julien Cristau +Reviewed-by: Michal Srb +Reviewed-by: Andy Ritger +Signed-off-by: Adam Jackson +Signed-off-by: Alan Coopersmith +--- + glx/glxserver.h | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/glx/glxserver.h b/glx/glxserver.h +index a324b29..9482601 100644 +--- glx/glxserver.h ++++ glx/glxserver.h +@@ -228,6 +228,47 @@ extern void glxSwapQueryServerStringReply(ClientPtr client, + * Routines for computing the size of variably-sized rendering commands. + */ + ++static _X_INLINE int ++safe_add(int a, int b) ++{ ++ if (a < 0 || b < 0) ++ return -1; ++ ++ if (INT_MAX - a < b) ++ return -1; ++ ++ return a + b; ++} ++ ++static _X_INLINE int ++safe_mul(int a, int b) ++{ ++ if (a < 0 || b < 0) ++ return -1; ++ ++ if (a == 0 || b == 0) ++ return 0; ++ ++ if (a > INT_MAX / b) ++ return -1; ++ ++ return a * b; ++} ++ ++static _X_INLINE int ++safe_pad(int a) ++{ ++ int ret; ++ ++ if (a < 0) ++ return -1; ++ ++ if ((ret = safe_add(a, 3)) < 0) ++ return -1; ++ ++ return ret & (GLuint)~3; ++} ++ + extern int __glXTypeSize(GLenum enm); + extern int __glXImageSize(GLenum format, GLenum type, + GLenum target, GLsizei w, GLsizei h, GLsizei d, +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-5-6) @@ -0,0 +1,225 @@ +From 698888e6671d54c7ae41e9d456f7f5483a3459d2 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 10 Nov 2014 12:13:42 -0500 +Subject: [PATCH 25/40] glx: Integer overflow protection for non-generated + render requests (v3) [CVE-2014-8093 5/6] + +v2: +Fix constants in __glXMap2fReqSize (Michal Srb) +Validate w/h/d for proxy targets too (Keith Packard) + +v3: +Fix Map[12]Size to correctly reject order == 0 (Julien Cristau) + +Reviewed-by: Keith Packard +Reviewed-by: Michal Srb +Reviewed-by: Andy Ritger +Signed-off-by: Adam Jackson +Signed-off-by: Alan Coopersmith +--- + glx/rensize.c | 77 +++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 41 insertions(+), 36 deletions(-) + +diff --git a/glx/rensize.c b/glx/rensize.c +index 9ff73c7..d46334a 100644 +--- glx/rensize.c ++++ glx/rensize.c +@@ -43,19 +43,11 @@ + (((a & 0xff000000U)>>24) | ((a & 0xff0000U)>>8) | \ + ((a & 0xff00U)<<8) | ((a & 0xffU)<<24)) + +-static int +-Map1Size(GLint k, GLint order) +-{ +- if (order <= 0 || k < 0) +- return -1; +- return k * order; +-} +- + int + __glXMap1dReqSize(const GLbyte * pc, Bool swap) + { + GLenum target; +- GLint order, k; ++ GLint order; + + target = *(GLenum *) (pc + 16); + order = *(GLint *) (pc + 20); +@@ -63,15 +55,16 @@ __glXMap1dReqSize(const GLbyte * pc, Bool swap) + target = SWAPL(target); + order = SWAPL(order); + } +- k = __glMap1d_size(target); +- return 8 * Map1Size(k, order); ++ if (order < 1) ++ return -1; ++ return safe_mul(8, safe_mul(__glMap1d_size(target), order)); + } + + int + __glXMap1fReqSize(const GLbyte * pc, Bool swap) + { + GLenum target; +- GLint order, k; ++ GLint order; + + target = *(GLenum *) (pc + 0); + order = *(GLint *) (pc + 12); +@@ -79,23 +72,24 @@ __glXMap1fReqSize(const GLbyte * pc, Bool swap) + target = SWAPL(target); + order = SWAPL(order); + } +- k = __glMap1f_size(target); +- return 4 * Map1Size(k, order); ++ if (order < 1) ++ return -1; ++ return safe_mul(4, safe_mul(__glMap1f_size(target), order)); + } + + static int + Map2Size(int k, int majorOrder, int minorOrder) + { +- if (majorOrder <= 0 || minorOrder <= 0 || k < 0) ++ if (majorOrder < 1 || minorOrder < 1) + return -1; +- return k * majorOrder * minorOrder; ++ return safe_mul(k, safe_mul(majorOrder, minorOrder)); + } + + int + __glXMap2dReqSize(const GLbyte * pc, Bool swap) + { + GLenum target; +- GLint uorder, vorder, k; ++ GLint uorder, vorder; + + target = *(GLenum *) (pc + 32); + uorder = *(GLint *) (pc + 36); +@@ -105,15 +99,14 @@ __glXMap2dReqSize(const GLbyte * pc, Bool swap) + uorder = SWAPL(uorder); + vorder = SWAPL(vorder); + } +- k = __glMap2d_size(target); +- return 8 * Map2Size(k, uorder, vorder); ++ return safe_mul(8, Map2Size(__glMap2d_size(target), uorder, vorder)); + } + + int + __glXMap2fReqSize(const GLbyte * pc, Bool swap) + { + GLenum target; +- GLint uorder, vorder, k; ++ GLint uorder, vorder; + + target = *(GLenum *) (pc + 0); + uorder = *(GLint *) (pc + 12); +@@ -123,8 +116,7 @@ __glXMap2fReqSize(const GLbyte * pc, Bool swap) + uorder = SWAPL(uorder); + vorder = SWAPL(vorder); + } +- k = __glMap2f_size(target); +- return 4 * Map2Size(k, uorder, vorder); ++ return safe_mul(4, Map2Size(__glMap2f_size(target), uorder, vorder)); + } + + /** +@@ -175,14 +167,16 @@ __glXImageSize(GLenum format, GLenum type, GLenum target, + GLint bytesPerElement, elementsPerGroup, groupsPerRow; + GLint groupSize, rowSize, padding, imageSize; + ++ if (w == 0 || h == 0 || d == 0) ++ return 0; ++ + if (w < 0 || h < 0 || d < 0 || + (type == GL_BITMAP && + (format != GL_COLOR_INDEX && format != GL_STENCIL_INDEX))) { + return -1; + } +- if (w == 0 || h == 0 || d == 0) +- return 0; + ++ /* proxy targets have no data */ + switch (target) { + case GL_PROXY_TEXTURE_1D: + case GL_PROXY_TEXTURE_2D: +@@ -199,6 +193,12 @@ __glXImageSize(GLenum format, GLenum type, GLenum target, + return 0; + } + ++ /* real data has to have real sizes */ ++ if (imageHeight < 0 || rowLength < 0 || skipImages < 0 || skipRows < 0) ++ return -1; ++ if (alignment != 1 && alignment != 2 && alignment != 4 && alignment != 8) ++ return -1; ++ + if (type == GL_BITMAP) { + if (rowLength > 0) { + groupsPerRow = rowLength; +@@ -207,11 +207,14 @@ __glXImageSize(GLenum format, GLenum type, GLenum target, + groupsPerRow = w; + } + rowSize = bits_to_bytes(groupsPerRow); ++ if (rowSize < 0) ++ return -1; + padding = (rowSize % alignment); + if (padding) { + rowSize += alignment - padding; + } +- return ((h + skipRows) * rowSize); ++ ++ return safe_mul(safe_add(h, skipRows), rowSize); + } + else { + switch (format) { +@@ -303,6 +306,7 @@ __glXImageSize(GLenum format, GLenum type, GLenum target, + default: + return -1; + } ++ /* known safe by the switches above, not checked */ + groupSize = bytesPerElement * elementsPerGroup; + if (rowLength > 0) { + groupsPerRow = rowLength; +@@ -310,18 +314,21 @@ __glXImageSize(GLenum format, GLenum type, GLenum target, + else { + groupsPerRow = w; + } +- rowSize = groupsPerRow * groupSize; ++ ++ if ((rowSize = safe_mul(groupsPerRow, groupSize)) < 0) ++ return -1; + padding = (rowSize % alignment); + if (padding) { + rowSize += alignment - padding; + } +- if (imageHeight > 0) { +- imageSize = (imageHeight + skipRows) * rowSize; +- } +- else { +- imageSize = (h + skipRows) * rowSize; +- } +- return ((d + skipImages) * imageSize); ++ ++ if (imageHeight > 0) ++ h = imageHeight; ++ h = safe_add(h, skipRows); ++ ++ imageSize = safe_mul(h, rowSize); ++ ++ return safe_mul(safe_add(d, skipImages), imageSize); + } + } + +@@ -445,9 +452,7 @@ __glXSeparableFilter2DReqSize(const GLbyte * pc, Bool swap) + /* XXX Should rowLength be used for either or both image? */ + image1size = __glXImageSize(format, type, 0, w, 1, 1, + 0, rowLength, 0, 0, alignment); +- image1size = __GLX_PAD(image1size); + image2size = __glXImageSize(format, type, 0, h, 1, 1, + 0, rowLength, 0, 0, alignment); +- return image1size + image2size; +- ++ return safe_add(safe_pad(image1size), image2size); + } +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8093-6-6) @@ -0,0 +1,34 @@ +From 7e7630bbb775573eea2a2335adb9d190c3e1e971 Mon Sep 17 00:00:00 2001 +From: Robert Morell +Date: Wed, 12 Nov 2014 18:51:43 -0800 +Subject: [PATCH 32/40] glx: Fix mask truncation in __glXGetAnswerBuffer + [CVE-2014-8093 6/6] + +On a system where sizeof(unsigned) != sizeof(intptr_t), the unary +bitwise not operation will result in a mask that clears all high bits +from temp_buf in the expression: + temp_buf = (temp_buf + mask) & ~mask; + +Signed-off-by: Robert Morell +Reviewed-by: Alan Coopersmith +Signed-off-by: Alan Coopersmith +--- + glx/indirect_util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glx/indirect_util.c b/glx/indirect_util.c +index de81491..9ba2815 100644 +--- glx/indirect_util.c ++++ glx/indirect_util.c +@@ -73,7 +73,7 @@ __glXGetAnswerBuffer(__GLXclientState * cl, size_t required_size, + void *local_buffer, size_t local_size, unsigned alignment) + { + void *buffer = local_buffer; +- const unsigned mask = alignment - 1; ++ const intptr_t mask = alignment - 1; + + if (local_size < required_size) { + size_t worst_case_size; +-- +2.1.2 + Copied: branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8094 (from r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8094) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/x11-servers/xorg-server/files/patch-CVE-2014-8094 Wed Dec 10 21:44:02 2014 (r374490, copy of r374489, head/x11-servers/xorg-server/files/patch-CVE-2014-8094) @@ -0,0 +1,35 @@ +From 6692670fde081bbfe9313f17d84037ae9116702a Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 22 Jan 2014 23:40:18 -0800 +Subject: [PATCH 05/40] dri2: integer overflow in ProcDRI2GetBuffers() + [CVE-2014-8094] + +ProcDRI2GetBuffers() tries to validate a length field (count). +There is an integer overflow in the validation. This can cause +out of bound reads and memory corruption later on. + +Reported-by: Ilja Van Sprundel +Signed-off-by: Alan Coopersmith +Reviewed-by: Peter Hutterer +Reviewed-by: Julien Cristau +--- + hw/xfree86/dri2/dri2ext.c | 3 +++ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 10 23:39:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C49D27E; Wed, 10 Dec 2014 23:39:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F339751; Wed, 10 Dec 2014 23:39:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANd8FY093396; Wed, 10 Dec 2014 23:39:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANd7OC093394; Wed, 10 Dec 2014 23:39:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412102339.sBANd7OC093394@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Dec 2014 23:39:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374496 - in branches/2014Q4/multimedia/libfame: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:39:08 -0000 Author: amdmi3 Date: Wed Dec 10 23:39:07 2014 New Revision: 374496 URL: https://svnweb.freebsd.org/changeset/ports/374496 QAT: https://qat.redports.org/buildarchive/r374496/ Log: MFH: r373697 - Fix library w/clang on i386 Broken .so was produced, undefined reference to _mmx_one. This fixes multimedia/recmpeg on i386. Approved by: portmgr blanket Approved by: ports-secteam (rea) Added: branches/2014Q4/multimedia/libfame/files/patch-src__half_mmx.h - copied unchanged from r373697, head/multimedia/libfame/files/patch-src__half_mmx.h Modified: branches/2014Q4/multimedia/libfame/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/libfame/Makefile ============================================================================== --- branches/2014Q4/multimedia/libfame/Makefile Wed Dec 10 23:12:09 2014 (r374495) +++ branches/2014Q4/multimedia/libfame/Makefile Wed Dec 10 23:39:07 2014 (r374496) @@ -3,7 +3,7 @@ PORTNAME= libfame PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION} Copied: branches/2014Q4/multimedia/libfame/files/patch-src__half_mmx.h (from r373697, head/multimedia/libfame/files/patch-src__half_mmx.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/libfame/files/patch-src__half_mmx.h Wed Dec 10 23:39:07 2014 (r374496, copy of r373697, head/multimedia/libfame/files/patch-src__half_mmx.h) @@ -0,0 +1,11 @@ +--- src/half_mmx.h.orig 2002-04-30 22:04:02.000000000 +0400 ++++ src/half_mmx.h 2014-12-01 01:08:04.000000000 +0300 +@@ -18,7 +18,7 @@ + */ + /**************************** half-pixel interpolation ***********************/ + +-static short const _mmx_one[] = { 1, 1, 1, 1 }; ++short const _mmx_one[] = { 1, 1, 1, 1 }; + + static void inline mmx_interpolate(unsigned char **ref, + int pitch, From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 10 23:41:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F33C368; Wed, 10 Dec 2014 23:41:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 704B67F1; Wed, 10 Dec 2014 23:41:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANfUVM096936; Wed, 10 Dec 2014 23:41:30 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANfSCS096923; Wed, 10 Dec 2014 23:41:28 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201412102341.sBANfSCS096923@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 10 Dec 2014 23:41:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374497 - in branches/2014Q4/dns: bind-tools bind910 bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:41:30 -0000 Author: delphij Date: Wed Dec 10 23:41:28 2014 New Revision: 374497 URL: https://svnweb.freebsd.org/changeset/ports/374497 QAT: https://qat.redports.org/buildarchive/r374497/ Log: MFH r371360,372675,372752,374305: Security update of BIND9 to 9.9.6-P1 and 9.10.1-P1. Security: CVE-2014-8500, CVE-2014-8680 Approved by: ports-secteam Modified: branches/2014Q4/dns/bind-tools/Makefile branches/2014Q4/dns/bind910/Makefile branches/2014Q4/dns/bind910/distinfo branches/2014Q4/dns/bind910/pkg-plist branches/2014Q4/dns/bind99/Makefile branches/2014Q4/dns/bind99/distinfo branches/2014Q4/dns/bind99/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/dns/bind-tools/Makefile ============================================================================== --- branches/2014Q4/dns/bind-tools/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind-tools/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +# Define PORTREVISION in ${MASTERDIR} PKGNAMESUFFIX= -tools COMMENT= Command line tools from BIND: dig, host, and nslookup Modified: branches/2014Q4/dns/bind910/Makefile ============================================================================== --- branches/2014Q4/dns/bind910/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -2,6 +2,13 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +.if defined(BIND_TOOLS_SLAVE) +# dns/bind-tools here +PORTREVISION= 0 +.else +# dns/bind910 here +PORTREVISION= 0 +.endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX?= 910 @@ -13,7 +20,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.1 +ISCVERSION= 9.10.1-P1 MAKE_JOBS_UNSAFE= yes @@ -169,8 +176,10 @@ CONFIGURE_ARGS+= --disable-threads PKGINSTALL= ${NONEXISTENT} PLIST_SUB+= NOBASE="" BASE="@comment " SUB_LIST+= NOBASE="" BASE="@comment " +.if !defined(BIND_TOOLS_SLAVE) USE_RC_SUBR+= named SUB_FILES+= named.conf +.endif # !defined(BIND_TOOLS_SLAVE) .if ${PORT_OPTIONS:MGOST} WITH_OPENSSL_PORT=yes .endif @@ -194,19 +203,11 @@ PORTDOCS= * post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ + @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} + ${WRKSRC}/bin/${FILE} .endfor - @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist - @${SED} -e 's#.*bind\.keys.*##' ${WRKSRC}/Makefile.in.Dist > \ - ${WRKSRC}/Makefile.in - @${MV} ${WRKSRC}/bin/named/Makefile.in ${WRKSRC}/bin/named/Makefile.in.Dist - @${SED} -e 's/$${PERL}/#/' -e 's/bind.keys.h/#/g' -e 's/bind9.xsl.h/#/g' \ - ${WRKSRC}/bin/named/Makefile.in.Dist > \ - ${WRKSRC}/bin/named/Makefile.in post-install: .if ${PORT_OPTIONS:MDOCS} Modified: branches/2014Q4/dns/bind910/distinfo ============================================================================== --- branches/2014Q4/dns/bind910/distinfo Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/distinfo Wed Dec 10 23:41:28 2014 (r374497) @@ -1,2 +1,2 @@ -SHA256 (bind-9.10.1.tar.gz) = 5361eca2b8b6bc0b13904b0f964336a478dfbc165711547f6cc3f8752ac60181 -SIZE (bind-9.10.1.tar.gz) = 8353313 +SHA256 (bind-9.10.1-P1.tar.gz) = 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d +SIZE (bind-9.10.1-P1.tar.gz) = 8356463 Modified: branches/2014Q4/dns/bind910/pkg-plist ============================================================================== --- branches/2014Q4/dns/bind910/pkg-plist Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind910/pkg-plist Wed Dec 10 23:41:28 2014 (r374497) @@ -122,6 +122,7 @@ include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h +include/isc/counter.h include/isc/crc64.h include/isc/dir.h include/isc/entropy.h @@ -408,6 +409,7 @@ sbin/rndc sbin/rndc-confgen sbin/tsig-keygen %%ETCDIR%%/rndc.conf.sample +%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db Modified: branches/2014Q4/dns/bind99/Makefile ============================================================================== --- branches/2014Q4/dns/bind99/Makefile Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/Makefile Wed Dec 10 23:41:28 2014 (r374497) @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -13,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.6 +ISCVERSION= 9.9.6-P1 MAKE_JOBS_UNSAFE= yes @@ -108,7 +109,7 @@ RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname -RPZ_PATCH_PATCHFILES= 9.9.6-rpz2+rl.14038.05.patch:vix +RPZ_PATCH_PATCHFILES= 9.9.6-P1-rpz2+rl.14038.05.patch:vix RPZ_PATCH_PATCH_SITES= http://ss.vix.su/~vjs/:vix ${MASTER_SITE_LOCAL:S/%SUBDIR%/mat\/bind/:S/$/:vix/} RRL_CONFIGURE_ENABLE= rrl @@ -173,6 +174,7 @@ PKGDEINSTALL= ${PKGINSTALL} CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} SUB_LIST+= BIND_DESTETC="${BIND_DESTETC}" +PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" PORTDOCS= * @@ -193,19 +195,11 @@ WITH_OPENSSL_PORT= yes post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ + @${REINPLACE_CMD} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ -e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} + ${WRKSRC}/bin/${FILE} .endfor - @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist - @${SED} -e 's#.*bind\.keys.*##' ${WRKSRC}/Makefile.in.Dist > \ - ${WRKSRC}/Makefile.in - @${MV} ${WRKSRC}/bin/named/Makefile.in ${WRKSRC}/bin/named/Makefile.in.Dist - @${SED} -e 's/$${PERL}/#/' -e 's/bind.keys.h/#/g' -e 's/bind9.xsl.h/#/g' \ - ${WRKSRC}/bin/named/Makefile.in.Dist > \ - ${WRKSRC}/bin/named/Makefile.in post-configure: @${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath,/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile Modified: branches/2014Q4/dns/bind99/distinfo ============================================================================== --- branches/2014Q4/dns/bind99/distinfo Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/distinfo Wed Dec 10 23:41:28 2014 (r374497) @@ -1,4 +1,4 @@ -SHA256 (bind-9.9.6.tar.gz) = 6b9432644a3bfa41695354543bd9e2547104e35f3c7354a416a030a4cdd1c514 -SIZE (bind-9.9.6.tar.gz) = 7811896 -SHA256 (9.9.6-rpz2+rl.14038.05.patch) = 7ff0f755a032f6c44ed5758c257a8e217be8e7f8af5bf967333e08621b1abe67 -SIZE (9.9.6-rpz2+rl.14038.05.patch) = 194775 +SHA256 (bind-9.9.6-P1.tar.gz) = dfedcb2b414d2803accd1a9c21d183178a288f40a2486af5ec0d3369a8cb8526 +SIZE (bind-9.9.6-P1.tar.gz) = 7816337 +SHA256 (9.9.6-P1-rpz2+rl.14038.05.patch) = b978d634c3deb1de42418700ac28ec947373f8979a4bbe2230d0eea462a6cc86 +SIZE (9.9.6-P1-rpz2+rl.14038.05.patch) = 194778 Modified: branches/2014Q4/dns/bind99/pkg-plist ============================================================================== --- branches/2014Q4/dns/bind99/pkg-plist Wed Dec 10 23:39:07 2014 (r374496) +++ branches/2014Q4/dns/bind99/pkg-plist Wed Dec 10 23:41:28 2014 (r374497) @@ -112,6 +112,7 @@ include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h +include/isc/counter.h include/isc/dir.h include/isc/entropy.h include/isc/error.h @@ -374,6 +375,8 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen +%%BASE%%%%BIND_DESTETC%%/bind.keys +%%NOBASE%%%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 10 23:43:04 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F2674BF; Wed, 10 Dec 2014 23:43:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B915822; Wed, 10 Dec 2014 23:43:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANh3g6097812; Wed, 10 Dec 2014 23:43:03 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANh3Nb097809; Wed, 10 Dec 2014 23:43:03 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412102343.sBANh3Nb097809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Dec 2014 23:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374498 - in branches/2014Q4/games/columns: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:43:04 -0000 Author: amdmi3 Date: Wed Dec 10 23:43:02 2014 New Revision: 374498 URL: https://svnweb.freebsd.org/changeset/ports/374498 QAT: https://qat.redports.org/buildarchive/r374498/ Log: MFH: r373734 - Clarify LICENSE - Add LICENSE_FILE - Simplify MASTER_SITES - Add distfile mirror - Move highscores to /var/games, use @sample to handle them - Fix font rendering - Drop @dirrm* from plist Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/columns/Makefile branches/2014Q4/games/columns/files/patch-columns.cc (contents, props changed) branches/2014Q4/games/columns/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/columns/Makefile ============================================================================== --- branches/2014Q4/games/columns/Makefile Wed Dec 10 23:41:28 2014 (r374497) +++ branches/2014Q4/games/columns/Makefile Wed Dec 10 23:43:02 2014 (r374498) @@ -3,17 +3,18 @@ PORTNAME= columns PORTVERSION= 1.2b -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games # mastersite disappeared in December 2000 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= thierry +MASTER_SITES= LOCAL/thierry \ + http://mirror.amdmi3.ru/distfiles/ DISTNAME= Columns-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Nice little implementation of columns game for X Window System -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING USE_SDL= sdl GNU_CONFIGURE= yes @@ -29,5 +30,7 @@ post-configure: post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}/var/games + ${MV} ${STAGEDIR}${DATADIR}/columns.hsc ${STAGEDIR}/var/games/columns.hsc.sample .include Modified: branches/2014Q4/games/columns/files/patch-columns.cc ============================================================================== --- branches/2014Q4/games/columns/files/patch-columns.cc Wed Dec 10 23:41:28 2014 (r374497) +++ branches/2014Q4/games/columns/files/patch-columns.cc Wed Dec 10 23:43:02 2014 (r374498) @@ -1,15 +1,10 @@ - -$FreeBSD$ - ---- columns.cc.orig 2000-03-17 04:52:55.000000000 +0400 -+++ columns.cc 2013-06-13 15:21:46.472644056 +0400 -@@ -22,10 +22,12 @@ +--- columns.cc.orig 2000-03-17 03:52:55.000000000 +0300 ++++ columns.cc 2014-12-02 05:13:18.850698698 +0300 +@@ -22,10 +22,9 @@ #include #include #include -+#ifndef __STDC__ - #include -+#endif +-#include #include #include -#include @@ -17,7 +12,33 @@ $FreeBSD$ #define HIGHSCORE_X 10 #define HIGHSCORE_Y 30 -@@ -1365,6 +1367,7 @@ void eval_args(int argc, char **argv) +@@ -269,6 +268,7 @@ + for (int i=0; i<256; i++) { + data[i] = NULL; + fnt->w[i] = fnt->h[i]= fnt->x[i] = 0; ++ fnt->strut = 0; + } + + // read character chunks one by one +@@ -357,7 +357,7 @@ + + void highscore_save() + { +- char *fname = find_datafile("columns.hsc"); ++ char *fname = "/var/games/columns.hsc"; + FILE *fp = fopen(fname,"wb"); + if (fp != NULL) { + for (int i=0; i Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC2FF5C2; Wed, 10 Dec 2014 23:44:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B89A8830; Wed, 10 Dec 2014 23:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANiDbB098156; Wed, 10 Dec 2014 23:44:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANiDDS098155; Wed, 10 Dec 2014 23:44:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412102344.sBANiDDS098155@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Dec 2014 23:44:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374499 - branches/2014Q4/games/doomlegacy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:44:13 -0000 Author: amdmi3 Date: Wed Dec 10 23:44:13 2014 New Revision: 374499 URL: https://svnweb.freebsd.org/changeset/ports/374499 QAT: https://qat.redports.org/buildarchive/r374499/ Log: MFH: r373815 - Fix build by marking as MAKE_JOBS_UNSAFE Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/doomlegacy/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/doomlegacy/Makefile ============================================================================== --- branches/2014Q4/games/doomlegacy/Makefile Wed Dec 10 23:43:02 2014 (r374498) +++ branches/2014Q4/games/doomlegacy/Makefile Wed Dec 10 23:44:13 2014 (r374499) @@ -22,6 +22,7 @@ USE_SDL= mixer sdl CFLAGS+= -DSVN_REV=\\\"1107\\\" WRKSRC= ${WRKDIR}/${DISTNAME:S,_beta1,,}/src +MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/${PORTNAME} share/doom/legacy.wad PORTDOCS= * From owner-svn-ports-branches@FreeBSD.ORG Wed Dec 10 23:47:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48ED9844; Wed, 10 Dec 2014 23:47:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35169865; Wed, 10 Dec 2014 23:47:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANlkQi098938; Wed, 10 Dec 2014 23:47:46 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANlkNl098937; Wed, 10 Dec 2014 23:47:46 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412102347.sBANlkNl098937@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 10 Dec 2014 23:47:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374501 - branches/2014Q4/games/libdungeonmaker X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:47:46 -0000 Author: amdmi3 Date: Wed Dec 10 23:47:45 2014 New Revision: 374501 URL: https://svnweb.freebsd.org/changeset/ports/374501 QAT: https://qat.redports.org/buildarchive/r374501/ Log: MFH: r373848 (and r374500) - Mark BROKEN on 10.x Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/libdungeonmaker/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/libdungeonmaker/Makefile ============================================================================== --- branches/2014Q4/games/libdungeonmaker/Makefile Wed Dec 10 23:44:53 2014 (r374500) +++ branches/2014Q4/games/libdungeonmaker/Makefile Wed Dec 10 23:47:45 2014 (r374501) @@ -18,6 +18,12 @@ MAKEFILE= Makefile.bsd OPTIONS_DEFINE= DOCS EXAMPLES +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024 && ${OSVERSION} < 1000705 +BROKEN= doesn't build with clang 3.3 (e.g. on FreeBSD 10.0) +.endif + do-install: ${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.so ${STAGEDIR}${PREFIX}/lib @@ -29,4 +35,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/design* ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/main.cpp ${STAGEDIR}${EXAMPLESDIR} -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 11 10:14:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72BD07C5; Thu, 11 Dec 2014 10:14:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D9DCBAA; Thu, 11 Dec 2014 10:14:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBAEYOC050991; Thu, 11 Dec 2014 10:14:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBAEXPT050988; Thu, 11 Dec 2014 10:14:33 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412111014.sBBAEXPT050988@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 11 Dec 2014 10:14:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374520 - in branches/2014Q4/x11-toolkits/py-gtkglext: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 10:14:34 -0000 Author: amdmi3 Date: Thu Dec 11 10:14:32 2014 New Revision: 374520 URL: https://svnweb.freebsd.org/changeset/ports/374520 QAT: https://qat.redports.org/buildarchive/r374520/ Log: MFH: r373847 - Fix python compilation to not reference stagedir in compiled files - Strip libraries Approved by: ports-secteam (rea) Added: branches/2014Q4/x11-toolkits/py-gtkglext/files/ - copied from r373847, head/x11-toolkits/py-gtkglext/files/ Modified: branches/2014Q4/x11-toolkits/py-gtkglext/Makefile branches/2014Q4/x11-toolkits/py-gtkglext/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/x11-toolkits/py-gtkglext/Makefile ============================================================================== --- branches/2014Q4/x11-toolkits/py-gtkglext/Makefile Thu Dec 11 10:10:56 2014 (r374519) +++ branches/2014Q4/x11-toolkits/py-gtkglext/Makefile Thu Dec 11 10:14:32 2014 (r374520) @@ -21,4 +21,8 @@ USE_PYTHON= yes USE_GNOME= pygtk2 GNU_CONFIGURE= yes +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gtk-2.0/gtk/gtkgl/_gtkgl.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gtk-2.0/gtk/gdkgl/_gdkgl.so + .include Modified: branches/2014Q4/x11-toolkits/py-gtkglext/pkg-plist ============================================================================== --- branches/2014Q4/x11-toolkits/py-gtkglext/pkg-plist Thu Dec 11 10:10:56 2014 (r374519) +++ branches/2014Q4/x11-toolkits/py-gtkglext/pkg-plist Thu Dec 11 10:14:32 2014 (r374520) @@ -19,5 +19,3 @@ libdata/pkgconfig/pygtkglext-1.0.pc share/pygtk/2.0/defs/gdkglext-types.defs share/pygtk/2.0/defs/gdkglext.defs share/pygtk/2.0/defs/gtkglext.defs -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gtkgl -@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk/gdkgl From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 11 10:25:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 732F6A18; Thu, 11 Dec 2014 10:25:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DE32CB4; Thu, 11 Dec 2014 10:25:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBAPe7T056124; Thu, 11 Dec 2014 10:25:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBAPevT056123; Thu, 11 Dec 2014 10:25:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412111025.sBBAPevT056123@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 11 Dec 2014 10:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374522 - branches/2014Q4/games/tenebrae X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 10:25:40 -0000 Author: amdmi3 Date: Thu Dec 11 10:25:39 2014 New Revision: 374522 URL: https://svnweb.freebsd.org/changeset/ports/374522 QAT: https://qat.redports.org/buildarchive/r374522/ Log: MFH: r373587 Unbreak on i386 by disabling assembly Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/tenebrae/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/tenebrae/Makefile ============================================================================== --- branches/2014Q4/games/tenebrae/Makefile Thu Dec 11 10:16:04 2014 (r374521) +++ branches/2014Q4/games/tenebrae/Makefile Thu Dec 11 10:25:39 2014 (r374522) @@ -25,8 +25,6 @@ MAKEFILE= Makefile.i386linux MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" OPTIONS_DEFINE= DOCS -OPTIONS_DEFINE_i386= ASM -OPTIONS_DEFAULT_i386= ASM OPTIONS_DEFINE_amd64= ASM OPTIONS_DEFAULT_amd64= ASM From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 11 10:16:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33E528AA; Thu, 11 Dec 2014 10:16:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1EEC5BC3; Thu, 11 Dec 2014 10:16:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBAG5lT051384; Thu, 11 Dec 2014 10:16:05 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBAG5sW051382; Thu, 11 Dec 2014 10:16:05 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412111016.sBBAG5sW051382@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 11 Dec 2014 10:16:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374521 - branches/2014Q4/games/linux-nwnclient X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 10:16:06 -0000 Author: amdmi3 Date: Thu Dec 11 10:16:04 2014 New Revision: 374521 URL: https://svnweb.freebsd.org/changeset/ports/374521 QAT: https://qat.redports.org/buildarchive/r374521/ Log: MFH: r373982 - Remove unneeded dotfile which breaks stage-qa - Drop @dirrm* from plist - Add empty directory to plist Approved by: portmgr blanket Approved by: ports-secteam (rea) Modified: branches/2014Q4/games/linux-nwnclient/Makefile branches/2014Q4/games/linux-nwnclient/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/linux-nwnclient/Makefile ============================================================================== --- branches/2014Q4/games/linux-nwnclient/Makefile Thu Dec 11 10:14:32 2014 (r374520) +++ branches/2014Q4/games/linux-nwnclient/Makefile Thu Dec 11 10:16:04 2014 (r374521) @@ -80,6 +80,7 @@ do-extract: ${RM} ${WRKSRC}/SDL-1.2.5/*; \ ${RMDIR} ${WRKSRC}/SDL-1.2.5; \ fi + @${FIND} ${WRKSRC} -type f -name ".*" -delete do-configure: ${SED} -e 's|%%NWNDATADIR%%|${NWNDATADIR}|' \ Modified: branches/2014Q4/games/linux-nwnclient/pkg-plist ============================================================================== --- branches/2014Q4/games/linux-nwnclient/pkg-plist Thu Dec 11 10:14:32 2014 (r374520) +++ branches/2014Q4/games/linux-nwnclient/pkg-plist Thu Dec 11 10:16:04 2014 (r374521) @@ -89,14 +89,4 @@ bin/nwn %%DIAMOND%%%%DATADIR%%/texturepacks/xp2_tex_tpa.erf %%DIAMOND%%%%DATADIR%%/xp2patch.key %%DATADIR%%/xp3.key -%%DIAMOND%%@dirrm %%DATADIR%%/texturepacks -@dirrm %%DATADIR%%/override -%%NWMOVIES%%@dirrm %%DATADIR%%/nwmovies/libdis -%%NWMOVIES%%@dirrm %%DATADIR%%/nwmovies -@dirrm %%DATADIR%%/nwm -@dirrm %%DATADIR%%/music -@dirrm %%DATADIR%%/miles -@dirrm %%DATADIR%%/lib -@dirrm %%DATADIR%%/data -@dirrm %%DATADIR%%/ambient -@dirrm %%DATADIR%% +@dir %%DATADIR%%/lib From owner-svn-ports-branches@FreeBSD.ORG Thu Dec 11 11:32:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20BAC399; Thu, 11 Dec 2014 11:32:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C5B560A; Thu, 11 Dec 2014 11:32:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBBWrDk088887; Thu, 11 Dec 2014 11:32:53 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBBWrUB088886; Thu, 11 Dec 2014 11:32:53 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201412111132.sBBBWrUB088886@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 11 Dec 2014 11:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374526 - branches/2014Q4/dns/bind99 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 11:32:54 -0000 Author: mat Date: Thu Dec 11 11:32:53 2014 New Revision: 374526 URL: https://svnweb.freebsd.org/changeset/ports/374526 QAT: https://qat.redports.org/buildarchive/r374526/ Log: MFH: r370291 Note REPLACE_BASE will get removed. With hat: portmgr Sponsored by: Absolight Modified: branches/2014Q4/dns/bind99/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/dns/bind99/Makefile ============================================================================== --- branches/2014Q4/dns/bind99/Makefile Thu Dec 11 11:09:05 2014 (r374525) +++ branches/2014Q4/dns/bind99/Makefile Thu Dec 11 11:32:53 2014 (r374526) @@ -153,6 +153,10 @@ CONFIGURE_ARGS+= --disable-threads .if ${PORT_OPTIONS:MREPLACE_BASE} .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option is not supported on this release +.else # >= 10.0 +# Move to BROKEN after expiration. +DEPRECATED= REPLACE_BASE option will be removed. There is no real need for foot-shooting. +EXPIRATION_DATE= 2015-01-01 .endif # >= 10.0 PKGNAMESUFFIX= -base PREFIX= /usr From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 12 07:12:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E220B3D; Fri, 12 Dec 2014 07:12:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3F20BD0; Fri, 12 Dec 2014 07:12:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBC7CB5t071324; Fri, 12 Dec 2014 07:12:11 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBC7CBAV071319; Fri, 12 Dec 2014 07:12:11 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201412120712.sBC7CBAV071319@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 12 Dec 2014 07:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374573 - branches/2014Q4/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2014 07:12:12 -0000 Author: rene Date: Fri Dec 12 07:12:10 2014 New Revision: 374573 URL: https://svnweb.freebsd.org/changeset/ports/374573 QAT: https://qat.redports.org/buildarchive/r374573/ Log: MFH: r374557 www/chromium: update to 39.0.2171.95 (bugfix release) Changelog: https://chromium.googlesource.com/chromium/src/+log/39.0.2171.71..39.0.2171.95 Approved by: ports-secteam (delphij) Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Fri Dec 12 06:33:17 2014 (r374572) +++ branches/2014Q4/www/chromium/Makefile Fri Dec 12 07:12:10 2014 (r374573) @@ -3,7 +3,7 @@ #TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium -PORTVERSION= 39.0.2171.71 +PORTVERSION= 39.0.2171.95 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q4/www/chromium/distinfo ============================================================================== --- branches/2014Q4/www/chromium/distinfo Fri Dec 12 06:33:17 2014 (r374572) +++ branches/2014Q4/www/chromium/distinfo Fri Dec 12 07:12:10 2014 (r374573) @@ -1,4 +1,4 @@ -SHA256 (chromium-39.0.2171.71.tar.xz) = b7597ce853528861d14a281f847cd5335cdce09984e42701e9b5f3bfe21fd190 -SIZE (chromium-39.0.2171.71.tar.xz) = 253084664 -SHA256 (chromium-39.0.2171.71-testdata.tar.xz) = 5ea8bc217a56b96667dfffd24d50490fd4a478a6617a034b3b9bb05e79f134e1 -SIZE (chromium-39.0.2171.71-testdata.tar.xz) = 115235548 +SHA256 (chromium-39.0.2171.95.tar.xz) = 66cb6902afbd8a0f990cb9e70ff1df843a7461f66077ffe7f41d730278a2a868 +SIZE (chromium-39.0.2171.95.tar.xz) = 253091292 +SHA256 (chromium-39.0.2171.95-testdata.tar.xz) = 1b723bfb8afdd1caf40c43caa85ea78c0400992436d54d1a33444acd8535ae96 +SIZE (chromium-39.0.2171.95-testdata.tar.xz) = 115237960 From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 12 08:58:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CC863A6; Fri, 12 Dec 2014 08:58:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 770F883E; Fri, 12 Dec 2014 08:58:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBC8wbIF021602; Fri, 12 Dec 2014 08:58:37 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBC8wZcL021591; Fri, 12 Dec 2014 08:58:35 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201412120858.sBC8wZcL021591@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 12 Dec 2014 08:58:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374576 - in branches/2014Q4/www: linux-c6-flashplugin11 linux-f10-flashplugin11 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2014 08:58:37 -0000 Author: tijl Date: Fri Dec 12 08:58:35 2014 New Revision: 374576 URL: https://svnweb.freebsd.org/changeset/ports/374576 QAT: https://qat.redports.org/buildarchive/r374576/ Log: MFH r369846, r372450, r374406: - Re-add PKGNAMEPREFIX for www/linux-f10-flashplugin11 - Honor LINUXBASE in pkg-plist - Reduce diff between linux-c6-flashplugin11 and linux-f10-flashplugin11 - Update to 11.2r202.418 - Update to 11.2r202.425 Approved by: ports-secteam (delphij) Modified: branches/2014Q4/www/linux-c6-flashplugin11/Makefile branches/2014Q4/www/linux-c6-flashplugin11/distinfo branches/2014Q4/www/linux-c6-flashplugin11/pkg-plist branches/2014Q4/www/linux-f10-flashplugin11/Makefile branches/2014Q4/www/linux-f10-flashplugin11/distinfo branches/2014Q4/www/linux-f10-flashplugin11/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2014Q4/www/linux-c6-flashplugin11/Makefile Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-c6-flashplugin11/Makefile Fri Dec 12 08:58:35 2014 (r374576) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.406 +PORTVERSION= 11.2r202.425 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \ LOCAL/nox:suplib @@ -16,7 +16,7 @@ COMMENT= Adobe Flash Player NPAPI Plugin ONLY_FOR_ARCHS= amd64 i386 USE_LINUX= c6 -USE_LINUX_APPS= openssl-compat curl cyrus-sasl2 nspr nss gtk2 #-alsalib libssh2 openldap +USE_LINUX_APPS= curl cyrus-sasl2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap WANT_GNOME= yes RESTRICTED= Redistribution not allowed @@ -31,10 +31,11 @@ WEBPLUGIN_FILES= libflashplayer.so OPTIONS_DEFINE= GNOME GNOME_DESC= include gnome support for .desktop file -CPE_VENDOR= adobe -CPE_PRODUCT= flash_player +CPE_VENDOR= adobe +CPE_PRODUCT= flash_player OPTIONS_SUB= yes +PLIST_SUB= LINUXBASE="${LINUXBASE}" .include Modified: branches/2014Q4/www/linux-c6-flashplugin11/distinfo ============================================================================== --- branches/2014Q4/www/linux-c6-flashplugin11/distinfo Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-c6-flashplugin11/distinfo Fri Dec 12 08:58:35 2014 (r374576) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.406/install_flash_player_11_linux.i386.tar.gz) = 8b44f49b85ed7dba310306cd62a3de35d37bb8468c3841e4d713a0b80541c381 -SIZE (flashplugin/11.2r202.406/install_flash_player_11_linux.i386.tar.gz) = 6925631 -SHA256 (flashplugin/11.2r202.406/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.406/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 +SIZE (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 6926590 +SHA256 (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2014Q4/www/linux-c6-flashplugin11/pkg-plist ============================================================================== --- branches/2014Q4/www/linux-c6-flashplugin11/pkg-plist Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-c6-flashplugin11/pkg-plist Fri Dec 12 08:58:35 2014 (r374576) @@ -6,4 +6,4 @@ share/icons/hicolor/22x22/apps/flash-pla share/icons/hicolor/24x24/apps/flash-player-properties.png share/icons/hicolor/32x32/apps/flash-player-properties.png share/icons/hicolor/48x48/apps/flash-player-properties.png -/compat/linux/usr/lib/libflashsupport.so +%%LINUXBASE%%/usr/lib/libflashsupport.so Modified: branches/2014Q4/www/linux-f10-flashplugin11/Makefile ============================================================================== --- branches/2014Q4/www/linux-f10-flashplugin11/Makefile Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-f10-flashplugin11/Makefile Fri Dec 12 08:58:35 2014 (r374576) @@ -2,21 +2,21 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.406 +PORTVERSION= 11.2r202.425 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:C/r/\./}/:plugin \ LOCAL/nox:suplib +PKGNAMEPREFIX= linux-${USE_LINUX}- DISTFILES= install_flash_player_11_linux.i386.tar.gz:plugin \ linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib +DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= Adobe Flash Player NPAPI Plugin -DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} - ONLY_FOR_ARCHS= amd64 i386 -USE_LINUX= yes -USE_LINUX_APPS= openssl curl cyrus-sasl2 libssh2 nspr nss openldap gtk2 +USE_LINUX= f10 +USE_LINUX_APPS= curl cyrus-sasl2 gtk2 libssh2 nspr nss openldap openssl WANT_GNOME= yes RESTRICTED= Redistribution not allowed @@ -35,6 +35,7 @@ CPE_VENDOR= adobe CPE_PRODUCT= flash_player OPTIONS_SUB= yes +PLIST_SUB= LINUXBASE="${LINUXBASE}" .include Modified: branches/2014Q4/www/linux-f10-flashplugin11/distinfo ============================================================================== --- branches/2014Q4/www/linux-f10-flashplugin11/distinfo Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-f10-flashplugin11/distinfo Fri Dec 12 08:58:35 2014 (r374576) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.406/install_flash_player_11_linux.i386.tar.gz) = 8b44f49b85ed7dba310306cd62a3de35d37bb8468c3841e4d713a0b80541c381 -SIZE (flashplugin/11.2r202.406/install_flash_player_11_linux.i386.tar.gz) = 6925631 -SHA256 (flashplugin/11.2r202.406/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.406/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 0be4858e345e078fbb34a6eeefef53ed1bc09dff75134fc0508c37f080b99149 +SIZE (flashplugin/11.2r202.425/install_flash_player_11_linux.i386.tar.gz) = 6926590 +SHA256 (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.425/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2014Q4/www/linux-f10-flashplugin11/pkg-plist ============================================================================== --- branches/2014Q4/www/linux-f10-flashplugin11/pkg-plist Fri Dec 12 08:52:21 2014 (r374575) +++ branches/2014Q4/www/linux-f10-flashplugin11/pkg-plist Fri Dec 12 08:58:35 2014 (r374576) @@ -6,4 +6,4 @@ share/icons/hicolor/22x22/apps/flash-pla share/icons/hicolor/24x24/apps/flash-player-properties.png share/icons/hicolor/32x32/apps/flash-player-properties.png share/icons/hicolor/48x48/apps/flash-player-properties.png -/compat/linux/usr/lib/libflashsupport.so +%%LINUXBASE%%/usr/lib/libflashsupport.so From owner-svn-ports-branches@FreeBSD.ORG Fri Dec 12 11:33:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08931181; Fri, 12 Dec 2014 11:33:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE386AD9; Fri, 12 Dec 2014 11:33:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBCBXh5F000634; Fri, 12 Dec 2014 11:33:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBCBXhE8000633; Fri, 12 Dec 2014 11:33:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412121133.sBCBXhE8000633@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 12 Dec 2014 11:33:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374588 - branches/2014Q4/graphics/exact-image/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2014 11:33:44 -0000 Author: amdmi3 Date: Fri Dec 12 11:33:42 2014 New Revision: 374588 URL: https://svnweb.freebsd.org/changeset/ports/374588 QAT: https://qat.redports.org/buildarchive/r374588/ Log: MFH: r374558 - Unbreak on amd64 by respecting C*FLAGS Approved by: portmgr blanket Approved by: ports-secteam (rea) Added: branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make - copied unchanged from r374558, head/graphics/exact-image/files/patch-build__bottom.make Modified: Directory Properties: branches/2014Q4/ (props changed) Copied: branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make (from r374558, head/graphics/exact-image/files/patch-build__bottom.make) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/graphics/exact-image/files/patch-build__bottom.make Fri Dec 12 11:33:42 2014 (r374588, copy of r374558, head/graphics/exact-image/files/patch-build__bottom.make) @@ -0,0 +1,31 @@ +--- build/bottom.make.orig 2010-07-22 18:35:17.000000000 +0400 ++++ build/bottom.make 2014-12-12 00:07:13.000000000 +0300 +@@ -43,23 +43,23 @@ + + $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.c + @echo ' C $@' +- $(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' ++ $(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' + + $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.m + @echo ' ObjC $@' +- $(Q)$(COMPILE.c) $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' ++ $(Q)$(COMPILE.c) ${CFLAGS} ${CPPFLAGS} $($(dir $@)CFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' + + $($(X_MODULE)_OUTPUT)/%.o: $($(X_MODULE)_OUTPUT)/%.cc + @echo ' C++ $@' +- $(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' ++ $(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' + + $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.cc + @echo ' C++ $@' +- $(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' ++ $(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' + + $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.mm + @echo ' ObjC++ $@' +- $(Q)$(COMPILE.cc) $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' ++ $(Q)$(COMPILE.cc) ${CXXFLAGS} ${CPPFLAGS} $($(dir $@)CXXFLAGS) -MMD -MP -MF '$(patsubst %.o,%.d,$@)' -o '$@' '$<' + + # only implicit rules if one binary per module ... + ifeq ($(words $(BINARY)), 1) From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 13 20:12:09 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 992162F6; Sat, 13 Dec 2014 20:12:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79B29FB; Sat, 13 Dec 2014 20:12:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBDKC9Ct071630; Sat, 13 Dec 2014 20:12:09 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBDKC8TF071626; Sat, 13 Dec 2014 20:12:08 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201412132012.sBDKC8TF071626@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 13 Dec 2014 20:12:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374683 - in branches/2014Q4/games/bsdgames: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2014 20:12:09 -0000 Author: adamw Date: Sat Dec 13 20:12:07 2014 New Revision: 374683 URL: https://svnweb.freebsd.org/changeset/ports/374683 QAT: https://qat.redports.org/buildarchive/r374683/ Log: MFH r374144, r374594, r374674, and r374681. r374144: Rename bs and fish to avoid conflicts with games/bs and shells/fish. While here, get on board with @dir. r374594: Fix a bounds-checking typo in trek. The number of sectors was being used to check input for the quadrant, and NSECTS > NQUADS. r374674: Since r367027, the setgid games have been installed as setgid root instead of setgid root. The port redefines BINGRP when necessary, but since BINGRP was being passed in MAKE_ARGS, it overrode those redefinitions. Passing BINGRP in MAKE_ENV instead should allow uidfix to still work, while making sure that the games are installed with the correct group. r374681: Revert the contents of r374674, as it broke packaging as a regular user. Instead, set the group and mode manually in the plist. Approved by: portmgr (antoine) Added: branches/2014Q4/games/bsdgames/files/patch-trek_computer.c - copied unchanged from r374594, head/games/bsdgames/files/patch-trek_computer.c Modified: branches/2014Q4/games/bsdgames/Makefile branches/2014Q4/games/bsdgames/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/bsdgames/Makefile ============================================================================== --- branches/2014Q4/games/bsdgames/Makefile Sat Dec 13 20:00:56 2014 (r374682) +++ branches/2014Q4/games/bsdgames/Makefile Sat Dec 13 20:12:07 2014 (r374683) @@ -3,6 +3,7 @@ PORTNAME= bsdgames PORTVERSION= 3.8.2 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= games # Fetched from git://git.dragonflybsd.org/dragonfly.git, v${PORTVERSION}, /games @@ -75,6 +76,12 @@ pre-install: .endfor post-install: +# avoid conflict with games/bs and shells/fish +.for prog in bs fish + ${MV} ${STAGEDIR}${PREFIX}/bin/${prog} ${STAGEDIR}${PREFIX}/bin/${prog}-game + ${MV} ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}-game.6.gz +.endfor + @${TOUCH} ${STAGEDIR}/var/games/atc_score @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; Copied: branches/2014Q4/games/bsdgames/files/patch-trek_computer.c (from r374594, head/games/bsdgames/files/patch-trek_computer.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/bsdgames/files/patch-trek_computer.c Sat Dec 13 20:12:07 2014 (r374683, copy of r374594, head/games/bsdgames/files/patch-trek_computer.c) @@ -0,0 +1,15 @@ +--- trek/computer.c.orig 2014-12-12 15:10:37 UTC ++++ trek/computer.c +@@ -175,10 +175,10 @@ computer(int v __unused) + tqy = Ship.quady; + } else { + ix = getintpar("Quadrant"); +- if (ix < 0 || ix >= NSECTS) ++ if (ix < 0 || ix >= NQUADS) + break; + iy = getintpar("q-y"); +- if (iy < 0 || iy >= NSECTS) ++ if (iy < 0 || iy >= NQUADS) + break; + tqx = ix; + tqy = iy; Modified: branches/2014Q4/games/bsdgames/pkg-plist ============================================================================== --- branches/2014Q4/games/bsdgames/pkg-plist Sat Dec 13 20:00:56 2014 (r374682) +++ branches/2014Q4/games/bsdgames/pkg-plist Sat Dec 13 20:12:07 2014 (r374683) @@ -1,28 +1,28 @@ bin/adventure bin/arithmetic -bin/atc +@(,games,2555) bin/atc bin/backgammon -bin/battlestar -bin/bs -bin/canfield +@(,games,2555) bin/battlestar +bin/bs-game +@(,games,2555) bin/canfield bin/cfscores -bin/cribbage -bin/fish -bin/hack +@(,games,2555) bin/cribbage +bin/fish-game +@(,games,2555) bin/hack bin/hangman bin/hunt bin/huntd bin/larn bin/mille -bin/phantasia +@(,games,2555) bin/phantasia bin/piano bin/pig bin/quiz bin/rain -bin/robots +@(,games,2555) bin/robots bin/rogue -bin/sail -bin/snake +@(,games,2555) bin/sail +@(,games,2555) bin/snake bin/snscore bin/teachgammon bin/trek @@ -35,11 +35,11 @@ man/man6/arithmetic.6.gz man/man6/atc.6.gz man/man6/backgammon.6.gz man/man6/battlestar.6.gz -man/man6/bs.6.gz +man/man6/bs-game.6.gz man/man6/canfield.6.gz man/man6/cfscores.6.gz man/man6/cribbage.6.gz -man/man6/fish.6.gz +man/man6/fish-game.6.gz man/man6/hack.6.gz man/man6/hangman.6.gz man/man6/hunt.6.gz @@ -106,45 +106,34 @@ share/games/quiz.db/ucc share/games/cribbage.instr share/games/fish.instr share/games/wump.info -@dirrm share/games/atc -@dirrm share/games/larn -@dirrm share/games/quiz.db -@dirrm share/games -@group games -@mode 664 -@sample /var/games/atc_score.sample -@sample /var/games/battlestar.log.sample -@sample /var/games/cfscores.sample -@sample /var/games/criblog.sample -@sample /var/games/hackdir/help.sample -@sample /var/games/hackdir/hh.sample -@sample /var/games/hackdir/data.sample -@sample /var/games/hackdir/perm.sample -@sample /var/games/hackdir/record.sample -@sample /var/games/hackdir/rumors.sample -@sample /var/games/larn/lscore12.0.sample -@sample /var/games/larn/llog12.0.sample -@sample /var/games/phantasia/monsters.sample -@sample /var/games/phantasia/void.sample -@sample /var/games/phantasia/characs.sample -@sample /var/games/phantasia/gold.sample -@sample /var/games/phantasia/lastdead.sample -@sample /var/games/phantasia/mess.sample -@sample /var/games/phantasia/motd.sample -@sample /var/games/phantasia/scoreboard.sample -@sample /var/games/robots_roll.sample -@sample /var/games/rogue.scores.sample -@sample /var/games/saillog.sample -@sample /var/games/snakerawscores.sample -@sample /var/games/snake.log.sample -@mode 0775 -@dirrmtry /var/games/phantasia -@dirrmtry /var/games/larn -@mode 0770 -@dirrmtry /var/games/hackdir/save -@mode 0775 -@dirrmtry /var/games/hackdir -@dirrmtry /var/games/battlestar -@dirrmtry /var/games/atc -@group wheel -@mode +@sample(,games,0664) /var/games/atc_score.sample +@sample(,games,0664) /var/games/battlestar.log.sample +@sample(,games,0664) /var/games/cfscores.sample +@sample(,games,0664) /var/games/criblog.sample +@sample(,games,0664) /var/games/hackdir/help.sample +@sample(,games,0664) /var/games/hackdir/hh.sample +@sample(,games,0664) /var/games/hackdir/data.sample +@sample(,games,0664) /var/games/hackdir/perm.sample +@sample(,games,0664) /var/games/hackdir/record.sample +@sample(,games,0664) /var/games/hackdir/rumors.sample +@sample(,games,0664) /var/games/larn/lscore12.0.sample +@sample(,games,0664) /var/games/larn/llog12.0.sample +@sample(,games,0664) /var/games/phantasia/monsters.sample +@sample(,games,0664) /var/games/phantasia/void.sample +@sample(,games,0664) /var/games/phantasia/characs.sample +@sample(,games,0664) /var/games/phantasia/gold.sample +@sample(,games,0664) /var/games/phantasia/lastdead.sample +@sample(,games,0664) /var/games/phantasia/mess.sample +@sample(,games,0664) /var/games/phantasia/motd.sample +@sample(,games,0664) /var/games/phantasia/scoreboard.sample +@sample(,games,0664) /var/games/robots_roll.sample +@sample(,games,0664) /var/games/rogue.scores.sample +@sample(,games,0664) /var/games/saillog.sample +@sample(,games,0664) /var/games/snakerawscores.sample +@sample(,games,0664) /var/games/snake.log.sample +@dir(,games,0775) /var/games/phantasia +@dir(,games,0775) /var/games/larn +@dir(,games,0770) /var/games/hackdir/save +@dir(,games,0775) /var/games/hackdir +@dir(,games,0775) /var/games/battlestar +@dir(,games,0775) /var/games/atc