From owner-svn-ports-branches@FreeBSD.ORG Mon Feb 16 22:04:24 2015 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 959DD340; Mon, 16 Feb 2015 22:04:24 +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 6643695C; Mon, 16 Feb 2015 22:04:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1GM4OsN075568; Mon, 16 Feb 2015 22:04:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1GM4NsC075563; Mon, 16 Feb 2015 22:04:23 GMT (envelope-from pgj@FreeBSD.org) Message-Id: <201502162204.t1GM4NsC075563@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pgj set sender to pgj@FreeBSD.org using -f From: Gabor Pali Date: Mon, 16 Feb 2015 22:04:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379122 - in branches/2015Q1/x11-wm: hs-xmonad hs-xmonad-contrib hs-xmonad/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, 16 Feb 2015 22:04:24 -0000 Author: pgj Date: Mon Feb 16 22:04:23 2015 New Revision: 379122 URL: https://svnweb.freebsd.org/changeset/ports/379122 QAT: https://qat.redports.org/buildarchive/r379122/ Log: MFH: r379052 - Add a (default) xmonad workaround for losing hotkeys in certain cases. For the details, please see the related bug report or issue #576 in the xmonad bug tracker [1]. [1] https://code.google.com/p/xmonad/issues/detail?id=576 PR: 181049 Submitted by: Dominik Ernst Approved by: portmgr (erwin) Obtained from: FreeBSD Haskell Added: branches/2015Q1/x11-wm/hs-xmonad/files/ - copied from r379052, head/x11-wm/hs-xmonad/files/ Modified: branches/2015Q1/x11-wm/hs-xmonad-contrib/Makefile branches/2015Q1/x11-wm/hs-xmonad/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-wm/hs-xmonad-contrib/Makefile ============================================================================== --- branches/2015Q1/x11-wm/hs-xmonad-contrib/Makefile Mon Feb 16 21:49:47 2015 (r379121) +++ branches/2015Q1/x11-wm/hs-xmonad-contrib/Makefile Mon Feb 16 22:04:23 2015 (r379122) @@ -3,7 +3,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org Modified: branches/2015Q1/x11-wm/hs-xmonad/Makefile ============================================================================== --- branches/2015Q1/x11-wm/hs-xmonad/Makefile Mon Feb 16 21:49:47 2015 (r379121) +++ branches/2015Q1/x11-wm/hs-xmonad/Makefile Mon Feb 16 22:04:23 2015 (r379122) @@ -3,7 +3,7 @@ PORTNAME= xmonad PORTVERSION= 0.11 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -19,5 +19,15 @@ MAN1SRC= man EXECUTABLE= xmonad +OPTIONS_DEFINE+= XFORK_FIX +OPTIONS_DEFAULT+= XFORK_FIX + +XFORK_FIX_DESC= Apply workaround for losing hotkeys (XMonad \#576) + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" + +.if ${PORT_OPTIONS:MXFORK_FIX} +EXTRA_PATCHES+= ${PATCHDIR}/nopatch-XMonad_Core.hs +.endif + .include From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 17 05:35:37 2015 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 7988D2A5; Tue, 17 Feb 2015 05:35:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63AFEC08; Tue, 17 Feb 2015 05:35:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1H5ZboA091047; Tue, 17 Feb 2015 05:35:37 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1H5ZawL091044; Tue, 17 Feb 2015 05:35:36 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201502170535.t1H5ZawL091044@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 17 Feb 2015 05:35:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379143 - branches/2015Q1/mail/postfix X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2015 05:35:37 -0000 Author: ohauer Date: Tue Feb 17 05:35:35 2015 New Revision: 379143 URL: https://svnweb.freebsd.org/changeset/ports/379143 QAT: https://qat.redports.org/buildarchive/r379143/ Log: MFH: r378221 - update conflicts for new postfix-current - use OPTIONS_SUB - enable TLS as default [1] - use USE_OPENSSL instead including Mk/openssl.mk - use new install instruction - use new notation for @mode in pkg-plist - bump PORTREVISON [1] Users using packages should have the ability to use TLS from the default package, (this makes the the postfix-tls port obsolete) MFH: r378967 - remove dead mirrors from MASTER_SITES (a good overview can be taken by viewving the source of http://www.postfix.org/download.html) - remove MASTER_SITE_SUBDIR, it should be used only for sites defined in bsd.site.mk MFH: r378980 - update to 2.11.4 Changes: 20141025 Bugfix (introduced: Postfix 2.11): core dump when smtp_policy_maps specifies an invalid TLS level. Viktor Dukhovni. File: smtp/smtp_tls_policy.c. 20150106 Robustness: don't segfault due to excessive recursion after a faulty configuration runs into the virtual_alias_recursion_limit. File: global/tok822_tree.c. 20150115 Safety: stop aliasing loops that exponentially increase the address length with each iteration. Back-ported from Postfix 3.0. File: cleanup/cleanup_map1n.c. 20150117 Cleanup: missing " in \%s\" in postconf(1) fatal error messages. Iain Hibbert. File: postconf/postconf_master.c. Approved by: portmgr (erwin) Modified: branches/2015Q1/mail/postfix/Makefile branches/2015Q1/mail/postfix/distinfo branches/2015Q1/mail/postfix/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/mail/postfix/Makefile ============================================================================== --- branches/2015Q1/mail/postfix/Makefile Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/Makefile Tue Feb 17 05:35:35 2015 (r379143) @@ -2,16 +2,16 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 2.11.3 -PORTREVISION= 3 +PORTVERSION= 2.11.4 PORTEPOCH= 1 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix +MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ + http://de.postfix.org/ftpmirror/ \ + http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ + http://www.artfiles.org/postfix.org/postfix-release/ \ + http://mirror.lhsolutions.nl/postfix-release/ \ + ftp://postfix.mirrors.pair.com/ +MASTER_SITES:= ${MASTER_SITES:S|$|official/|} DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org @@ -25,9 +25,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg PORTSCOUT= limit:^2\.11\. VDAVERSION= 2.10.0 -CONFLICTS_INSTALL?= courier-0.* postfix-1.* postfix2?-* postfix21?-* \ - postfix-current-2.* postfix-current-base-2.* postfix-tls-* \ - sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* +CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ + postfix2?-* postfix21?-* postfix-tls-* \ + postfix-current-[23].* postfix-current-base-[23].* \ + sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* USERS= postfix GROUPS= mail maildrop postfix @@ -39,13 +40,14 @@ USE_SUBMAKE= yes USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" +OPTIONS_SUB= yes OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP_SASL LMDB MYSQL NIS \ OPENLDAP PCRE PGSQL SASL2 SPF SQLITE TEST TLS VDA OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT -OPTIONS_DEFAULT= PCRE +OPTIONS_DEFAULT= PCRE TLS PCRE_DESC= Perl Compatible Regular Expressions SASL2_DESC= Cyrus SASLv2 (Simple Auth. and Sec. Layer) @@ -97,10 +99,10 @@ PKGNAMESUFFIX= -base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix -PLIST_SUB+= BASE="" BMAN="share/" +PLIST_SUB+= BMAN="share/" .else USE_RC_SUBR= postfix -PLIST_SUB+= BASE="@comment " BMAN="" +PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} @@ -114,7 +116,8 @@ READMEDIR= no DAEMONDIR= ${PREFIX}/libexec/postfix -SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}" +SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ + DAEMONDIR="${DAEMONDIR}" SUB_FILES+= pkg-install pkg-message POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ @@ -169,9 +172,11 @@ POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HO .endif .if ${PORT_OPTIONS:MTLS} -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +USE_OPENSSL= yes POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto +.else +POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MSPF} @@ -182,9 +187,6 @@ PATCHFILES+= postfix-2.8.0-libspf2-1.2. PATCH_DIST_STRIP= -p1 POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 -PLIST_SUB+= SPF="" -.else -PLIST_SUB+= SPF="@comment " .endif .if ${PORT_OPTIONS:MBDB} @@ -216,18 +218,18 @@ POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -ls .if ${PORT_OPTIONS:MOPENLDAP} USE_OPENLDAP= yes -.if defined(WITH_OPENLDAP_VER) +. if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} -.endif +. endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber _REQUIRE+= slapd -.if ${PORT_OPTIONS:MLDAP_SASL} -.if ! ${PORT_OPTIONS:MSASL2} +. if ${PORT_OPTIONS:MLDAP_SASL} +. if ! ${PORT_OPTIONS:MSASL2} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -.endif +. endif POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL -.endif +. endif .endif .if ${PORT_OPTIONS:MCDB} @@ -245,17 +247,11 @@ _REQUIRE+= ypserv PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda PATCHFILES+= postfix-vda-v13-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 -PLIST_SUB+= VDA="" -.else -PLIST_SUB+= VDA="@comment " .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 -PLIST_SUB+= TEST="" -.else -PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MLMDB} @@ -327,8 +323,9 @@ post-patch: >> ${WRKSRC}/conf/postfix-files do-configure: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ + (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ + ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ + AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: @@ -337,7 +334,8 @@ pre-install: .endif do-install: - @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=${WRKDIR} \ + @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ + install_root=${STAGEDIR} tempdir=${WRKDIR} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ Modified: branches/2015Q1/mail/postfix/distinfo ============================================================================== --- branches/2015Q1/mail/postfix/distinfo Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/distinfo Tue Feb 17 05:35:35 2015 (r379143) @@ -1,5 +1,5 @@ -SHA256 (postfix/postfix-2.11.3.tar.gz) = 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3 -SIZE (postfix/postfix-2.11.3.tar.gz) = 4039705 +SHA256 (postfix/postfix-2.11.4.tar.gz) = f4154c1db58c0300897d4c430bd90714ac7855249df59cc8828910fd5ccb031e +SIZE (postfix/postfix-2.11.4.tar.gz) = 4040104 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 SHA256 (postfix/postfix-vda-v13-2.10.0.patch) = 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f Modified: branches/2015Q1/mail/postfix/pkg-plist ============================================================================== --- branches/2015Q1/mail/postfix/pkg-plist Tue Feb 17 05:17:09 2015 (r379142) +++ branches/2015Q1/mail/postfix/pkg-plist Tue Feb 17 05:35:35 2015 (r379143) @@ -8,7 +8,7 @@ bin/qshape bin/rmail %%TEST%%bin/smtp-sink %%TEST%%bin/smtp-source -%%BASE%%@cwd / +%%INST_BASE%%@cwd / etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/bounce.cf.default @@ -128,21 +128,18 @@ libexec/postfix/virtual sbin/postalias sbin/postcat sbin/postconf +@(,maildrop,2755) sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti -@group maildrop -@mode 2755 -sbin/postdrop -sbin/postqueue -@group -@mode +@(,maildrop,2755) sbin/postqueue sbin/postsuper sbin/posttls-finger sbin/sendmail +@dir %%PFETC%% @dir /var/db/postfix @dir(postfix,,700) /var/spool/postfix/active @dir(postfix,,700) /var/spool/postfix/bounce @@ -159,6 +156,3 @@ sbin/sendmail @dir(postfix,,700) /var/spool/postfix/saved @dir(postfix,,700) /var/spool/postfix/trace @dir(,,755) /var/spool/postfix -%%BASE%%@cwd / -@dir etc/postfix -@cwd %%RESETPREFIX%% From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 17 22:04:28 2015 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 219CD10C; Tue, 17 Feb 2015 22:04:28 +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 E80C7C2F; Tue, 17 Feb 2015 22:04: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 t1HM4RJj065230; Tue, 17 Feb 2015 22:04:27 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1HM4Re1065227; Tue, 17 Feb 2015 22:04:27 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502172204.t1HM4Re1065227@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 17 Feb 2015 22:04:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379194 - in branches/2015Q1/archivers/unzip: . 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: Tue, 17 Feb 2015 22:04:28 -0000 Author: delphij Date: Tue Feb 17 22:04:26 2015 New Revision: 379194 URL: https://svnweb.freebsd.org/changeset/ports/379194 QAT: https://qat.redports.org/buildarchive/r379194/ Log: MFH: r379192 Apply fix for CVE-2015-1315 from Marc Deslauriers . Approved by: ports-secteam Modified: branches/2015Q1/archivers/unzip/Makefile branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/unzip/Makefile ============================================================================== --- branches/2015Q1/archivers/unzip/Makefile Tue Feb 17 22:03:32 2015 (r379193) +++ branches/2015Q1/archivers/unzip/Makefile Tue Feb 17 22:04:26 2015 (r379194) @@ -3,7 +3,7 @@ PORTNAME= unzip PORTVERSION= 6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers MASTER_SITES= SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \ SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce Modified: branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c ============================================================================== --- branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue Feb 17 22:03:32 2015 (r379193) +++ branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue Feb 17 22:04:26 2015 (r379194) @@ -76,15 +76,27 @@ + + slen = strlen(string); + s = string; -+ dlen = buflen = 2*slen; -+ d = buf = malloc(buflen + 1); ++ ++ /* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ ++ * as this function also gets called with G.outbuf in fileio.c ++ */ ++ buflen = FILNAMSIZ; ++ if (OUTBUFSIZ + 1 < FILNAMSIZ) ++ { ++ buflen = OUTBUFSIZ + 1; ++ } ++ ++ d = buf = malloc(buflen); + if(!d) + goto cleanup; ++ + bzero(buf,buflen); ++ dlen = buflen - 1; ++ + if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1) + goto cleanup; + strncpy(string, buf, buflen); -+ ++ + cleanup: + free(buf); + iconv_close(cd); From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 17 23:22:45 2015 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 75FFA75F; Tue, 17 Feb 2015 23:22: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 60B5C682; Tue, 17 Feb 2015 23:22: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 t1HNMjhN005037; Tue, 17 Feb 2015 23:22:45 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1HNMjMN005036; Tue, 17 Feb 2015 23:22:45 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502172322.t1HNMjMN005036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 17 Feb 2015 23:22:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379196 - branches/2015Q1/archivers/unzip/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: Tue, 17 Feb 2015 23:22:45 -0000 Author: delphij Date: Tue Feb 17 23:22:44 2015 New Revision: 379196 URL: https://svnweb.freebsd.org/changeset/ports/379196 QAT: https://qat.redports.org/buildarchive/r379196/ Log: MFH: r379195 Fix build. The merge should have been tested against an ICONV build. Submitted by: jbeich Pointy hat to: delphij Approved by: ports-secteam (implicit, fix build) Modified: branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c ============================================================================== --- branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue Feb 17 23:21:35 2015 (r379195) +++ branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Tue Feb 17 23:22:44 2015 (r379196) @@ -1,5 +1,5 @@ ---- unix/unix.c.orig 2009-01-23 23:31:26 UTC -+++ unix/unix.c +--- unix.c.orig 2015-02-17 15:18:36.176142072 -0800 ++++ unix.c 2015-02-17 15:18:56.289341100 -0800 @@ -30,6 +30,9 @@ #define UNZIP_INTERNAL #include "unzip.h" @@ -10,7 +10,7 @@ #ifdef SCO_XENIX # define SYSNDIR #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */ -@@ -1874,3 +1877,90 @@ static void qlfix(__G__ ef_ptr, ef_len) +@@ -1874,3 +1877,102 @@ } } #endif /* QLZIP */ From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 18 18:38:16 2015 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 3AB72269; Wed, 18 Feb 2015 18:38: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 252942AE; Wed, 18 Feb 2015 18:38: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 t1IIcGMJ031830; Wed, 18 Feb 2015 18:38:16 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IIcG2i031829; Wed, 18 Feb 2015 18:38:16 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502181838.t1IIcG2i031829@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 18 Feb 2015 18:38:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379305 - branches/2015Q1/archivers/unzip/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, 18 Feb 2015 18:38:16 -0000 Author: delphij Date: Wed Feb 18 18:38:15 2015 New Revision: 379305 URL: https://svnweb.freebsd.org/changeset/ports/379305 QAT: https://qat.redports.org/buildarchive/r379305/ Log: MFH: r379304 Fix patch, pass my pointy hats please. Reported by: Tomoaki AOKI Approved by: ports-secteam Modified: branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c ============================================================================== --- branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Wed Feb 18 18:37:37 2015 (r379304) +++ branches/2015Q1/archivers/unzip/files/extra-iconv-patch-unix_unix.c Wed Feb 18 18:38:15 2015 (r379305) @@ -1,5 +1,5 @@ ---- unix.c.orig 2015-02-17 15:18:36.176142072 -0800 -+++ unix.c 2015-02-17 15:18:56.289341100 -0800 +--- unix/unix.c.orig 2015-02-17 15:18:36.176142072 -0800 ++++ unix/unix.c 2015-02-17 15:18:56.289341100 -0800 @@ -30,6 +30,9 @@ #define UNZIP_INTERNAL #include "unzip.h" From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 20 00:00:31 2015 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 80FDE51A; Fri, 20 Feb 2015 00:00:31 +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 61D7D97E; Fri, 20 Feb 2015 00:00:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K00VNp080931; Fri, 20 Feb 2015 00:00:31 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K00U7M080929; Fri, 20 Feb 2015 00:00:30 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201502200000.t1K00U7M080929@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Fri, 20 Feb 2015 00:00:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379404 - branches/2015Q1/devel/libvirt 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, 20 Feb 2015 00:00:31 -0000 Author: jgh Date: Fri Feb 20 00:00:30 2015 New Revision: 379404 URL: https://svnweb.freebsd.org/changeset/ports/379404 QAT: https://qat.redports.org/buildarchive/r379404/ Log: MFH: r379361 - fix build failures on 8/9 (bhyve) Reported by: mat@ Approved by: portmgr (mat) Modified: branches/2015Q1/devel/libvirt/Makefile branches/2015Q1/devel/libvirt/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/libvirt/Makefile ============================================================================== --- branches/2015Q1/devel/libvirt/Makefile Thu Feb 19 23:27:01 2015 (r379403) +++ branches/2015Q1/devel/libvirt/Makefile Fri Feb 20 00:00:30 2015 (r379404) @@ -21,8 +21,8 @@ BUILD_DEPENDS= dnsmasq:${PORTSDIR}/dns/d RUN_DEPENDS= dnsmasq:${PORTSDIR}/dns/dnsmasq OPTIONS_DEFINE= DOCS NLS QEMU -OPTIONS_DEFINE_amd64= BHYVE .if exists(/usr/sbin/bhyve) +OPTIONS_DEFINE_amd64= BHYVE OPTIONS_DEFAULT_amd64= BHYVE .endif QEMU_DESC= QEMU driver @@ -36,8 +36,6 @@ QEMU_LIB_DEPENDS= libyajl.so:${PORTSDIR} QEMU_RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode \ qemu-io:${PORTSDIR}/emulators/qemu-devel -BHYVE_CONFIGURE_WITH= bhyve - NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} @@ -79,13 +77,15 @@ PORTDOCS= * .include -#work around an options bug (thanks mat@) -.if ${ARCH} != amd64 -PLIST_SUB+= BHYVE="@comment " +.if (exists(/usr/sbin/bhyve) && ${OSVERSION} >= 100051) +CONFIGURE_ARGS+= --with-bhyve +.else +CONFIGURE_ARGS+= --without-bhyve .endif .if ${PORT_OPTIONS:MBHYVE} -STRIP_FILES+= libvirt/connection-driver/libvirt_driver_bhyve.so +STRIP_FILES+= lib/libvirt/connection-driver/libvirt_driver_bhyve.so +PLIST_FILES+= lib/libvirt/connection-driver/libvirt_driver_bhyve.so .endif post-patch: @@ -116,6 +116,12 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor +.if ${PORT_OPTIONS:MBHYVE} +.for strip in ${STRIP_FILES} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${strip} +.endfor +.endif + .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ Modified: branches/2015Q1/devel/libvirt/pkg-plist ============================================================================== --- branches/2015Q1/devel/libvirt/pkg-plist Thu Feb 19 23:27:01 2015 (r379403) +++ branches/2015Q1/devel/libvirt/pkg-plist Fri Feb 20 00:00:30 2015 (r379404) @@ -289,7 +289,6 @@ share/gtk-doc/html/libvirt/up.png %%NLS%%share/locale/zh_TW/LC_MESSAGES/libvirt.mo %%NLS%%share/locale/zu/LC_MESSAGES/libvirt.mo %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so -%%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so lib/libvirt/connection-driver/libvirt_driver_network.so lib/libvirt/connection-driver/libvirt_driver_secret.so lib/libvirt/connection-driver/libvirt_driver_storage.so From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 20 20:24:59 2015 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 23AC240B; Fri, 20 Feb 2015 20:24:59 +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 EAD0C2A6; Fri, 20 Feb 2015 20:24:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KKOwHo068212; Fri, 20 Feb 2015 20:24:58 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KKOw4B068210; Fri, 20 Feb 2015 20:24:58 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201502202024.t1KKOw4B068210@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Fri, 20 Feb 2015 20:24:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379467 - branches/2015Q1/deskutils/egroupware 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, 20 Feb 2015 20:24:59 -0000 Author: danilo Date: Fri Feb 20 20:24:57 2015 New Revision: 379467 URL: https://svnweb.freebsd.org/changeset/ports/379467 QAT: https://qat.redports.org/buildarchive/r379467/ Log: MFH: r379342 - Update to 1.8.007.20150218 - This release contains important security fixes Changlog: http://svn.stylite.de/viewvc/egroupware/branches/1.8/egroupware/doc/rpm-build/debian.changes?view=markup Approved by: ports-secteam (delphij) Modified: branches/2015Q1/deskutils/egroupware/Makefile branches/2015Q1/deskutils/egroupware/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/deskutils/egroupware/Makefile ============================================================================== --- branches/2015Q1/deskutils/egroupware/Makefile Fri Feb 20 20:23:03 2015 (r379466) +++ branches/2015Q1/deskutils/egroupware/Makefile Fri Feb 20 20:24:57 2015 (r379467) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= eGroupware -PORTVERSION= 1.8.007.20140512 +PORTVERSION= 1.8.007.20150218 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}-1.8/${PORTNAME}-${PORTVERSION} DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2 \ Modified: branches/2015Q1/deskutils/egroupware/distinfo ============================================================================== --- branches/2015Q1/deskutils/egroupware/distinfo Fri Feb 20 20:23:03 2015 (r379466) +++ branches/2015Q1/deskutils/egroupware/distinfo Fri Feb 20 20:24:57 2015 (r379467) @@ -1,4 +1,4 @@ -SHA256 (eGroupware-1.8.007.20140512.tar.bz2) = 134074231aebbad201799ee444ae10906de2d07d88b23b581750f75ad9093db8 -SIZE (eGroupware-1.8.007.20140512.tar.bz2) = 10834105 -SHA256 (eGroupware-egw-pear-1.8.007.20140512.tar.bz2) = 7e8d37e1fb6ed07c5efe1bc41fd87ea2162b9a0905a9ef55654d052e9f5a9719 -SIZE (eGroupware-egw-pear-1.8.007.20140512.tar.bz2) = 77582 +SHA256 (eGroupware-1.8.007.20150218.tar.bz2) = 1f4a7297ac3b230bd93d909b6dccae41bbf9d56926ce69f068de8045bafbe3c2 +SIZE (eGroupware-1.8.007.20150218.tar.bz2) = 10783139 +SHA256 (eGroupware-egw-pear-1.8.007.20150218.tar.bz2) = 1be8d6dcaf671fd211731dcc0d505713d12fe0bac16275b1f2b0c45fc3437a2f +SIZE (eGroupware-egw-pear-1.8.007.20150218.tar.bz2) = 77547 From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 21 00:19:46 2015 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 012ED27C; Sat, 21 Feb 2015 00:19: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 D6521FD; Sat, 21 Feb 2015 00:19: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 t1L0JjVO080172; Sat, 21 Feb 2015 00:19:45 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1L0Jj25080170; Sat, 21 Feb 2015 00:19:45 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201502210019.t1L0Jj25080170@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 21 Feb 2015 00:19:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379474 - in branches/2015Q1/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: Sat, 21 Feb 2015 00:19:46 -0000 Author: rene Date: Sat Feb 21 00:19:44 2015 New Revision: 379474 URL: https://svnweb.freebsd.org/changeset/ports/379474 QAT: https://qat.redports.org/buildarchive/r379474/ Log: MFH: r379470 www/chromium: fixup last commit - Make __FreeBSD_versoin check actually work - Implement OS::GetCurrnetThreadId on FreeBSD 8 - Move DragonFly's condtional to its own #elif for clarity - Add NetBSD conditional for reference Differential Revision: https://reviews.freebsd.org/D1857 Submitted by: jbeich Reviewed by: marino, myself Approved by: ports-secteam (zi) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Fri Feb 20 23:51:55 2015 (r379473) +++ branches/2015Q1/www/chromium/Makefile Sat Feb 21 00:19:44 2015 (r379474) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 40.0.2214.111 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Fri Feb 20 23:51:55 2015 (r379473) +++ branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Sat Feb 21 00:19:44 2015 (r379474) @@ -1,17 +1,37 @@ --- v8/src/base/platform/platform-posix.cc.orig 2015-01-27 03:22:59.000000000 +0100 +++ v8/src/base/platform/platform-posix.cc 2015-02-06 18:41:53.881294389 +0100 -@@ -259,6 +259,14 @@ +@@ -54,6 +54,15 @@ + #include // NOLINT, for prctl + #endif + ++#if V8_OS_FREEBSD && !defined(__DragonFly__) ++#include // for __FreeBSD_version ++#include // for thr_self ++#endif ++ ++#if V8_OS_NETBSD ++#include // for _lwp_self ++#endif ++ + #if !V8_OS_NACL + #include + #endif +@@ -259,6 +268,18 @@ int OS::GetCurrentThreadId() { return static_cast(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast(gettid()); -+#elif V8_OS_FREEBSD -+# ifdef __DragonFly__ ++#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__) + return static_cast(lwp_gettid()); -+# elif __FreeBSD_version__ < 900031 -+ return 0; /* ! */ ++#elif V8_OS_FREEBSD ++# if __FreeBSD_version < 900031 ++ long lwpid; ++ thr_self(&lwpid); ++ return static_cast(lwpid); +# else + return static_cast(pthread_getthreadid_np()); +# endif ++#elif V8_OS_NETBSD ++ return static_cast(_lwp_self()); #else return static_cast(pthread_self()); #endif From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 21 00:20:32 2015 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 663E6366; Sat, 21 Feb 2015 00:20: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 3822710D; Sat, 21 Feb 2015 00:20: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 t1L0KWMU083862; Sat, 21 Feb 2015 00:20:32 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1L0KV3D083860; Sat, 21 Feb 2015 00:20:31 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201502210020.t1L0KV3D083860@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 21 Feb 2015 00:20:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379475 - branches/2015Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Feb 2015 00:20:32 -0000 Author: rene Date: Sat Feb 21 00:20:31 2015 New Revision: 379475 URL: https://svnweb.freebsd.org/changeset/ports/379475 QAT: https://qat.redports.org/buildarchive/r379475/ Log: MFH: r379471 www/chromium: update to 40.0.2214.115 (bugfix release) Changelog: https://chromium.googlesource.com/chromium/src/+log/40.0.2214.111..40.0.2214.115 Approved by: ports-secteam (zi) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Sat Feb 21 00:19:44 2015 (r379474) +++ branches/2015Q1/www/chromium/Makefile Sat Feb 21 00:20:31 2015 (r379475) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 40.0.2214.111 -PORTREVISION= 1 +PORTVERSION= 40.0.2214.115 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2015Q1/www/chromium/distinfo ============================================================================== --- branches/2015Q1/www/chromium/distinfo Sat Feb 21 00:19:44 2015 (r379474) +++ branches/2015Q1/www/chromium/distinfo Sat Feb 21 00:20:31 2015 (r379475) @@ -1,4 +1,4 @@ -SHA256 (chromium-40.0.2214.111.tar.xz) = 9e1f1a661702217a3fa7bf25a0e70d334a236ca67fadc4bebcfa2e8f7328cd49 -SIZE (chromium-40.0.2214.111.tar.xz) = 284978632 -SHA256 (chromium-40.0.2214.111-testdata.tar.xz) = 3f800644e56ea82ed539fcf42d2b654742105108357869f4bbf737a4d6b172eb -SIZE (chromium-40.0.2214.111-testdata.tar.xz) = 115348388 +SHA256 (chromium-40.0.2214.115.tar.xz) = 2261b96dba5747b52512e2391956c54f4e36b9bbaa310b16c7fb0f1e4efba6a5 +SIZE (chromium-40.0.2214.115.tar.xz) = 284973228 +SHA256 (chromium-40.0.2214.115-testdata.tar.xz) = 862a2d2b1afeb7b458f39b65ef1fd4062415dbb7f948d5f463ec31a845369300 +SIZE (chromium-40.0.2214.115-testdata.tar.xz) = 115348788