From owner-svn-ports-branches@FreeBSD.ORG Sun Oct 12 06:37:06 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 7E9CA7C9; Sun, 12 Oct 2014 06:37: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 68D12CD7; Sun, 12 Oct 2014 06:37: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 s9C6b63J056804; Sun, 12 Oct 2014 06:37:06 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9C6b5Cv056799; Sun, 12 Oct 2014 06:37:05 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201410120637.s9C6b5Cv056799@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 12 Oct 2014 06:37:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370683 - in branches/2014Q4/multimedia/transcode: . 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: Sun, 12 Oct 2014 06:37:06 -0000 Author: riggs Date: Sun Oct 12 06:37:05 2014 New Revision: 370683 URL: https://svnweb.freebsd.org/changeset/ports/370683 QAT: https://qat.redports.org/buildarchive/r370683/ Log: MFH: r370633 - Fix build problem (plist generation) with export_xvid.so symlink - Make port ready for ffmpeg 2.4 and later - Pet portlint - Bump PORTREVISION - Resolve merge conflicts by getting port on par with head PR: 194161 Submitted by: cyberbotx@cyberbotx.com (maintainer) Approved by: portmgr(erwin) Added: branches/2014Q4/multimedia/transcode/files/patch-import__probe_ffmpeg.c - copied unchanged from r370633, head/multimedia/transcode/files/patch-import__probe_ffmpeg.c branches/2014Q4/multimedia/transcode/pkg-plist (contents, props changed) Modified: branches/2014Q4/multimedia/transcode/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/multimedia/transcode/Makefile ============================================================================== --- branches/2014Q4/multimedia/transcode/Makefile Sun Oct 12 06:12:59 2014 (r370682) +++ branches/2014Q4/multimedia/transcode/Makefile Sun Oct 12 06:37:05 2014 (r370683) @@ -3,7 +3,7 @@ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 16 +PORTREVISION= 18 CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ @@ -14,20 +14,20 @@ LICENSE= GPLv2 LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg -FAKEDIR= ${WRKDIR}/fake -PLIST= ${WRKDIR}/plist USE_LDCONFIG= yes -USES= gmake pkgconfig tar:bzip2 libtool +USES= gmake libtool pkgconfig tar:bzip2 +USE_GCC= any WANT_SDL= yes WANT_GNOME= yes -USE_AUTOTOOLS= libtoolize +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-oss CPPFLAGS+= -isystem ${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --enable-oss +INSTALL_TARGET= install-strip NO_OPTIONS_SORT= yes -OPTIONS_DEFINE= OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME XVID \ - X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \ +OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \ + XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \ FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV BKTR_DESC= Bktr capture card support @@ -139,8 +139,6 @@ post-patch: s|-lMagick|-lMagickCore|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -pre-configure: - @${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -E -e 's|-ldl||g' ${WRKSRC}/configure @${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -E -e 's|WRKSRC|${WRKSRC}|g' ${WRKSRC}/export/Makefile.in @@ -151,19 +149,8 @@ pre-configure: ${WRKSRC}/import/import_mov.c \ ${WRKSRC}/import/probe_mov.c -pre-install: - ${RM} -rf ${PLIST} ${FAKEDIR} - ${MKDIR} ${FAKEDIR} - ${TOUCH} -f ${PLIST} - @(cd ${WRKSRC} && ${MAKE_CMD} install prefix=${FAKEDIR} mandir=${FAKEDIR}/man) -.for dir in bin share/doc lib - @(cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|${dir}/|' | grep -v \\.la$$ >> ${PLIST}) - @(cd ${FAKEDIR}/${dir} && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST}) -.endfor - @(cd ${FAKEDIR}/man && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|man/|' \ - -e 's|$$|.gz|' >> ${PLIST}) +post-stage: + @(cd ${STAGEDIR}${PREFIX} && \ + ${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST}) .include Copied: branches/2014Q4/multimedia/transcode/files/patch-import__probe_ffmpeg.c (from r370633, head/multimedia/transcode/files/patch-import__probe_ffmpeg.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/transcode/files/patch-import__probe_ffmpeg.c Sun Oct 12 06:37:05 2014 (r370683, copy of r370633, head/multimedia/transcode/files/patch-import__probe_ffmpeg.c) @@ -0,0 +1,11 @@ +--- import/probe_ffmpeg.c.orig 2011-11-19 16:50:27 UTC ++++ import/probe_ffmpeg.c +@@ -120,7 +120,7 @@ + + translate_info(lavf_dmx_context, ipipe->probe_info); + +- av_close_input_file(lavf_dmx_context); ++ avformat_close_input(lavf_dmx_context); + return; + } + Added: branches/2014Q4/multimedia/transcode/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/multimedia/transcode/pkg-plist Sun Oct 12 06:37:05 2014 (r370683) @@ -0,0 +1,130 @@ +bin/avifix +bin/aviindex +bin/avimerge +bin/avisplit +bin/avisync +bin/tccat +bin/tcdecode +bin/tcdemux +bin/tcextract +bin/tcmodinfo +bin/tcmp3cut +bin/tcprobe +bin/tcscan +bin/tcxmlcheck +bin/tcxpm2rgb +bin/tcyait +bin/transcode +man/man1/avifix.1.gz +man/man1/aviindex.1.gz +man/man1/avimerge.1.gz +man/man1/avisplit.1.gz +man/man1/avisync.1.gz +man/man1/tccat.1.gz +man/man1/tcdecode.1.gz +man/man1/tcdemux.1.gz +man/man1/tcexport.1.gz +man/man1/tcextract.1.gz +man/man1/tcmodchain.1.gz +man/man1/tcmodinfo.1.gz +man/man1/tcprobe.1.gz +man/man1/tcpvmexportd.1.gz +man/man1/tcscan.1.gz +man/man1/tcxmlcheck.1.gz +man/man1/transcode.1.gz +man/man1/transcode_export.1.gz +man/man1/transcode_filter.1.gz +man/man1/transcode_import.1.gz +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt +%%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt +%%PORTDOCS%%%%DOCSDIR%%/README.cluster +%%PORTDOCS%%%%DOCSDIR%%/README.dv +%%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps +%%PORTDOCS%%%%DOCSDIR%%/README.rip +%%PORTDOCS%%%%DOCSDIR%%/README.sync +%%PORTDOCS%%%%DOCSDIR%%/README.vcd +%%PORTDOCS%%%%DOCSDIR%%/README.xvid-credits +%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-0.6.13 +%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-1.1.0 +%%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt +%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt +%%PORTDOCS%%%%DOCSDIR%%/faq +%%PORTDOCS%%%%DOCSDIR%%/filter-socket.txt +%%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt +%%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt +%%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt +%%PORTDOCS%%%%DOCSDIR%%/filter_text.txt +%%PORTDOCS%%%%DOCSDIR%%/filter_yuvdenoise.txt +%%PORTDOCS%%%%DOCSDIR%%/framerate.txt +%%PORTDOCS%%%%DOCSDIR%%/html/dv.html +%%PORTDOCS%%%%DOCSDIR%%/html/dvd.html +%%PORTDOCS%%%%DOCSDIR%%/html/export_divx.html +%%PORTDOCS%%%%DOCSDIR%%/html/export_divx4.php +%%PORTDOCS%%%%DOCSDIR%%/html/export_divx5.php +%%PORTDOCS%%%%DOCSDIR%%/html/export_fame.php +%%PORTDOCS%%%%DOCSDIR%%/html/export_ogg.php +%%PORTDOCS%%%%DOCSDIR%%/html/export_opendivx.php +%%PORTDOCS%%%%DOCSDIR%%/html/export_xvid.php +%%PORTDOCS%%%%DOCSDIR%%/html/import_avi.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_dv.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_dvd.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_mp3.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg2.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg3.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_null.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_nuv.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_ogg.php +%%PORTDOCS%%%%DOCSDIR%%/html/import_raw.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_vob.html +%%PORTDOCS%%%%DOCSDIR%%/html/import_yuv4mpeg.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/intro.html +%%PORTDOCS%%%%DOCSDIR%%/html/mes0-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/mes4-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/mes5-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/mes6-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/mes7-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/misc.html +%%PORTDOCS%%%%DOCSDIR%%/html/modules.html +%%PORTDOCS%%%%DOCSDIR%%/html/mpeg.html +%%PORTDOCS%%%%DOCSDIR%%/html/new.png +%%PORTDOCS%%%%DOCSDIR%%/html/other.html +%%PORTDOCS%%%%DOCSDIR%%/html/post.html +%%PORTDOCS%%%%DOCSDIR%%/html/pre.html +%%PORTDOCS%%%%DOCSDIR%%/html/smart.html +%%PORTDOCS%%%%DOCSDIR%%/html/sorry.html +%%PORTDOCS%%%%DOCSDIR%%/html/sub0-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/sub1-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/sub2-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/sub3-00000.png +%%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html +%%PORTDOCS%%%%DOCSDIR%%/html/table.php +%%PORTDOCS%%%%DOCSDIR%%/html/tc.png +%%PORTDOCS%%%%DOCSDIR%%/import-xml.txt +%%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt +%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt +%%PORTDOCS%%%%DOCSDIR%%/import_x11.txt +%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt +%%PORTDOCS%%%%DOCSDIR%%/pvm3/export_pvm.txt +%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_10x.cfg +%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_11x.cfg +%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_config.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/OPTIMIZERS +%%PORTDOCS%%%%DOCSDIR%%/tech/architecture.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/avi_comments.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/clone.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/export-API.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/filter-API.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/filter_template.c +%%PORTDOCS%%%%DOCSDIR%%/tech/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_basic.css +%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_frame_buffer.html +%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_input_rotation.html +%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_libraries.html +%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_logo.png +%%PORTDOCS%%%%DOCSDIR%%/tech/ibp_support.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/import-API.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/libraries.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/module-system-API.txt +%%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt From owner-svn-ports-branches@FreeBSD.ORG Sun Oct 12 06:57:20 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 3907EC3C; Sun, 12 Oct 2014 06:57:20 +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 19CDFE63; Sun, 12 Oct 2014 06:57:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9C6vJUE066351; Sun, 12 Oct 2014 06:57:19 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9C6vIFO066340; Sun, 12 Oct 2014 06:57:18 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201410120657.s9C6vIFO066340@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Sun, 12 Oct 2014 06:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370684 - in branches/2014Q4/misc/xfce4-weather-plugin: . 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: Sun, 12 Oct 2014 06:57:20 -0000 Author: olivierd Date: Sun Oct 12 06:57:17 2014 New Revision: 370684 URL: https://svnweb.freebsd.org/changeset/ports/370684 QAT: https://qat.redports.org/buildarchive/r370684/ Log: MFH: r370666 - Switch LocationforecastLTS to the new API (1.2), previous one is no longer available - Drop @dirm* in pkg-plist - Bump PORTREVISION Obtained from: Upstream repository ('trunk' branch) Approved by: portmgr (erwin@) Added: branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c - copied unchanged from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c - copied unchanged from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h - copied unchanged from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c - copied unchanged from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c Modified: branches/2014Q4/misc/xfce4-weather-plugin/Makefile branches/2014Q4/misc/xfce4-weather-plugin/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/misc/xfce4-weather-plugin/Makefile ============================================================================== --- branches/2014Q4/misc/xfce4-weather-plugin/Makefile Sun Oct 12 06:37:05 2014 (r370683) +++ branches/2014Q4/misc/xfce4-weather-plugin/Makefile Sun Oct 12 06:57:17 2014 (r370684) @@ -3,7 +3,7 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.8.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc xfce geography MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -16,7 +16,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup -SSP_UNSAFE= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALL_TARGET= install-strip Copied: branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c (from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c Sun Oct 12 06:57:17 2014 (r370684, copy of r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-parsers.c) @@ -0,0 +1,22 @@ +Make plugin ready for met.no locationforecast-1.2 API (bug #10916). + +--- panel-plugin/weather-parsers.c.orig 2013-02-01 15:18:50 UTC ++++ panel-plugin/weather-parsers.c +@@ -28,6 +28,7 @@ + #define _XOPEN_SOURCE + #define _XOPEN_SOURCE_EXTENDED 1 + #include "weather-parsers.h" ++#include "weather-translate.h" + #include "weather-debug.h" + + #include +@@ -196,8 +197,8 @@ + } + if (NODE_IS_TYPE(child_node, "symbol")) { + g_free(loc->symbol); +- loc->symbol = PROP(child_node, "id"); + loc->symbol_id = strtol(PROP(child_node, "number"), NULL, 10); ++ loc->symbol = g_strdup(get_symbol_for_id(loc->symbol_id)); + } + } + Copied: branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c (from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c Sun Oct 12 06:57:17 2014 (r370684, copy of r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.c) @@ -0,0 +1,95 @@ +Make plugin ready for met.no locationforecast-1.2 API (bug #10916). + +--- panel-plugin/weather-translate.c.orig 2013-01-24 14:45:10 UTC ++++ panel-plugin/weather-translate.c +@@ -29,6 +29,7 @@ + #include "weather-translate.h" + + #define DAY_LOC_N (sizeof(gchar) * 100) ++#define NODATA "NODATA" + + + static const gchar *wdirs[] = { +@@ -169,7 +170,7 @@ + + { 15, "FOG", N_("Fog"), N_("Fog") }, + +- /* Symbols 16-19 are used for polar days */ ++ /* Symbols 16-19 are used for polar days (unused beginning with API version 1.2) */ + { 16, "SUN", N_("Sunny"), N_("Clear") }, + { 17, "LIGHTCLOUD", N_("Lightly cloudy"), N_("Lightly cloudy") }, + { 18, "LIGHTRAINSUN", N_("Rain showers"), N_("Rain showers") }, +@@ -185,6 +186,73 @@ + #define NUM_SYMBOLS (sizeof(symbol_to_desc) / sizeof(symbol_to_desc[0])) + + ++/* ++ * API version 1.2, published in May 2014, introduced new symbols. We ++ * try to match these with existing symbols, in order to be compatible ++ * with existing icon themes and to maintain translation completeness. ++ * ++ * See http://api.met.no/weatherapi/weathericon/1.1/documentation ++ * for a list of symbols. For a list of symbols with descriptions, ++ * see http://om.yr.no/forklaring/symbol. ++ */ ++gint ++replace_symbol_id(gint id) ++{ ++ /* Symbol ids greater than 100 are used for indicating polar ++ * night. These ids are over the ordinary id + 100. Since we ++ * don't support polar icons, we can simply subtract 100 to ++ * get the non-polar symbol ids. ++ */ ++ if (id > 100) ++ id -= 100; ++ ++ switch (id) { ++ case 24: return 22; /* Light rain showers and thunder */ ++ case 25: return 6; /* Heavy rain showers and thunder */ ++ case 26: return 20; /* Light sleet showers and thunder */ ++ case 27: return 20; /* Heavy sleet showers and thunder */ ++ case 28: return 21; /* Light snow showers and thunder */ ++ case 29: return 21; /* Heavy snow showers and thunder */ ++ case 30: return 22; /* Light rain and thunder */ ++ case 31: return 23; /* Light sleet and thunder */ ++ case 32: return 23; /* Heavy sleet and thunder */ ++ case 33: return 14; /* Light snow and thunder */ ++ case 34: return 14; /* Heavy snow and thunder */ ++ ++ /* symbols 35-39 are unused */ ++ ++ case 40: return 5; /* Light rain showers */ ++ case 41: return 5; /* Heavy rain showers */ ++ case 42: return 7; /* Light sleet showers */ ++ case 43: return 7; /* Heavy sleet showers */ ++ case 44: return 8; /* Light snow showers */ ++ case 45: return 8; /* Heavy snow showers */ ++ case 46: return 9; /* Light rain */ ++ case 47: return 12; /* Light sleet */ ++ case 48: return 12; /* Heavy sleet */ ++ case 49: return 13; /* Light snow */ ++ case 50: return 13; /* Heavy snow */ ++ default: return id; ++ } ++} ++ ++ ++const gchar * ++get_symbol_for_id(gint id) ++{ ++ if (G_UNLIKELY(id < 1)) ++ return NODATA; ++ ++ if (id >= NUM_SYMBOLS) ++ id = replace_symbol_id(id); ++ ++ if (id < NUM_SYMBOLS) ++ return symbol_to_desc[id-1].symbol; ++ ++ return NODATA; ++} ++ ++ + const gchar * + translate_desc(const gchar *desc, + const gboolean nighttime) Copied: branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h (from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h Sun Oct 12 06:57:17 2014 (r370684, copy of r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather-translate.h) @@ -0,0 +1,13 @@ +Make plugin ready for met.no locationforecast-1.2 API (bug #10916). + +--- panel-plugin/weather-translate.h.orig 2013-01-24 14:45:10 UTC ++++ panel-plugin/weather-translate.h +@@ -24,6 +24,8 @@ + + G_BEGIN_DECLS + ++const gchar *get_symbol_for_id(gint id); ++ + const gchar *translate_desc(const gchar *desc, + gboolean nighttime); + Copied: branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c (from r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c Sun Oct 12 06:57:17 2014 (r370684, copy of r370666, head/misc/xfce4-weather-plugin/files/patch-panel-plugin__weather.c) @@ -0,0 +1,13 @@ +Make plugin ready for met.no locationforecast-1.2 API (bug #10916). + +--- panel-plugin/weather.c.orig 2013-02-18 10:21:00 UTC ++++ panel-plugin/weather.c +@@ -638,7 +638,7 @@ + /* build url */ + url = + g_strdup_printf("http://api.yr.no/weatherapi" +- "/locationforecastlts/1.1/?lat=%s;lon=%s;msl=%d", ++ "/locationforecastlts/1.2/?lat=%s;lon=%s;msl=%d", + data->lat, data->lon, data->msl); + + /* start receive thread */ Modified: branches/2014Q4/misc/xfce4-weather-plugin/pkg-plist ============================================================================== --- branches/2014Q4/misc/xfce4-weather-plugin/pkg-plist Sun Oct 12 06:37:05 2014 (r370683) +++ branches/2014Q4/misc/xfce4-weather-plugin/pkg-plist Sun Oct 12 06:57:17 2014 (r370684) @@ -335,33 +335,3 @@ share/xfce4/weather/icons/simplistic/48/ share/xfce4/weather/icons/simplistic/48/sun-night.png share/xfce4/weather/icons/simplistic/48/sun.png share/xfce4/weather/icons/simplistic/theme.info -@dirrm share/xfce4/weather/icons/simplistic/48 -@dirrm share/xfce4/weather/icons/simplistic/22 -@dirrm share/xfce4/weather/icons/simplistic/128 -@dirrm share/xfce4/weather/icons/simplistic -@dirrm share/xfce4/weather/icons/liquid/48 -@dirrm share/xfce4/weather/icons/liquid/22 -@dirrm share/xfce4/weather/icons/liquid/128 -@dirrm share/xfce4/weather/icons/liquid-dark/48 -@dirrm share/xfce4/weather/icons/liquid-dark/22 -@dirrm share/xfce4/weather/icons/liquid-dark/128 -@dirrm share/xfce4/weather/icons/liquid-dark -@dirrm share/xfce4/weather/icons/liquid -@dirrm share/xfce4/weather/icons -@dirrm share/xfce4/weather -@dirrmtry share/xfce4/panel/plugins -@dirrmtry share/xfce4/panel -@dirrmtry share/xfce4 -@dirrmtry share/locale/ur_PK/LC_MESSAGES -@dirrmtry share/locale/ur_PK -@dirrmtry share/locale/ur/LC_MESSAGES -@dirrmtry share/locale/ur -@dirrmtry share/locale/ug/LC_MESSAGES -@dirrmtry share/locale/ug -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/ast/LC_MESSAGES -@dirrmtry share/locale/ast -@dirrmtry lib/xfce4/panel/plugins -@dirrmtry lib/xfce4/panel -@dirrmtry lib/xfce4 From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:04: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 48DCBA70; Mon, 13 Oct 2014 17:04: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 34D11194; Mon, 13 Oct 2014 17:04: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 s9DH4647052114; Mon, 13 Oct 2014 17:04:06 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH46Z7052113; Mon, 13 Oct 2014 17:04:06 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131704.s9DH46Z7052113@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:04:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370794 - branches/2014Q4/devel/gearmand 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, 13 Oct 2014 17:04:06 -0000 Author: bdrewery Date: Mon Oct 13 17:04:05 2014 New Revision: 370794 URL: https://svnweb.freebsd.org/changeset/ports/370794 QAT: https://qat.redports.org/buildarchive/r370794/ Log: MFH: r370793 - Fix dependency on boost. It should be a LIB_DEPENDS. PR: 191440 Submitted by: matt@conundrum.com (based on) Modified: branches/2014Q4/devel/gearmand/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/gearmand/Makefile ============================================================================== --- branches/2014Q4/devel/gearmand/Makefile Mon Oct 13 17:02:47 2014 (r370793) +++ branches/2014Q4/devel/gearmand/Makefile Mon Oct 13 17:04:05 2014 (r370794) @@ -3,16 +3,16 @@ PORTNAME= gearmand PORTVERSION= 1.0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library -BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx -LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx +LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs \ + libevent.so:${PORTSDIR}/devel/libevent2 \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid CONFLICTS= p5-Gearman-Server-1.* gearmand-1.1.* From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:06:37 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 005E3C67; Mon, 13 Oct 2014 17:06:36 +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 E00881B8; Mon, 13 Oct 2014 17:06:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH6aum052769; Mon, 13 Oct 2014 17:06:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH6a9A052764; Mon, 13 Oct 2014 17:06:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131706.s9DH6a9A052764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:06:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370796 - in branches/2014Q4/ports-mgmt/portupgrade-devel: . 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, 13 Oct 2014 17:06:37 -0000 Author: bdrewery Date: Mon Oct 13 17:06:35 2014 New Revision: 370796 URL: https://svnweb.freebsd.org/changeset/ports/370796 QAT: https://qat.redports.org/buildarchive/r370796/ Log: MFH: r370240 - Update to checkin 2161660, which matches 2.4.13 - Update @dir usage Changes: * portinstall/upgrade -P[P] now supported with pkgng * pkg_fetch now supports pkgng * Fixed pkg-1.3 delete support to not recurse * Fixed portupgrade -b support with pkgng * Improved portsclean performance with pkgng (#59) * Use service(8) for rc script restarting * Show command executions with PORTUPGRADE_DEBUG in environment * Deprecate rc script handling in lieu of pkg's HANDLE_RC_SCRIPTS in pkg.conf Deleted: branches/2014Q4/ports-mgmt/portupgrade-devel/files/ Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile branches/2014Q4/ports-mgmt/portupgrade-devel/distinfo branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:04:48 2014 (r370795) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:06:35 2014 (r370796) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= portupgrade -PORTVERSION= 20140524 -PORTREVISION= 2 +PORTVERSION= 20141006 +PORTREVISION= 0 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -23,7 +23,7 @@ USES= uidfix USE_GITHUB= yes GH_ACCOUNT= freebsd GH_PROJECT= portupgrade -GH_COMMIT= 352086b +GH_COMMIT= 2161660 GH_TAGNAME= ${GH_COMMIT} DIST_SUBDIR= ${PORTNAME} Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/distinfo ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/distinfo Mon Oct 13 17:04:48 2014 (r370795) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/distinfo Mon Oct 13 17:06:35 2014 (r370796) @@ -1,2 +1,2 @@ -SHA256 (portupgrade/freebsd-portupgrade-20140524-0-g352086b.tar.gz) = 80c76da88848a5d7d9b5867e77f025ca029f12590a6c50bd75985263efa341b1 -SIZE (portupgrade/freebsd-portupgrade-20140524-0-g352086b.tar.gz) = 107125 +SHA256 (portupgrade/freebsd-portupgrade-20141006-0-g2161660.tar.gz) = 9b773754d634f39ed81ed451536a0dbed8a89f8d2097509cd80defb612c45898 +SIZE (portupgrade/freebsd-portupgrade-20141006-0-g2161660.tar.gz) = 107785 Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Mon Oct 13 17:04:48 2014 (r370795) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Mon Oct 13 17:06:35 2014 (r370796) @@ -1,6 +1,4 @@ -@exec /bin/mkdir -p %D/lib/compat/pkg -@dirrmtry lib/compat/pkg -@dirrmtry lib/compat +@dir lib/compat/pkg man/man1/pkg_deinstall.1.gz man/man1/pkg_fetch.1.gz man/man1/pkg_glob.1.gz @@ -46,19 +44,12 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb -@dirrm %%RUBY_SITELIBDIR%%/pkgtools @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@dirrmtry share/zsh/site-functions -@dirrmtry share/zsh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash/complete.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcsh/complete.sample %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bash -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcsh -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:07:03 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 4C700E32; Mon, 13 Oct 2014 17:07:03 +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 1E4861C4; Mon, 13 Oct 2014 17:07:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH72cg053114; Mon, 13 Oct 2014 17:07:02 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH72x3053112; Mon, 13 Oct 2014 17:07:02 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131707.s9DH72x3053112@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:07:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370798 - branches/2014Q4/ports-mgmt/portupgrade-devel 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, 13 Oct 2014 17:07:03 -0000 Author: bdrewery Date: Mon Oct 13 17:07:02 2014 New Revision: 370798 URL: https://svnweb.freebsd.org/changeset/ports/370798 QAT: https://qat.redports.org/buildarchive/r370798/ Log: MFH: r370244 - Plist fixes. No need for @exec and use @sample. Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:06:50 2014 (r370797) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:07:02 2014 (r370798) @@ -3,7 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 20141006 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Mon Oct 13 17:06:50 2014 (r370797) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/pkg-plist Mon Oct 13 17:07:02 2014 (r370798) @@ -30,7 +30,6 @@ sbin/portsclean sbin/portsdb sbin/portupgrade sbin/portversion -@exec /bin/mkdir -p %D/%%RUBY_SITELIBDIR%%/pkgtools %%RUBY_SITELIBDIR%%/pkgtools/pkg.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdb.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdbtools.rb @@ -44,9 +43,7 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb -@unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi -etc/pkgtools.conf.sample -@exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf +@sample etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash/complete.sample From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:07:23 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 BCAF0F14; Mon, 13 Oct 2014 17:07:23 +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 A87051CA; Mon, 13 Oct 2014 17:07:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH7NQb053332; Mon, 13 Oct 2014 17:07:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH7Nbh053329; Mon, 13 Oct 2014 17:07:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131707.s9DH7Nbh053329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:07:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370799 - in branches/2014Q4/ports-mgmt/portupgrade: . 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, 13 Oct 2014 17:07:24 -0000 Author: bdrewery Date: Mon Oct 13 17:07:22 2014 New Revision: 370799 URL: https://svnweb.freebsd.org/changeset/ports/370799 QAT: https://qat.redports.org/buildarchive/r370799/ Log: MFH: r370246 - Update to 2.4.13 - Update plist for pkg-1.3 - Remove pkg-message as ALT_PKGDEP has not worked properly since 2008. See https://github.com/freebsd/portupgrade/issues/61 Changes: * portinstall/upgrade -P[P] now supported with pkgng * pkg_fetch now supports pkgng * Fixed pkg-1.3 delete support to not recurse * Fixed portupgrade -b support with pkgng * Improved portsclean performance with pkgng (#59) * Use service(8) for rc script restarting * Show command executions with PORTUPGRADE_DEBUG in environment * Deprecate rc script handling in lieu of pkg's HANDLE_RC_SCRIPTS in pkg.conf Deleted: branches/2014Q4/ports-mgmt/portupgrade/files/ branches/2014Q4/ports-mgmt/portupgrade/pkg-message Modified: branches/2014Q4/ports-mgmt/portupgrade/Makefile branches/2014Q4/ports-mgmt/portupgrade/distinfo branches/2014Q4/ports-mgmt/portupgrade/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ports-mgmt/portupgrade/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade/Makefile Mon Oct 13 17:07:02 2014 (r370798) +++ branches/2014Q4/ports-mgmt/portupgrade/Makefile Mon Oct 13 17:07:22 2014 (r370799) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= portupgrade -PORTVERSION= 2.4.12 -PORTREVISION= 2 +PORTVERSION= 2.4.13 +PORTREVISION= 0 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ Modified: branches/2014Q4/ports-mgmt/portupgrade/distinfo ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade/distinfo Mon Oct 13 17:07:02 2014 (r370798) +++ branches/2014Q4/ports-mgmt/portupgrade/distinfo Mon Oct 13 17:07:22 2014 (r370799) @@ -1,2 +1,2 @@ -SHA256 (portupgrade/pkgtools-2.4.12.tar.bz2) = 5b389fc877798d5948698923daf2d166fa724ba9d932505253398fc7721e1d82 -SIZE (portupgrade/pkgtools-2.4.12.tar.bz2) = 85928 +SHA256 (portupgrade/pkgtools-2.4.13.tar.bz2) = ddcca87ea5324f54e68774757697980272077d176086fd5957b8b0338d10c06e +SIZE (portupgrade/pkgtools-2.4.13.tar.bz2) = 86529 Modified: branches/2014Q4/ports-mgmt/portupgrade/pkg-plist ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade/pkg-plist Mon Oct 13 17:07:02 2014 (r370798) +++ branches/2014Q4/ports-mgmt/portupgrade/pkg-plist Mon Oct 13 17:07:22 2014 (r370799) @@ -1,6 +1,4 @@ -@exec /bin/mkdir -p %D/lib/compat/pkg -@dirrmtry lib/compat/pkg -@dirrmtry lib/compat +@dir lib/compat/pkg man/man1/pkg_deinstall.1.gz man/man1/pkg_fetch.1.gz man/man1/pkg_glob.1.gz @@ -32,7 +30,6 @@ sbin/portsclean sbin/portsdb sbin/portupgrade sbin/portversion -@exec /bin/mkdir -p %D/%%RUBY_SITELIBDIR%%/pkgtools %%RUBY_SITELIBDIR%%/pkgtools/pkg.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdb.rb %%RUBY_SITELIBDIR%%/pkgtools/pkgdbtools.rb @@ -46,17 +43,10 @@ sbin/portversion %%RUBY_SITELIBDIR%%/pkgtools/portsdb.rb %%RUBY_SITELIBDIR%%/pkgtools/revision.rb %%RUBY_SITELIBDIR%%/pkgtools.rb -@dirrm %%RUBY_SITELIBDIR%%/pkgtools @sample etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools -@dirrmtry share/zsh/site-functions -@dirrmtry share/zsh %%EXAMPLESDIR%%/bash/complete.sample %%EXAMPLESDIR%%/tcsh/complete.sample %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.md -@dirrm %%EXAMPLESDIR%%/bash -@dirrm %%EXAMPLESDIR%%/tcsh -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:07:45 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 93921FFF; Mon, 13 Oct 2014 17:07:45 +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 655551D4; Mon, 13 Oct 2014 17:07:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH7jrp053508; Mon, 13 Oct 2014 17:07:45 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH7jZw053506; Mon, 13 Oct 2014 17:07:45 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131707.s9DH7jZw053506@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:07:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370800 - in branches/2014Q4/ports-mgmt: portupgrade portupgrade-devel 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, 13 Oct 2014 17:07:45 -0000 Author: bdrewery Date: Mon Oct 13 17:07:44 2014 New Revision: 370800 URL: https://svnweb.freebsd.org/changeset/ports/370800 QAT: https://qat.redports.org/buildarchive/r370800/ Log: MFH: r370790 - Add dependency back for ruby-bdb for Ruby 2.0. PR: 188084 PR: 185523 Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile branches/2014Q4/ports-mgmt/portupgrade/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:07:22 2014 (r370799) +++ branches/2014Q4/ports-mgmt/portupgrade-devel/Makefile Mon Oct 13 17:07:44 2014 (r370800) @@ -3,7 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 20141006 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= ports-mgmt MASTER_SITES= GH \ @@ -44,10 +44,8 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif -# Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 +# For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb -.endif regression-test: patch cd ${WRKSRC} && ${MAKE} test Modified: branches/2014Q4/ports-mgmt/portupgrade/Makefile ============================================================================== --- branches/2014Q4/ports-mgmt/portupgrade/Makefile Mon Oct 13 17:07:22 2014 (r370799) +++ branches/2014Q4/ports-mgmt/portupgrade/Makefile Mon Oct 13 17:07:44 2014 (r370800) @@ -3,7 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.13 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -39,11 +39,8 @@ INSTALL_TARGET= install INSTALL_TARGET+= install-doc .endif -# Reported that ruby-bdb is BROKEN with 2.0 -.if ${RUBY_VER} != 2.0 && ${RUBY_VER} != 2.1 # For PKG_DBDRIVER={bdb_btree,bdb_hash} RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb -.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:08:54 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 D8451196; Mon, 13 Oct 2014 17:08: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 C45531F0; Mon, 13 Oct 2014 17:08: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 s9DH8sXh053805; Mon, 13 Oct 2014 17:08:54 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH8s6v053804; Mon, 13 Oct 2014 17:08:54 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131708.s9DH8s6v053804@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:08:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370801 - branches/2014Q4/security/openssh-portable 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, 13 Oct 2014 17:08:55 -0000 Author: bdrewery Date: Mon Oct 13 17:08:54 2014 New Revision: 370801 URL: https://svnweb.freebsd.org/changeset/ports/370801 QAT: https://qat.redports.org/buildarchive/r370801/ Log: MFH: r369933 - Mark OVERWRITE_BASE and security/openssh-portable-base as DEPRECATED. These will be removed on January 1 2015. Really ports should not be touching the base system at all. This option is a big foot-shoot problem: 1. Recent versions of FreeBSD such as 9.3, 10.0, 10.1+, now remove all ssh files from /usr if you 'make delete-old' with WITHOUT_SSH. This results in removing the overwrite base files. 2. Uninstalling the package leaves the system with no ssh. 3. Running installworld without WITHOUT_SSH results in overwriting the package, or giving false-positive 'pkg check -s' errors. 4. The port fails to pass QA checks because it removes system files. Modified: branches/2014Q4/security/openssh-portable/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/openssh-portable/Makefile ============================================================================== --- branches/2014Q4/security/openssh-portable/Makefile Mon Oct 13 17:07:44 2014 (r370800) +++ branches/2014Q4/security/openssh-portable/Makefile Mon Oct 13 17:08:54 2014 (r370801) @@ -202,6 +202,8 @@ CONFIGURE_LIBS+= -lldap EMPTYDIR= /var/empty .if ${PORT_OPTIONS:MOVERWRITE_BASE} +DEPRECATED= Overwrite-base option/port/pkg will be removed. There is no real need for foot-shooting. +EXPIRATION_DATE= 2015-01-01 WITH_OPENSSL_BASE= yes CONFIGURE_ARGS+= --localstatedir=/var PREFIX= /usr From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:09:18 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 9174A291; Mon, 13 Oct 2014 17:09:18 +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 7D3551F8; Mon, 13 Oct 2014 17:09:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH9IYg054215; Mon, 13 Oct 2014 17:09:18 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH9I0G054213; Mon, 13 Oct 2014 17:09:18 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131709.s9DH9I0G054213@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:09:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370802 - branches/2014Q4/security/openssh-portable 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, 13 Oct 2014 17:09:18 -0000 Author: bdrewery Date: Mon Oct 13 17:09:17 2014 New Revision: 370802 URL: https://svnweb.freebsd.org/changeset/ports/370802 QAT: https://qat.redports.org/buildarchive/r370802/ Log: MFH: r370264 Note my intentions with OVERWRITE_BASE Modified: branches/2014Q4/security/openssh-portable/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/openssh-portable/Makefile ============================================================================== --- branches/2014Q4/security/openssh-portable/Makefile Mon Oct 13 17:08:54 2014 (r370801) +++ branches/2014Q4/security/openssh-portable/Makefile Mon Oct 13 17:09:17 2014 (r370802) @@ -202,6 +202,7 @@ CONFIGURE_LIBS+= -lldap EMPTYDIR= /var/empty .if ${PORT_OPTIONS:MOVERWRITE_BASE} +# XXX: Mark this BROKEN rather than remove the option to force people to notice for POLA. DEPRECATED= Overwrite-base option/port/pkg will be removed. There is no real need for foot-shooting. EXPIRATION_DATE= 2015-01-01 WITH_OPENSSL_BASE= yes From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 17:09:50 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 BF454379; Mon, 13 Oct 2014 17:09:50 +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 AB74A201; Mon, 13 Oct 2014 17:09:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DH9o38054405; Mon, 13 Oct 2014 17:09:50 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DH9oU7054403; Mon, 13 Oct 2014 17:09:50 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410131709.s9DH9oU7054403@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 13 Oct 2014 17:09:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370803 - branches/2014Q4/shells/bash 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, 13 Oct 2014 17:09:50 -0000 Author: bdrewery Date: Mon Oct 13 17:09:49 2014 New Revision: 370803 URL: https://svnweb.freebsd.org/changeset/ports/370803 QAT: https://qat.redports.org/buildarchive/r370803/ Log: MFH: r370147 Update to 4.3.30 Modified: branches/2014Q4/shells/bash/Makefile branches/2014Q4/shells/bash/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/shells/bash/Makefile ============================================================================== --- branches/2014Q4/shells/bash/Makefile Mon Oct 13 17:09:17 2014 (r370802) +++ branches/2014Q4/shells/bash/Makefile Mon Oct 13 17:09:49 2014 (r370803) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bash -PATCHLEVEL= 29 +PATCHLEVEL= 30 PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g} PORTREVISION?= 0 CATEGORIES= shells Modified: branches/2014Q4/shells/bash/distinfo ============================================================================== --- branches/2014Q4/shells/bash/distinfo Mon Oct 13 17:09:17 2014 (r370802) +++ branches/2014Q4/shells/bash/distinfo Mon Oct 13 17:09:49 2014 (r370803) @@ -58,3 +58,5 @@ SHA256 (bash/bash43-028) = e8b0dbed4724f SIZE (bash/bash43-028) = 69606 SHA256 (bash/bash43-029) = 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SIZE (bash/bash43-029) = 1824 +SHA256 (bash/bash43-030) = 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b +SIZE (bash/bash43-030) = 63206 From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 22:02:19 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 BCCB7B5D; Mon, 13 Oct 2014 22:02:19 +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 A88917B8; Mon, 13 Oct 2014 22:02:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DM2J6b097082; Mon, 13 Oct 2014 22:02:19 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DM2Jrg097080; Mon, 13 Oct 2014 22:02:19 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410132202.s9DM2Jrg097080@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 13 Oct 2014 22:02:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370820 - branches/2014Q4/net/sslh 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, 13 Oct 2014 22:02:19 -0000 Author: antoine Date: Mon Oct 13 22:02:18 2014 New Revision: 370820 URL: https://svnweb.freebsd.org/changeset/ports/370820 QAT: https://qat.redports.org/buildarchive/r370820/ Log: MFH: r370204 Fixing 'fetch' and unbreak. Note: the author confirm that the recent changes to the source archive was just adding a COPYING file . PR: ports/194134 Submitted by: maintainer Modified: branches/2014Q4/net/sslh/Makefile branches/2014Q4/net/sslh/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/sslh/Makefile ============================================================================== --- branches/2014Q4/net/sslh/Makefile Mon Oct 13 22:01:47 2014 (r370819) +++ branches/2014Q4/net/sslh/Makefile Mon Oct 13 22:02:18 2014 (r370820) @@ -3,8 +3,8 @@ PORTNAME= sslh PORTVERSION= 1.16 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.rutschle.net/tech/ Modified: branches/2014Q4/net/sslh/distinfo ============================================================================== --- branches/2014Q4/net/sslh/distinfo Mon Oct 13 22:01:47 2014 (r370819) +++ branches/2014Q4/net/sslh/distinfo Mon Oct 13 22:02:18 2014 (r370820) @@ -1,2 +1,2 @@ -SHA256 (sslh-v1.16.tar.gz) = e97b3be9f010bc763a7f11c94e54d8ead33cab3f0c93a52bb9a7f708212e5902 -SIZE (sslh-v1.16.tar.gz) = 36483 +SHA256 (sslh-v1.16.tar.gz) = a610beb878ee5c73aa505e5d526589edcf7060d09e4fedfe82e732f2138f8434 +SIZE (sslh-v1.16.tar.gz) = 43836 From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 13 22:05:16 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 5031CD40; Mon, 13 Oct 2014 22:05:16 +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 3BF5C7DE; Mon, 13 Oct 2014 22:05:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DM5GJr097594; Mon, 13 Oct 2014 22:05:16 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DM5FB4097592; Mon, 13 Oct 2014 22:05:15 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410132205.s9DM5FB4097592@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 13 Oct 2014 22:05:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370821 - branches/2014Q4/devel/libsigrok 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, 13 Oct 2014 22:05:16 -0000 Author: antoine Date: Mon Oct 13 22:05:15 2014 New Revision: 370821 URL: https://svnweb.freebsd.org/changeset/ports/370821 QAT: https://qat.redports.org/buildarchive/r370821/ Log: MFH: r370272 Fix build on head and 10.1 Modified: branches/2014Q4/devel/libsigrok/Makefile branches/2014Q4/devel/libsigrok/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/libsigrok/Makefile ============================================================================== --- branches/2014Q4/devel/libsigrok/Makefile Mon Oct 13 22:02:18 2014 (r370820) +++ branches/2014Q4/devel/libsigrok/Makefile Mon Oct 13 22:05:15 2014 (r370821) @@ -22,7 +22,11 @@ MAKE_JOBS_UNSAFE= yes LDFLAGS+= -L/usr/lib -lusb USE_LDCONFIG= yes +.include + # Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION +.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe +.endif -.include +.include Modified: branches/2014Q4/devel/libsigrok/pkg-plist ============================================================================== --- branches/2014Q4/devel/libsigrok/pkg-plist Mon Oct 13 22:02:18 2014 (r370820) +++ branches/2014Q4/devel/libsigrok/pkg-plist Mon Oct 13 22:05:15 2014 (r370821) @@ -6,4 +6,3 @@ lib/libsigrok.so lib/libsigrok.so.2 lib/libsigrok.so.2.0.0 libdata/pkgconfig/libsigrok.pc -@dirrm include/libsigrok From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 15:45: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 76E02F27; Wed, 15 Oct 2014 15:45: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 62C36941; Wed, 15 Oct 2014 15:45: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 s9FFj7OY008525; Wed, 15 Oct 2014 15:45:07 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FFj7b6008524; Wed, 15 Oct 2014 15:45:07 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201410151545.s9FFj7b6008524@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 15 Oct 2014 15:45:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370931 - in branches/2014Q4/net/svnup: . 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, 15 Oct 2014 15:45:07 -0000 Author: bdrewery Date: Wed Oct 15 15:45:06 2014 New Revision: 370931 URL: https://svnweb.freebsd.org/changeset/ports/370931 QAT: https://qat.redports.org/buildarchive/r370931/ Log: MFH: r370930 - Allow svnup to work with TLS; SSLv3 is being disabled due to POODLE. PR: 194241 Submitted by: spil.oss@gmail.com Obtained from: Merged in upstream Added: branches/2014Q4/net/svnup/files/ - copied from r370930, head/net/svnup/files/ Modified: branches/2014Q4/net/svnup/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/net/svnup/Makefile ============================================================================== --- branches/2014Q4/net/svnup/Makefile Wed Oct 15 15:44:41 2014 (r370930) +++ branches/2014Q4/net/svnup/Makefile Wed Oct 15 15:45:06 2014 (r370931) @@ -2,6 +2,7 @@ PORTNAME= svnup PORTVERSION= 1.06 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://jcm.dsl.visi.com/freebsd/svnup/ \ LOCAL/jgh/net/${PORTNAME}/ From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 18:42:27 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 A829C414; Wed, 15 Oct 2014 18:42:27 +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 92CC7E4B; Wed, 15 Oct 2014 18:42:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FIgRuP094434; Wed, 15 Oct 2014 18:42:27 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FIgQd1094429; Wed, 15 Oct 2014 18:42:26 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410151842.s9FIgQd1094429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 15 Oct 2014 18:42:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370942 - in branches/2014Q4: devel/mingw32-openssl security/openssl 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, 15 Oct 2014 18:42:27 -0000 Author: delphij Date: Wed Oct 15 18:42:25 2014 New Revision: 370942 URL: https://svnweb.freebsd.org/changeset/ports/370942 QAT: https://qat.redports.org/buildarchive/r370942/ Log: MFH r370940-370941: Update to 1.01j. Security: vuxml 03175e62-5494-11e4-9cc1-bc5ff4fb5e7b Security: CVE-2014-3513 Security: CVE-2014-3566 Security: CVE-2014-3567 Security: CVE-2014-3568 Approved by: ports-secteam Modified: branches/2014Q4/devel/mingw32-openssl/Makefile branches/2014Q4/devel/mingw32-openssl/distinfo branches/2014Q4/security/openssl/Makefile branches/2014Q4/security/openssl/distinfo branches/2014Q4/security/openssl/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/mingw32-openssl/Makefile ============================================================================== --- branches/2014Q4/devel/mingw32-openssl/Makefile Wed Oct 15 18:34:58 2014 (r370941) +++ branches/2014Q4/devel/mingw32-openssl/Makefile Wed Oct 15 18:42:25 2014 (r370942) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openssl -PORTVERSION= 1.0.1i +PORTVERSION= 1.0.1j CATEGORIES= devel security MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2014Q4/devel/mingw32-openssl/distinfo ============================================================================== --- branches/2014Q4/devel/mingw32-openssl/distinfo Wed Oct 15 18:34:58 2014 (r370941) +++ branches/2014Q4/devel/mingw32-openssl/distinfo Wed Oct 15 18:42:25 2014 (r370942) @@ -1,2 +1,2 @@ -SHA256 (openssl-1.0.1i/openssl-1.0.1i.tar.gz) = 3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 -SIZE (openssl-1.0.1i/openssl-1.0.1i.tar.gz) = 4422117 +SHA256 (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 +SIZE (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 4432964 Modified: branches/2014Q4/security/openssl/Makefile ============================================================================== --- branches/2014Q4/security/openssl/Makefile Wed Oct 15 18:34:58 2014 (r370941) +++ branches/2014Q4/security/openssl/Makefile Wed Oct 15 18:42:25 2014 (r370942) @@ -3,8 +3,8 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= i -PORTREVISION= 15 +DISTVERSIONSUFFIX= j +PORTREVISION= 16 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2014Q4/security/openssl/distinfo ============================================================================== --- branches/2014Q4/security/openssl/distinfo Wed Oct 15 18:34:58 2014 (r370941) +++ branches/2014Q4/security/openssl/distinfo Wed Oct 15 18:42:25 2014 (r370942) @@ -1,10 +1,10 @@ -SHA256 (openssl-1.0.1i/openssl-1.0.1i.tar.gz) = 3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 -SIZE (openssl-1.0.1i/openssl-1.0.1i.tar.gz) = 4422117 -SHA256 (openssl-1.0.1i/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae -SIZE (openssl-1.0.1i/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 -SHA256 (openssl-1.0.1i/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 -SIZE (openssl-1.0.1i/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 -SHA256 (openssl-1.0.1i/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b -SIZE (openssl-1.0.1i/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 -SHA256 (openssl-1.0.1i/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f -SIZE (openssl-1.0.1i/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 +SHA256 (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 +SIZE (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 4432964 +SHA256 (openssl-1.0.1j/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae +SIZE (openssl-1.0.1j/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 +SHA256 (openssl-1.0.1j/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 +SIZE (openssl-1.0.1j/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 +SHA256 (openssl-1.0.1j/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b +SIZE (openssl-1.0.1j/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 +SHA256 (openssl-1.0.1j/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f +SIZE (openssl-1.0.1j/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 Modified: branches/2014Q4/security/openssl/pkg-plist ============================================================================== --- branches/2014Q4/security/openssl/pkg-plist Wed Oct 15 18:34:58 2014 (r370941) +++ branches/2014Q4/security/openssl/pkg-plist Wed Oct 15 18:42:25 2014 (r370942) @@ -101,6 +101,7 @@ libdata/pkgconfig/openssl.pc %%SHARED%%@dirrm lib/engines man/man1/CA.pl.1.gz man/man1/asn1parse.1.gz +man/man1/c_rehash.1.gz man/man1/ca.1.gz man/man1/ciphers.1.gz man/man1/cms.1.gz @@ -110,6 +111,7 @@ man/man1/dgst.1.gz man/man1/dhparam.1.gz man/man1/dsa.1.gz man/man1/dsaparam.1.gz +man/man1/dss1.1.gz man/man1/ec.1.gz man/man1/ecparam.1.gz man/man1/enc.1.gz @@ -142,6 +144,10 @@ man/man1/s_time.1.gz man/man1/sess_id.1.gz man/man1/sha.1.gz man/man1/sha1.1.gz +man/man1/sha224.1.gz +man/man1/sha256.1.gz +man/man1/sha384.1.gz +man/man1/sha512.1.gz man/man1/smime.1.gz man/man1/speed.1.gz man/man1/spkac.1.gz @@ -413,6 +419,7 @@ man/man3/CMS_add0_recipient_key.3.gz man/man3/CMS_add1_ReceiptRequest.3.gz man/man3/CMS_add1_cert.3.gz man/man3/CMS_add1_recipient_cert.3.gz +man/man3/CMS_add1_signer.3.gz man/man3/CMS_compress.3.gz man/man3/CMS_decrypt.3.gz man/man3/CMS_encrypt.3.gz @@ -427,7 +434,6 @@ man/man3/CMS_get1_crls.3.gz man/man3/CMS_set1_eContentType.3.gz man/man3/CMS_set1_signer_certs.3.gz man/man3/CMS_sign.3.gz -man/man3/CMS_sign_add1_signer.3.gz man/man3/CMS_sign_receipt.3.gz man/man3/CMS_uncompress.3.gz man/man3/CMS_verify.3.gz From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 20:44:42 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 20C1D29C; Wed, 15 Oct 2014 20:44:42 +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 0AC83E4B; Wed, 15 Oct 2014 20:44:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FKigBF053288; Wed, 15 Oct 2014 20:44:42 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FKieUS053279; Wed, 15 Oct 2014 20:44:40 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201410152044.s9FKieUS053279@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 15 Oct 2014 20:44:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370952 - in branches/2014Q4/www/mod_authnz_crowd: . 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, 15 Oct 2014 20:44:42 -0000 Author: ohauer Date: Wed Oct 15 20:44:40 2014 New Revision: 370952 URL: https://svnweb.freebsd.org/changeset/ports/370952 QAT: https://qat.redports.org/buildarchive/r370952/ Log: MFH: r370882 - fix build with apache24 - fix build with subversion 1.8.x PR: 193536 Submitted by: ohauer Approved by: Vick Khera (maintainer) Obtained from: https://bitbucket.org/atlassian/cwdapache/pull-request/18/added-apache-24-compatibility-and-fixed/diff [2] [1] fix shaped and tested by Vick Khera [2] based on Approved by: portmgr (mat) Added: branches/2014Q4/www/mod_authnz_crowd/files/patch-src__apache24_svn18 - copied unchanged from r370882, head/www/mod_authnz_crowd/files/patch-src__apache24_svn18 Modified: branches/2014Q4/www/mod_authnz_crowd/Makefile branches/2014Q4/www/mod_authnz_crowd/files/patch-configure.ac branches/2014Q4/www/mod_authnz_crowd/files/patch-src__Makefile.am branches/2014Q4/www/mod_authnz_crowd/files/patch-src__svn__Makefile.am branches/2014Q4/www/mod_authnz_crowd/pkg-descr Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/mod_authnz_crowd/Makefile ============================================================================== --- branches/2014Q4/www/mod_authnz_crowd/Makefile Wed Oct 15 20:28:48 2014 (r370951) +++ branches/2014Q4/www/mod_authnz_crowd/Makefile Wed Oct 15 20:44:40 2014 (r370952) @@ -3,13 +3,13 @@ PORTNAME= mod_authnz_crowd PORTVERSION= 2.2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://downloads.atlassian.com/software/crowd/downloads/cwdapache/ DIST_SUBDIR= apache2 MAINTAINER= vivek@khera.org -COMMENT= Apache 2.2.x module to use Atlassian Crowd for authentication +COMMENT= Apache 2.2+ module to use Atlassian Crowd for authentication LICENSE= APACHE20 @@ -22,19 +22,26 @@ LIBS+= -L${LOCALBASE}/lib USES= autoreconf libtool USE_GNOME= libxml2 USE_GCC= any -USE_APACHE= 22 +USE_APACHE= 22+ SUB_FILES= pkg-message zzz_authnz_crowd.conf SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} \ - APACHEMODDIR=${APACHEMODDIR} + APACHEMODDIR=${APACHEMODDIR} \ + AP_MODULE=mod_authnz_crowd PLIST_FILES= ${APACHEMODDIR}/mod_authnz_crowd.so \ + ${APACHEMODDIR}/mod_authnz_crowd.so.0.0.0 \ ${APACHEMODDIR}/mod_authz_svn_crowd.so \ + ${APACHEMODDIR}/mod_authz_svn_crowd.so.0.0.0 \ ${APACHEETCDIR}/Includes/zzz_authnz_crowd.conf post-patch: ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ ${WRKSRC}/src/Makefile.am + ${REINPLACE_CMD} -e 's|%%APACHEETCDIR%%|${APACHEETCDIR}|g' \ + -e 's|%%APACHEINCLUDEDIR%%|${APACHEINCLUDEDIR}|g' \ + -e 's|%%APACHEMODDIR%%|${APACHEMODDIR}|g' \ + ${WRKSRC}/configure.ac pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} Modified: branches/2014Q4/www/mod_authnz_crowd/files/patch-configure.ac ============================================================================== --- branches/2014Q4/www/mod_authnz_crowd/files/patch-configure.ac Wed Oct 15 20:28:48 2014 (r370951) +++ branches/2014Q4/www/mod_authnz_crowd/files/patch-configure.ac Wed Oct 15 20:44:40 2014 (r370952) @@ -1,22 +1,23 @@ ---- ./configure.ac.orig 2011-03-29 07:51:33.000000000 +0200 -+++ ./configure.ac 2013-06-22 22:54:04.000000000 +0200 +--- configure.ac.orig 2013-07-26 05:20:50 UTC ++++ configure.ac @@ -1,5 +1,6 @@ - AC_INIT([mod_authnz_crowd], [2.0.2], [support@atlassian.com]) - AM_INIT_AUTOMAKE([-Wall -Werror foreign]) + AC_INIT([mod_authnz_crowd], m4_esyscmd([./version-gen]), [support@atlassian.com]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Wall foreign]) +AM_PROG_AR AC_PROG_CC AC_PROG_LIBTOOL AC_CONFIG_HEADERS([config.h]) -@@ -12,7 +13,7 @@ +@@ -16,7 +17,7 @@ - AC_CHECK_LIB([apr-1], [apr_pool_pre_cleanup_register], [], [AC_MSG_ERROR([apr_pool_pre_cleanup_register was not found in libapr-1])]) + AC_CHECK_LIB([xml2], [xmlFree], [CFLAGS+=" `xml2-config --cflags`" LIBS+=" `xml2-config --libs`"], [AC_MSG_ERROR([libxml2 was not found])]) -AC_CHECK_FILE([/usr/local/apache2/include/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/apache2/include"], [ -+AC_CHECK_FILE([/usr/local/include/apache22/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/include/apache22"], [ ++AC_CHECK_FILE([/usr/local/%%APACHEINCLUDEDIR%%/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/%%APACHEINCLUDEDIR%%"], [ AC_CHECK_FILE([/usr/include/httpd/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/httpd"], [ AC_CHECK_FILE([/usr/include/apache2/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/apache2"], [ AC_MSG_ERROR([Could not locate Apache include directory]) -@@ -21,7 +22,7 @@ +@@ -25,7 +26,7 @@ ]) AC_SUBST([APACHE_INCLUDE_DIR]) @@ -25,25 +26,25 @@ APACHE_BIN_DIR=`AS_DIRNAME($HTTPD)` AC_SUBST([APACHE_BIN_DIR]) -@@ -32,7 +33,7 @@ +@@ -36,7 +37,7 @@ ]) AC_SUBST([SVN_DIR]) -AC_CHECK_FILE([/usr/libexec/apache2/mod_dav.so], [APACHE_MODULES_DIR="/usr/libexec/apache2"], [ -+AC_CHECK_FILE([/usr/local/libexec/apache22/mod_dav.so], [APACHE_MODULES_DIR="/usr/local/libexec/apache22"], [ ++AC_CHECK_FILE([/usr/local/%%APACHEMODDIR%%/mod_dav.so], [APACHE_MODULES_DIR="/usr/local/%%APACHEMODDIR%%"], [ AC_CHECK_FILE([/usr/lib64/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib64/httpd/modules"], [ AC_CHECK_FILE([/usr/lib/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/httpd/modules"], [ AC_CHECK_FILE([/usr/lib/apache2/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/apache2/modules"], [ -@@ -43,7 +44,7 @@ +@@ -47,7 +48,7 @@ ]) AC_SUBST([APACHE_MODULES_DIR]) -AC_CHECK_FILE([/usr/local/apache2/conf/httpd.conf], [HTTPD_CONF="/usr/local/apache2/conf/httpd.conf"], [ -+AC_CHECK_FILE([/usr/local/etc/apache22/httpd.conf], [HTTPD_CONF="/usr/local/etc/apache22/httpd.conf"], [ ++AC_CHECK_FILE([/usr/local/%%APACHEETCDIR%%/httpd.conf], [HTTPD_CONF="/usr/local/%%APACHEETCDIR%%/httpd.conf"], [ AC_CHECK_FILE([/etc/httpd/conf/httpd.conf], [HTTPD_CONF="/etc/httpd/conf/httpd.conf"], [ AC_CHECK_FILE([/etc/apache2/httpd.conf], [HTTPD_CONF="/etc/apache2/httpd.conf"], [ - AC_MSG_ERROR([Could not locate Apache configuration file]) -@@ -52,7 +53,7 @@ + AC_CHECK_FILE([/etc/apache2/apache2.conf], [HTTPD_CONF="/etc/apache2/apache2.conf"], [ +@@ -58,7 +59,7 @@ ]) AC_SUBST([HTTPD_CONF]) @@ -52,7 +53,7 @@ AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [ AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [ AC_MSG_ERROR([Could not locate Apache apxs binary]) -@@ -61,7 +62,7 @@ +@@ -67,7 +68,7 @@ ]) AC_SUBST([APXS]) Modified: branches/2014Q4/www/mod_authnz_crowd/files/patch-src__Makefile.am ============================================================================== --- branches/2014Q4/www/mod_authnz_crowd/files/patch-src__Makefile.am Wed Oct 15 20:28:48 2014 (r370951) +++ branches/2014Q4/www/mod_authnz_crowd/files/patch-src__Makefile.am Wed Oct 15 20:44:40 2014 (r370952) @@ -1,5 +1,5 @@ ---- src/Makefile.am-dist 2013-09-25 02:41:53.000000000 -0400 -+++ src/Makefile.am 2014-01-14 11:20:54.178664699 -0500 +--- src/Makefile.am.orig 2013-09-25 06:41:53 UTC ++++ src/Makefile.am @@ -3,9 +3,9 @@ lib_LTLIBRARIES = mod_authnz_crowd.la mod_authnz_crowd_la_SOURCES = mod_authnz_crowd.c mod_authnz_crowd.h crowd_client.c crowd_client.h cache.c cache.h util.c util.h Copied: branches/2014Q4/www/mod_authnz_crowd/files/patch-src__apache24_svn18 (from r370882, head/www/mod_authnz_crowd/files/patch-src__apache24_svn18) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/mod_authnz_crowd/files/patch-src__apache24_svn18 Wed Oct 15 20:44:40 2014 (r370952, copy of r370882, head/www/mod_authnz_crowd/files/patch-src__apache24_svn18) @@ -0,0 +1,193 @@ +diff --git a/src/crowd_client.c b/src/crowd_client.c +index c190d0b..9a42acf 100644 +--- a/src/crowd_client.c ++++ src/crowd_client.c +@@ -631,9 +631,15 @@ static char *make_app_cache_key(const request_rec *r, const crowd_config *config + } + + static char *make_session_cache_key(const char *token, const char *forwarded_for, const request_rec *r, const crowd_config *config) { ++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) ++ return log_ralloc(r, apr_psprintf(r->pool, "%s\037%s\037%s\037%s\037%s", token, ++ forwarded_for == NULL ? "" : forwarded_for, r->connection->client_ip, config->crowd_app_name, ++ config->crowd_url)); ++#else + return log_ralloc(r, apr_psprintf(r->pool, "%s\037%s\037%s\037%s\037%s", token, + forwarded_for == NULL ? "" : forwarded_for, r->connection->remote_ip, config->crowd_app_name, + config->crowd_url)); ++#endif + } + + /*========================== +@@ -764,9 +770,15 @@ static bool handle_crowd_create_session_session_element(write_data_t *write_data + } + + static const char *get_validation_factors(const request_rec *r, const char *forwarded_for) { ++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) ++ const char *payload_beginning = log_ralloc(r, apr_pstrcat(r->pool, ++ "remote_address", r->connection->client_ip, ++ "", NULL)); ++#else + const char *payload_beginning = log_ralloc(r, apr_pstrcat(r->pool, + "remote_address", r->connection->remote_ip, + "", NULL)); ++#endif + if (payload_beginning == NULL) { + return NULL; + } +@@ -863,7 +875,7 @@ static const char *make_validate_session_url(const request_rec *r, const crowd_c + + char *url = log_ralloc(r, apr_pstrcat(r->pool, urlWithoutToken, escapedToken, NULL)); + +- curl_free(escapedToken); ++ curl_free((void *)escapedToken); + + return url; + } +diff --git a/src/mod_authnz_crowd.c b/src/mod_authnz_crowd.c +index 44232a2..e9f849b 100644 +--- a/src/mod_authnz_crowd.c ++++ src/mod_authnz_crowd.c +@@ -520,7 +520,6 @@ static authn_status authn_crowd_check_password(request_rec *r, const char *user, + static const authn_provider authn_crowd_provider = + { + &authn_crowd_check_password, /* Callback for HTTP Basic authentication */ +- NULL /* Callback for HTTP Digest authentication */ + }; + + static unsigned int parse_number(const char *string, const char *name, unsigned int min, unsigned int max, +@@ -611,6 +610,83 @@ apr_array_header_t *authnz_crowd_user_groups(const char *username, request_rec * + * @param r the current request + * @return OK, DECLINED, or HTTP_... + */ ++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) ++static authz_status auth_group_checker(request_rec *r, ++ const char *require_line, ++ const void *parsed_require_args) { ++ const char *t, *w; ++ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "mod_authnz_crowd:auth_group_checker"); ++ ++ authnz_crowd_dir_config *config = get_config(r); ++ if (config == NULL) { ++ return AUTHZ_GENERAL_ERROR; ++ } ++ ++ if (r->user == NULL) { ++ ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, "Authorisation requested, but no user provided."); ++ return AUTHZ_DENIED_NO_USER; ++ } ++ ++ apr_array_header_t *user_groups = NULL; ++ ++ /* Fetch groups only if actually needed. */ ++ if (user_groups == NULL) { ++ user_groups = crowd_user_groups(r->user, r, config->crowd_config); ++ if (user_groups == NULL) { ++ return AUTHZ_GENERAL_ERROR; ++ } ++ } ++ ++ /* Iterate over the groups mentioned in the requirement. */ ++ t = require_line; ++ while ((w = ap_getword_conf(r->pool, &t)) && w[0]) { ++ int y; ++ for (y = 0; y < user_groups->nelts; y++) { ++ const char *user_group = APR_ARRAY_IDX(user_groups, y, const char *); ++ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, ++ "auth_group_checker: user_group=%s, required_group=%s", user_group, w); ++ if (strcasecmp(user_group, w) == 0) { ++ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, ++ "Granted authorisation to '%s' on the basis of membership of '%s'.", r->user, user_group); ++ return AUTHZ_GRANTED; ++ } ++ } ++ ++ } ++ ++ ++ ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, "Denied authorisation to '%s'.", r->user); ++ return AUTHZ_DENIED; ++} ++ ++static const authz_provider authz_crowd_group_provider = ++{ ++ &auth_group_checker, ++ NULL, ++}; ++ ++static void register_hooks(apr_pool_t *p) ++{ ++ ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE); ++ ap_hook_check_user_id(check_user_id, NULL, NULL, APR_HOOK_FIRST); ++ ap_register_auth_provider( ++ p, ++ AUTHN_PROVIDER_GROUP, ++ "crowd", ++ AUTHN_PROVIDER_VERSION, ++ &authn_crowd_provider, AP_AUTH_INTERNAL_PER_CONF ++ ); ++ ++ // Require crowd-group group1 group2 ... ++ ap_register_auth_provider( ++ p, ++ AUTHZ_PROVIDER_GROUP, ++ "crowd-group", ++ AUTHZ_PROVIDER_VERSION, ++ &authz_crowd_group_provider, AP_AUTH_INTERNAL_PER_CONF ++ ); ++} ++#else + static int auth_checker(request_rec *r) { + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "mod_authnz_crowd:auth_checker"); + +@@ -690,6 +766,9 @@ static void register_hooks(apr_pool_t *p) + ap_hook_auth_checker(auth_checker, pre_auth_checker, NULL, APR_HOOK_MIDDLE); + } + ++#endif ++ ++ + module AP_MODULE_DECLARE_DATA authnz_crowd_module = + { + STANDARD20_MODULE_STUFF, +diff --git a/src/svn/mod_authz_svn_crowd.c b/src/svn/mod_authz_svn_crowd.c +index 69b9aa0..3164a40 100644 +--- a/src/svn/mod_authz_svn_crowd.c ++++ src/svn/mod_authz_svn_crowd.c +@@ -50,6 +50,7 @@ + + #include + #include ++#include + + const char * + svn_fspath__canonicalize(const char *fspath, +@@ -73,6 +74,7 @@ typedef struct authz_svn_config_rec { + const char *base_path; + const char *access_file; + const char *repo_relative_access_file; ++ const char *groups_file; // rwb + const char *force_username_case; + } authz_svn_config_rec; + +@@ -105,6 +107,12 @@ struct svn_config_t + /* Temporary value used for expanded default values in svn_config_get. + (Using a stringbuf so that frequent resetting is efficient.) */ + svn_stringbuf_t *tmp_value; ++ ++#if SVN_VER_MINOR >= 7 ++ /* Specifies whether section names are populated case sensitively. */ ++ svn_boolean_t section_names_case_sensitive; ++#endif ++ + }; + + typedef struct +@@ -113,7 +121,7 @@ typedef struct + const char *name; + + /* The section name, converted into a hash key. */ +- const char *hash_key; ++ // const char *hash_key; + + /* Table of cfg_option_t's. */ + apr_hash_t *options; Modified: branches/2014Q4/www/mod_authnz_crowd/files/patch-src__svn__Makefile.am ============================================================================== --- branches/2014Q4/www/mod_authnz_crowd/files/patch-src__svn__Makefile.am Wed Oct 15 20:28:48 2014 (r370951) +++ branches/2014Q4/www/mod_authnz_crowd/files/patch-src__svn__Makefile.am Wed Oct 15 20:44:40 2014 (r370952) @@ -1,5 +1,5 @@ ---- ./src/svn/Makefile.am.orig 2011-03-29 07:51:32.000000000 +0200 -+++ ./src/svn/Makefile.am 2013-06-22 22:54:04.000000000 +0200 +--- src/svn/Makefile.am.orig 2013-07-26 05:20:50 UTC ++++ src/svn/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = mod_authz_svn_crowd.la mod_authz_svn_crowd_la_SOURCES = mod_authz_svn_crowd.c Modified: branches/2014Q4/www/mod_authnz_crowd/pkg-descr ============================================================================== --- branches/2014Q4/www/mod_authnz_crowd/pkg-descr Wed Oct 15 20:28:48 2014 (r370951) +++ branches/2014Q4/www/mod_authnz_crowd/pkg-descr Wed Oct 15 20:44:40 2014 (r370952) @@ -1,4 +1,4 @@ -Apache 2.2 connector for Atlassian Crowd to provide authentication and +Apache 2.2/2.4 connector for Atlassian Crowd to provide authentication and authorization support using Basic Auth. WWW: https://confluence.atlassian.com/display/CROWD/Integrating+Crowd+with+Apache From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 20:47:15 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 D7A9558C; Wed, 15 Oct 2014 20:47:15 +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 B8A76E7A; Wed, 15 Oct 2014 20:47:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FKlF4l053817; Wed, 15 Oct 2014 20:47:15 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FKlFKv053813; Wed, 15 Oct 2014 20:47:15 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201410152047.s9FKlFKv053813@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 15 Oct 2014 20:47:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370953 - branches/2014Q4/japanese/bugzilla44 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, 15 Oct 2014 20:47:16 -0000 Author: ohauer Date: Wed Oct 15 20:47:14 2014 New Revision: 370953 URL: https://svnweb.freebsd.org/changeset/ports/370953 QAT: https://qat.redports.org/buildarchive/r370953/ Log: MFH: r370883 - update to version 4.4.6 - adopt new pkg-plist style Submitted by: tota Approved by: portmgr (mat) Modified: branches/2014Q4/japanese/bugzilla44/Makefile branches/2014Q4/japanese/bugzilla44/distinfo branches/2014Q4/japanese/bugzilla44/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/japanese/bugzilla44/Makefile ============================================================================== --- branches/2014Q4/japanese/bugzilla44/Makefile Wed Oct 15 20:44:40 2014 (r370952) +++ branches/2014Q4/japanese/bugzilla44/Makefile Wed Oct 15 20:47:14 2014 (r370953) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.5 +PORTVERSION= 4.4.6 CATEGORIES= japanese MASTER_SITES= http://bug-ja.org/releases/4.4/ \ LOCAL @@ -28,8 +28,6 @@ do-install: # Maintainer plist: patch @( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) - @( cd ${WRKDIR}/ && ${FIND} default -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/ja/"$$1}' | ${SORT} -r >> ${PLIST}.new ) - @${ECHO} "@dirrmtry %%WWWDIR%%/template/ja" >> ${PLIST}.new @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ ${ECHO_MSG} no pkg-plist changes; \ ${RM} ${PLIST}.new ; \ Modified: branches/2014Q4/japanese/bugzilla44/distinfo ============================================================================== --- branches/2014Q4/japanese/bugzilla44/distinfo Wed Oct 15 20:44:40 2014 (r370952) +++ branches/2014Q4/japanese/bugzilla44/distinfo Wed Oct 15 20:47:14 2014 (r370953) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/Bugzilla-ja-4.4.5-template.tar.bz2) = 61a4663e08260b753d6484274954d5f07e855b76aba81600a6d6fc5f03209da9 -SIZE (bugzilla/Bugzilla-ja-4.4.5-template.tar.bz2) = 241062 +SHA256 (bugzilla/Bugzilla-ja-4.4.6-template.tar.bz2) = 45a980758cf145a35fa471badde6d4be5d0cb1655dbad8221ae96fa11929a5bd +SIZE (bugzilla/Bugzilla-ja-4.4.6-template.tar.bz2) = 241047 Modified: branches/2014Q4/japanese/bugzilla44/pkg-plist ============================================================================== --- branches/2014Q4/japanese/bugzilla44/pkg-plist Wed Oct 15 20:44:40 2014 (r370952) +++ branches/2014Q4/japanese/bugzilla44/pkg-plist Wed Oct 15 20:47:14 2014 (r370953) @@ -276,43 +276,3 @@ %%WWWDIR%%/template/ja/default/whine/mail.txt.tmpl %%WWWDIR%%/template/ja/default/whine/multipart-mime.txt.tmpl %%WWWDIR%%/template/ja/default/whine/schedule.html.tmpl -@dirrmtry %%WWWDIR%%/template/ja/default/whine -@dirrmtry %%WWWDIR%%/template/ja/default/setup -@dirrmtry %%WWWDIR%%/template/ja/default/search -@dirrmtry %%WWWDIR%%/template/ja/default/request -@dirrmtry %%WWWDIR%%/template/ja/default/reports -@dirrmtry %%WWWDIR%%/template/ja/default/pages -@dirrmtry %%WWWDIR%%/template/ja/default/list -@dirrmtry %%WWWDIR%%/template/ja/default/global -@dirrmtry %%WWWDIR%%/template/ja/default/flag -@dirrmtry %%WWWDIR%%/template/ja/default/extensions -@dirrmtry %%WWWDIR%%/template/ja/default/email -@dirrmtry %%WWWDIR%%/template/ja/default/bug/process -@dirrmtry %%WWWDIR%%/template/ja/default/bug/create -@dirrmtry %%WWWDIR%%/template/ja/default/bug/activity -@dirrmtry %%WWWDIR%%/template/ja/default/bug -@dirrmtry %%WWWDIR%%/template/ja/default/attachment -@dirrmtry %%WWWDIR%%/template/ja/default/admin/workflow -@dirrmtry %%WWWDIR%%/template/ja/default/admin/versions -@dirrmtry %%WWWDIR%%/template/ja/default/admin/users -@dirrmtry %%WWWDIR%%/template/ja/default/admin/settings -@dirrmtry %%WWWDIR%%/template/ja/default/admin/sanitycheck -@dirrmtry %%WWWDIR%%/template/ja/default/admin/products/groupcontrol -@dirrmtry %%WWWDIR%%/template/ja/default/admin/products -@dirrmtry %%WWWDIR%%/template/ja/default/admin/params -@dirrmtry %%WWWDIR%%/template/ja/default/admin/milestones -@dirrmtry %%WWWDIR%%/template/ja/default/admin/keywords -@dirrmtry %%WWWDIR%%/template/ja/default/admin/groups -@dirrmtry %%WWWDIR%%/template/ja/default/admin/flag-type -@dirrmtry %%WWWDIR%%/template/ja/default/admin/fieldvalues -@dirrmtry %%WWWDIR%%/template/ja/default/admin/custom_fields -@dirrmtry %%WWWDIR%%/template/ja/default/admin/components -@dirrmtry %%WWWDIR%%/template/ja/default/admin/classifications -@dirrmtry %%WWWDIR%%/template/ja/default/admin -@dirrmtry %%WWWDIR%%/template/ja/default/account/prefs -@dirrmtry %%WWWDIR%%/template/ja/default/account/password -@dirrmtry %%WWWDIR%%/template/ja/default/account/email -@dirrmtry %%WWWDIR%%/template/ja/default/account/auth -@dirrmtry %%WWWDIR%%/template/ja/default/account -@dirrmtry %%WWWDIR%%/template/ja/default -@dirrmtry %%WWWDIR%%/template/ja From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 20:49:23 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 8D1056A4; Wed, 15 Oct 2014 20:49:23 +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 793DFE89; Wed, 15 Oct 2014 20:49:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FKnNwx054222; Wed, 15 Oct 2014 20:49:23 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FKnMeV054219; Wed, 15 Oct 2014 20:49:22 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201410152049.s9FKnMeV054219@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Wed, 15 Oct 2014 20:49:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370954 - branches/2014Q4/german/bugzilla44 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, 15 Oct 2014 20:49:23 -0000 Author: ohauer Date: Wed Oct 15 20:49:22 2014 New Revision: 370954 URL: https://svnweb.freebsd.org/changeset/ports/370954 QAT: https://qat.redports.org/buildarchive/r370954/ Log: MFH: r370884 - update to version 4.4.6 - adopt new pkg-plist style Approved by: portmgr (mat) Modified: branches/2014Q4/german/bugzilla44/Makefile branches/2014Q4/german/bugzilla44/distinfo branches/2014Q4/german/bugzilla44/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/german/bugzilla44/Makefile ============================================================================== --- branches/2014Q4/german/bugzilla44/Makefile Wed Oct 15 20:47:14 2014 (r370953) +++ branches/2014Q4/german/bugzilla44/Makefile Wed Oct 15 20:49:22 2014 (r370954) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.5 +PORTVERSION= 4.4.6 CATEGORIES= german MASTER_SITES= SF MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION} @@ -36,7 +36,6 @@ do-install: # Maintainer plist: patch @( cd ${WRKDIR}/ && ${FIND} de -type f | ${AWK} '{print "%%WWWDIR%%/template/"$$1}' | ${SORT} > ${PLIST}.new ) - @( cd ${WRKDIR}/ && ${FIND} de -type d | ${AWK} '{print "@dirrmtry %%WWWDIR%%/template/"$$1}' | ${SORT} -r >> ${PLIST}.new ) @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ ${ECHO_MSG} no pkg-plist changes; \ ${RM} ${PLIST}.new ; \ Modified: branches/2014Q4/german/bugzilla44/distinfo ============================================================================== --- branches/2014Q4/german/bugzilla44/distinfo Wed Oct 15 20:47:14 2014 (r370953) +++ branches/2014Q4/german/bugzilla44/distinfo Wed Oct 15 20:49:22 2014 (r370954) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/germzilla-4.4.5-1.utf-8.tar.gz) = f5ca4e50288b676569d55bf22a2979fb002f03c4ff94d9e0079072d9157f35c2 -SIZE (bugzilla/germzilla-4.4.5-1.utf-8.tar.gz) = 263069 +SHA256 (bugzilla/germzilla-4.4.6-1.utf-8.tar.gz) = 90d984c03b5e15897d90293039b6fa448b538b9c690d3d75ecdafa04c5d793e2 +SIZE (bugzilla/germzilla-4.4.6-1.utf-8.tar.gz) = 263017 Modified: branches/2014Q4/german/bugzilla44/pkg-plist ============================================================================== --- branches/2014Q4/german/bugzilla44/pkg-plist Wed Oct 15 20:47:14 2014 (r370953) +++ branches/2014Q4/german/bugzilla44/pkg-plist Wed Oct 15 20:49:22 2014 (r370954) @@ -241,42 +241,3 @@ %%WWWDIR%%/template/de/default/whine/mail.txt.tmpl %%WWWDIR%%/template/de/default/whine/multipart-mime.txt.tmpl %%WWWDIR%%/template/de/default/whine/schedule.html.tmpl -@dirrmtry %%WWWDIR%%/template/de/default/whine -@dirrmtry %%WWWDIR%%/template/de/default/setup -@dirrmtry %%WWWDIR%%/template/de/default/search -@dirrmtry %%WWWDIR%%/template/de/default/request -@dirrmtry %%WWWDIR%%/template/de/default/reports -@dirrmtry %%WWWDIR%%/template/de/default/pages -@dirrmtry %%WWWDIR%%/template/de/default/list -@dirrmtry %%WWWDIR%%/template/de/default/global -@dirrmtry %%WWWDIR%%/template/de/default/flag -@dirrmtry %%WWWDIR%%/template/de/default/email -@dirrmtry %%WWWDIR%%/template/de/default/bug/process -@dirrmtry %%WWWDIR%%/template/de/default/bug/create -@dirrmtry %%WWWDIR%%/template/de/default/bug/activity -@dirrmtry %%WWWDIR%%/template/de/default/bug -@dirrmtry %%WWWDIR%%/template/de/default/attachment -@dirrmtry %%WWWDIR%%/template/de/default/admin/workflow -@dirrmtry %%WWWDIR%%/template/de/default/admin/versions -@dirrmtry %%WWWDIR%%/template/de/default/admin/users -@dirrmtry %%WWWDIR%%/template/de/default/admin/settings -@dirrmtry %%WWWDIR%%/template/de/default/admin/sanitycheck -@dirrmtry %%WWWDIR%%/template/de/default/admin/products/groupcontrol -@dirrmtry %%WWWDIR%%/template/de/default/admin/products -@dirrmtry %%WWWDIR%%/template/de/default/admin/params -@dirrmtry %%WWWDIR%%/template/de/default/admin/milestones -@dirrmtry %%WWWDIR%%/template/de/default/admin/keywords -@dirrmtry %%WWWDIR%%/template/de/default/admin/groups -@dirrmtry %%WWWDIR%%/template/de/default/admin/flag-type -@dirrmtry %%WWWDIR%%/template/de/default/admin/fieldvalues -@dirrmtry %%WWWDIR%%/template/de/default/admin/custom_fields -@dirrmtry %%WWWDIR%%/template/de/default/admin/components -@dirrmtry %%WWWDIR%%/template/de/default/admin/classifications -@dirrmtry %%WWWDIR%%/template/de/default/admin -@dirrmtry %%WWWDIR%%/template/de/default/account/prefs -@dirrmtry %%WWWDIR%%/template/de/default/account/password -@dirrmtry %%WWWDIR%%/template/de/default/account/email -@dirrmtry %%WWWDIR%%/template/de/default/account/auth -@dirrmtry %%WWWDIR%%/template/de/default/account -@dirrmtry %%WWWDIR%%/template/de/default -@dirrmtry %%WWWDIR%%/template/de From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 21:55:38 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 53A731B9; Wed, 15 Oct 2014 21:55:38 +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 3D74C83D; Wed, 15 Oct 2014 21:55:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FLtcnH087337; Wed, 15 Oct 2014 21:55:38 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FLtYOI087308; Wed, 15 Oct 2014 21:55:34 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201410152155.s9FLtYOI087308@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 15 Oct 2014 21:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370959 - in branches/2014Q4/www/chromium: . 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, 15 Oct 2014 21:55:38 -0000 Author: rene Date: Wed Oct 15 21:55:33 2014 New Revision: 370959 URL: https://svnweb.freebsd.org/changeset/ports/370959 QAT: https://qat.redports.org/buildarchive/r370959/ Log: MFH: r370928 www/chromium: desupport SSLv3.0, taken from upstream GIT repository. While here really fix the desktop icon. Bump PORTREVISION Obtained from: https://chromium.googlesource.com/chromium/src/+/701bb044ac5ad4f1572e86b83a673cc49383efb4 Obtained from: https://chromium.googlesource.com/chromium/src/+/32352ad08ee673a4d43e8593ce988b224f6482d3 Security: CVE-2014-3566 ("Poodle") Approved by: portmgr (bdrewery) Added: branches/2014Q4/www/chromium/files/patch-chrome__app__generated_resources.grd - copied unchanged from r370928, head/www/chromium/files/patch-chrome__app__generated_resources.grd branches/2014Q4/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc - copied unchanged from r370928, head/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc - copied unchanged from r370928, head/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc branches/2014Q4/www/chromium/files/patch-chrome__common__localized_error.cc - copied unchanged from r370928, head/www/chromium/files/patch-chrome__common__localized_error.cc branches/2014Q4/www/chromium/files/patch-net__base__net_error_list.h - copied unchanged from r370928, head/www/chromium/files/patch-net__base__net_error_list.h branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc - copied unchanged from r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc - copied unchanged from r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.cc - copied unchanged from r370928, head/www/chromium/files/patch-net__ssl__ssl_config.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.h - copied unchanged from r370928, head/www/chromium/files/patch-net__ssl__ssl_config.h branches/2014Q4/www/chromium/files/patch-tools__metrics__histograms__histograms.xml - copied unchanged from r370928, head/www/chromium/files/patch-tools__metrics__histograms__histograms.xml Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/files/chromium-browser.desktop.in branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/Makefile Wed Oct 15 21:55:33 2014 (r370959) @@ -3,7 +3,7 @@ PORTNAME= chromium PORTVERSION= 38.0.2125.101 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q4/www/chromium/files/chromium-browser.desktop.in ============================================================================== --- branches/2014Q4/www/chromium/files/chromium-browser.desktop.in Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/files/chromium-browser.desktop.in Wed Oct 15 21:55:33 2014 (r370959) @@ -4,7 +4,7 @@ Version=1.0 Encoding=UTF-8 Name=Chromium Comment=%%COMMENT%% -Icon=%%DATADIR%%/product_logo_48.png +Icon=chrome Exec=chrome %U Categories=Application;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Copied: branches/2014Q4/www/chromium/files/patch-chrome__app__generated_resources.grd (from r370928, head/www/chromium/files/patch-chrome__app__generated_resources.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__generated_resources.grd Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-chrome__app__generated_resources.grd) @@ -0,0 +1,19 @@ +--- chrome/app/generated_resources.grd.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/generated_resources.grd +@@ -9024,6 +9024,16 @@ + SSL protocol error. + + ++ ++ SSL server probably obsolete. ++ ++ ++ Unable to connect securely to the server. This website may have worked previously, but connecting to such sites has now been shown to cause security risks to all users and thus has been disabled for your safety. ++ ++ ++ An SSLv3 fallback was able to handshake with the server, but we no longer accept SSLv3 fallbacks due to new attacks against the protocol. The server needs to be updated to support a minimum of TLS 1.0 and preferably TLS 1.2. ++ ++ + + Incorrect certificate for host. + Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc (from r370928, head/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc) @@ -0,0 +1,57 @@ +--- chrome/browser/net/ssl_config_service_manager_pref.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/net/ssl_config_service_manager_pref.cc +@@ -174,6 +174,7 @@ + BooleanPrefMember rev_checking_required_local_anchors_; + StringPrefMember ssl_version_min_; + StringPrefMember ssl_version_max_; ++ StringPrefMember ssl_version_fallback_min_; + BooleanPrefMember ssl_record_splitting_disabled_; + + // The cached list of disabled SSL cipher suites. +@@ -204,6 +205,8 @@ + prefs::kSSLVersionMin, local_state, local_state_callback); + ssl_version_max_.Init( + prefs::kSSLVersionMax, local_state, local_state_callback); ++ ssl_version_fallback_min_.Init( ++ prefs::kSSLVersionFallbackMin, local_state, local_state_callback); + ssl_record_splitting_disabled_.Init( + prefs::kDisableSSLRecordSplitting, local_state, local_state_callback); + +@@ -230,8 +233,12 @@ + SSLProtocolVersionToString(default_config.version_min); + std::string version_max_str = + SSLProtocolVersionToString(default_config.version_max); ++ std::string version_fallback_min_str = ++ SSLProtocolVersionToString(default_config.version_fallback_min); + registry->RegisterStringPref(prefs::kSSLVersionMin, version_min_str); + registry->RegisterStringPref(prefs::kSSLVersionMax, version_max_str); ++ registry->RegisterStringPref(prefs::kSSLVersionFallbackMin, ++ version_fallback_min_str); + registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting, + !default_config.false_start_enabled); + registry->RegisterListPref(prefs::kCipherSuiteBlacklist); +@@ -275,10 +282,14 @@ + rev_checking_required_local_anchors_.GetValue(); + std::string version_min_str = ssl_version_min_.GetValue(); + std::string version_max_str = ssl_version_max_.GetValue(); ++ std::string version_fallback_min_str = ssl_version_fallback_min_.GetValue(); + config->version_min = net::kDefaultSSLVersionMin; + config->version_max = net::kDefaultSSLVersionMax; ++ config->version_fallback_min = net::kDefaultSSLVersionFallbackMin; + uint16 version_min = SSLProtocolVersionFromString(version_min_str); + uint16 version_max = SSLProtocolVersionFromString(version_max_str); ++ uint16 version_fallback_min = ++ SSLProtocolVersionFromString(version_fallback_min_str); + if (version_min) { + // TODO(wtc): get the minimum SSL protocol version supported by the + // SSLClientSocket class. Right now it happens to be the same as the +@@ -293,6 +304,9 @@ + uint16 supported_version_max = config->version_max; + config->version_max = std::min(supported_version_max, version_max); + } ++ if (version_fallback_min) { ++ config->version_fallback_min = version_fallback_min; ++ } + config->disabled_cipher_suites = disabled_cipher_suites_; + // disabling False Start also happens to disable record splitting. + config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue(); Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc (from r370928, head/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc) @@ -0,0 +1,10 @@ +--- chrome/browser/prefs/command_line_pref_store.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/prefs/command_line_pref_store.cc +@@ -33,6 +33,7 @@ + { switches::kDiskCacheDir, prefs::kDiskCacheDir }, + { switches::kSSLVersionMin, prefs::kSSLVersionMin }, + { switches::kSSLVersionMax, prefs::kSSLVersionMax }, ++ { switches::kSSLVersionFallbackMin, prefs::kSSLVersionFallbackMin }, + }; + + const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry Modified: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc Wed Oct 15 21:55:33 2014 (r370959) @@ -1,6 +1,17 @@ ---- chrome/common/chrome_switches.cc.orig 2014-10-02 17:39:46 UTC -+++ chrome/common/chrome_switches.cc -@@ -1277,13 +1277,13 @@ +--- chrome/common/chrome_switches.cc.orig 2014-10-02 19:39:46.000000000 +0200 ++++ chrome/common/chrome_switches.cc 2014-10-15 11:59:52.000000000 +0200 +@@ -1127,6 +1127,10 @@ + // "tls1.2"). + const char kSSLVersionMin[] = "ssl-version-min"; + ++// Specifies the minimum SSL/TLS version ("ssl3", "tls1", "tls1.1", or ++// "tls1.2") that TLS fallback will accept. ++const char kSSLVersionFallbackMin[] = "ssl-version-fallback-min"; ++ + // Starts the browser maximized, regardless of any previous settings. + const char kStartMaximized[] = "start-maximized"; + +@@ -1277,13 +1281,13 @@ const char kPasswordStore[] = "password-store"; #endif Modified: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h Wed Oct 15 21:55:33 2014 (r370959) @@ -1,6 +1,14 @@ ---- chrome/common/chrome_switches.h.orig 2014-10-02 17:39:46 UTC -+++ chrome/common/chrome_switches.h -@@ -362,7 +362,7 @@ +--- chrome/common/chrome_switches.h.orig 2014-10-02 19:39:46.000000000 +0200 ++++ chrome/common/chrome_switches.h 2014-10-15 11:59:52.000000000 +0200 +@@ -309,6 +309,7 @@ + extern const char kSpellingServiceFeedbackIntervalSeconds[]; + extern const char kSSLVersionMax[]; + extern const char kSSLVersionMin[]; ++extern const char kSSLVersionFallbackMin[]; + extern const char kStartMaximized[]; + extern const char kSupervisedUserId[]; + extern const char kSupervisedUserSyncToken[]; +@@ -362,7 +363,7 @@ extern const char kPasswordStore[]; #endif Copied: branches/2014Q4/www/chromium/files/patch-chrome__common__localized_error.cc (from r370928, head/www/chromium/files/patch-chrome__common__localized_error.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__localized_error.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-chrome__common__localized_error.cc) @@ -0,0 +1,35 @@ +--- chrome/common/localized_error.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/common/localized_error.cc +@@ -40,6 +40,8 @@ + static const char kWeakDHKeyLearnMoreUrl[] = + "http://sites.google.com/a/chromium.org/dev/" + "err_ssl_weak_server_ephemeral_dh_key"; ++static const char kSSLv3FallbackUrl[] = ++ "https://code.google.com/p/chromium/issues/detail?id=418848"; + #if defined(OS_CHROMEOS) + static const char kAppWarningLearnMoreUrl[] = + "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html" +@@ -301,6 +303,13 @@ + IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, + SUGGEST_CHECK_CONNECTION, + }, ++ {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, ++ IDS_ERRORPAGES_TITLE_LOAD_FAILED, ++ IDS_ERRORPAGES_HEADING_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, ++ IDS_ERRORPAGES_SUMMARY_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, ++ IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, ++ SUGGEST_LEARNMORE, ++ }, + }; + + // Special error page to be used in the case of navigating back to a page +@@ -796,6 +805,9 @@ + case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: + learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); + break; ++ case net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION: ++ learn_more_url = GURL(kSSLv3FallbackUrl); ++ break; + default: + break; + } Modified: branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc Wed Oct 15 21:55:33 2014 (r370959) @@ -1,5 +1,5 @@ ---- chrome/common/pref_names.cc.orig 2014-10-02 17:39:46 UTC -+++ chrome/common/pref_names.cc +--- chrome/common/pref_names.cc.orig 2014-10-02 19:39:46.000000000 +0200 ++++ chrome/common/pref_names.cc 2014-10-15 11:59:52.000000000 +0200 @@ -898,7 +898,7 @@ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. const char kForceSafeSearch[] = "settings.force_safesearch"; @@ -9,3 +9,11 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif +@@ -1288,6 +1288,7 @@ + "ssl.rev_checking.required_for_local_anchors"; + const char kSSLVersionMin[] = "ssl.version_min"; + const char kSSLVersionMax[] = "ssl.version_max"; ++const char kSSLVersionFallbackMin[] = "ssl.version_fallback_min"; + const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; + const char kDisableSSLRecordSplitting[] = "ssl.ssl_record_splitting.disabled"; + Modified: branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h Wed Oct 15 21:48:04 2014 (r370958) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h Wed Oct 15 21:55:33 2014 (r370959) @@ -1,5 +1,5 @@ ---- chrome/common/pref_names.h.orig 2014-10-02 17:39:46 UTC -+++ chrome/common/pref_names.h +--- chrome/common/pref_names.h.orig 2014-10-02 19:39:46.000000000 +0200 ++++ chrome/common/pref_names.h 2014-10-15 11:59:52.000000000 +0200 @@ -291,7 +291,7 @@ extern const char kForceSafeSearch[]; extern const char kDeleteTimePeriod[]; @@ -9,3 +9,11 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; +@@ -405,6 +405,7 @@ + extern const char kCertRevocationCheckingRequiredLocalAnchors[]; + extern const char kSSLVersionMin[]; + extern const char kSSLVersionMax[]; ++extern const char kSSLVersionFallbackMin[]; + extern const char kCipherSuiteBlacklist[]; + extern const char kDisableSSLRecordSplitting[]; + Copied: branches/2014Q4/www/chromium/files/patch-net__base__net_error_list.h (from r370928, head/www/chromium/files/patch-net__base__net_error_list.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-net__base__net_error_list.h Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-net__base__net_error_list.h) @@ -0,0 +1,13 @@ +--- net/base/net_error_list.h.orig 2014-10-02 17:18:59 UTC ++++ net/base/net_error_list.h +@@ -336,6 +336,10 @@ + // library. + NET_ERROR(SSL_CLIENT_AUTH_CERT_BAD_FORMAT, -164) + ++// The SSL server requires falling back to a version older than the configured ++// minimum fallback version, and thus fallback failed. ++NET_ERROR(SSL_FALLBACK_BEYOND_MINIMUM_VERSION, -165) ++ + // Certificate error codes + // + // The values of certificate error codes must be consecutive. Copied: branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc (from r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc) @@ -0,0 +1,14 @@ +--- net/socket/ssl_client_socket_nss.cc.orig 2014-10-02 17:39:47 UTC ++++ net/socket/ssl_client_socket_nss.cc +@@ -3330,6 +3330,11 @@ + EnterFunction(result); + + if (result == OK) { ++ if (ssl_config_.version_fallback && ++ ssl_config_.version_max < ssl_config_.version_fallback_min) { ++ return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION; ++ } ++ + // SSL handshake is completed. Let's verify the certificate. + GotoState(STATE_VERIFY_CERT); + // Done! Copied: branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc (from r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc) @@ -0,0 +1,14 @@ +--- net/socket/ssl_client_socket_openssl.cc.orig 2014-10-02 17:39:47 UTC ++++ net/socket/ssl_client_socket_openssl.cc +@@ -890,6 +890,11 @@ + << " is: " << (SSL_session_reused(ssl_) ? "Success" : "Fail"); + } + ++ if (ssl_config_.version_fallback && ++ ssl_config_.version_max < ssl_config_.version_fallback_min) { ++ return ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION; ++ } ++ + // SSL handshake is completed. If NPN wasn't negotiated, see if ALPN was. + if (npn_status_ == kNextProtoUnsupported) { + const uint8_t* alpn_proto = NULL; Copied: branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.cc (from r370928, head/www/chromium/files/patch-net__ssl__ssl_config.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.cc Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-net__ssl__ssl_config.cc) @@ -0,0 +1,19 @@ +--- net/ssl/ssl_config.cc.orig 2014-10-02 17:39:47 UTC ++++ net/ssl/ssl_config.cc +@@ -25,6 +25,8 @@ + SSL_PROTOCOL_VERSION_TLS1_2; + #endif + ++const uint16 kDefaultSSLVersionFallbackMin = SSL_PROTOCOL_VERSION_TLS1; ++ + SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} + + SSLConfig::CertAndStatus::~CertAndStatus() {} +@@ -34,6 +36,7 @@ + rev_checking_required_local_anchors(false), + version_min(kDefaultSSLVersionMin), + version_max(kDefaultSSLVersionMax), ++ version_fallback_min(kDefaultSSLVersionFallbackMin), + channel_id_enabled(true), + false_start_enabled(true), + signed_cert_timestamps_enabled(true), Copied: branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.h (from r370928, head/www/chromium/files/patch-net__ssl__ssl_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.h Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-net__ssl__ssl_config.h) @@ -0,0 +1,25 @@ +--- net/ssl/ssl_config.h.orig 2014-10-02 17:19:00 UTC ++++ net/ssl/ssl_config.h +@@ -32,6 +32,9 @@ + // Default maximum protocol version. + NET_EXPORT extern const uint16 kDefaultSSLVersionMax; + ++// Default minimum protocol version that it's acceptable to fallback to. ++NET_EXPORT extern const uint16 kDefaultSSLVersionFallbackMin; ++ + // A collection of SSL-related configuration settings. + struct NET_EXPORT SSLConfig { + // Default to revocation checking. +@@ -73,6 +76,12 @@ + uint16 version_min; + uint16 version_max; + ++ // version_fallback_min contains the minimum version that is acceptable to ++ // fallback to. Versions before this may be tried to see whether they would ++ // have succeeded and thus to give a better message to the user, but the ++ // resulting connection won't be used in these cases. ++ uint16 version_fallback_min; ++ + // Presorted list of cipher suites which should be explicitly prevented from + // being used in addition to those disabled by the net built-in policy. + // Copied: branches/2014Q4/www/chromium/files/patch-tools__metrics__histograms__histograms.xml (from r370928, head/www/chromium/files/patch-tools__metrics__histograms__histograms.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-tools__metrics__histograms__histograms.xml Wed Oct 15 21:55:33 2014 (r370959, copy of r370928, head/www/chromium/files/patch-tools__metrics__histograms__histograms.xml) @@ -0,0 +1,10 @@ +--- tools/metrics/histograms/histograms.xml.orig 2014-10-02 17:39:48 UTC ++++ tools/metrics/histograms/histograms.xml +@@ -45253,6 +45253,7 @@ + + + ++ + + + From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 22:26:26 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 117D3974; Wed, 15 Oct 2014 22:26:26 +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 D782DAF5; Wed, 15 Oct 2014 22:26:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9FMQP3V001821; Wed, 15 Oct 2014 22:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FMQPO5001819; Wed, 15 Oct 2014 22:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410152226.s9FMQPO5001819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 15 Oct 2014 22:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370961 - in branches/2014Q4/security/bruteblock: . 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, 15 Oct 2014 22:26:26 -0000 Author: amdmi3 Date: Wed Oct 15 22:26:24 2014 New Revision: 370961 URL: https://svnweb.freebsd.org/changeset/ports/370961 QAT: https://qat.redports.org/buildarchive/r370961/ Log: MFH: r370950 - Fix rule reset time on arm PR: 194381 Submitted by: ronald-lists@klop.ws Approved by: portmgr Added: branches/2014Q4/security/bruteblock/files/patch-bruteblock.c - copied unchanged from r370950, head/security/bruteblock/files/patch-bruteblock.c Modified: branches/2014Q4/security/bruteblock/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/bruteblock/Makefile ============================================================================== --- branches/2014Q4/security/bruteblock/Makefile Wed Oct 15 22:05:08 2014 (r370960) +++ branches/2014Q4/security/bruteblock/Makefile Wed Oct 15 22:26:24 2014 (r370961) @@ -3,7 +3,7 @@ PORTNAME= bruteblock PORTVERSION= 0.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://samm.kiev.ua/bruteblock/ \ http://mirror.amdmi3.ru/distfiles/ Copied: branches/2014Q4/security/bruteblock/files/patch-bruteblock.c (from r370950, head/security/bruteblock/files/patch-bruteblock.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/security/bruteblock/files/patch-bruteblock.c Wed Oct 15 22:26:24 2014 (r370961, copy of r370950, head/security/bruteblock/files/patch-bruteblock.c) @@ -0,0 +1,11 @@ +--- bruteblock.c.orig 2006-08-20 08:22:37.000000000 +0200 ++++ bruteblock.c 2014-10-15 16:19:19.000000000 +0200 +@@ -99,7 +99,7 @@ + snprintf(table, sizeof(table), "%d", ipfw2_table_no); + argv[1] = table; + argv[2] = command; +- snprintf(utime, sizeof(utime), "%d", ++ snprintf(utime, sizeof(utime), "%lld", + time(NULL) + reset_ip); + argv[4] = utime; + argv[3] = host; From owner-svn-ports-branches@FreeBSD.ORG Wed Oct 15 22:27:34 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 DBAABA64; Wed, 15 Oct 2014 22:27: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 AE7D0B06; Wed, 15 Oct 2014 22:27: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 s9FMRYYJ002125; Wed, 15 Oct 2014 22:27:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9FMRYs2002123; Wed, 15 Oct 2014 22:27:34 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410152227.s9FMRYs2002123@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 15 Oct 2014 22:27:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370962 - in branches/2014Q4/security/bruteblock: . 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, 15 Oct 2014 22:27:35 -0000 Author: amdmi3 Date: Wed Oct 15 22:27:33 2014 New Revision: 370962 URL: https://svnweb.freebsd.org/changeset/ports/370962 QAT: https://qat.redports.org/buildarchive/r370962/ Log: MFH: r370951 - Fix regex to match all sshd auth errors PR: 194382 Submitted by: ronald-lists@klop.ws Approved by: portmgr Modified: branches/2014Q4/security/bruteblock/Makefile branches/2014Q4/security/bruteblock/files/patch-etc-ssh.conf Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/bruteblock/Makefile ============================================================================== --- branches/2014Q4/security/bruteblock/Makefile Wed Oct 15 22:26:24 2014 (r370961) +++ branches/2014Q4/security/bruteblock/Makefile Wed Oct 15 22:27:33 2014 (r370962) @@ -3,7 +3,7 @@ PORTNAME= bruteblock PORTVERSION= 0.0.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://samm.kiev.ua/bruteblock/ \ http://mirror.amdmi3.ru/distfiles/ Modified: branches/2014Q4/security/bruteblock/files/patch-etc-ssh.conf ============================================================================== --- branches/2014Q4/security/bruteblock/files/patch-etc-ssh.conf Wed Oct 15 22:26:24 2014 (r370961) +++ branches/2014Q4/security/bruteblock/files/patch-etc-ssh.conf Wed Oct 15 22:27:33 2014 (r370962) @@ -15,7 +15,7 @@ +# +regexp = sshd.*(?:Illegal|Invalid) user \S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) +regexp1 = sshd.*Failed \S+ for (?:(?:illegal|invalid) user )?\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) -+regexp2 = sshd.*error: PAM: authentication error for (?:(?:illegal|invalid) user )\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) ++regexp2 = sshd.*error: PAM: authentication error for (?:(?:illegal|invalid) user )?\S+ from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) +regexp3 = sshd.*Did not receive identification string from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) # Number of failed login attempts within time before we block From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 16 05:28:50 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 592A21F5; Thu, 16 Oct 2014 05:28:50 +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 3A9AA94B; Thu, 16 Oct 2014 05:28:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9G5Sodg099325; Thu, 16 Oct 2014 05:28:50 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9G5SmLw099317; Thu, 16 Oct 2014 05:28:48 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410160528.s9G5SmLw099317@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 16 Oct 2014 05:28:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370968 - in branches/2014Q4/security/sudo: . 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, 16 Oct 2014 05:28:50 -0000 Author: bapt Date: Thu Oct 16 05:28:48 2014 New Revision: 370968 URL: https://svnweb.freebsd.org/changeset/ports/370968 QAT: https://qat.redports.org/buildarchive/r370968/ Log: MFH: r370967 Update to 1.8.11p1 PR: 194259 Submitted by: cy@ and Yasuhiro KIMURA Added: branches/2014Q4/security/sudo/files/patch-install-sh - copied unchanged from r370967, head/security/sudo/files/patch-install-sh Modified: branches/2014Q4/security/sudo/Makefile branches/2014Q4/security/sudo/distinfo branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c branches/2014Q4/security/sudo/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/security/sudo/Makefile ============================================================================== --- branches/2014Q4/security/sudo/Makefile Thu Oct 16 02:05:17 2014 (r370967) +++ branches/2014Q4/security/sudo/Makefile Thu Oct 16 05:28:48 2014 (r370968) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -DISTVERSION= 1.8.10p3 -PORTREVISION= 1 +DISTVERSION= 1.8.11p1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SUDO} @@ -15,6 +14,7 @@ LICENSE_NAME= Sudo license LICENSE_FILE= ${WRKSRC}/doc/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= libtool GNU_CONFIGURE= yes LDFLAGS+= -lgcc LDFLAGS+= -lssp_nonshared @@ -92,9 +92,10 @@ post-patch: post-install: ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default ${TOUCH} ${STAGEDIR}${PREFIX}/etc/sudoers.d/.keep-me + ${MV} ${STAGEDIR}${PREFIX}/etc/sudoers ${STAGEDIR}${PREFIX}/etc/sudoers.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo -.for f in group_file.so sudoers.so system_group.so +.for f in group_file.so libsudo_util.so sudoers.so system_group.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f} .endfor Modified: branches/2014Q4/security/sudo/distinfo ============================================================================== --- branches/2014Q4/security/sudo/distinfo Thu Oct 16 02:05:17 2014 (r370967) +++ branches/2014Q4/security/sudo/distinfo Thu Oct 16 05:28:48 2014 (r370968) @@ -1,2 +1,2 @@ -SHA256 (sudo-1.8.10p3.tar.gz) = 6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400 -SIZE (sudo-1.8.10p3.tar.gz) = 2262370 +SHA256 (sudo-1.8.11p1.tar.gz) = 44c275772595a119185336164bb76b6e08f23d38aa0fe0d6bab48812e75d6a43 +SIZE (sudo-1.8.11p1.tar.gz) = 2402012 Copied: branches/2014Q4/security/sudo/files/patch-install-sh (from r370967, head/security/sudo/files/patch-install-sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/security/sudo/files/patch-install-sh Thu Oct 16 05:28:48 2014 (r370968, copy of r370967, head/security/sudo/files/patch-install-sh) @@ -0,0 +1,28 @@ +--- install-sh.orig 2014-09-24 01:40:15.000000000 +0900 ++++ install-sh 2014-10-10 07:26:54.000000000 +0900 +@@ -171,12 +171,6 @@ + if [ ! -d "${DEST}" ] ; then + ${MKDIR} "${DEST}" || exit 1 + fi +- if ${CHOWNIT} ; then +- ${CHOWN} "${OWNER}" "${DEST}" || exit 1 +- fi +- if ${CHGROUPIT} ; then +- ${CHGRP} "${GROUP}" "${DEST}" || exit 1 +- fi + if ${CHMODIT} ; then + ${CHMOD} "${MODE}" "${DEST}" || exit 1 + fi +@@ -227,12 +221,6 @@ + if ${STRIPIT} ; then + ${STRIP} "${DEST}" || exit 1 + fi +-if ${CHOWNIT} ; then +- ${CHOWN} "${OWNER}" "${DEST}" || exit 1 +-fi +-if ${CHGROUPIT} ; then +- ${CHGRP} "${GROUP}" "${DEST}" || exit 1 +-fi + if ${CHMODIT} ; then + ${CHMOD} "${MODE}" "${DEST}" || exit 1 + fi Modified: branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in ============================================================================== --- branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in Thu Oct 16 02:05:17 2014 (r370967) +++ branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in Thu Oct 16 05:28:48 2014 (r370968) @@ -1,14 +1,12 @@ ---- ./plugins/sudoers/Makefile.in.orig 2011-04-11 08:28:33.000000000 -0400 -+++ ./plugins/sudoers/Makefile.in 2011-04-17 09:38:29.349385961 -0400 -@@ -358,9 +358,8 @@ +--- plugins/sudoers/Makefile.in.orig 2014-10-08 05:26:20.000000000 +0900 ++++ plugins/sudoers/Makefile.in 2014-10-10 07:23:21.000000000 +0900 +@@ -323,8 +323,7 @@ + install-sudoers: install-dirs - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \ - $(DESTDIR)$(sudoersdir)/sudoers.d + $(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d - test -r $(DESTDIR)$(sudoersdir)/sudoers || \ -- $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \ -- sudoers $(DESTDIR)$(sudoersdir)/sudoers -+ $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \ -+ sudoers $(DESTDIR)$(sudoersdir)/sudoers.sample +- $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers ++ $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers uninstall: - -rm -f $(DESTDIR)$(plugindir)/sudoers$(soext) + -$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la Modified: branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c ============================================================================== --- branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c Thu Oct 16 02:05:17 2014 (r370967) +++ branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c Thu Oct 16 05:28:48 2014 (r370968) @@ -1,10 +1,10 @@ ---- ./plugins/sudoers/audit.c.orig 2013-06-04 11:48:28.000000000 +0200 -+++ ./plugins/sudoers/audit.c 2013-07-05 13:10:01.000000000 +0200 -@@ -39,6 +39,7 @@ +--- plugins/sudoers/audit.c.orig 2014-09-24 01:40:15.000000000 +0900 ++++ plugins/sudoers/audit.c 2014-10-10 07:24:43.000000000 +0900 +@@ -42,6 +42,7 @@ #ifdef HAVE_BSM_AUDIT # include "bsm_audit.h" -+# include "gettext.h" ++# include "sudo_gettext.h" #endif #ifdef HAVE_LINUX_AUDIT # include "linux_audit.h" Modified: branches/2014Q4/security/sudo/pkg-plist ============================================================================== --- branches/2014Q4/security/sudo/pkg-plist Thu Oct 16 02:05:17 2014 (r370967) +++ branches/2014Q4/security/sudo/pkg-plist Thu Oct 16 05:28:48 2014 (r370968) @@ -7,6 +7,9 @@ etc/pam.d/sudo.default @exec if [ ! -f %D/etc/pam.d/sudo ] ; then cp -p %D/%F %B/sudo; fi include/sudo_plugin.h libexec/sudo/group_file.so +libexec/sudo/libsudo_util.so +libexec/sudo/libsudo_util.so.0 +libexec/sudo/libsudo_util.so.0.0.0 libexec/sudo/sudo_noexec.so libexec/sudo/sudoers.so libexec/sudo/system_group.so @@ -37,12 +40,14 @@ sbin/visudo %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory %%NLS%%share/locale/ca/LC_MESSAGES/sudo.mo +%%NLS%%share/locale/ca/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/cs/LC_MESSAGES/sudo.mo %%NLS%%share/locale/cs/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/da/LC_MESSAGES/sudo.mo %%NLS%%share/locale/da/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/de/LC_MESSAGES/sudo.mo %%NLS%%share/locale/de/LC_MESSAGES/sudoers.mo +%%NLS%%share/locale/el/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/eo/LC_MESSAGES/sudo.mo %%NLS%%share/locale/eo/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/es/LC_MESSAGES/sudo.mo @@ -59,6 +64,8 @@ sbin/visudo %%NLS%%share/locale/ja/LC_MESSAGES/sudo.mo %%NLS%%share/locale/ja/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/lt/LC_MESSAGES/sudoers.mo +%%NLS%%share/locale/nb/LC_MESSAGES/sudo.mo +%%NLS%%share/locale/nb/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/nl/LC_MESSAGES/sudo.mo %%NLS%%share/locale/nl/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/pl/LC_MESSAGES/sudo.mo @@ -80,7 +87,6 @@ sbin/visudo %%NLS%%share/locale/vi/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/sudo.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/sudoers.mo -%%PORTDOCS%%@dirrm %%DOCSDIR%% etc/sudoers.d/.keep-me @dir /var/db/sudo @dir /var/run/sudo From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 16 05:31: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 2D4DB309; Thu, 16 Oct 2014 05:31: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 1655D9F7; Thu, 16 Oct 2014 05:31: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 s9G5VhKD004109; Thu, 16 Oct 2014 05:31:43 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9G5VfHY004097; Thu, 16 Oct 2014 05:31:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410160531.s9G5VfHY004097@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 16 Oct 2014 05:31:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370969 - in branches/2014Q4: Mk Mk/Uses devel/nspr mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files net-im/linux-instantbird security/ca_root_nss se... 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, 16 Oct 2014 05:31:44 -0000 Author: bapt Date: Thu Oct 16 05:31:40 2014 New Revision: 370969 URL: https://svnweb.freebsd.org/changeset/ports/370969 QAT: https://qat.redports.org/buildarchive/r370969/ Log: MFH: r370932 - Update Firefox to 33.0 - Update Firefox ESR to 31.2.0 - Update NSS to 3.17.2 - Update Thunderbird to 31.2.0 - Update libxul to 31.2.0 (and mark as BROKEN) - Disable SSL 3.0 with pref (Upstream bug 1076983) - (workaround) replace USE_GCC=yes with USES=compiler:gcc-c++11-lib in order to fix runtime for PGO and powerpc/powerpc64 on libc++ systems - Add OSS audio fallback for HTML5 audio from upstream bug; not exposed yet because WebRTC still needs ALSA or PulseAudio - Kill @dirrm from gecko@ ports per CHANGES from 20140922 - Drop workaround for LLVM PR 19007: base and lang/clang34 have the fix - Improve workaround comment for LLVM PR 15840, partially rejecting r348851 by marino@ until bug 193555 PR: 194356 Submitted by: Jan Beich Security: http://www.vuxml.org/freebsd/9c1495ac-8d8c-4789-a0f3-8ca6b476619c.html Added: branches/2014Q4/mail/thunderbird/files/patch-bug1021761 - copied unchanged from r370932, head/mail/thunderbird/files/patch-bug1021761 branches/2014Q4/mail/thunderbird/files/patch-bug1073709 - copied unchanged from r370932, head/mail/thunderbird/files/patch-bug1073709 branches/2014Q4/mail/thunderbird/files/patch-bug1076983 - copied unchanged from r370932, head/mail/thunderbird/files/patch-bug1076983 branches/2014Q4/www/firefox-esr/files/patch-bug1021761 - copied unchanged from r370932, head/www/firefox-esr/files/patch-bug1021761 branches/2014Q4/www/firefox-esr/files/patch-bug1073709 - copied unchanged from r370932, head/www/firefox-esr/files/patch-bug1073709 branches/2014Q4/www/firefox-esr/files/patch-bug1076983 - copied unchanged from r370932, head/www/firefox-esr/files/patch-bug1076983 branches/2014Q4/www/firefox/files/patch-bug1021761 - copied unchanged from r370932, head/www/firefox/files/patch-bug1021761 branches/2014Q4/www/firefox/files/patch-bug1041268 - copied unchanged from r370932, head/www/firefox/files/patch-bug1041268 branches/2014Q4/www/firefox/files/patch-bug1073709 - copied unchanged from r370932, head/www/firefox/files/patch-bug1073709 branches/2014Q4/www/firefox/files/patch-bug1076983 - copied unchanged from r370932, head/www/firefox/files/patch-bug1076983 branches/2014Q4/www/firefox/files/patch-system-openh264 - copied unchanged from r370932, head/www/firefox/files/patch-system-openh264 branches/2014Q4/www/libxul/files/patch-bug1013882 - copied unchanged from r370932, head/www/libxul/files/patch-bug1013882 branches/2014Q4/www/libxul/files/patch-bug1021761 - copied unchanged from r370932, head/www/libxul/files/patch-bug1021761 branches/2014Q4/www/libxul/files/patch-bug1026828 - copied unchanged from r370932, head/www/libxul/files/patch-bug1026828 branches/2014Q4/www/libxul/files/patch-bug1041381 - copied unchanged from r370932, head/www/libxul/files/patch-bug1041381 branches/2014Q4/www/libxul/files/patch-bug1073709 - copied unchanged from r370932, head/www/libxul/files/patch-bug1073709 branches/2014Q4/www/libxul/files/patch-bug1076983 - copied unchanged from r370932, head/www/libxul/files/patch-bug1076983 branches/2014Q4/www/libxul/files/patch-bug847568 - copied unchanged from r370932, head/www/libxul/files/patch-bug847568 branches/2014Q4/www/libxul/files/patch-bug981348 - copied unchanged from r370932, head/www/libxul/files/patch-bug981348 branches/2014Q4/www/libxul/files/patch-toolkit_mozapps_installer_packager_mk - copied unchanged from r370932, head/www/libxul/files/patch-toolkit_mozapps_installer_packager_mk branches/2014Q4/www/libxul/files/patch-z-bug517422 - copied unchanged from r370932, head/www/libxul/files/patch-z-bug517422 Deleted: branches/2014Q4/mail/thunderbird/files/patch-clang34-disable-stdcall branches/2014Q4/www/firefox-esr/files/patch-clang34-disable-stdcall branches/2014Q4/www/firefox/files/patch-bug1015547 branches/2014Q4/www/firefox/files/patch-bug1026828 branches/2014Q4/www/firefox/files/patch-clang34-disable-stdcall branches/2014Q4/www/libxul/files/patch-bug783463 branches/2014Q4/www/libxul/files/patch-bug803480 branches/2014Q4/www/libxul/files/patch-bug807492 branches/2014Q4/www/libxul/files/patch-bug810716 branches/2014Q4/www/libxul/files/patch-bug851992 branches/2014Q4/www/libxul/files/patch-bug876156 branches/2014Q4/www/libxul/files/patch-bug878791 branches/2014Q4/www/libxul/files/patch-bug886181 branches/2014Q4/www/libxul/files/patch-bug889699 branches/2014Q4/www/libxul/files/patch-bug893397 branches/2014Q4/www/libxul/files/patch-bug910875 branches/2014Q4/www/libxul/files/patch-bug916216 branches/2014Q4/www/libxul/files/patch-bug916589 branches/2014Q4/www/libxul/files/patch-bug918177 branches/2014Q4/www/libxul/files/patch-bug938730 branches/2014Q4/www/libxul/files/patch-bug945046 branches/2014Q4/www/libxul/files/patch-bug946560 branches/2014Q4/www/libxul/files/patch-bug961816 branches/2014Q4/www/libxul/files/patch-bug962345 branches/2014Q4/www/libxul/files/patch-bug975634 branches/2014Q4/www/libxul/files/patch-bug977457 branches/2014Q4/www/libxul/files/patch-bug985848 branches/2014Q4/www/libxul/files/patch-clang34-disable-stdcall branches/2014Q4/www/libxul/files/patch-toolkit_xre_Makefile.in branches/2014Q4/www/libxul/files/patch-z-bug1026828 branches/2014Q4/www/libxul/files/patch-z-bug847568 branches/2014Q4/www/libxul/files/patch-zz-bug517422 branches/2014Q4/www/libxul/files/pkg-deinstall.in branches/2014Q4/www/libxul/files/pkg-install.in Modified: branches/2014Q4/Mk/Uses/gecko.mk branches/2014Q4/Mk/bsd.gecko.mk branches/2014Q4/devel/nspr/pkg-plist branches/2014Q4/mail/linux-thunderbird/Makefile branches/2014Q4/mail/linux-thunderbird/distinfo branches/2014Q4/mail/linux-thunderbird/pkg-plist branches/2014Q4/mail/thunderbird-i18n/Makefile branches/2014Q4/mail/thunderbird-i18n/distinfo branches/2014Q4/mail/thunderbird/Makefile branches/2014Q4/mail/thunderbird/distinfo branches/2014Q4/net-im/linux-instantbird/pkg-plist branches/2014Q4/security/ca_root_nss/Makefile branches/2014Q4/security/ca_root_nss/distinfo branches/2014Q4/security/ca_root_nss/pkg-plist branches/2014Q4/security/nss/Makefile branches/2014Q4/security/nss/distinfo branches/2014Q4/security/nss/pkg-plist 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/distinfo branches/2014Q4/www/firefox/Makefile branches/2014Q4/www/firefox/distinfo branches/2014Q4/www/firefox/files/patch-bug779713 branches/2014Q4/www/firefox/files/patch-bug826985 branches/2014Q4/www/firefox/files/patch-bug847568 branches/2014Q4/www/libxul/Makefile branches/2014Q4/www/libxul/distinfo branches/2014Q4/www/libxul/files/patch-bug1013675 branches/2014Q4/www/libxul/files/patch-bug1015547 branches/2014Q4/www/libxul/files/patch-bug1041795 branches/2014Q4/www/libxul/files/patch-bug702179 branches/2014Q4/www/libxul/files/patch-bug779713 branches/2014Q4/www/libxul/files/patch-bug826985 branches/2014Q4/www/libxul/files/patch-bug961264 branches/2014Q4/www/libxul/files/patch-config-baseconfig.mk branches/2014Q4/www/linux-firefox/Makefile branches/2014Q4/www/linux-firefox/distinfo branches/2014Q4/www/linux-firefox/pkg-plist branches/2014Q4/www/linux-seamonkey/Makefile.common branches/2014Q4/www/xpi-adblock/Makefile.xpi Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2014Q4/Mk/Uses/gecko.mk Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/Mk/Uses/gecko.mk Thu Oct 16 05:31:40 2014 (r370969) @@ -31,18 +31,18 @@ GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` -BUILD_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul -RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul +BUILD_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul +RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 31 -_GECKO_VERSIONS= 31 32 +_GECKO_VERSIONS= 31 33 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 31_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -32_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +33_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null Modified: branches/2014Q4/Mk/bsd.gecko.mk ============================================================================== --- branches/2014Q4/Mk/bsd.gecko.mk Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/Mk/bsd.gecko.mk Thu Oct 16 05:31:40 2014 (r370969) @@ -94,7 +94,6 @@ USE_XORG= xext xrender xt MOZILLA_SUFX?= none MOZSRC?= ${WRKSRC} WRKSRC?= ${WRKDIR}/mozilla -PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files MOZ_PIS_DIR?= lib/${MOZILLA}/init.d @@ -254,11 +253,7 @@ MOZ_TOOLKIT= cairo-gtk3 USE_MOZILLA+= -cairo # ports/169343 USE_DISPLAY=yes # install USE_GNOME+= pango -. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey" USE_QT5+= qmake_build buildtools_build gui network quick printsupport -. else -USE_QT4+= qmake_build moc_build rcc_build gui network opengl -. endif MOZ_EXPORT+= HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}" .elif ${MOZ_TOOLKIT:Mcairo-gtk3} USE_GNOME+= gtk30 @@ -287,13 +282,8 @@ MOZ_OPTIONS+= --disable-dbus --disable-l .endif .if ${PORT_OPTIONS:MGSTREAMER} -. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey" USE_GSTREAMER1?=good libav MOZ_OPTIONS+= --enable-gstreamer=1.0 -. else -USE_GSTREAMER?= good ffmpeg -MOZ_OPTIONS+= --enable-gstreamer -. endif .else MOZ_OPTIONS+= --disable-gstreamer .endif @@ -337,7 +327,7 @@ MOZ_OPTIONS+= --disable-libproxy .endif .if ${PORT_OPTIONS:MPGO} -USE_GCC?= yes +USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} USE_DISPLAY=yes .undef GNU_CONFIGURE @@ -449,7 +439,7 @@ LIBS+= -lcxxrt . endif . endif .elif ${ARCH:Mpowerpc*} -USE_GCC?= yes +USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} CFLAGS+= -D__STDC_CONSTANT_MACROS . if ${ARCH} == "powerpc64" MOZ_EXPORT+= UNAME_m="${ARCH}" @@ -600,15 +590,12 @@ port-post-install: gecko-create-plist: # Create the plist - ${RM} -f ${PLISTF} ${PLISTD} + ${RM} -f ${PLISTF} .for dir in ${MOZILLA_PLIST_DIRS} @cd ${STAGEDIR}${PREFIX}/${dir} && ${FIND} -H -s * ! -type d | \ - ${SED} -e 's|^|${dir}/|' >> ${PLISTF} && \ - ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLISTD} + ${SED} -e 's|^|${dir}/|' >> ${PLISTF} .endfor ${CAT} ${PLISTF} | ${SORT} >> ${TMPPLIST} - ${CAT} ${PLISTD} | ${SORT} -r >> ${TMPPLIST} gecko-moz-pis-pre-install: .if defined(MOZ_PIS_SCRIPTS) Modified: branches/2014Q4/devel/nspr/pkg-plist ============================================================================== --- branches/2014Q4/devel/nspr/pkg-plist Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/devel/nspr/pkg-plist Thu Oct 16 05:31:40 2014 (r370969) @@ -90,7 +90,3 @@ lib/libplds4.a lib/libplds4.so lib/libplds4.so.1 libdata/pkgconfig/nspr.pc -@dirrm include/nspr/private -@dirrm include/nspr/obsolete -@dirrm include/nspr/md -@dirrm include/nspr Modified: branches/2014Q4/mail/linux-thunderbird/Makefile ============================================================================== --- branches/2014Q4/mail/linux-thunderbird/Makefile Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/linux-thunderbird/Makefile Thu Oct 16 05:31:40 2014 (r370969) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.1.2 +DISTVERSION= 31.2.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 Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/linux-thunderbird/distinfo Thu Oct 16 05:31:40 2014 (r370969) @@ -1,5 +1,5 @@ -SHA256 (thunderbird-31.1.2.tar.bz2) = 9209fa7bdada6245717dbfaf517d68cef04719812504bc0c988def6adc7baab5 -SIZE (thunderbird-31.1.2.tar.bz2) = 33552961 +SHA256 (thunderbird-31.2.0.tar.bz2) = 4c4da90f383d7b43e97e471656a6cfbbd44d1b80d57b8b2405497678aced46b5 +SIZE (thunderbird-31.2.0.tar.bz2) = 33559450 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/linux-thunderbird/pkg-plist ============================================================================== --- branches/2014Q4/mail/linux-thunderbird/pkg-plist Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/linux-thunderbird/pkg-plist Thu Oct 16 05:31:40 2014 (r370969) @@ -78,17 +78,3 @@ lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true -@dirrm lib/%%APP_NAME%%/chrome/icons/default -@dirrm lib/%%APP_NAME%%/chrome/icons -@dirrm lib/%%APP_NAME%%/chrome -@dirrm lib/%%APP_NAME%%/components -@dirrm lib/%%APP_NAME%%/defaults/messenger -@dirrm lib/%%APP_NAME%%/defaults/pref -@dirrm lib/%%APP_NAME%%/defaults -@dirrm lib/%%APP_NAME%%/dictionaries -@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -@dirrm lib/%%APP_NAME%%/extensions -@dirrm lib/%%APP_NAME%%/icons -@dirrm lib/%%APP_NAME%%/isp -@dirrm lib/%%APP_NAME%%/searchplugins -@dirrm lib/%%APP_NAME%% Modified: branches/2014Q4/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2014Q4/mail/thunderbird-i18n/Makefile Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/thunderbird-i18n/Makefile Thu Oct 16 05:31:40 2014 (r370969) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 31.1.2 +PORTVERSION= 31.2.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -12,7 +12,7 @@ DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for Thunderbird -USES= gecko:thunderbird zip +USES= gecko:thunderbird,build zip USE_XPI= thunderbird NO_BUILD= yes @@ -24,15 +24,11 @@ WDIR= langpack-*@thunderbird.mozilla.org XPI_DISTNAMES= ${THUNDERBIRD_I18N_} PLIST?= ${WRKDIR}/plist -PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files .include "${.CURDIR}/Makefile.option" .include -# make sure that thunderbird always gets upgraded before this port -BUILD_DEPENDS= thunderbird>=0:${PORTSDIR}/mail/thunderbird - .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif @@ -55,12 +51,9 @@ do-extract: fi; \ cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/; \ ${FIND} -H -s * ! -type d | \ - ${SED} -e "s|^|lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTF} && \ - ${FIND} -d * -type d | \ - ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTD}; \ + ${SED} -e "s|^|lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTF}; \ done ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} - ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} do-install: Modified: branches/2014Q4/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2014Q4/mail/thunderbird-i18n/distinfo Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/thunderbird-i18n/distinfo Thu Oct 16 05:31:40 2014 (r370969) @@ -1,110 +1,110 @@ -SHA256 (xpi/thunderbird-i18n-31.1.2/ar.xpi) = d7f7f5fa42bc7dbeeb67ea312cd1390f9daf38cf22db2d29acebcd1d3e74d1fa -SIZE (xpi/thunderbird-i18n-31.1.2/ar.xpi) = 472810 -SHA256 (xpi/thunderbird-i18n-31.1.2/ast.xpi) = 635422fbc96177f43cb01c292a3b0a06ceb3040355d00880a6ddeffb4dcfeb4a -SIZE (xpi/thunderbird-i18n-31.1.2/ast.xpi) = 393048 -SHA256 (xpi/thunderbird-i18n-31.1.2/be.xpi) = a8a48f464b3a44a5724096995431606b740af3247bb325f47a63c065f626c1d7 -SIZE (xpi/thunderbird-i18n-31.1.2/be.xpi) = 427488 -SHA256 (xpi/thunderbird-i18n-31.1.2/bg.xpi) = e5dd2c1c5a97cc90514a1d0e0852e8579e625d689964b198036a6ac6f33e446c -SIZE (xpi/thunderbird-i18n-31.1.2/bg.xpi) = 493735 -SHA256 (xpi/thunderbird-i18n-31.1.2/bn-BD.xpi) = 461fac71d5d8a3910d68740def12b2235374b39f5cfa01ab912021e295cbd3c2 -SIZE (xpi/thunderbird-i18n-31.1.2/bn-BD.xpi) = 555612 -SHA256 (xpi/thunderbird-i18n-31.1.2/br.xpi) = 3c1d248c517de97d559a85f127e6871afd1a8c245cb4999be80626a258bdbb49 -SIZE (xpi/thunderbird-i18n-31.1.2/br.xpi) = 441444 -SHA256 (xpi/thunderbird-i18n-31.1.2/ca.xpi) = fff999721e7b388880a7a9c64d73add479e2a2f9e447b8d4e506a318efde9069 -SIZE (xpi/thunderbird-i18n-31.1.2/ca.xpi) = 441712 -SHA256 (xpi/thunderbird-i18n-31.1.2/cs.xpi) = 40c16d650c2f48ea945daca989f24cc293343794c45c5cde3f7ffe1305b8f159 -SIZE (xpi/thunderbird-i18n-31.1.2/cs.xpi) = 444701 -SHA256 (xpi/thunderbird-i18n-31.1.2/da.xpi) = fdfd890e09e23004cc1ba4c0df38648cd74f1c8d9d8d336c15a2aee8f75d98fc -SIZE (xpi/thunderbird-i18n-31.1.2/da.xpi) = 422052 -SHA256 (xpi/thunderbird-i18n-31.1.2/de.xpi) = da60f2a84ca8cb6b4e15393046ae43adac368dac35327f04bf89d31e8e0f829e -SIZE (xpi/thunderbird-i18n-31.1.2/de.xpi) = 424665 -SHA256 (xpi/thunderbird-i18n-31.1.2/el.xpi) = 975fdb6134fe5436d0459eb89dc6e8ae3d8829f2b8f7b5a3387011215184cef5 -SIZE (xpi/thunderbird-i18n-31.1.2/el.xpi) = 484855 -SHA256 (xpi/thunderbird-i18n-31.1.2/en-GB.xpi) = 87ac86fac2b341286e9789c1037404588813bb858e9cd718f7de5e401ddade6e -SIZE (xpi/thunderbird-i18n-31.1.2/en-GB.xpi) = 412515 -SHA256 (xpi/thunderbird-i18n-31.1.2/en-US.xpi) = f96739de83f760ee65727e9a68ad59e13cc60d2272b6a03bc80b5153fa0a365a -SIZE (xpi/thunderbird-i18n-31.1.2/en-US.xpi) = 413660 -SHA256 (xpi/thunderbird-i18n-31.1.2/es-AR.xpi) = d50ef569c6f74ceac8d9eb128cd98c3b2bb0af4853d1bf7a26265d5f31a8d452 -SIZE (xpi/thunderbird-i18n-31.1.2/es-AR.xpi) = 438530 -SHA256 (xpi/thunderbird-i18n-31.1.2/es-ES.xpi) = 6a9ec42a0f90b1d59fb61e47e533b5c79df41e13d8452d2fba5e5a649527cffe -SIZE (xpi/thunderbird-i18n-31.1.2/es-ES.xpi) = 374979 -SHA256 (xpi/thunderbird-i18n-31.1.2/et.xpi) = 7763519e3c74f37afa026a8fe7214a2b99e9d0f86391031eaa66869e3ef74870 -SIZE (xpi/thunderbird-i18n-31.1.2/et.xpi) = 434364 -SHA256 (xpi/thunderbird-i18n-31.1.2/eu.xpi) = 233ce00a457754f2454f26e618cc01f1736671a717a96b63cc7bea3d72193172 -SIZE (xpi/thunderbird-i18n-31.1.2/eu.xpi) = 431448 -SHA256 (xpi/thunderbird-i18n-31.1.2/fi.xpi) = 833ce0403ed46f87cb2730d2a0a4f3cdaa383295f84e7beeb90d6e48b2a0ddf7 -SIZE (xpi/thunderbird-i18n-31.1.2/fi.xpi) = 435632 -SHA256 (xpi/thunderbird-i18n-31.1.2/fr.xpi) = daf99b99c3fa73679801750bfbd33ac007edc05621ad663e4e26ddfee17b5dd2 -SIZE (xpi/thunderbird-i18n-31.1.2/fr.xpi) = 444143 -SHA256 (xpi/thunderbird-i18n-31.1.2/fy-NL.xpi) = f775a2236591a18d84fcf36e5b5a5d1bb8a5864b91faa29c2b39e0bee599ff0e -SIZE (xpi/thunderbird-i18n-31.1.2/fy-NL.xpi) = 438544 -SHA256 (xpi/thunderbird-i18n-31.1.2/ga-IE.xpi) = 6eed7b3ac1e4f9ac89b138041c2a10d7fae0ef5492035397bfafe771952526db -SIZE (xpi/thunderbird-i18n-31.1.2/ga-IE.xpi) = 449361 -SHA256 (xpi/thunderbird-i18n-31.1.2/gd.xpi) = 0576fb35d74a20624581b4fe53ef916032e77e3c7bfd9a7b86fdf687a413c923 -SIZE (xpi/thunderbird-i18n-31.1.2/gd.xpi) = 453171 -SHA256 (xpi/thunderbird-i18n-31.1.2/gl.xpi) = 274c45fe7bffe038a9c846359e99847193672e7c4dcec4c47e65720a8d16e3c0 -SIZE (xpi/thunderbird-i18n-31.1.2/gl.xpi) = 446787 -SHA256 (xpi/thunderbird-i18n-31.1.2/he.xpi) = 784505dd220387ff2b569118380957882feabf61366a9cde1e794e4fc08414f7 -SIZE (xpi/thunderbird-i18n-31.1.2/he.xpi) = 476111 -SHA256 (xpi/thunderbird-i18n-31.1.2/hr.xpi) = 4908835dafeb9bef43f4fa294f254bcd64c611c40f1aa35716730f179a3af554 -SIZE (xpi/thunderbird-i18n-31.1.2/hr.xpi) = 436982 -SHA256 (xpi/thunderbird-i18n-31.1.2/hu.xpi) = 210f50f948c726744ffdfa33cdb1fd9f4434698bd6c131257984f2e2cdcc1ecc -SIZE (xpi/thunderbird-i18n-31.1.2/hu.xpi) = 454541 -SHA256 (xpi/thunderbird-i18n-31.1.2/hy-AM.xpi) = 8acd553aacfdf9f4ed66fdd50454f473146fa1762309ff48104a941e62cff995 -SIZE (xpi/thunderbird-i18n-31.1.2/hy-AM.xpi) = 492767 -SHA256 (xpi/thunderbird-i18n-31.1.2/id.xpi) = 8388260bdb9d7d715e7cfdfe21826e5d390bcb1f48d1e649d82d0142f360d42d -SIZE (xpi/thunderbird-i18n-31.1.2/id.xpi) = 475875 -SHA256 (xpi/thunderbird-i18n-31.1.2/is.xpi) = cebe06ca5e72448ffe8e5d97c61b2be3a898b1ceb9726f9a0bfa7cec714f8eb2 -SIZE (xpi/thunderbird-i18n-31.1.2/is.xpi) = 437959 -SHA256 (xpi/thunderbird-i18n-31.1.2/it.xpi) = d5bab57141fbae37f3a983ed85983d91fff71f005da1dcf89682563c92baf3f3 -SIZE (xpi/thunderbird-i18n-31.1.2/it.xpi) = 368000 -SHA256 (xpi/thunderbird-i18n-31.1.2/ja.xpi) = 06a62d4ef79c2a7006b15fae6882b7919b10843c2b93cd23decf9e4d07151555 -SIZE (xpi/thunderbird-i18n-31.1.2/ja.xpi) = 489267 -SHA256 (xpi/thunderbird-i18n-31.1.2/ko.xpi) = fb40e186e31bc836a8f18be6df4dc654b793a782f1b79f4b143ff3830781dca2 -SIZE (xpi/thunderbird-i18n-31.1.2/ko.xpi) = 448920 -SHA256 (xpi/thunderbird-i18n-31.1.2/lt.xpi) = 80dc6b4ba4fef803776e3634682cded4ae4df1a35771d30ed0c2a1f4af6a6e30 -SIZE (xpi/thunderbird-i18n-31.1.2/lt.xpi) = 457812 -SHA256 (xpi/thunderbird-i18n-31.1.2/nb-NO.xpi) = be32cfc7192a3836f48c11022ec58d28091f568f1bf2fc25e1d7667ac6222603 -SIZE (xpi/thunderbird-i18n-31.1.2/nb-NO.xpi) = 430941 -SHA256 (xpi/thunderbird-i18n-31.1.2/nl.xpi) = 0607fe516735fea3763154f63bc2212f1b76ea3cfae26f1748e7d3f05b5a1301 -SIZE (xpi/thunderbird-i18n-31.1.2/nl.xpi) = 431887 -SHA256 (xpi/thunderbird-i18n-31.1.2/nn-NO.xpi) = 31782ee5743442de756d7eb6dc601ec5843af0d6f45254f946fedca23dfbf9f5 -SIZE (xpi/thunderbird-i18n-31.1.2/nn-NO.xpi) = 433198 -SHA256 (xpi/thunderbird-i18n-31.1.2/pa-IN.xpi) = 4f3849fb31c8fe4f65869b35595621df22d2491d08df259d9fdb14ee89b9df04 -SIZE (xpi/thunderbird-i18n-31.1.2/pa-IN.xpi) = 525323 -SHA256 (xpi/thunderbird-i18n-31.1.2/pl.xpi) = ea31936122f377d83c6d059435c28c3e990cadd6d1332d97ac3a7bb196ad085b -SIZE (xpi/thunderbird-i18n-31.1.2/pl.xpi) = 410872 -SHA256 (xpi/thunderbird-i18n-31.1.2/pt-BR.xpi) = 74501df72d4747944fafafde1fedf2214c86c4f4ba594d276f5efec437f14a28 -SIZE (xpi/thunderbird-i18n-31.1.2/pt-BR.xpi) = 450477 -SHA256 (xpi/thunderbird-i18n-31.1.2/pt-PT.xpi) = 43f0d1a2a6187e3f01e75c091c599341b0895e71e3c76b7e6cd040fd95d69482 -SIZE (xpi/thunderbird-i18n-31.1.2/pt-PT.xpi) = 439603 -SHA256 (xpi/thunderbird-i18n-31.1.2/rm.xpi) = 5c8c153c5f36e7237605fcbaa2d66df0e72b7c6a20f793b9113c3e16c87240b8 -SIZE (xpi/thunderbird-i18n-31.1.2/rm.xpi) = 439185 -SHA256 (xpi/thunderbird-i18n-31.1.2/ro.xpi) = 381a1f57aa7e3646dcd29aa28eec1bd951cff1e378d5fe795a5e87556fd286ae -SIZE (xpi/thunderbird-i18n-31.1.2/ro.xpi) = 479746 -SHA256 (xpi/thunderbird-i18n-31.1.2/ru.xpi) = 667ffecf4065352a0e6b32ed5d4535dc9758167cb431b01b13bac9d4027719e5 -SIZE (xpi/thunderbird-i18n-31.1.2/ru.xpi) = 436156 -SHA256 (xpi/thunderbird-i18n-31.1.2/si.xpi) = 5bb7054dc79e73852f39464b3cabeb28ef45dd814a2fbef699fd8ac0d28cfa15 -SIZE (xpi/thunderbird-i18n-31.1.2/si.xpi) = 528812 -SHA256 (xpi/thunderbird-i18n-31.1.2/sk.xpi) = e8f13c479e58e7858ef82864927bb48d013d3f1b7c04b26b525504cb475ba02e -SIZE (xpi/thunderbird-i18n-31.1.2/sk.xpi) = 452995 -SHA256 (xpi/thunderbird-i18n-31.1.2/sl.xpi) = 4e2c3392ae516d34f2568a6de607e86e641eda8e1dd211420ab9c569354757b2 -SIZE (xpi/thunderbird-i18n-31.1.2/sl.xpi) = 433874 -SHA256 (xpi/thunderbird-i18n-31.1.2/sq.xpi) = f38d505b006a209c28fbe2497e2840b1402f15659ab8850b96e401b37439aa43 -SIZE (xpi/thunderbird-i18n-31.1.2/sq.xpi) = 454695 -SHA256 (xpi/thunderbird-i18n-31.1.2/sr.xpi) = 0ea7ab963f7316a8c99c4ede0d2604532b8e9c640d1c1ad17b5aef52410efb6a -SIZE (xpi/thunderbird-i18n-31.1.2/sr.xpi) = 537335 -SHA256 (xpi/thunderbird-i18n-31.1.2/sv-SE.xpi) = c2be7fa0cc149411afa6cd697fc5f9c5db8e8dc94eb361e9005a7c85207812ad -SIZE (xpi/thunderbird-i18n-31.1.2/sv-SE.xpi) = 436105 -SHA256 (xpi/thunderbird-i18n-31.1.2/ta-LK.xpi) = 2990c01eccc33ba92e4bd4a5b6bc6a862a3d4ba038187193862aee20590f222f -SIZE (xpi/thunderbird-i18n-31.1.2/ta-LK.xpi) = 553508 -SHA256 (xpi/thunderbird-i18n-31.1.2/tr.xpi) = 7c28f5337d0f5265ffc264e06b7f18b733358ba040d36cccc14586e4b2b212d5 -SIZE (xpi/thunderbird-i18n-31.1.2/tr.xpi) = 457359 -SHA256 (xpi/thunderbird-i18n-31.1.2/uk.xpi) = 711e037fe115f63b560e59ca33f26fe89b021587d3ade4706df0fe5c4822af16 -SIZE (xpi/thunderbird-i18n-31.1.2/uk.xpi) = 499656 -SHA256 (xpi/thunderbird-i18n-31.1.2/vi.xpi) = 9889f4d9ebf9d298b7a5076879bf34e71dd00665a6be69ff2331df49fdc0b620 -SIZE (xpi/thunderbird-i18n-31.1.2/vi.xpi) = 513834 -SHA256 (xpi/thunderbird-i18n-31.1.2/zh-CN.xpi) = b29c35c9b4de9678f8f15d5910b23b842553b80763f41f2340e823a03b44700e -SIZE (xpi/thunderbird-i18n-31.1.2/zh-CN.xpi) = 462667 -SHA256 (xpi/thunderbird-i18n-31.1.2/zh-TW.xpi) = 9c76eae686d8a72ceb11a24ad155521aa02ee65ade6a068a4dfe6df5f7ba4698 -SIZE (xpi/thunderbird-i18n-31.1.2/zh-TW.xpi) = 463408 +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 Modified: branches/2014Q4/mail/thunderbird/Makefile ============================================================================== --- branches/2014Q4/mail/thunderbird/Makefile Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/thunderbird/Makefile Thu Oct 16 05:31:40 2014 (r370969) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.1.2 +DISTVERSION= 31.2.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/build1/source/ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/ DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -31,7 +31,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.3.1.2 +L_VERSION= 3.3.2 SSP_UNSAFE= yes USE_AUTOTOOLS= autoconf213:env @@ -80,8 +80,8 @@ 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> -# http://svnweb.freebsd.org/changeset/base/255804 -.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056 +# 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 \ Modified: branches/2014Q4/mail/thunderbird/distinfo ============================================================================== --- branches/2014Q4/mail/thunderbird/distinfo Thu Oct 16 05:28:48 2014 (r370968) +++ branches/2014Q4/mail/thunderbird/distinfo Thu Oct 16 05:31:40 2014 (r370969) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-31.1.2.source.tar.bz2) = 86b18e7642ad8e6004cb4826daec586a24fae8a27da59df49f0039495dd5d7b5 -SIZE (thunderbird-31.1.2.source.tar.bz2) = 171033949 +SHA256 (thunderbird-31.2.0.source.tar.bz2) = 48130bbd9102303167aa832ea80970201777ee65b91fbab515332527850749b4 +SIZE (thunderbird-31.2.0.source.tar.bz2) = 171047372 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 Copied: branches/2014Q4/mail/thunderbird/files/patch-bug1021761 (from r370932, head/mail/thunderbird/files/patch-bug1021761) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/mail/thunderbird/files/patch-bug1021761 Thu Oct 16 05:31:40 2014 (r370969, copy of r370932, head/mail/thunderbird/files/patch-bug1021761) @@ -0,0 +1,1092 @@ +diff --git configure.in configure.in +index 48e60c0..ec08417 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5438,6 +5438,60 @@ fi + AC_SUBST(MOZ_WEBM_ENCODER) + + dnl ================================== ++dnl = Check OSS availability ++dnl ================================== ++ ++dnl If using Linux, Solaris or BSDs, ensure that OSS is available ++case "$OS_TARGET" in ++Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) ++ MOZ_OSS=1 ++ ;; ++esac ++ ++MOZ_ARG_DISABLE_BOOL(oss, ++[ --disable-oss Disable OpenSoundSystem support], ++ MOZ_OSS=, ++ MOZ_OSS=1) ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "$MOZ_OSS"; then ++ dnl Prefer 4Front implementation ++ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) ++ if test -z "$MOZ_OSS_CFLAGS"; then ++ for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do ++ if test -e "$oss_conf"; then ++ . "$oss_conf" ++ fi ++ done ++ if test -d "$OSSLIBDIR"; then ++ MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include" ++ fi ++ fi ++ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) ++ ++ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" ++ MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h) ++ ++ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ ++ "$ac_cv_header_linux_soundcard_h" != "yes" -a \ ++ "$ac_cv_header_soundcard_h" != "yes"; then ++ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --disable-ogg --disable-wave --disable-webm.]) ++ fi ++ ++ dnl Assume NetBSD implementation over SunAudio ++ AC_CHECK_LIB(ossaudio, _oss_ioctl, ++ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") ++ MOZ_OSS_LIBS="-lossaudio"]) ++fi ++CFLAGS=$_SAVE_CFLAGS ++LIBS=$_SAVE_LIBS ++ ++AC_SUBST(MOZ_OSS) ++AC_SUBST_LIST(MOZ_OSS_CFLAGS) ++AC_SUBST_LIST(MOZ_OSS_LIBS) ++ ++dnl ================================== + dnl = Check alsa availability on Linux + dnl ================================== + +@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, + MOZ_ALSA=1, + MOZ_ALSA=) + ++MOZ_ARG_DISABLE_BOOL(alsa-dlopen, ++[ --disable-alsa-dlopen Disable runtime linking of libasound.so], ++ DISABLE_LIBASOUND_DLOPEN=1, ++ DISABLE_LIBASOUND_DLOPEN=) ++ + if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) + fi + ++if test -n "$DISABLE_LIBASOUND_DLOPEN"; then ++ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN) ++else ++ MOZ_ALSA_LIBS= ++fi ++ + AC_SUBST(MOZ_ALSA) + + dnl ======================================================== +diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS +index b441e8a..950d9e5 100644 +--- mozilla/media/libcubeb/AUTHORS ++++ mozilla/media/libcubeb/AUTHORS +@@ -4,3 +4,4 @@ Michael Wu + Paul Adenot + David Richards + Sebastien Alaiwan ++Evgeniy Vodolazskiy +diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c +index 9c3adcc..45d765b 100644 +--- mozilla/media/libcubeb/src/cubeb.c ++++ mozilla/media/libcubeb/src/cubeb.c +@@ -54,6 +54,9 @@ int opensl_init(cubeb ** context, char const * context_name); + #if defined(USE_AUDIOTRACK) + int audiotrack_init(cubeb ** context, char const * context_name); + #endif ++#if defined(USE_OSS) ++int oss_init(cubeb ** context, char const * context_name); ++#endif + + int + validate_stream_params(cubeb_stream_params stream_params) +@@ -120,6 +123,9 @@ cubeb_init(cubeb ** context, char const * context_name) + #if defined(USE_AUDIOTRACK) + audiotrack_init, + #endif ++#if defined(USE_OSS) ++ oss_init, ++#endif + }; + int i; + +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index a962553..1f780f4 100644 +--- mozilla/media/libcubeb/src/cubeb_alsa.c ++++ mozilla/media/libcubeb/src/cubeb_alsa.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -24,6 +25,50 @@ + + #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x ++MAKE_TYPEDEF(snd_config); ++MAKE_TYPEDEF(snd_config_add); ++MAKE_TYPEDEF(snd_config_copy); ++MAKE_TYPEDEF(snd_config_delete); ++MAKE_TYPEDEF(snd_config_get_id); ++MAKE_TYPEDEF(snd_config_get_string); ++MAKE_TYPEDEF(snd_config_imake_integer); ++MAKE_TYPEDEF(snd_config_search); ++MAKE_TYPEDEF(snd_config_search_definition); ++MAKE_TYPEDEF(snd_lib_error_set_handler); ++MAKE_TYPEDEF(snd_pcm_avail_update); ++MAKE_TYPEDEF(snd_pcm_close); ++MAKE_TYPEDEF(snd_pcm_delay); ++MAKE_TYPEDEF(snd_pcm_drain); ++MAKE_TYPEDEF(snd_pcm_frames_to_bytes); ++MAKE_TYPEDEF(snd_pcm_get_params); ++/* snd_pcm_hw_params_alloca is actually a macro */ ++/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ ++MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++MAKE_TYPEDEF(snd_pcm_hw_params_any); ++MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); ++MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); ++MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); ++MAKE_TYPEDEF(snd_pcm_nonblock); ++MAKE_TYPEDEF(snd_pcm_open); ++MAKE_TYPEDEF(snd_pcm_open_lconf); ++MAKE_TYPEDEF(snd_pcm_pause); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); ++MAKE_TYPEDEF(snd_pcm_recover); ++MAKE_TYPEDEF(snd_pcm_set_params); ++MAKE_TYPEDEF(snd_pcm_state); ++MAKE_TYPEDEF(snd_pcm_writei); ++ ++#undef MAKE_TYPEDEF ++#endif ++ + /* ALSA is not thread-safe. snd_pcm_t instances are individually protected + by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction + is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), +@@ -64,6 +109,8 @@ struct cubeb { + workaround is not required. */ + snd_config_t * local_config; + int is_pa; ++ ++ void * libasound; + }; + + enum stream_state { +@@ -262,7 +309,7 @@ alsa_refill_stream(cubeb_stream * stm) + + pthread_mutex_lock(&stm->mutex); + +- r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + if (r < 0 || revents != POLLOUT) { + /* This should be a stream error; it makes no sense for poll(2) to wake + for this stream and then have the stream report that it's not ready. +@@ -271,10 +318,10 @@ alsa_refill_stream(cubeb_stream * stm) + return RUNNING; + } + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + if (avail == -EPIPE) { +- snd_pcm_recover(stm->pcm, avail, 1); +- avail = snd_pcm_avail_update(stm->pcm); ++ WRAP(snd_pcm_recover)(stm->pcm, avail, 1); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + } + + /* Failed to recover from an xrun, this stream must be broken. */ +@@ -293,8 +340,8 @@ alsa_refill_stream(cubeb_stream * stm) + available to write. If avail is still zero here, the stream must be in + a funky state, so recover and try again. */ + if (avail == 0) { +- snd_pcm_recover(stm->pcm, -EPIPE, 1); +- avail = snd_pcm_avail_update(stm->pcm); ++ WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + if (avail <= 0) { + pthread_mutex_unlock(&stm->mutex); + stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); +@@ -302,7 +349,7 @@ alsa_refill_stream(cubeb_stream * stm) + } + } + +- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail)); ++ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail)); + 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); + if (wrote == -EPIPE) { +- snd_pcm_recover(stm->pcm, wrote, 1); +- wrote = snd_pcm_writei(stm->pcm, p, got); ++ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); + } + assert(wrote >= 0 && wrote == got); + stm->write_position += wrote; +@@ -342,7 +389,7 @@ alsa_refill_stream(cubeb_stream * stm) + + /* Fill the remaining buffer with silence to guarantee one full period + has been written. */ +- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got); ++ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got); + + set_timeout(&stm->drain_timeout, buffer_time * 1000); + +@@ -453,26 +500,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -481,7 +528,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -490,7 +537,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -513,22 +560,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -537,7 +584,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -548,12 +595,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -564,18 +611,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -583,7 +630,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -595,9 +642,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream, snd_config_t * l + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -610,7 +657,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -667,12 +714,65 @@ alsa_init(cubeb ** context, char const * context_name) + pthread_attr_t attr; + snd_pcm_t * dummy; + ++ void * libasound = NULL; ++ ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) do { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } while(0) ++ ++ LOAD(snd_config); ++ LOAD(snd_config_add); ++ LOAD(snd_config_copy); ++ LOAD(snd_config_delete); ++ LOAD(snd_config_get_id); ++ LOAD(snd_config_get_string); ++ LOAD(snd_config_imake_integer); ++ LOAD(snd_config_search); ++ LOAD(snd_config_search_definition); ++ LOAD(snd_lib_error_set_handler); ++ LOAD(snd_pcm_avail_update); ++ LOAD(snd_pcm_close); ++ LOAD(snd_pcm_delay); ++ LOAD(snd_pcm_drain); ++ LOAD(snd_pcm_frames_to_bytes); ++ LOAD(snd_pcm_get_params); ++ /* snd_pcm_hw_params_alloca is actually a macro */ ++ /* LOAD(snd_pcm_hw_params_alloca); */ ++ LOAD(snd_pcm_hw_params_sizeof); ++ LOAD(snd_pcm_hw_params_any); ++ LOAD(snd_pcm_hw_params_get_channels_max); ++ LOAD(snd_pcm_hw_params_get_rate); ++ LOAD(snd_pcm_hw_params_set_rate_near); ++ LOAD(snd_pcm_nonblock); ++ LOAD(snd_pcm_open); ++ LOAD(snd_pcm_open_lconf); ++ LOAD(snd_pcm_pause); ++ LOAD(snd_pcm_poll_descriptors); ++ LOAD(snd_pcm_poll_descriptors_count); ++ LOAD(snd_pcm_poll_descriptors_revents); ++ LOAD(snd_pcm_recover); ++ LOAD(snd_pcm_set_params); ++ LOAD(snd_pcm_state); ++ LOAD(snd_pcm_writei); ++ ++#undef LOAD ++#endif + assert(context); + *context = NULL; + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -680,6 +780,8 @@ alsa_init(cubeb ** context, char const * context_name) + ctx = calloc(1, sizeof(*ctx)); + assert(ctx); + ++ ctx->libasound = libasound; ++ + ctx->ops = &alsa_ops; + + r = pthread_mutex_init(&ctx->mutex, NULL); +@@ -729,7 +831,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -768,9 +870,13 @@ alsa_destroy(cubeb * ctx) + pthread_mutex_destroy(&ctx->mutex); + free(ctx->fds); + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + +@@ -838,7 +944,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't +@@ -848,23 +954,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, + latency = latency < 500 ? 500 : latency; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, +- stm->params.channels, stm->params.rate, 1, +- latency * 1000); ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ stm->params.channels, stm->params.rate, 1, ++ latency * 1000); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 16 07:02:33 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 F35F163F; Thu, 16 Oct 2014 07:02:32 +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 D3C9D1C6; Thu, 16 Oct 2014 07:02:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9G72Wv2046361; Thu, 16 Oct 2014 07:02:32 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9G72W0f046358; Thu, 16 Oct 2014 07:02:32 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410160702.s9G72W0f046358@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 16 Oct 2014 07:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370972 - in branches/2014Q4/devel/matreshka: . 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, 16 Oct 2014 07:02:33 -0000 Author: marino Date: Thu Oct 16 07:02:31 2014 New Revision: 370972 URL: https://svnweb.freebsd.org/changeset/ports/370972 QAT: https://qat.redports.org/buildarchive/r370972/ Log: MFH: r370966 devel/matreshka: Fix build on i386 platforms The author of matreshka informed me that GPRBuild 2014 has a bug in it that suppresses flags like -msse2 and -march. It's been fixed in the Pro version, but not the GPL version. He worked around the bug instead, and this commit brings in the essential part of that workaround. The GPRBuild bug prevented Matreshka from building on i386 on all releases and all platforms. While here, remove @dirrm from pkg-plist, strip the installed libraries, convert to USES=pgsql and tighten the makefile up a bit. Approved by: portmgr Added: branches/2014Q4/devel/matreshka/files/patch-Makefile.build - copied unchanged from r370966, head/devel/matreshka/files/patch-Makefile.build branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in - copied unchanged from r370966, head/devel/matreshka/files/patch-Makefile.config.in Modified: branches/2014Q4/devel/matreshka/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/matreshka/Makefile ============================================================================== --- branches/2014Q4/devel/matreshka/Makefile Thu Oct 16 06:06:45 2014 (r370971) +++ branches/2014Q4/devel/matreshka/Makefile Thu Oct 16 07:02:31 2014 (r370972) @@ -3,7 +3,7 @@ PORTNAME= matreshka PORTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://forge.ada-ru.org/matreshka/downloads/ @@ -30,6 +30,11 @@ MYSQL_CONFIGURE_ENABLE= mysql ORACLE_CONFIGURE_ENABLE= oracle AMF_CONFIGURE_ENABLE= amf +MYSQL_USE= MYSQL=yes +PGSQL_USES= pgsql +SQLITE3_USE= SQLITE=yes +FIREBIRD_USE= FIREBIRD=yes + MAKE_JOBS_UNSAFE= yes MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} @@ -38,29 +43,15 @@ MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMB .if ${PORT_OPTIONS:MFIREBIRD} CONFIGURE_ARGS+= --with-firebird-libdir=${LOCALBASE}/lib -USE_FIREBIRD= yes -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -.endif - -.if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE= yes .endif pre-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} config post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so \ + ${STAGEDIR}${PREFIX}/bin/wsdl2ada @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ ${SORT} >> ${TMPPLIST} - @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ - ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST} - @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST} .include Copied: branches/2014Q4/devel/matreshka/files/patch-Makefile.build (from r370966, head/devel/matreshka/files/patch-Makefile.build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/devel/matreshka/files/patch-Makefile.build Thu Oct 16 07:02:31 2014 (r370972, copy of r370966, head/devel/matreshka/files/patch-Makefile.build) @@ -0,0 +1,29 @@ +--- Makefile.build.orig 2013-09-18 07:12:40.852703000 +0000 ++++ Makefile.build +@@ -1,5 +1,6 @@ + include Makefile.config + ++GNATMAKE = gnatmake + GPRBUILD_FLAGS = -p $(SMP_MFLAGS) + + ALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql +@@ -31,6 +32,19 @@ endif + all: $(ALL_TARGETS) + + league: ++ifneq (, $(findstring x86,$(ARCHITECTURE))) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_utilities.adb ++ifeq ($(ARCHITECTURE), x86) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse.adb ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse2.ads ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-generic_x86_sse2.adb ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2.ads ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2_popcnt.ads ++endif ++ifeq ($(ARCHITECTURE), x86_64) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_64_popcnt.ads ++endif ++endif + $(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_league.gpr + + xml: league Copied: branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in (from r370966, head/devel/matreshka/files/patch-Makefile.config.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/devel/matreshka/files/patch-Makefile.config.in Thu Oct 16 07:02:31 2014 (r370972, copy of r370966, head/devel/matreshka/files/patch-Makefile.config.in) @@ -0,0 +1,10 @@ +--- Makefile.config.in.orig 2013-12-22 22:34:01.201864000 +0000 ++++ Makefile.config.in +@@ -1,6 +1,7 @@ + + VERSION = @VERSION@ + RTL_VERSION = @RTL_VERSION_SUFFIX@ ++ARCHITECTURE = @ARCHITECTURE@ + OPERATING_SYSTEM = @OPERATING_SYSTEM@ + + PREFIX = @PREFIX@ From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 16 12:20:35 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 DB4F4418; Thu, 16 Oct 2014 12:20:35 +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 C4F62C1A; Thu, 16 Oct 2014 12:20:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9GCKZAM099962; Thu, 16 Oct 2014 12:20:35 GMT (envelope-from beat@FreeBSD.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GCKXOT099946; Thu, 16 Oct 2014 12:20:33 GMT (envelope-from beat@FreeBSD.org) Message-Id: <201410161220.s9GCKXOT099946@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: beat set sender to beat@FreeBSD.org using -f From: Beat Gaetzi Date: Thu, 16 Oct 2014 12:20:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371004 - in branches/2014Q4/www: linux-seamonkey seamonkey seamonkey-i18n 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: Thu, 16 Oct 2014 12:20:36 -0000 Author: beat Date: Thu Oct 16 12:20:33 2014 New Revision: 371004 URL: https://svnweb.freebsd.org/changeset/ports/371004 QAT: https://qat.redports.org/buildarchive/r371004/ Log: MFH: r370991 - Update SeaMonkey to 2.30 - Disable SSL 3.0 with pref (Upstream bug 1076983) - Apply r368080 to seamonkey-i18n - Kill @dirrm from gecko@ ports per CHANGES from 20140922 PR: 194356 Submitted by: Jan Beich Security: http://www.vuxml.org/freebsd/9c1495ac-8d8c-4789-a0f3-8ca6b476619c.html Approved by: ports-secteam (rea) Added: branches/2014Q4/www/seamonkey/files/patch-bug1021761 - copied unchanged from r370991, head/www/seamonkey/files/patch-bug1021761 branches/2014Q4/www/seamonkey/files/patch-bug1041268 - copied unchanged from r370991, head/www/seamonkey/files/patch-bug1041268 branches/2014Q4/www/seamonkey/files/patch-bug1073709 - copied unchanged from r370991, head/www/seamonkey/files/patch-bug1073709 branches/2014Q4/www/seamonkey/files/patch-bug1076983 - copied unchanged from r370991, head/www/seamonkey/files/patch-bug1076983 branches/2014Q4/www/seamonkey/files/patch-system-openh264 - copied unchanged from r370991, head/www/seamonkey/files/patch-system-openh264 Deleted: branches/2014Q4/www/seamonkey/files/patch-bug1015547 branches/2014Q4/www/seamonkey/files/patch-bug1026828 branches/2014Q4/www/seamonkey/files/patch-clang34-disable-stdcall Modified: 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-bug779713 branches/2014Q4/www/seamonkey/files/patch-bug826985 branches/2014Q4/www/seamonkey/files/patch-bug847568 Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/linux-seamonkey/Makefile ============================================================================== --- branches/2014Q4/www/linux-seamonkey/Makefile Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/linux-seamonkey/Makefile Thu Oct 16 12:20:33 2014 (r371004) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.29.1 +DISTVERSION= 2.30 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 Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/linux-seamonkey/distinfo Thu Oct 16 12:20:33 2014 (r371004) @@ -1,5 +1,5 @@ -SHA256 (seamonkey-2.29.1.tar.bz2) = 8f92ed28925080a55996ffd90d764f961c05c072cba806fac1de3c53f432393b -SIZE (seamonkey-2.29.1.tar.bz2) = 40020490 +SHA256 (seamonkey-2.30.tar.bz2) = 629d3ab73a1fdbe2650ac2cda75c7c30fbed8eada52d05f2f88e5321b97b4fca +SIZE (seamonkey-2.30.tar.bz2) = 39998490 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 Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/linux-seamonkey/pkg-plist Thu Oct 16 12:20:33 2014 (r371004) @@ -50,9 +50,6 @@ lib/%%APP_NAME%%/chrome/icons/default/pl lib/%%APP_NAME%%/chrome/icons/default/places16.png lib/%%APP_NAME%%/chrome/icons/default/places48.png lib/%%APP_NAME%%/chrome/icons/default/seamonkey.png -lib/%%APP_NAME%%/chrome/icons/default/venkman-window.png -lib/%%APP_NAME%%/chrome/icons/default/venkman-window16.png -lib/%%APP_NAME%%/chrome/icons/default/venkman-window48.png lib/%%APP_NAME%%/components/components.manifest lib/%%APP_NAME%%/components/libdbusservice.so lib/%%APP_NAME%%/components/libmozgnome.so @@ -64,14 +61,16 @@ lib/%%APP_NAME%%/crashreporter.ini lib/%%APP_NAME%%/defaults/messenger/mailViews.dat lib/%%APP_NAME%%/defaults/pref/browser-prefs.js 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 lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic lib/%%APP_NAME%%/distribution/extensions/inspector@mozilla.org.xpi lib/%%APP_NAME%%/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi -lib/%%APP_NAME%%/distribution/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi lib/%%APP_NAME%%/extensions/modern@themes.mozilla.org.xpi lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi lib/%%APP_NAME%%/icons/updater.png @@ -126,19 +125,3 @@ lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true -@dirrm lib/%%APP_NAME%%/chrome/icons/default -@dirrm lib/%%APP_NAME%%/chrome/icons -@dirrm lib/%%APP_NAME%%/chrome -@dirrm lib/%%APP_NAME%%/components -@dirrm lib/%%APP_NAME%%/defaults/messenger -@dirrm lib/%%APP_NAME%%/defaults/pref -@dirrm lib/%%APP_NAME%%/defaults/profile -@dirrm lib/%%APP_NAME%%/defaults -@dirrm lib/%%APP_NAME%%/dictionaries -@dirrm lib/%%APP_NAME%%/distribution/extensions -@dirrm lib/%%APP_NAME%%/distribution -@dirrm lib/%%APP_NAME%%/extensions -@dirrm lib/%%APP_NAME%%/icons -@dirrm lib/%%APP_NAME%%/isp -@dirrm lib/%%APP_NAME%%/searchplugins -@dirrm lib/%%APP_NAME%% Modified: branches/2014Q4/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2014Q4/www/seamonkey-i18n/Makefile Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/seamonkey-i18n/Makefile Thu Oct 16 12:20:33 2014 (r371004) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.29.1 +PORTVERSION= 2.30 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= @@ -14,7 +14,7 @@ COMMENT= Localized interface for SeaMonk EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:seamonkey +USES= zip:infozip gecko:seamonkey,build USE_XPI= seamonkey linux-seamonkey NO_ARCH= yes @@ -25,7 +25,6 @@ WDIR= langpack-*@seamonkey.mozilla.org XPI_DISTNAMES= ${SEAMONKEY_I18N_} PLIST?= ${WRKDIR}/plist -PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files .include "${.CURDIR}/Makefile.option" @@ -57,12 +56,9 @@ do-extract: fi; \ cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/; \ ${FIND} -H -s * ! -type d | \ - ${SED} -e "s|^|lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTF} && \ - ${FIND} -d * -type d | \ - ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTD}; \ + ${SED} -e "s|^|lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTF}; \ done ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} - ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} do-install: @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} Modified: branches/2014Q4/www/seamonkey-i18n/distinfo ============================================================================== --- branches/2014Q4/www/seamonkey-i18n/distinfo Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/seamonkey-i18n/distinfo Thu Oct 16 12:20:33 2014 (r371004) @@ -1,54 +1,54 @@ -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.be.langpack.xpi) = 48e99f9a34bc17166e432ddf57060ef007a52a2f5a72f678b30c2ca150d788d4 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.be.langpack.xpi) = 837343 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ca.langpack.xpi) = da62c41035d664f70164c82ba410ca63e8cee66842584be02526b979a1ea17d7 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ca.langpack.xpi) = 830894 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.cs.langpack.xpi) = a4fb43ae82e84f6f6ee3c563d7369c7df23a4e75c4c8bc579161867e8a62dc0c -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.cs.langpack.xpi) = 832269 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.de.langpack.xpi) = bb7f7996400cab45d3cfe6599c225a9ebb4a11c02f213f8f048cb02698729f08 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.de.langpack.xpi) = 837074 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.en-GB.langpack.xpi) = db76c94cee1683b2fbc54f29b5a472d22d41f02146adb4f73f4a1e909c8febfa -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.en-GB.langpack.xpi) = 800825 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.en-US.langpack.xpi) = dc60fe6d769d27828cd2cc2f3e7eb7403a2ebeed2fd16a0ec81aa64a58e65550 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.en-US.langpack.xpi) = 800947 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.es-AR.langpack.xpi) = f6c23b2ca45b5f62cf9957a3723787b7e9a6b2ebadb36c114bf68b44a1bea8b7 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.es-AR.langpack.xpi) = 851550 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.es-ES.langpack.xpi) = 2194e35efaf96f6b571fae1f6cdc02f7d877870163d71ebe29850fcaa7aebf32 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.es-ES.langpack.xpi) = 827398 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.fi.langpack.xpi) = 90e56c6c84f0fb20fd1246efb9e14280006b9498702e4f6f0a1d4b7d07c8e36b -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.fi.langpack.xpi) = 798958 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.fr.langpack.xpi) = f5b984b90314d4d84c777e2c614058cba38f48d001130b6bb44d65209212e6a8 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.fr.langpack.xpi) = 809849 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.gl.langpack.xpi) = ddfca812273b853171175f8e49629515cfe786a5e611106cf87696d0997c75b8 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.gl.langpack.xpi) = 811262 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.hu.langpack.xpi) = f1de97811c9853c9ab2d5811baa3aee513bfc21b9f6ffe19f9a494a2a74c9731 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.hu.langpack.xpi) = 845864 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.it.langpack.xpi) = 59f3cc936e9e0abf8ff1634b5aa7efd20c3cbb36bc3d87a2ca66843f8f5a85e1 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.it.langpack.xpi) = 747523 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ja-JP-mac.langpack.xpi) = 18b9a04b12224faa267fff4478dd615f20a95ec77fb5672426a90809ef1a5065 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ja-JP-mac.langpack.xpi) = 898137 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ja.langpack.xpi) = ef93a8e30fef1d9fef12ab63abcde4b99b2294c74f0d88823ac30c8a6189a6c9 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ja.langpack.xpi) = 882631 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.lt.langpack.xpi) = 73ad71029ffa88d71082465d27b3fd3faa74fc2358b2c79f176b68d8aa6153a1 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.lt.langpack.xpi) = 847473 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.nb-NO.langpack.xpi) = c36b9c2a943aef843fe03b735a62f57114ab7333ac9b59dbb69f4f625dbc3194 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.nb-NO.langpack.xpi) = 820415 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.nl.langpack.xpi) = 0678cb91ee1864222641034a4982f13509196cb36c61b3f794bf944e9f0bba8b -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.nl.langpack.xpi) = 795958 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.pl.langpack.xpi) = 548f9f16d70224e712e68b557cf5c6f6d50658dbba803b5de17b1f987326fcd8 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.pl.langpack.xpi) = 868185 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.pt-PT.langpack.xpi) = 88dfff6b9ea02e057ea284a70ea2098d83c8fd9dfeaadb8b6cb3773e3bcc894d -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.pt-PT.langpack.xpi) = 835298 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ru.langpack.xpi) = 683e6b1bb5549ba77459a1ef2a308a536010874f15421ff85b48d63bd8cfdffc -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.ru.langpack.xpi) = 904350 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.sk.langpack.xpi) = cd19bbc1f21995ef0eeb0d6187e59b568414eb23c960406fc8ec3043fea17a2e -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.sk.langpack.xpi) = 859266 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.sv-SE.langpack.xpi) = 2f37fc22042d362a759fce13a817ce41105240a5be8ebbe9f85825306c98a047 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.sv-SE.langpack.xpi) = 824247 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.tr.langpack.xpi) = ccb92bc100a1893a0476b74150c18e69cfc795ec0067c109b924780965c646a1 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.tr.langpack.xpi) = 808132 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.uk.langpack.xpi) = 39814cea13d2a356abbdd052841c607d980172ba2a5fafbacbf0d0ce151be65f -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.uk.langpack.xpi) = 870448 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.zh-CN.langpack.xpi) = adb0634422270ecd074a95b6288f728746ed32041f3de127a609aac71c74a4c3 -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.zh-CN.langpack.xpi) = 833565 -SHA256 (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.zh-TW.langpack.xpi) = 51baf967ad8b2b8f5cf0ccd3c92674f0d427bc2ee9f1adea7a535257993c59ce -SIZE (xpi/seamonkey-i18n-2.29.1/seamonkey-2.29.1.zh-TW.langpack.xpi) = 858131 +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 Modified: branches/2014Q4/www/seamonkey/Makefile ============================================================================== --- branches/2014Q4/www/seamonkey/Makefile Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/seamonkey/Makefile Thu Oct 16 12:20:33 2014 (r371004) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.29.1 +DISTVERSION= 2.30 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/ @@ -31,7 +31,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.7.2 -L_VERSION= 3.4 +L_VERSION= 3.5 SSP_UNSAFE= yes USE_AUTOTOOLS= autoconf213:env @@ -84,9 +84,8 @@ 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> -# http://svnweb.freebsd.org/changeset/base/255804 -.if ${OPSYS} == FreeBSD -.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056 +# 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 \ @@ -100,7 +99,6 @@ CXXFLAGS+= -O1 . endif . endif .endif -.endif .if ${PORT_OPTIONS:MALSA} RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib Modified: branches/2014Q4/www/seamonkey/distinfo ============================================================================== --- branches/2014Q4/www/seamonkey/distinfo Thu Oct 16 11:53:42 2014 (r371003) +++ branches/2014Q4/www/seamonkey/distinfo Thu Oct 16 12:20:33 2014 (r371004) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.29.1.source.tar.bz2) = 26e345f71c6f305084ada10e10e55356fe4f08be25948cddb27eea81c0cd0679 -SIZE (seamonkey-2.29.1.source.tar.bz2) = 173439941 +SHA256 (seamonkey-2.30.source.tar.bz2) = 613eb08d80bf671b390869e9682810d7ae312a9858f6b69da76155f42ff1d516 +SIZE (seamonkey-2.30.source.tar.bz2) = 178435927 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 SIZE (enigmail-1.7.2.tar.gz) = 1420346 Copied: branches/2014Q4/www/seamonkey/files/patch-bug1021761 (from r370991, head/www/seamonkey/files/patch-bug1021761) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/seamonkey/files/patch-bug1021761 Thu Oct 16 12:20:33 2014 (r371004, copy of r370991, head/www/seamonkey/files/patch-bug1021761) @@ -0,0 +1,1101 @@ +diff --git configure.in configure.in +index 48e60c0..ec08417 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5438,6 +5438,60 @@ fi + AC_SUBST(MOZ_WEBM_ENCODER) + + dnl ================================== ++dnl = Check OSS availability ++dnl ================================== ++ ++dnl If using Linux, Solaris or BSDs, ensure that OSS is available ++case "$OS_TARGET" in ++Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) ++ MOZ_OSS=1 ++ ;; ++esac ++ ++MOZ_ARG_DISABLE_BOOL(oss, ++[ --disable-oss Disable OpenSoundSystem support], ++ MOZ_OSS=, ++ MOZ_OSS=1) ++ ++_SAVE_CFLAGS=$CFLAGS ++_SAVE_LIBS=$LIBS ++if test -n "$MOZ_OSS"; then ++ dnl Prefer 4Front implementation ++ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) ++ if test -z "$MOZ_OSS_CFLAGS"; then ++ for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do ++ if test -e "$oss_conf"; then ++ . "$oss_conf" ++ fi ++ done ++ if test -d "$OSSLIBDIR"; then ++ MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include" ++ fi ++ fi ++ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) ++ ++ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" ++ MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h) ++ ++ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ ++ "$ac_cv_header_linux_soundcard_h" != "yes" -a \ ++ "$ac_cv_header_soundcard_h" != "yes"; then ++ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --disable-ogg --disable-wave --disable-webm.]) ++ fi ++ ++ dnl Assume NetBSD implementation over SunAudio ++ AC_CHECK_LIB(ossaudio, _oss_ioctl, ++ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") ++ MOZ_OSS_LIBS="-lossaudio"]) ++fi ++CFLAGS=$_SAVE_CFLAGS ++LIBS=$_SAVE_LIBS ++ ++AC_SUBST(MOZ_OSS) ++AC_SUBST_LIST(MOZ_OSS_CFLAGS) ++AC_SUBST_LIST(MOZ_OSS_LIBS) ++ ++dnl ================================== + dnl = Check alsa availability on Linux + dnl ================================== + +@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, + MOZ_ALSA=1, + MOZ_ALSA=) + ++MOZ_ARG_DISABLE_BOOL(alsa-dlopen, ++[ --disable-alsa-dlopen Disable runtime linking of libasound.so], ++ DISABLE_LIBASOUND_DLOPEN=1, ++ DISABLE_LIBASOUND_DLOPEN=) ++ + if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) + fi + ++if test -n "$DISABLE_LIBASOUND_DLOPEN"; then ++ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN) ++else ++ MOZ_ALSA_LIBS= ++fi ++ + AC_SUBST(MOZ_ALSA) + + dnl ======================================================== +diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS +index b441e8a..950d9e5 100644 +--- mozilla/media/libcubeb/AUTHORS ++++ mozilla/media/libcubeb/AUTHORS +@@ -4,3 +4,4 @@ Michael Wu + Paul Adenot + David Richards + Sebastien Alaiwan ++Evgeniy Vodolazskiy +diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c +index 9c3adcc..45d765b 100644 +--- mozilla/media/libcubeb/src/cubeb.c ++++ mozilla/media/libcubeb/src/cubeb.c +@@ -54,6 +54,9 @@ int opensl_init(cubeb ** context, char const * context_name); + #if defined(USE_AUDIOTRACK) + int audiotrack_init(cubeb ** context, char const * context_name); + #endif ++#if defined(USE_OSS) ++int oss_init(cubeb ** context, char const * context_name); ++#endif + + int + validate_stream_params(cubeb_stream_params stream_params) +@@ -120,6 +123,9 @@ cubeb_init(cubeb ** context, char const * context_name) + #if defined(USE_AUDIOTRACK) + audiotrack_init, + #endif ++#if defined(USE_OSS) ++ oss_init, ++#endif + }; + int i; + +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index a962553..1f780f4 100644 +--- mozilla/media/libcubeb/src/cubeb_alsa.c ++++ mozilla/media/libcubeb/src/cubeb_alsa.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -24,6 +25,50 @@ + + #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" + ++#ifdef DISABLE_LIBASOUND_DLOPEN ++#define WRAP(x) x ++#else ++#define WRAP(x) cubeb_##x ++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x ++MAKE_TYPEDEF(snd_config); ++MAKE_TYPEDEF(snd_config_add); ++MAKE_TYPEDEF(snd_config_copy); ++MAKE_TYPEDEF(snd_config_delete); ++MAKE_TYPEDEF(snd_config_get_id); ++MAKE_TYPEDEF(snd_config_get_string); ++MAKE_TYPEDEF(snd_config_imake_integer); ++MAKE_TYPEDEF(snd_config_search); ++MAKE_TYPEDEF(snd_config_search_definition); ++MAKE_TYPEDEF(snd_lib_error_set_handler); ++MAKE_TYPEDEF(snd_pcm_avail_update); ++MAKE_TYPEDEF(snd_pcm_close); ++MAKE_TYPEDEF(snd_pcm_delay); ++MAKE_TYPEDEF(snd_pcm_drain); ++MAKE_TYPEDEF(snd_pcm_frames_to_bytes); ++MAKE_TYPEDEF(snd_pcm_get_params); ++/* snd_pcm_hw_params_alloca is actually a macro */ ++/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ ++MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); ++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof ++MAKE_TYPEDEF(snd_pcm_hw_params_any); ++MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); ++MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); ++MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); ++MAKE_TYPEDEF(snd_pcm_nonblock); ++MAKE_TYPEDEF(snd_pcm_open); ++MAKE_TYPEDEF(snd_pcm_open_lconf); ++MAKE_TYPEDEF(snd_pcm_pause); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); ++MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); ++MAKE_TYPEDEF(snd_pcm_recover); ++MAKE_TYPEDEF(snd_pcm_set_params); ++MAKE_TYPEDEF(snd_pcm_state); ++MAKE_TYPEDEF(snd_pcm_writei); ++ ++#undef MAKE_TYPEDEF ++#endif ++ + /* ALSA is not thread-safe. snd_pcm_t instances are individually protected + by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction + is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), +@@ -64,6 +109,8 @@ struct cubeb { + workaround is not required. */ + snd_config_t * local_config; + int is_pa; ++ ++ void * libasound; + }; + + enum stream_state { +@@ -262,7 +309,7 @@ alsa_refill_stream(cubeb_stream * stm) + + pthread_mutex_lock(&stm->mutex); + +- r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); ++ r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); + if (r < 0 || revents != POLLOUT) { + /* This should be a stream error; it makes no sense for poll(2) to wake + for this stream and then have the stream report that it's not ready. +@@ -271,10 +318,10 @@ alsa_refill_stream(cubeb_stream * stm) + return RUNNING; + } + +- avail = snd_pcm_avail_update(stm->pcm); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + if (avail == -EPIPE) { +- snd_pcm_recover(stm->pcm, avail, 1); +- avail = snd_pcm_avail_update(stm->pcm); ++ WRAP(snd_pcm_recover)(stm->pcm, avail, 1); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + } + + /* Failed to recover from an xrun, this stream must be broken. */ +@@ -293,8 +340,8 @@ alsa_refill_stream(cubeb_stream * stm) + available to write. If avail is still zero here, the stream must be in + a funky state, so recover and try again. */ + if (avail == 0) { +- snd_pcm_recover(stm->pcm, -EPIPE, 1); +- avail = snd_pcm_avail_update(stm->pcm); ++ WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1); ++ avail = WRAP(snd_pcm_avail_update)(stm->pcm); + if (avail <= 0) { + pthread_mutex_unlock(&stm->mutex); + stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); +@@ -302,7 +349,7 @@ alsa_refill_stream(cubeb_stream * stm) + } + } + +- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail)); ++ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail)); + 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); + if (wrote == -EPIPE) { +- snd_pcm_recover(stm->pcm, wrote, 1); +- wrote = snd_pcm_writei(stm->pcm, p, got); ++ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); + } + assert(wrote >= 0 && wrote == got); + stm->write_position += wrote; +@@ -342,7 +389,7 @@ alsa_refill_stream(cubeb_stream * stm) + + /* Fill the remaining buffer with silence to guarantee one full period + has been written. */ +- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got); ++ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got); + + set_timeout(&stm->drain_timeout, buffer_time * 1000); + +@@ -453,26 +500,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + + slave_def = NULL; + +- r = snd_config_search(root_pcm, "slave", &slave_pcm); ++ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); + if (r < 0) { + return NULL; + } + +- r = snd_config_get_string(slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_pcm, &string); + if (r >= 0) { +- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); + if (r < 0) { + return NULL; + } + } + + do { +- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); ++ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); + if (r < 0) { + break; + } + +- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); ++ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); + if (r < 0) { + break; + } +@@ -481,7 +528,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm); + if (r < 0) { + break; + } +@@ -490,7 +537,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) + } while (0); + + if (slave_def) { +- snd_config_delete(slave_def); ++ WRAP(snd_config_delete)(slave_def); + } + + return NULL; +@@ -513,22 +560,22 @@ init_local_config_with_workaround(char const * pcm_name) + + lconf = NULL; + +- if (snd_config == NULL) { ++ if (*WRAP(snd_config) == NULL) { + return NULL; + } + +- r = snd_config_copy(&lconf, snd_config); ++ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); + if (r < 0) { + return NULL; + } + + do { +- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); ++ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); + if (r < 0) { + break; + } + +- r = snd_config_get_id(pcm_node, &string); ++ r = WRAP(snd_config_get_id)(pcm_node, &string); + if (r < 0) { + break; + } +@@ -537,7 +584,7 @@ init_local_config_with_workaround(char const * pcm_name) + if (r < 0 || r > (int) sizeof(node_name)) { + break; + } +- r = snd_config_search(lconf, node_name, &pcm_node); ++ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); + if (r < 0) { + break; + } +@@ -548,12 +595,12 @@ init_local_config_with_workaround(char const * pcm_name) + } + + /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ +- r = snd_config_search(pcm_node, "type", &node); ++ r = WRAP(snd_config_search)(pcm_node, "type", &node); + if (r < 0) { + break; + } + +- r = snd_config_get_string(node, &string); ++ r = WRAP(snd_config_get_string)(node, &string); + if (r < 0) { + break; + } +@@ -564,18 +611,18 @@ init_local_config_with_workaround(char const * pcm_name) + + /* Don't clobber an explicit existing handle_underrun value, set it only + if it doesn't already exist. */ +- r = snd_config_search(pcm_node, "handle_underrun", &node); ++ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); + if (r != -ENOENT) { + break; + } + + /* Disable pcm_pulse's asynchronous underrun handling. */ +- r = snd_config_imake_integer(&node, "handle_underrun", 0); ++ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); + if (r < 0) { + break; + } + +- r = snd_config_add(pcm_node, node); ++ r = WRAP(snd_config_add)(pcm_node, node); + if (r < 0) { + break; + } +@@ -583,7 +630,7 @@ init_local_config_with_workaround(char const * pcm_name) + return lconf; + } while (0); + +- snd_config_delete(lconf); ++ WRAP(snd_config_delete)(lconf); + + return NULL; + } +@@ -595,9 +642,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream, snd_config_t * l + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (local_config) { +- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); ++ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); + } else { +- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); ++ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); + } + pthread_mutex_unlock(&cubeb_alsa_mutex); + +@@ -610,7 +657,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) + int r; + + pthread_mutex_lock(&cubeb_alsa_mutex); +- r = snd_pcm_close(pcm); ++ r = WRAP(snd_pcm_close)(pcm); + pthread_mutex_unlock(&cubeb_alsa_mutex); + + return r; +@@ -667,12 +714,65 @@ alsa_init(cubeb ** context, char const * context_name) + pthread_attr_t attr; + snd_pcm_t * dummy; + ++ void * libasound = NULL; ++ ++#ifndef DISABLE_LIBASOUND_DLOPEN ++ libasound = dlopen("libasound.so", RTLD_LAZY); ++ if (!libasound) { ++ return CUBEB_ERROR; ++ } ++ ++#define LOAD(x) do { \ ++ cubeb_##x = dlsym(libasound, #x); \ ++ if (!cubeb_##x) { \ ++ dlclose(libasound); \ ++ return CUBEB_ERROR; \ ++ } \ ++ } while(0) ++ ++ LOAD(snd_config); ++ LOAD(snd_config_add); ++ LOAD(snd_config_copy); ++ LOAD(snd_config_delete); ++ LOAD(snd_config_get_id); ++ LOAD(snd_config_get_string); ++ LOAD(snd_config_imake_integer); ++ LOAD(snd_config_search); ++ LOAD(snd_config_search_definition); ++ LOAD(snd_lib_error_set_handler); ++ LOAD(snd_pcm_avail_update); ++ LOAD(snd_pcm_close); ++ LOAD(snd_pcm_delay); ++ LOAD(snd_pcm_drain); ++ LOAD(snd_pcm_frames_to_bytes); ++ LOAD(snd_pcm_get_params); ++ /* snd_pcm_hw_params_alloca is actually a macro */ ++ /* LOAD(snd_pcm_hw_params_alloca); */ ++ LOAD(snd_pcm_hw_params_sizeof); ++ LOAD(snd_pcm_hw_params_any); ++ LOAD(snd_pcm_hw_params_get_channels_max); ++ LOAD(snd_pcm_hw_params_get_rate); ++ LOAD(snd_pcm_hw_params_set_rate_near); ++ LOAD(snd_pcm_nonblock); ++ LOAD(snd_pcm_open); ++ LOAD(snd_pcm_open_lconf); ++ LOAD(snd_pcm_pause); ++ LOAD(snd_pcm_poll_descriptors); ++ LOAD(snd_pcm_poll_descriptors_count); ++ LOAD(snd_pcm_poll_descriptors_revents); ++ LOAD(snd_pcm_recover); ++ LOAD(snd_pcm_set_params); ++ LOAD(snd_pcm_state); ++ LOAD(snd_pcm_writei); ++ ++#undef LOAD ++#endif + assert(context); + *context = NULL; + + pthread_mutex_lock(&cubeb_alsa_mutex); + if (!cubeb_alsa_error_handler_set) { +- snd_lib_error_set_handler(silent_error_handler); ++ WRAP(snd_lib_error_set_handler)(silent_error_handler); + cubeb_alsa_error_handler_set = 1; + } + pthread_mutex_unlock(&cubeb_alsa_mutex); +@@ -680,6 +780,8 @@ alsa_init(cubeb ** context, char const * context_name) + ctx = calloc(1, sizeof(*ctx)); + assert(ctx); + ++ ctx->libasound = libasound; ++ + ctx->ops = &alsa_ops; + + r = pthread_mutex_init(&ctx->mutex, NULL); +@@ -729,7 +831,7 @@ alsa_init(cubeb ** context, char const * context_name) + config fails with EINVAL, the PA PCM is too old for this workaround. */ + if (r == -EINVAL) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + ctx->local_config = NULL; + } else if (r >= 0) { +@@ -768,9 +870,13 @@ alsa_destroy(cubeb * ctx) + pthread_mutex_destroy(&ctx->mutex); + free(ctx->fds); + ++ if (ctx->libasound) { ++ dlclose(ctx->libasound); ++ } ++ + if (ctx->local_config) { + pthread_mutex_lock(&cubeb_alsa_mutex); +- snd_config_delete(ctx->local_config); ++ WRAP(snd_config_delete)(ctx->local_config); + pthread_mutex_unlock(&cubeb_alsa_mutex); + } + +@@ -838,7 +944,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, + return CUBEB_ERROR; + } + +- r = snd_pcm_nonblock(stm->pcm, 1); ++ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); + assert(r == 0); + + /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't +@@ -848,23 +954,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, + latency = latency < 500 ? 500 : latency; + } + +- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, +- stm->params.channels, stm->params.rate, 1, +- latency * 1000); ++ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, ++ stm->params.channels, stm->params.rate, 1, ++ latency * 1000); + if (r < 0) { + alsa_stream_destroy(stm); + return CUBEB_ERROR_INVALID_FORMAT; + } + +- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size); ++ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size); + assert(r == 0); + +- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); ++ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); + assert(stm->nfds > 0); + + stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); + assert(stm->saved_fds); +- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); ++ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); + assert((nfds_t) r == stm->nfds); + + r = pthread_cond_init(&stm->cond, NULL); +@@ -895,7 +1001,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -937,12 +1043,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) + return CUBEB_ERROR; + } + +- rv = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (rv < 0) { + return CUBEB_ERROR; + } + +- rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (rv < 0) { + return CUBEB_ERROR; + } +@@ -962,34 +1068,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { + + /* get a pcm, disabling resampling, so we get a rate the + * hardware/dmix/pulse/etc. supports. */ +- rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); ++ rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); + if (rv < 0) { + return CUBEB_ERROR; + } + +- rv = snd_pcm_hw_params_any(pcm, hw_params); ++ rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (rv < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (rv >= 0) { + /* There is a default rate: use it. */ +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_OK; + } + + /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ + *rate = 44100; + +- rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (rv < 0) { +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + return CUBEB_ERROR; + } + +- snd_pcm_close(pcm); ++ WRAP(snd_pcm_close)(pcm); + + return CUBEB_OK; + } +@@ -1013,7 +1119,7 @@ alsa_stream_start(cubeb_stream * stm) + ctx = stm->context; + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 0); ++ WRAP(snd_pcm_pause)(stm->pcm, 0); + gettimeofday(&stm->last_activity, NULL); + pthread_mutex_unlock(&stm->mutex); + +@@ -1047,7 +1153,7 @@ alsa_stream_stop(cubeb_stream * stm) + pthread_mutex_unlock(&ctx->mutex); + + pthread_mutex_lock(&stm->mutex); +- snd_pcm_pause(stm->pcm, 1); ++ WRAP(snd_pcm_pause)(stm->pcm, 1); + pthread_mutex_unlock(&stm->mutex); + + return CUBEB_OK; +@@ -1063,8 +1169,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) + pthread_mutex_lock(&stm->mutex); + + delay = -1; +- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || +- snd_pcm_delay(stm->pcm, &delay) != 0) { ++ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || ++ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { + *position = stm->last_position; + pthread_mutex_unlock(&stm->mutex); + return CUBEB_OK; +@@ -1089,7 +1195,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) + snd_pcm_sframes_t delay; + /* This function returns the delay in frames until a frame written using + snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ +- if (snd_pcm_delay(stm->pcm, &delay)) { ++ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { + return CUBEB_ERROR; + } + +diff --git media/libcubeb/src/cubeb_oss.c media/libcubeb/src/cubeb_oss.c +new file mode 100644 +index 0000000..5e38e27 +--- /dev/null ++++ mozilla/media/libcubeb/src/cubeb_oss.c +@@ -0,0 +1,399 @@ ++/* ++ * Copyright © 2014 Mozilla Foundation ++ * ++ * This program is made available under an ISC-style license. See the ++ * accompanying file LICENSE for details. ++ */ ++#if defined(HAVE_SYS_SOUNDCARD_H) ++#include ++#elif defined(HAVE_LINUX_SOUNDCARD_H) ++#include ++#else ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "cubeb/cubeb.h" ++#include "cubeb-internal.h" ++ ++#ifndef CUBEB_OSS_DEFAULT_OUTPUT ++#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp" ++#endif ++ ++#define OSS_BUFFER_SIZE 1024 ++ ++struct cubeb { ++ struct cubeb_ops const * ops; ++}; ++ ++struct cubeb_stream { ++ cubeb * context; ++ ++ cubeb_data_callback data_callback; ++ cubeb_state_callback state_callback; ++ void * user_ptr; ++ float volume; ++ float panning; ++ ++ pthread_mutex_t state_mutex; ++ pthread_cond_t state_cond; ++ ++ int running; ++ int stopped; ++ int floating; ++ ++ /* These two vars are needed to support old versions of OSS */ ++ unsigned int position_bytes; ++ unsigned int last_position_bytes; ++ ++ uint64_t written_frags; /* The number of fragments written to /dev/dsp */ ++ uint64_t missed_frags; /* fragments output with stopped stream */ ++ ++ cubeb_stream_params params; ++ int fd; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Thu Oct 16 18:48: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 BDFA149C; Thu, 16 Oct 2014 18:48: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 AA429D9B; Thu, 16 Oct 2014 18:48: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 s9GImiwg012519; Thu, 16 Oct 2014 18:48:44 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GImiHr012517; Thu, 16 Oct 2014 18:48:44 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201410161848.s9GImiHr012517@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 16 Oct 2014 18:48:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371016 - branches/2014Q4/www/drupal7 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, 16 Oct 2014 18:48:44 -0000 Author: flo Date: Thu Oct 16 18:48:43 2014 New Revision: 371016 URL: https://svnweb.freebsd.org/changeset/ports/371016 QAT: https://qat.redports.org/buildarchive/r371016/ Log: MFH: r371013 Update to 7.32 Security: 6f825fa4-5560-11e4-a4c3-00a0986f28c4 Approved by: portmgr Modified: branches/2014Q4/www/drupal7/Makefile branches/2014Q4/www/drupal7/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/drupal7/Makefile ============================================================================== --- branches/2014Q4/www/drupal7/Makefile Thu Oct 16 18:45:55 2014 (r371015) +++ branches/2014Q4/www/drupal7/Makefile Thu Oct 16 18:48:43 2014 (r371016) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= drupal7 -PORTVERSION= 7.28 -PORTREVISION= 1 +PORTVERSION= 7.32 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} Modified: branches/2014Q4/www/drupal7/distinfo ============================================================================== --- branches/2014Q4/www/drupal7/distinfo Thu Oct 16 18:45:55 2014 (r371015) +++ branches/2014Q4/www/drupal7/distinfo Thu Oct 16 18:48:43 2014 (r371016) @@ -1,2 +1,2 @@ -SHA256 (drupal/drupal-7.28.tar.gz) = 941b6de8978d215c95fe6f8466e3cb212f16647de93b38bbc41df020fd6e5eaa -SIZE (drupal/drupal-7.28.tar.gz) = 3212823 +SHA256 (drupal/drupal-7.32.tar.gz) = f36d5ab0891997bf3c681b76151c6b015b0bb9041610e1c9af7d17e28dc15c39 +SIZE (drupal/drupal-7.32.tar.gz) = 3215563 From owner-svn-ports-branches@FreeBSD.ORG Fri Oct 17 23:33:09 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 B4787963; Fri, 17 Oct 2014 23:33: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 8644FDED; Fri, 17 Oct 2014 23:33: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 s9HNX90d049551; Fri, 17 Oct 2014 23:33:09 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HNX9Pn049549; Fri, 17 Oct 2014 23:33:09 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410172333.s9HNX9Pn049549@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 17 Oct 2014 23:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371086 - branches/2014Q4/mail/nullmailer 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, 17 Oct 2014 23:33:09 -0000 Author: bapt Date: Fri Oct 17 23:33:08 2014 New Revision: 371086 URL: https://svnweb.freebsd.org/changeset/ports/371086 QAT: https://qat.redports.org/buildarchive/r371086/ Log: MFH: r371085 Fix plist PR: 194205 Pointyhat to: bapt Modified: branches/2014Q4/mail/nullmailer/Makefile branches/2014Q4/mail/nullmailer/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/mail/nullmailer/Makefile ============================================================================== --- branches/2014Q4/mail/nullmailer/Makefile Fri Oct 17 23:32:06 2014 (r371085) +++ branches/2014Q4/mail/nullmailer/Makefile Fri Oct 17 23:33:08 2014 (r371086) @@ -3,7 +3,7 @@ PORTNAME= nullmailer PORTVERSION= 1.13 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ \ Modified: branches/2014Q4/mail/nullmailer/pkg-plist ============================================================================== --- branches/2014Q4/mail/nullmailer/pkg-plist Fri Oct 17 23:32:06 2014 (r371085) +++ branches/2014Q4/mail/nullmailer/pkg-plist Fri Oct 17 23:33:08 2014 (r371086) @@ -4,7 +4,7 @@ libexec/nullmailer/qmqp libexec/nullmailer/sendmail bin/nullmailer-inject bin/nullmailer-smtpd -@(%%NULLMAIL_USER%%,,2555) sbin/nullmailer-queue +@(%%NULLMAIL_USER%%,,4555) sbin/nullmailer-queue sbin/nullmailer-send man/man1/nullmailer-inject.1.gz man/man1/sendmail.1.gz @@ -16,3 +16,7 @@ man/man8/nullmailer-send.8.gz @dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/nullmailer/queue @dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/nullmailer/tmp @dir %%LOCALSTATEDIR%%/nullmailer +@exec mkfifo %%LOCALSTATEDIR%%/nullmailer/trigger +@exec chmod 600 %%LOCALSTATEDIR%%/nullmailer/trigger +@exec chown %%NULLMAIL_USER%%:%%NULLMAIL_USER%% %%LOCALSTATEDIR%%/nullmailer/trigger +@unexec rm -f %%LOCALSTATEDIR%%/nullmailer/trigger From owner-svn-ports-branches@FreeBSD.ORG Fri Oct 17 23:36:26 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 0F6A4C82; Fri, 17 Oct 2014 23:36:26 +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 F00F8E32; Fri, 17 Oct 2014 23:36:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9HNaPq5050193; Fri, 17 Oct 2014 23:36:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HNaPLa050192; Fri, 17 Oct 2014 23:36:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410172336.s9HNaPLa050192@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 17 Oct 2014 23:36:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371088 - branches/2014Q4/mail/nullmailer 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, 17 Oct 2014 23:36:26 -0000 Author: bapt Date: Fri Oct 17 23:36:25 2014 New Revision: 371088 URL: https://svnweb.freebsd.org/changeset/ports/371088 QAT: https://qat.redports.org/buildarchive/r371088/ Log: MFH: r371087 Fix harder PR: 194205 Modified: branches/2014Q4/mail/nullmailer/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/mail/nullmailer/pkg-plist ============================================================================== --- branches/2014Q4/mail/nullmailer/pkg-plist Fri Oct 17 23:35:23 2014 (r371087) +++ branches/2014Q4/mail/nullmailer/pkg-plist Fri Oct 17 23:36:25 2014 (r371088) @@ -1,6 +1,6 @@ libexec/nullmailer/smtp libexec/nullmailer/qmqp -@(%%NULLMAIL_USER%%,,2555) libexec/nullmailer/mailq +@(%%NULLMAIL_USER%%,,4555) libexec/nullmailer/mailq libexec/nullmailer/sendmail bin/nullmailer-inject bin/nullmailer-smtpd From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 10:25: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 1BB11F3E; Sat, 18 Oct 2014 10:25: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 EF62FD86; Sat, 18 Oct 2014 10:25: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 s9IAP8B6056864; Sat, 18 Oct 2014 10:25:08 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IAP85o056863; Sat, 18 Oct 2014 10:25:08 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181025.s9IAP85o056863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 10:25:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371111 - branches/2014Q4/Mk/Uses 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, 18 Oct 2014 10:25:09 -0000 Author: antoine Date: Sat Oct 18 10:25:08 2014 New Revision: 371111 URL: https://svnweb.freebsd.org/changeset/ports/371111 QAT: https://qat.redports.org/buildarchive/r371111/ Log: MFH: r371110 Unbreak seamonkey-i18n With hat: portmgr Modified: branches/2014Q4/Mk/Uses/gecko.mk Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/Mk/Uses/gecko.mk ============================================================================== --- branches/2014Q4/Mk/Uses/gecko.mk Sat Oct 18 10:23:53 2014 (r371110) +++ branches/2014Q4/Mk/Uses/gecko.mk Sat Oct 18 10:25:08 2014 (r371111) @@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .elif ${gecko_ARGS:Mseamonkey} -_GECKO_DEFAULT_VERSION= 29 -_GECKO_VERSIONS= 29 +_GECKO_DEFAULT_VERSION= 30 +_GECKO_VERSIONS= 30 _GECKO_TYPE= seamonkey .if exists(${LOCALBASE}/bin/seamonkey) @@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Seamonkey versions -29_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey +30_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey .elif ${gecko_ARGS:Mthunderbird} From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 14:45:35 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 E96C890A; Sat, 18 Oct 2014 14:45:35 +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 D58BE6D5; Sat, 18 Oct 2014 14:45:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IEjZW1079635; Sat, 18 Oct 2014 14:45:35 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IEjZM3079634; Sat, 18 Oct 2014 14:45:35 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181445.s9IEjZM3079634@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 14:45:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371130 - branches/2014Q4/mail/rss2email3 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, 18 Oct 2014 14:45:36 -0000 Author: antoine Date: Sat Oct 18 14:45:35 2014 New Revision: 371130 URL: https://svnweb.freebsd.org/changeset/ports/371130 QAT: https://qat.redports.org/buildarchive/r371130/ Log: MFH: r371129 Ignore on the package builders when the default version of python is different from the requested one Reported by: pkg-fallout Modified: branches/2014Q4/mail/rss2email3/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/mail/rss2email3/Makefile ============================================================================== --- branches/2014Q4/mail/rss2email3/Makefile Sat Oct 18 14:44:52 2014 (r371129) +++ branches/2014Q4/mail/rss2email3/Makefile Sat Oct 18 14:45:35 2014 (r371130) @@ -36,4 +36,10 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include +.include + +.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} +.endif + +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 14:48:48 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 965A9AE3; Sat, 18 Oct 2014 14:48:48 +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 822DD74B; Sat, 18 Oct 2014 14:48:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IEmmnn080209; Sat, 18 Oct 2014 14:48:48 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IEmmxb080208; Sat, 18 Oct 2014 14:48:48 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181448.s9IEmmxb080208@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 14:48:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371132 - branches/2014Q4/databases/freetds-devel 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, 18 Oct 2014 14:48:48 -0000 Author: antoine Date: Sat Oct 18 14:48:47 2014 New Revision: 371132 URL: https://svnweb.freebsd.org/changeset/ports/371132 QAT: https://qat.redports.org/buildarchive/r371132/ Log: MFH: r370740 Mark BROKEN: Fails to build with gcc: /bin/sh ../../libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -DDEBUG=1 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wpointer-arith -D_THREAD_SAFE -pthread -O2 -pipe -fno-strict-aliasing -I/usr/include -Wdeclaration-after-statement -MT threadsafe.lo -MD -MP -MF .deps/threadsafe.Tpo -c -o threadsafe.lo threadsafe.c libtool: compile: cc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -DDEBUG=1 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wpointer-arith -D_THREAD_SAFE -pthread -O2 -pipe -fno-strict-aliasing -I/usr/include -Wdeclaration-after-statement -MT threadsafe.lo -MD -MP -MF .deps/threadsafe.Tpo -c threadsafe.c -fPIC -DPIC -o .libs/threadsafe.o In file included from threadsafe.c:84: ../../include/freetds/tds.h:149: warning: function declaration isn't a prototype ../../include/freetds/tds.h:149: error: bit-field '__res_state' has invalid type Makefile:439: recipe for target 'threadsafe.lo' failed with clang: /bin/sh ../../libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -DDEBUG=1 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wpointer-arith -D_THREAD_SAFE -pthread -O2 -pipe -fno-strict-aliasing -I/usr/include -Wdeclaration-after-statement -MT threadsafe.lo -MD -MP -MF .deps/threadsafe.Tpo -c -o threadsafe.lo threadsafe.c libtool: compile: cc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I/usr/local/include -D_REENTRANT -D_THREAD_SAFE -DDEBUG=1 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wpointer-arith -D_THREAD_SAFE -pthread -O2 -pipe -fno-strict-aliasing -I/usr/include -Wdeclaration-after-statement -MT threadsafe.lo -MD -MP -MF .deps/threadsafe.Tpo -c threadsafe.c -fPIC -DPIC -o .libs/threadsafe.o In file included from threadsafe.c:84: ../../include/freetds/tds.h:149:16: error: bit-field '__res_state' has non-integral type 'TDS_USMALLINT (*())' TDS_USMALLINT _res:10; ^ ~~ /usr/include/resolv.h:282:16: note: expanded from macro '_res' #define _res (*__res_state()) ^ 1 error generated. Makefile:439: recipe for target 'threadsafe.lo' failed Reported by: pkg-fallout Modified: branches/2014Q4/databases/freetds-devel/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/databases/freetds-devel/Makefile ============================================================================== --- branches/2014Q4/databases/freetds-devel/Makefile Sat Oct 18 14:46:42 2014 (r371131) +++ branches/2014Q4/databases/freetds-devel/Makefile Sat Oct 18 14:48:47 2014 (r371132) @@ -14,6 +14,8 @@ COMMENT= Sybase/Microsoft TDS protocol l LICENSE= LGPL20 +BROKEN= Fails to build + WRKSRC= ${WRKDIR}/${PORTNAME}-dev.${PORTVERSION} TDS_VER?= 7.2 USES= gmake iconv libtool:keepla pkgconfig tar:bzip2 From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 14:50:19 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 2B993BCE; Sat, 18 Oct 2014 14:50:19 +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 0D6BE756; Sat, 18 Oct 2014 14:50:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IEoIFq080619; Sat, 18 Oct 2014 14:50:18 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IEoHLZ080614; Sat, 18 Oct 2014 14:50:17 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181450.s9IEoHLZ080614@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 14:50:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371133 - branches/2014Q4/devel/p4d 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, 18 Oct 2014 14:50:19 -0000 Author: antoine Date: Sat Oct 18 14:50:17 2014 New Revision: 371133 URL: https://svnweb.freebsd.org/changeset/ports/371133 QAT: https://qat.redports.org/buildarchive/r371133/ Log: MFH: r370689 - Update to upstream version 2014.1.933132 PR: 193618 Submitted by: gordon@FreeBSD.org (maintainer) Modified: branches/2014Q4/devel/p4d/Makefile branches/2014Q4/devel/p4d/distinfo.freebsd100x86 branches/2014Q4/devel/p4d/distinfo.freebsd100x86_64 branches/2014Q4/devel/p4d/distinfo.freebsd70x86 branches/2014Q4/devel/p4d/distinfo.freebsd70x86_64 Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/p4d/Makefile ============================================================================== --- branches/2014Q4/devel/p4d/Makefile Sat Oct 18 14:48:47 2014 (r371132) +++ branches/2014Q4/devel/p4d/Makefile Sat Oct 18 14:50:17 2014 (r371133) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2014.1.907894 +PORTVERSION= 2014.1.933132 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2014Q4/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2014Q4/devel/p4d/distinfo.freebsd100x86 Sat Oct 18 14:48:47 2014 (r371132) +++ branches/2014Q4/devel/p4d/distinfo.freebsd100x86 Sat Oct 18 14:50:17 2014 (r371133) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.1.907894/bin.freebsd100x86/p4d) = 8350061fc8d755906794e972c605f2094477fe671ddd35f39fcb7e9697dc3ed0 -SIZE (perforce/2014.1.907894/bin.freebsd100x86/p4d) = 4517028 +SHA256 (perforce/2014.1.933132/bin.freebsd100x86/p4d) = eeea43b390deec1ec32e5c1b2c6668e840de90f906ca90f857396be47b2be62d +SIZE (perforce/2014.1.933132/bin.freebsd100x86/p4d) = 4517028 Modified: branches/2014Q4/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2014Q4/devel/p4d/distinfo.freebsd100x86_64 Sat Oct 18 14:48:47 2014 (r371132) +++ branches/2014Q4/devel/p4d/distinfo.freebsd100x86_64 Sat Oct 18 14:50:17 2014 (r371133) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.1.907894/bin.freebsd100x86_64/p4d) = 2a4e541ec251ce53de5ae6255a156f48f9214dfbc0395670269bb9fb8198dda2 -SIZE (perforce/2014.1.907894/bin.freebsd100x86_64/p4d) = 4685408 +SHA256 (perforce/2014.1.933132/bin.freebsd100x86_64/p4d) = 49fb9dd03beb01fdf606005ce6ae74fe35e85cba7363918b6808e60a8d8714c5 +SIZE (perforce/2014.1.933132/bin.freebsd100x86_64/p4d) = 4685952 Modified: branches/2014Q4/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2014Q4/devel/p4d/distinfo.freebsd70x86 Sat Oct 18 14:48:47 2014 (r371132) +++ branches/2014Q4/devel/p4d/distinfo.freebsd70x86 Sat Oct 18 14:50:17 2014 (r371133) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.1.907894/bin.freebsd70x86/p4d) = 1d0fcc2daa19e1c6a6e5e60798cb2c74ed3efa16f8f0d1aed6744072c18a0141 -SIZE (perforce/2014.1.907894/bin.freebsd70x86/p4d) = 4862096 +SHA256 (perforce/2014.1.933132/bin.freebsd70x86/p4d) = 4b560d904dbc8dfd434eb547a65754502ab9560097fdee97fe90f09b6a1dd425 +SIZE (perforce/2014.1.933132/bin.freebsd70x86/p4d) = 4862576 Modified: branches/2014Q4/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2014Q4/devel/p4d/distinfo.freebsd70x86_64 Sat Oct 18 14:48:47 2014 (r371132) +++ branches/2014Q4/devel/p4d/distinfo.freebsd70x86_64 Sat Oct 18 14:50:17 2014 (r371133) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.1.907894/bin.freebsd70x86_64/p4d) = cb3c717a5583f4bab3bcf1771698fbf5d2a4ce6235ab99436733e99dd5810281 -SIZE (perforce/2014.1.907894/bin.freebsd70x86_64/p4d) = 5027088 +SHA256 (perforce/2014.1.933132/bin.freebsd70x86_64/p4d) = f73a2130760f0a5621c9110d77128dd962221b94f64a45d716c5095e26abec03 +SIZE (perforce/2014.1.933132/bin.freebsd70x86_64/p4d) = 5028176 From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 14:52:41 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 1B701CC0; Sat, 18 Oct 2014 14:52:41 +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 E1C937ED; Sat, 18 Oct 2014 14:52: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 s9IEqevA084370; Sat, 18 Oct 2014 14:52:40 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IEqeJM084366; Sat, 18 Oct 2014 14:52:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181452.s9IEqeJM084366@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 14:52:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371134 - branches/2014Q4/math/py-pymc 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, 18 Oct 2014 14:52:41 -0000 Author: antoine Date: Sat Oct 18 14:52:39 2014 New Revision: 371134 URL: https://svnweb.freebsd.org/changeset/ports/371134 QAT: https://qat.redports.org/buildarchive/r371134/ Log: MFH: r371025 - Update to 2.3.3 Modified: branches/2014Q4/math/py-pymc/Makefile branches/2014Q4/math/py-pymc/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/math/py-pymc/Makefile ============================================================================== --- branches/2014Q4/math/py-pymc/Makefile Sat Oct 18 14:50:17 2014 (r371133) +++ branches/2014Q4/math/py-pymc/Makefile Sat Oct 18 14:52:39 2014 (r371134) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pymc -PORTVERSION= 2.3 -PORTREVISION= 2 +PORTVERSION= 2.3.3 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP @@ -29,9 +28,10 @@ RUN_DEPENDS= ${PYNUMPY} \ OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +LDFLAGS+= -shared + +USES= python +USE_PYTHON= distutils autoplist PORTDOCS= * post-install: @@ -43,6 +43,5 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/Container_values.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/LazyFunction.so ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.rst ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q4/math/py-pymc/distinfo ============================================================================== --- branches/2014Q4/math/py-pymc/distinfo Sat Oct 18 14:50:17 2014 (r371133) +++ branches/2014Q4/math/py-pymc/distinfo Sat Oct 18 14:52:39 2014 (r371134) @@ -1,2 +1,2 @@ -SHA256 (pymc-2.3.tar.gz) = db029c59d6a04f0c97d88993151c4ee58c76b9ad5c71ead7ee250088ba4cce0d -SIZE (pymc-2.3.tar.gz) = 13080085 +SHA256 (pymc-2.3.3.tar.gz) = 2b5f442e982fea53c3bed1ab7c648d5a261ca1bed4c6b8a4323ff19fccbc01ca +SIZE (pymc-2.3.3.tar.gz) = 384253 From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 14:55:05 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 7E389DAB; Sat, 18 Oct 2014 14:55:05 +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 66EC77F6; Sat, 18 Oct 2014 14:55:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IEt5Co084802; Sat, 18 Oct 2014 14:55:05 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IEt5Vb084801; Sat, 18 Oct 2014 14:55:05 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181455.s9IEt5Vb084801@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 14:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371135 - branches/2014Q4/science/py-obspy 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, 18 Oct 2014 14:55:05 -0000 Author: antoine Date: Sat Oct 18 14:55:04 2014 New Revision: 371135 URL: https://svnweb.freebsd.org/changeset/ports/371135 QAT: https://qat.redports.org/buildarchive/r371135/ Log: MFH: r371026 - Fix build Modified: branches/2014Q4/science/py-obspy/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/science/py-obspy/Makefile ============================================================================== --- branches/2014Q4/science/py-obspy/Makefile Sat Oct 18 14:52:39 2014 (r371134) +++ branches/2014Q4/science/py-obspy/Makefile Sat Oct 18 14:55:04 2014 (r371135) @@ -21,11 +21,10 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= fortran zip +USES= fortran zip python USE_LDCONFIG= yes -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +LDFLAGS+= -shared +USE_PYTHON= distutils autoplist post-patch: ${REINPLACE_CMD} -e "s#FC#${FC}#g" ${WRKSRC}/setup.py From owner-svn-ports-branches@FreeBSD.ORG Sat Oct 18 22:05:30 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 4340F2B1; Sat, 18 Oct 2014 22:05: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 2F2E6FF7; Sat, 18 Oct 2014 22:05: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 s9IM5UmZ088632; Sat, 18 Oct 2014 22:05:30 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IM5TgY088630; Sat, 18 Oct 2014 22:05:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410182205.s9IM5TgY088630@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 18 Oct 2014 22:05:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371162 - branches/2014Q4/sysutils/dfc 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, 18 Oct 2014 22:05:30 -0000 Author: bapt Date: Sat Oct 18 22:05:29 2014 New Revision: 371162 URL: https://svnweb.freebsd.org/changeset/ports/371162 QAT: https://qat.redports.org/buildarchive/r371162/ Log: MFH: r371161 Fix plist with NLS While here sort plist PR: 194444 Modified: branches/2014Q4/sysutils/dfc/Makefile branches/2014Q4/sysutils/dfc/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/sysutils/dfc/Makefile ============================================================================== --- branches/2014Q4/sysutils/dfc/Makefile Sat Oct 18 22:04:29 2014 (r371161) +++ branches/2014Q4/sysutils/dfc/Makefile Sat Oct 18 22:05:29 2014 (r371162) @@ -2,6 +2,7 @@ PORTNAME= dfc PORTVERSION= 3.0.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://projects.gw-computing.net/attachments/download/79/ Modified: branches/2014Q4/sysutils/dfc/pkg-plist ============================================================================== --- branches/2014Q4/sysutils/dfc/pkg-plist Sat Oct 18 22:04:29 2014 (r371161) +++ branches/2014Q4/sysutils/dfc/pkg-plist Sat Oct 18 22:05:29 2014 (r371162) @@ -1,13 +1,13 @@ +bin/dfc +etc/xdg/dfc/dfcrc +%%NLS%%etc/xdg/dfc/fr/dfcrc +%%NLS%%man/fr/man1/dfc.1.gz +man/man1/dfc.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TRANSLATORS -bin/dfc -etc/xdg/dfc/dfcrc -etc/xdg/dfc/fr/dfcrc -man/fr/man1/dfc.1.gz -man/man1/dfc.1.gz %%NLS%%share/locale/fr/LC_MESSAGES/dfc.mo %%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry man/fr/man1