From owner-svn-ports-branches@freebsd.org Mon Mar 9 17:58:23 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1000826900B; Mon, 9 Mar 2020 17:58:23 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bmDG5h3jz4DQh; Mon, 9 Mar 2020 17:58:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 87C42DB9E; Mon, 9 Mar 2020 17:58:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f172.google.com with SMTP id l20so6032504qtp.4; Mon, 09 Mar 2020 10:58:22 -0700 (PDT) X-Gm-Message-State: ANhLgQ3wSmfPae9/QAVXQ6ejtrZ1+XZ0W+VXIVyeMVOsxoZ6Yv5hCIsc z26bZPhXX5cEGhgJtww4wOMvsZYocjlm+Fv+NNw= X-Google-Smtp-Source: ADFU+vvIEmcnKLYLVTfWfMQmc0PDwrZyTK76crbtKJZPdtgzxgugFwq79+8xiO50Zdhw+FnGLnm6xfsdbflf2lJt0To= X-Received: by 2002:ac8:564e:: with SMTP id 14mr2094227qtt.53.1583776701941; Mon, 09 Mar 2020 10:58:21 -0700 (PDT) MIME-Version: 1.0 References: <202003071906.027J6c4u063317@repo.freebsd.org> In-Reply-To: <202003071906.027J6c4u063317@repo.freebsd.org> From: Kyle Evans Date: Mon, 9 Mar 2020 12:58:10 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r527969 - in branches/2020Q1: Mk www/firefox www/firefox/files To: Jan Beich Cc: ports-committers , svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 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, 09 Mar 2020 17:58:23 -0000 On Sat, Mar 7, 2020 at 1:06 PM Jan Beich wrote: > > Author: jbeich > Date: Sat Mar 7 19:06:38 2020 > New Revision: 527969 > URL: https://svnweb.freebsd.org/changeset/ports/527969 > > Log: > MFH: r527804 > > www/firefox: update to 74.0 > > Changes: https://www.mozilla.org/firefox/74.0/releasenotes/ > PR: 244310 > Security: 9f900456-0bfa-4da4-ad59-14b2933259a2 > Approved by: ports-secteam blanket > Differential Revision: https://reviews.freebsd.org/D23646 > > Deleted: > branches/2020Q1/www/firefox/files/patch-cubeb-sndio > Modified: > branches/2020Q1/Mk/bsd.gecko.mk > branches/2020Q1/www/firefox/Makefile > branches/2020Q1/www/firefox/distinfo > branches/2020Q1/www/firefox/files/patch-bug1288587 > Directory Properties: > branches/2020Q1/ (props changed) > > Modified: branches/2020Q1/Mk/bsd.gecko.mk > ============================================================================== > --- branches/2020Q1/Mk/bsd.gecko.mk Sat Mar 7 19:05:28 2020 (r527968) > +++ branches/2020Q1/Mk/bsd.gecko.mk Sat Mar 7 19:06:38 2020 (r527969) > @@ -76,7 +76,7 @@ LDFLAGS+= -Wl,--as-needed > BUNDLE_LIBS= yes > > BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ > - rust-cbindgen>=0.12.0:devel/rust-cbindgen \ > + rust-cbindgen>=0.13.0:devel/rust-cbindgen \ > ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \ > ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ > node:www/node > > Modified: branches/2020Q1/www/firefox/Makefile > ============================================================================== > --- branches/2020Q1/www/firefox/Makefile Sat Mar 7 19:05:28 2020 (r527968) > +++ branches/2020Q1/www/firefox/Makefile Sat Mar 7 19:06:38 2020 (r527969) > @@ -2,26 +2,24 @@ > # $FreeBSD$ > > PORTNAME= firefox > -DISTVERSION= 73.0.1 > -PORTREVISION= 1 > +DISTVERSION= 74.0 > PORTEPOCH= 1 > CATEGORIES= www > MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ > - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source > + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source > DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} > > MAINTAINER= gecko@FreeBSD.org > COMMENT= Web browser based on the browser portion of Mozilla > > -BUILD_DEPENDS= nspr>=4.24:devel/nspr \ > - nss>=3.49.2:security/nss \ > +BUILD_DEPENDS= nspr>=4.25:devel/nspr \ > + nss>=3.50:security/nss \ > icu>=64.1,1:devel/icu \ > libevent>=2.1.8:devel/libevent \ > harfbuzz>=2.6.4:print/harfbuzz \ > graphite2>=1.3.13:graphics/graphite2 \ > png>=1.6.35:graphics/png \ > libvpx>=1.5.0:multimedia/libvpx \ > - sqlite3>=3.30.1:databases/sqlite3 \ > ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ > v4l_compat>0:multimedia/v4l_compat \ > autoconf-2.13:devel/autoconf213 \ Hi, This bumped the requirement of nspr to 4.25, which happened in r524792 -- this hasn't been MFH'd yet, so the build in quarterly is now broken. e.g. http://beefy2.nyi.freebsd.org/data/121amd64-quarterly/527970/logs/errors/firefox-74.0_1,1.log Thanks, Kyle Evans From owner-svn-ports-branches@freebsd.org Mon Mar 9 18:24:01 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A598269911; Mon, 9 Mar 2020 18:24:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bmns0r0Wz40l7; Mon, 9 Mar 2020 18:24:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7186CEF39; Mon, 9 Mar 2020 18:24:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029INxL3087874; Mon, 9 Mar 2020 18:23:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029INxNw087872; Mon, 9 Mar 2020 18:23:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003091823.029INxNw087872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Mar 2020 18:23:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528113 - branches/2020Q1/devel/rust-cbindgen X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/devel/rust-cbindgen X-SVN-Commit-Revision: 528113 X-SVN-Commit-Repository: ports 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.29 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, 09 Mar 2020 18:24:01 -0000 Author: jbeich Date: Mon Mar 9 18:23:59 2020 New Revision: 528113 URL: https://svnweb.freebsd.org/changeset/ports/528113 Log: MFH: r522737 r524737 r525719 devel/rust-cbindgen: update to 0.13.1 Changes: https://github.com/eqrion/cbindgen/compare/v0.12.1...v0.13.1 Reported by: GitHub (watch releases) Approved by: ports-secteam blanket Modified: branches/2020Q1/devel/rust-cbindgen/Makefile branches/2020Q1/devel/rust-cbindgen/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/rust-cbindgen/Makefile ============================================================================== --- branches/2020Q1/devel/rust-cbindgen/Makefile Mon Mar 9 18:16:21 2020 (r528112) +++ branches/2020Q1/devel/rust-cbindgen/Makefile Mon Mar 9 18:23:59 2020 (r528113) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cbindgen -DISTVERSION= 0.12.1 +DISTVERSION= 0.13.1 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Modified: branches/2020Q1/devel/rust-cbindgen/distinfo ============================================================================== --- branches/2020Q1/devel/rust-cbindgen/distinfo Mon Mar 9 18:16:21 2020 (r528112) +++ branches/2020Q1/devel/rust-cbindgen/distinfo Mon Mar 9 18:23:59 2020 (r528113) @@ -1,6 +1,6 @@ -TIMESTAMP = 1574179215 -SHA256 (rust/crates/cbindgen-0.12.1.tar.gz) = 4984c9e9ed8bd39c9713b1611a251f176b354fa009dc9af9163849129d01ca8b -SIZE (rust/crates/cbindgen-0.12.1.tar.gz) = 142473 +TIMESTAMP = 1560161136 +SHA256 (rust/crates/cbindgen-0.13.1.tar.gz) = 2c955bd5e66e36a03612c877585d75219da64e3d9ae5f14d76c979ccb95de070 +SIZE (rust/crates/cbindgen-0.13.1.tar.gz) = 155690 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 SHA256 (rust/crates/atty-0.2.13.tar.gz) = 1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90 From owner-svn-ports-branches@freebsd.org Mon Mar 9 18:25:08 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D748326994D; Mon, 9 Mar 2020 18:25:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bmq81dGMz420p; Mon, 9 Mar 2020 18:25:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6803BEF3E; Mon, 9 Mar 2020 18:25:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029IP7Hd088079; Mon, 9 Mar 2020 18:25:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029IP62h088076; Mon, 9 Mar 2020 18:25:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003091825.029IP62h088076@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Mar 2020 18:25:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528114 - in branches/2020Q1/devel/nspr: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/devel/nspr: . files X-SVN-Commit-Revision: 528114 X-SVN-Commit-Repository: ports 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.29 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, 09 Mar 2020 18:25:09 -0000 Author: jbeich Date: Mon Mar 9 18:25:06 2020 New Revision: 528114 URL: https://svnweb.freebsd.org/changeset/ports/528114 Log: MFH: r524792 devel/nspr: update to 4.25 - Only run tests enabled on upstream CI Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-25-Release-td383750.html ABI: https://abi-laboratory.pro/tracker/timeline/nspr/ Reported by: Repology Approved by: ports-secteam blanket Modified: branches/2020Q1/devel/nspr/Makefile branches/2020Q1/devel/nspr/distinfo branches/2020Q1/devel/nspr/files/patch-tests Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/nspr/Makefile ============================================================================== --- branches/2020Q1/devel/nspr/Makefile Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/Makefile Mon Mar 9 18:25:06 2020 (r528114) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.24 +DISTVERSION= 4.25 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src @@ -39,7 +39,7 @@ post-install: do-test-TEST-on: ${TEST_WRKSRC}/lib/tests/string ${TEST_WRKSRC}/lib/tests/base64t - cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh + (cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh ${TEST_WRKSRC}/dist) # The test below is commented out, because arena requires # command-line arguments. If you can provide reasonable values # for it, please contact ${MAINTAINER}. Thank you. Modified: branches/2020Q1/devel/nspr/distinfo ============================================================================== --- branches/2020Q1/devel/nspr/distinfo Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/distinfo Mon Mar 9 18:25:06 2020 (r528114) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575309517 -SHA256 (nspr-4.24.tar.gz) = 90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0 -SIZE (nspr-4.24.tar.gz) = 1078825 +TIMESTAMP = 1580503070 +SHA256 (nspr-4.25.tar.gz) = 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 +SIZE (nspr-4.25.tar.gz) = 1079633 Modified: branches/2020Q1/devel/nspr/files/patch-tests ============================================================================== --- branches/2020Q1/devel/nspr/files/patch-tests Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/files/patch-tests Mon Mar 9 18:25:06 2020 (r528114) @@ -9,38 +9,6 @@ endif endif endif ---- pr/tests/Makefile.in.orig 2019-10-15 14:21:38 UTC -+++ pr/tests/Makefile.in -@@ -442,17 +442,18 @@ endif - ALWAYS: - - runtests:: $(PROGS) ALWAYS -- @$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n" -- @$(ECHO) "BEGIN\t\t\t`date`" -- @$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n" -- @$(ECHO) "Test\t\t\tResult\n" -+ @$(ECHO) "NSPR Test Results - $(OBJDIR)" -+ @$(ECHO) "BEGIN `date`" -+ @$(ECHO) "Test Result" - @cd $(OBJDIR); for i in $(PROGRAMS); do \ -- $(ECHO) "$$i\c"; \ -- ./$$i >> $(LOGFILE) 2>&1 ; \ -+ printf "$$i"; \ -+ ./$$i > $$i.output 2>&1; \ - if [ 0 = $$? ] ; then \ -- $(ECHO) "\t\t\tPassed"; \ -- else \ -- $(ECHO) "\t\t\tFAILED"; \ -- fi; \ -+ $(ECHO) " Passed"; \ -+ rm $$i.output; \ -+ else \ -+ $(ECHO) " FAILED"; \ -+ cat $$i.output; \ -+ fi; \ - done -- @$(ECHO) "\nEND\t\t`date`\n" -+ @$(ECHO) "END `date`" --- pr/tests/cleanup.c.orig 2019-10-15 14:21:38 UTC +++ pr/tests/cleanup.c @@ -15,7 +15,7 @@ @@ -1042,51 +1010,9 @@ programName, writesMin, writesTot * 1000 / durationTot, writesMax); PR_DestroyCondVar(cv); ---- pr/tests/runtests.sh.orig 2019-08-19 14:12:12 UTC -+++ pr/tests/runtests.sh -@@ -56,9 +56,6 @@ fi - # Tests not run (but should) - # - --#forktest (failed on IRIX) --#nbconn - fails on some platforms --#poll_er - fails on some platforms? limited use? - #prpoll - the bad-FD test needs to be moved to a different test - #sleep - specific to OS/2 - -@@ -91,6 +88,7 @@ exit - fdcach - fileio - foreign -+forktest - formattm - fsync - gethost -@@ -98,7 +96,6 @@ getproto - i2l - initclk - inrval --instrumt - intrio - intrupt - io_timeout -@@ -119,6 +116,7 @@ logger - many_cv - multiwait - nameshm1 -+nbconn - nblayer - nonblock - ntioto -@@ -135,6 +133,7 @@ perf - pipeping - pipeping2 - pipeself -+poll_er - poll_nm - poll_to - pollable -@@ -207,7 +206,7 @@ OBJDIR=`basename $PWD` +--- pr/tests/runtests.sh.orig 2020-01-31 20:37:50.000000000 +0000 ++++ pr/tests/runtests.sh 2020-02-01 22:39:16.320853988 +0000 +@@ -226,7 +226,7 @@ OBJDIR=`basename $PWD` printf "\nNSPR Test Results - $OBJDIR\n\n" printf "BEGIN\t\t\t`date`\n" printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n" @@ -1095,11 +1021,11 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then for prog in $TESTS do -@@ -225,10 +224,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = +@@ -244,10 +244,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = else for prog in $TESTS do -- printf "$prog" +- printf "$prog (`date +%T`)" - printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1 - export test_rval - ./$prog >> ${LOGFILE} 2>&1 & @@ -1108,7 +1034,7 @@ test_pid=$! sleep_pid=0 if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0 -@@ -243,28 +240,11 @@ else +@@ -262,9 +260,9 @@ else printf "\t\t\tPassed\n"; else printf "\t\t\tFAILED\n"; @@ -1119,28 +1045,9 @@ done fi; - printf "END\t\t\t`date`\n" - exit $rval -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ---- pr/tests/sel_spd.c.orig 2019-10-15 14:21:38 UTC +--- pr/tests/sel_spd.c.orig 2020-01-31 20:37:50 UTC +++ pr/tests/sel_spd.c -@@ -15,23 +15,26 @@ +@@ -15,6 +15,9 @@ #include #include #include @@ -1148,7 +1055,10 @@ +# include /* getopt(3) */ +#endif - #define PORT_BASE 19000 + #ifdef DEBUG + #define PORT_INC_DO +100 +@@ -30,19 +33,19 @@ + #define PORT_BASE 19000 PORT_INC_DO PORT_INC_3264 typedef struct timer_slot_t { - unsigned long d_connect; @@ -1177,16 +1087,16 @@ static int verbose=0; static PRMonitor *exit_cv; -@@ -88,7 +91,7 @@ _server_thread(void *arg_id) +@@ -98,7 +101,7 @@ _server_thread(void *arg_id) + { void _client_thread(void *); - PRThread *thread; int *id = (int *)arg_id; - PRFileDesc *sock; + PRFileDesc *sock = NULL; PRSocketOptionData sockopt; PRNetAddr sa; PRFileDesc * newsock; -@@ -467,12 +470,12 @@ void +@@ -476,12 +479,12 @@ void tally_results(int verbose) { int index; From owner-svn-ports-branches@freebsd.org Mon Mar 9 18:28:08 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DE6A426999A; Mon, 9 Mar 2020 18:28:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bmtb0MTrz45m2; Mon, 9 Mar 2020 18:28:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 802F2EF40; Mon, 9 Mar 2020 18:28:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029IS6Ep088374; Mon, 9 Mar 2020 18:28:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029IS59R088371; Mon, 9 Mar 2020 18:28:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003091828.029IS59R088371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Mar 2020 18:28:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528115 - in branches/2020Q1/security: ca_root_nss nss nss/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/security: ca_root_nss nss nss/files X-SVN-Commit-Revision: 528115 X-SVN-Commit-Repository: ports 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.29 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, 09 Mar 2020 18:28:08 -0000 Author: jbeich Date: Mon Mar 9 18:28:05 2020 New Revision: 528115 URL: https://svnweb.freebsd.org/changeset/ports/528115 Log: MFH: r527914 security/nss: update to 3.51 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.51_release_notes Changes: https://hg.mozilla.org/projects/nss/shortlog/NSS_3_51_RTM ABI: https://abi-laboratory.pro/tracker/timeline/nss/ Approved by: ports-secteam blanket (required by Firefox 75) Deleted: branches/2020Q1/security/nss/files/patch-bug1612177 Modified: branches/2020Q1/security/ca_root_nss/Makefile branches/2020Q1/security/ca_root_nss/distinfo branches/2020Q1/security/nss/Makefile branches/2020Q1/security/nss/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/security/ca_root_nss/Makefile ============================================================================== --- branches/2020Q1/security/ca_root_nss/Makefile Mon Mar 9 18:25:06 2020 (r528114) +++ branches/2020Q1/security/ca_root_nss/Makefile Mon Mar 9 18:28:05 2020 (r528115) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.50 +VERSION_NSS= 3.51 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2020Q1/security/ca_root_nss/distinfo ============================================================================== --- branches/2020Q1/security/ca_root_nss/distinfo Mon Mar 9 18:25:06 2020 (r528114) +++ branches/2020Q1/security/ca_root_nss/distinfo Mon Mar 9 18:28:05 2020 (r528115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581109126 -SHA256 (nss-3.50.tar.gz) = 185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7 -SIZE (nss-3.50.tar.gz) = 78041630 +TIMESTAMP = 1583520260 +SHA256 (nss-3.51.tar.gz) = 75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c +SIZE (nss-3.51.tar.gz) = 78305125 Modified: branches/2020Q1/security/nss/Makefile ============================================================================== --- branches/2020Q1/security/nss/Makefile Mon Mar 9 18:25:06 2020 (r528114) +++ branches/2020Q1/security/nss/Makefile Mon Mar 9 18:28:05 2020 (r528115) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.50 +PORTVERSION= 3.51 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2020Q1/security/nss/distinfo ============================================================================== --- branches/2020Q1/security/nss/distinfo Mon Mar 9 18:25:06 2020 (r528114) +++ branches/2020Q1/security/nss/distinfo Mon Mar 9 18:28:05 2020 (r528115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581109126 -SHA256 (nss-3.50.tar.gz) = 185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7 -SIZE (nss-3.50.tar.gz) = 78041630 +TIMESTAMP = 1583520260 +SHA256 (nss-3.51.tar.gz) = 75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c +SIZE (nss-3.51.tar.gz) = 78305125 From owner-svn-ports-branches@freebsd.org Mon Mar 9 23:43:56 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D76F250670; Mon, 9 Mar 2020 23:43:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bvv00FJdz3CKw; Mon, 9 Mar 2020 23:43:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87C3D1AA2F; Mon, 9 Mar 2020 23:43:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029NhtMq081912; Mon, 9 Mar 2020 23:43:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029Nht93081911; Mon, 9 Mar 2020 23:43:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003092343.029Nht93081911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Mar 2020 23:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528140 - branches/2020Q1/www/firefox X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/www/firefox X-SVN-Commit-Revision: 528140 X-SVN-Commit-Repository: ports 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.29 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, 09 Mar 2020 23:43:56 -0000 Author: jbeich Date: Mon Mar 9 23:43:54 2020 New Revision: 528140 URL: https://svnweb.freebsd.org/changeset/ports/528140 Log: MFH: r528139 www/firefox: switch to rc3 Changes: https://hg.mozilla.org/releases/mozilla-release/rev/c6e493873ba5 Approved by: ports-secteam blanket Modified: branches/2020Q1/www/firefox/Makefile branches/2020Q1/www/firefox/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/firefox/Makefile ============================================================================== --- branches/2020Q1/www/firefox/Makefile Mon Mar 9 23:43:01 2020 (r528139) +++ branches/2020Q1/www/firefox/Makefile Mon Mar 9 23:43:54 2020 (r528140) @@ -3,11 +3,11 @@ PORTNAME= firefox DISTVERSION= 74.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q1/www/firefox/distinfo ============================================================================== --- branches/2020Q1/www/firefox/distinfo Mon Mar 9 23:43:01 2020 (r528139) +++ branches/2020Q1/www/firefox/distinfo Mon Mar 9 23:43:54 2020 (r528140) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583372737 -SHA256 (firefox-74.0.source.tar.xz) = 9ad2e5a6c7ab63bf53ee2a354d57e167ae929e3d3dd2b0d3afd1264e59fc1a2b -SIZE (firefox-74.0.source.tar.xz) = 322945996 +TIMESTAMP = 1583759447 +SHA256 (firefox-74.0.source.tar.xz) = 74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a +SIZE (firefox-74.0.source.tar.xz) = 320001124 From owner-svn-ports-branches@freebsd.org Wed Mar 11 20:34:50 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 313A8269E84; Wed, 11 Mar 2020 20:34:50 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48d3bt02yGz4DT2; Wed, 11 Mar 2020 20:34:50 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EBADC1A328; Wed, 11 Mar 2020 20:34:49 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BKYn8b003426; Wed, 11 Mar 2020 20:34:49 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BKYniu003424; Wed, 11 Mar 2020 20:34:49 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202003112034.02BKYniu003424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Wed, 11 Mar 2020 20:34:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528253 - branches/2020Q1/multimedia/mkvtoolnix X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2020Q1/multimedia/mkvtoolnix X-SVN-Commit-Revision: 528253 X-SVN-Commit-Repository: ports 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.29 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, 11 Mar 2020 20:34:50 -0000 Author: riggs Date: Wed Mar 11 20:34:49 2020 New Revision: 528253 URL: https://svnweb.freebsd.org/changeset/ports/528253 Log: MFH: r528243 Update to upstream version 44.0.0 Details: - Mostly bugfixes, see https://mkvtoolnix.download/doc/NEWS.md but also a helpful new feature: - MKVToolNix GUI: header editor: the attachments can now be reordered via drag & drop. Approved by: ports-secteam (riggs) Modified: branches/2020Q1/multimedia/mkvtoolnix/Makefile branches/2020Q1/multimedia/mkvtoolnix/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/mkvtoolnix/Makefile ============================================================================== --- branches/2020Q1/multimedia/mkvtoolnix/Makefile Wed Mar 11 20:17:11 2020 (r528252) +++ branches/2020Q1/multimedia/mkvtoolnix/Makefile Wed Mar 11 20:34:49 2020 (r528253) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 43.0.0 +PORTVERSION= 44.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ Modified: branches/2020Q1/multimedia/mkvtoolnix/distinfo ============================================================================== --- branches/2020Q1/multimedia/mkvtoolnix/distinfo Wed Mar 11 20:17:11 2020 (r528252) +++ branches/2020Q1/multimedia/mkvtoolnix/distinfo Wed Mar 11 20:34:49 2020 (r528253) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580542008 -SHA256 (mkvtoolnix-43.0.0.tar.xz) = 5acfda67817c17702c35e14c2acd78340f608d154842a791ea17fd38835910b6 -SIZE (mkvtoolnix-43.0.0.tar.xz) = 7486252 +TIMESTAMP = 1583915152 +SHA256 (mkvtoolnix-44.0.0.tar.xz) = d93843ed669d837c67c2c929f4ac2bd1e848ea5db7586681226fa371e88c92cb +SIZE (mkvtoolnix-44.0.0.tar.xz) = 7487616 From owner-svn-ports-branches@freebsd.org Thu Mar 12 00:44:46 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8C5326F9BE; Thu, 12 Mar 2020 00:44:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48d98G4lCKz4PFl; Thu, 12 Mar 2020 00:44:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17B1C1D15C; Thu, 12 Mar 2020 00:44:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02C0ij18052401; Thu, 12 Mar 2020 00:44:45 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02C0ijCn052397; Thu, 12 Mar 2020 00:44:45 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202003120044.02C0ijCn052397@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 12 Mar 2020 00:44:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528259 - in branches/2020Q1/emulators/virtualbox-ose: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in branches/2020Q1/emulators/virtualbox-ose: . files X-SVN-Commit-Revision: 528259 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 00:44:47 -0000 Author: kevans Date: Thu Mar 12 00:44:44 2020 New Revision: 528259 URL: https://svnweb.freebsd.org/changeset/ports/528259 Log: MFH: r528258 emulators/virtualbox-ose: use contemporary GCC instead of old llvm The bug in PR 236616 resulted in virtualbox getting pinned to llvm7. This is less than ideal, and in-fact has been broken by improvements to machine/atomic.h on x86 that require a more modern compiler. Switch the build to USE_GCC= any. The patches that were previously applied if COMPILER_TYPE == clang are actually needed by newer GCCs as well, so make those standard patches instead, folding the Config.kmk patches together. We should put some effort into testing llvm10 and working out why llvm breaks it, but fixing the build is more important at the moment. Q/A: * portlint (pre-existing issues; none in current patch) * testport (-CURRENT, amd64) * run testing by madpilot@ PR: 244603 Approved by: koobs (mentor), bapt (mentor) Approved by: portmgr (blanket: build fix) Differential Revision: https://reviews.freebsd.org/D23967 Approved by: ports-secteam (blanket: build fix) Added: branches/2020Q1/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk - copied unchanged from r528258, head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk branches/2020Q1/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk - copied unchanged from r528258, head/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk Deleted: branches/2020Q1/emulators/virtualbox-ose/files/extrapatch-Config.kmk branches/2020Q1/emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk branches/2020Q1/emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk Modified: branches/2020Q1/emulators/virtualbox-ose/Makefile branches/2020Q1/emulators/virtualbox-ose/files/patch-Config.kmk Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2020Q1/emulators/virtualbox-ose/Makefile Thu Mar 12 00:41:32 2020 (r528258) +++ branches/2020Q1/emulators/virtualbox-ose/Makefile Thu Mar 12 00:44:44 2020 (r528259) @@ -14,6 +14,7 @@ COMMENT= General-purpose full virtualizer for x86 hard LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild BUILD_DEPENDS= yasm:devel/yasm \ xsltproc:textproc/libxslt \ kmk:devel/kBuild \ @@ -28,8 +29,13 @@ CPE_PRODUCT= vm_virtualbox WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 -USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 +USES= cpe gnome iconv pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 +# machine/atomic.h may use features that are only available in GCC9. This is +# a workaround, anyways- we should be expressing USES= compiler:c++14-lang, but +# contemporary clang miscompiles virtualbox in some fashion and yields runtime +# breakage. +USE_GCC= any HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-java --passive-mesa @@ -200,20 +206,6 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .include -.if ${COMPILER_TYPE} == clang -.if ${COMPILER_VERSION} >= 80 -# XXX PR236616: Clang 8 & 9 caused runtime problems. -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} -CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 70 -.endif -PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ - ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \ - ${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk -.endif - .if ${PYTHON_MAJOR_VER} >= 3 PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \ PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc @@ -285,7 +277,6 @@ post-patch: @${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \ ${WRKSRC}/LocalConfig.kmk .endif -.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk @${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \ @@ -294,7 +285,6 @@ post-patch: @${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \ ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \ ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk -.endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ Modified: branches/2020Q1/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- branches/2020Q1/emulators/virtualbox-ose/files/patch-Config.kmk Thu Mar 12 00:41:32 2020 (r528258) +++ branches/2020Q1/emulators/virtualbox-ose/files/patch-Config.kmk Thu Mar 12 00:44:44 2020 (r528259) @@ -1,4 +1,4 @@ ---- Config.kmk.orig 2019-05-13 13:12:00 UTC +--- Config.kmk.orig 2019-10-10 18:06:26 UTC +++ Config.kmk @@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. @@ -74,7 +74,23 @@ # branding VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf -@@ -4575,7 +4571,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ +@@ -4158,6 +4154,7 @@ ifdef VBOX_WITH_RAW_MODE + TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL) + TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) + TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) ++ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin + ifeq ($(KBUILD_TARGET),solaris) + TEMPLATE_VBoxRc_LDFLAGS = -r + else +@@ -4299,6 +4296,7 @@ ifeq ($(VBOX_LDR_FMT),elf) + TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) + TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) + TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) ++TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin + TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding + TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables + ifeq ($(KBUILD_TARGET),solaris) +@@ -4623,7 +4621,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -std=c99 @@ -83,7 +99,16 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \ -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef -@@ -4622,7 +4618,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS +@@ -4656,7 +4654,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS + | xargs -J% objcopy % $(out) + + ## Strip debug info (comment out if debugging or something). +- objcopy --strip-debug $(out) ++# objcopy --strip-debug $(out) + endef + else # x86 + TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld +@@ -4670,7 +4668,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS | xargs -J% objcopy % $(outbase).kld # Link the final .ko (a shared object). @@ -92,7 +117,7 @@ endef endif # x86 -@@ -4908,10 +4904,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \ +@@ -4956,10 +4954,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \ TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic @@ -112,7 +137,7 @@ /usr/include \ /usr/X11R6/include \ /usr/local/include -@@ -5202,7 +5206,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -5250,7 +5256,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) @@ -121,7 +146,7 @@ # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -@@ -5729,10 +5733,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI +@@ -5777,10 +5783,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI else ifeq ($(KBUILD_TARGET),haiku) TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++ @@ -141,7 +166,7 @@ /usr/include \ /usr/X11R6/include \ /usr/local/include -@@ -6271,13 +6283,10 @@ ifdef VBOX_WITH_QTGUI +@@ -6319,13 +6333,10 @@ ifdef VBOX_WITH_QTGUI TEMPLATE_VBOXQTGUIEXE_LIBPATH += \ $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) @@ -156,7 +181,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -6500,12 +6509,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ +@@ -6548,12 +6559,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ @@ -169,7 +194,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),netbsd) TEMPLATE_VBoxBldProg_TOOL = GXX3 -@@ -6906,6 +6911,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ +@@ -6954,6 +6961,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed Copied: branches/2020Q1/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk (from r528258, head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk Thu Mar 12 00:44:44 2020 (r528259, copy of r528258, head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk) @@ -0,0 +1,11 @@ +--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500 ++++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500 +@@ -35,7 +35,7 @@ + iPxeBiosBin_CLEAN = \ + $(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \ + +-if1of ($(KBUILD_TARGET), darwin os2 solaris win) ++if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win) + $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@) + $(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@) + $(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@ Copied: branches/2020Q1/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk (from r528258, head/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk Thu Mar 12 00:44:44 2020 (r528259, copy of r528258, head/emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk) @@ -0,0 +1,10 @@ +--- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500 ++++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500 +@@ -41,6 +41,7 @@ + # + ifneq ($(KBUILD_TARGET),win) + VBoxRemPrimary_TEMPLATE = VBOXR3NP ++ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD + # workaround the regparm bug in gcc <= 3.3 + VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,) + else From owner-svn-ports-branches@freebsd.org Thu Mar 12 03:06:29 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85EC9273496; Thu, 12 Mar 2020 03:06:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dDHn344Vz4FgC; Thu, 12 Mar 2020 03:06:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 648F51EBB5; Thu, 12 Mar 2020 03:06:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02C36Td5038136; Thu, 12 Mar 2020 03:06:29 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02C36SSk038133; Thu, 12 Mar 2020 03:06:28 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202003120306.02C36SSk038133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 12 Mar 2020 03:06:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528268 - in branches/2020Q1/www: flashplayer linux-flashplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in branches/2020Q1/www: flashplayer linux-flashplayer X-SVN-Commit-Revision: 528268 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 03:06:29 -0000 Author: jkim Date: Thu Mar 12 03:06:28 2020 New Revision: 528268 URL: https://svnweb.freebsd.org/changeset/ports/528268 Log: MFH: r528267 Update to 32.0.0.344. Approved by: ports-secteam (blanket) Modified: branches/2020Q1/www/flashplayer/Makefile branches/2020Q1/www/linux-flashplayer/Makefile branches/2020Q1/www/linux-flashplayer/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/flashplayer/Makefile ============================================================================== --- branches/2020Q1/www/flashplayer/Makefile Thu Mar 12 03:04:05 2020 (r528267) +++ branches/2020Q1/www/flashplayer/Makefile Thu Mar 12 03:06:28 2020 (r528268) @@ -2,7 +2,7 @@ PORTNAME= flashplayer PORTVERSION= 32.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= www multimedia DISTFILES= Modified: branches/2020Q1/www/linux-flashplayer/Makefile ============================================================================== --- branches/2020Q1/www/linux-flashplayer/Makefile Thu Mar 12 03:04:05 2020 (r528267) +++ branches/2020Q1/www/linux-flashplayer/Makefile Thu Mar 12 03:06:28 2020 (r528268) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 32.0.0.330 +PORTVERSION= 32.0.0.344 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2020Q1/www/linux-flashplayer/distinfo ============================================================================== --- branches/2020Q1/www/linux-flashplayer/distinfo Thu Mar 12 03:04:05 2020 (r528267) +++ branches/2020Q1/www/linux-flashplayer/distinfo Thu Mar 12 03:06:28 2020 (r528268) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581433121 -SHA256 (flashplayer/32.0.0.330/flash_player_npapi_linux.i386.tar.gz) = c2a4b74f09f04e2d81f70155845d0b62dafccc7a0c80f046292c81ea9ca92bf6 -SIZE (flashplayer/32.0.0.330/flash_player_npapi_linux.i386.tar.gz) = 8542901 +TIMESTAMP = 1583982151 +SHA256 (flashplayer/32.0.0.344/flash_player_npapi_linux.i386.tar.gz) = 84762b51115fc3321ad7d47a65477d72ea02684d6f064af6f65c520d4c3ca2ec +SIZE (flashplayer/32.0.0.344/flash_player_npapi_linux.i386.tar.gz) = 8543568 From owner-svn-ports-branches@freebsd.org Thu Mar 12 06:21:03 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61767276100; Thu, 12 Mar 2020 06:21:03 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from toco-domains.de (mail.toco-domains.de [IPv6:2a01:4f8:151:4202::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48dJcG3QMnz49B3; Thu, 12 Mar 2020 06:21:01 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: by toco-domains.de (Postfix, from userid 65534) id C471ADB75F; Thu, 12 Mar 2020 07:20:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on toco-mail X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.3 Received: from Jochens-MacBook-Pro.local (ip-95-222-237-84.hsi15.unitymediagroup.de [95.222.237.84]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by toco-domains.de (Postfix) with ESMTPSA id 768A5DB752; Thu, 12 Mar 2020 07:20:50 +0100 (CET) Subject: Re: svn commit: r528268 - in branches/2020Q1/www: flashplayer linux-flashplayer To: Jung-uk Kim , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <202003120306.02C36SSk038133@repo.freebsd.org> From: Jochen Neumeister Message-ID: <491d1e11-5772-7bd1-3c00-8d97723b1ffa@FreeBSD.org> Date: Thu, 12 Mar 2020 07:20:49 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <202003120306.02C36SSk038133@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: de-DE X-Rspamd-Queue-Id: 48dJcG3QMnz49B3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.21 / 15.00]; NEURAL_SPAM_MEDIUM(0.78)[0.780,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 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, 12 Mar 2020 06:21:03 -0000 Am 12.03.20 um 04:06 schrieb Jung-uk Kim: > Author: jkim > Date: Thu Mar 12 03:06:28 2020 > New Revision: 528268 > URL: https://svnweb.freebsd.org/changeset/ports/528268 > > Log: > MFH: r528267 > > Update to 32.0.0.344. > > Approved by: ports-secteam (blanket) What exactly is the reason for MFH, and why then (blanket)? I can't tell from the commit log. With hat: ports-secteam Jochen > > Modified: > branches/2020Q1/www/flashplayer/Makefile > branches/2020Q1/www/linux-flashplayer/Makefile > branches/2020Q1/www/linux-flashplayer/distinfo > Directory Properties: > branches/2020Q1/ (props changed) > > Modified: branches/2020Q1/www/flashplayer/Makefile > ============================================================================== > --- branches/2020Q1/www/flashplayer/Makefile Thu Mar 12 03:04:05 2020 (r528267) > +++ branches/2020Q1/www/flashplayer/Makefile Thu Mar 12 03:06:28 2020 (r528268) > @@ -2,7 +2,7 @@ > > PORTNAME= flashplayer > PORTVERSION= 32.0 > -PORTREVISION= 14 > +PORTREVISION= 15 > CATEGORIES= www multimedia > DISTFILES= > > > Modified: branches/2020Q1/www/linux-flashplayer/Makefile > ============================================================================== > --- branches/2020Q1/www/linux-flashplayer/Makefile Thu Mar 12 03:04:05 2020 (r528267) > +++ branches/2020Q1/www/linux-flashplayer/Makefile Thu Mar 12 03:06:28 2020 (r528268) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= flashplayer > -PORTVERSION= 32.0.0.330 > +PORTVERSION= 32.0.0.344 > CATEGORIES= www multimedia linux > MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ > PKGNAMEPREFIX= linux- > > Modified: branches/2020Q1/www/linux-flashplayer/distinfo > ============================================================================== > --- branches/2020Q1/www/linux-flashplayer/distinfo Thu Mar 12 03:04:05 2020 (r528267) > +++ branches/2020Q1/www/linux-flashplayer/distinfo Thu Mar 12 03:06:28 2020 (r528268) > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1581433121 > -SHA256 (flashplayer/32.0.0.330/flash_player_npapi_linux.i386.tar.gz) = c2a4b74f09f04e2d81f70155845d0b62dafccc7a0c80f046292c81ea9ca92bf6 > -SIZE (flashplayer/32.0.0.330/flash_player_npapi_linux.i386.tar.gz) = 8542901 > +TIMESTAMP = 1583982151 > +SHA256 (flashplayer/32.0.0.344/flash_player_npapi_linux.i386.tar.gz) = 84762b51115fc3321ad7d47a65477d72ea02684d6f064af6f65c520d4c3ca2ec > +SIZE (flashplayer/32.0.0.344/flash_player_npapi_linux.i386.tar.gz) = 8543568 From owner-svn-ports-branches@freebsd.org Thu Mar 12 07:05:04 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F924276C60; Thu, 12 Mar 2020 07:05:04 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dKb40Pbgz4GPR; Thu, 12 Mar 2020 07:05:04 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id CA2721CCB8; Thu, 12 Mar 2020 07:03:48 +0000 (UTC) Date: Thu, 12 Mar 2020 07:03:48 +0000 From: Alexey Dokuchaev To: Jochen Neumeister Cc: Jung-uk Kim , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r528268 - in branches/2020Q1/www: flashplayer linux-flashplayer Message-ID: <20200312070348.GA52752@FreeBSD.org> References: <202003120306.02C36SSk038133@repo.freebsd.org> <491d1e11-5772-7bd1-3c00-8d97723b1ffa@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <491d1e11-5772-7bd1-3c00-8d97723b1ffa@FreeBSD.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 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, 12 Mar 2020 07:05:04 -0000 On Thu, Mar 12, 2020 at 07:20:49AM +0100, Jochen Neumeister wrote: > Am 12.03.20 um 04:06 schrieb Jung-uk Kim: > > New Revision: 528268 > > URL: https://svnweb.freebsd.org/changeset/ports/528268 > > > > Log: > > MFH: r528267 > > Update to 32.0.0.344. > > Approved by: ports-secteam (blanket) > > What exactly is the reason for MFH, and why then (blanket)? > I can't tell from the commit log. It's probably safe to assume that whenever version bumps in this piece of sh^Wsoftware it's due to another dozen of secutity bugs discovered. ./danfe From owner-svn-ports-branches@freebsd.org Thu Mar 12 07:47:50 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F2DD82774D9; Thu, 12 Mar 2020 07:47:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dLXQ5Gnsz48gN; Thu, 12 Mar 2020 07:47:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5AE5B21EC5; Thu, 12 Mar 2020 07:47:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02C7lnvm005579; Thu, 12 Mar 2020 07:47:49 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02C7lkuO005561; Thu, 12 Mar 2020 07:47:46 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202003120747.02C7lkuO005561@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 12 Mar 2020 07:47:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528273 - in branches/2020Q1/databases: mysql56-client mysql56-client/files mysql56-server mysql56-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2020Q1/databases: mysql56-client mysql56-client/files mysql56-server mysql56-server/files X-SVN-Commit-Revision: 528273 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 07:47:51 -0000 Author: joneum Date: Thu Mar 12 07:47:46 2020 New Revision: 528273 URL: https://svnweb.freebsd.org/changeset/ports/528273 Log: MFH: r528272 This fix a Problem, when MySQL build with libressl /var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:230:25: error: use of undeclared identifier 'SSL_OP_NO_TLSv1_3' SSL_OP_NO_TLSv1_3 | ^ /var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:275:12: warning: implicit declaration of function 'SSL_CTX_set_ciphersuites' is invalid in C99 [-Wimplicit-function-declaration] if (0 == SSL_CTX_set_ciphersuites(ssl_fd->ssl_context, "")) Special thanks for his help to: fluffy PR: 244320 Sponsored by: Netzkommune GmbH Approved by: ports-secteam (joneum) Added: branches/2020Q1/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc - copied unchanged from r528272, head/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc branches/2020Q1/databases/mysql56-client/files/patch-sql-common_client.c - copied unchanged from r528272, head/databases/mysql56-client/files/patch-sql-common_client.c branches/2020Q1/databases/mysql56-client/files/patch-sql_mysqld.cc - copied unchanged from r528272, head/databases/mysql56-client/files/patch-sql_mysqld.cc branches/2020Q1/databases/mysql56-client/files/patch-vio_vio.c - copied unchanged from r528272, head/databases/mysql56-client/files/patch-vio_vio.c branches/2020Q1/databases/mysql56-client/files/patch-vio_viossl.c - copied unchanged from r528272, head/databases/mysql56-client/files/patch-vio_viossl.c branches/2020Q1/databases/mysql56-client/files/patch-vio_viosslfactories.c - copied unchanged from r528272, head/databases/mysql56-client/files/patch-vio_viosslfactories.c branches/2020Q1/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc - copied unchanged from r528272, head/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc branches/2020Q1/databases/mysql56-server/files/patch-sql-common_client.c - copied unchanged from r528272, head/databases/mysql56-server/files/patch-sql-common_client.c branches/2020Q1/databases/mysql56-server/files/patch-sql_mysqld.cc - copied unchanged from r528272, head/databases/mysql56-server/files/patch-sql_mysqld.cc branches/2020Q1/databases/mysql56-server/files/patch-vio_vio.c - copied unchanged from r528272, head/databases/mysql56-server/files/patch-vio_vio.c branches/2020Q1/databases/mysql56-server/files/patch-vio_viossl.c - copied unchanged from r528272, head/databases/mysql56-server/files/patch-vio_viossl.c branches/2020Q1/databases/mysql56-server/files/patch-vio_viosslfactories.c - copied unchanged from r528272, head/databases/mysql56-server/files/patch-vio_viosslfactories.c Modified: branches/2020Q1/databases/mysql56-client/Makefile branches/2020Q1/databases/mysql56-client/files/patch-cmake_ssl.cmake branches/2020Q1/databases/mysql56-server/Makefile branches/2020Q1/databases/mysql56-server/files/patch-cmake_ssl.cmake Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/databases/mysql56-client/Makefile ============================================================================== --- branches/2020Q1/databases/mysql56-client/Makefile Thu Mar 12 07:42:38 2020 (r528272) +++ branches/2020Q1/databases/mysql56-client/Makefile Thu Mar 12 07:47:46 2020 (r528273) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) Modified: branches/2020Q1/databases/mysql56-client/files/patch-cmake_ssl.cmake ============================================================================== --- branches/2020Q1/databases/mysql56-client/files/patch-cmake_ssl.cmake Thu Mar 12 07:42:38 2020 (r528272) +++ branches/2020Q1/databases/mysql56-client/files/patch-cmake_ssl.cmake Thu Mar 12 07:47:46 2020 (r528273) @@ -1,11 +1,25 @@ ---- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC +--- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC +++ cmake/ssl.cmake -@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) +@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) + ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" + OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ++ ) ++ SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ) SET(OPENSSL_FOUND TRUE) ELSE() Copied: branches/2020Q1/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc (from r528272, head/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc) @@ -0,0 +1,74 @@ +--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC ++++ mysys_ssl/my_aes_openssl.cc +@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); Copied: branches/2020Q1/databases/mysql56-client/files/patch-sql-common_client.c (from r528272, head/databases/mysql56-client/files/patch-sql-common_client.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-sql-common_client.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-sql-common_client.c) @@ -0,0 +1,15 @@ +--- sql-common/client.c.orig 2019-11-26 16:53:45 UTC ++++ sql-common/client.c +@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char + goto error; + } + +- cn= (char *) ASN1_STRING_data(cn_asn1); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ cn= (const char *) ASN1_STRING_data(cn_asn1); ++#else ++ cn= (const char *) ASN1_STRING_get0_data(cn_asn1); ++#endif + + // There should not be any NULL embedded in the CN + if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) Copied: branches/2020Q1/databases/mysql56-client/files/patch-sql_mysqld.cc (from r528272, head/databases/mysql56-client/files/patch-sql_mysqld.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-sql_mysqld.cc Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-sql_mysqld.cc) @@ -0,0 +1,65 @@ +--- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC ++++ sql/mysqld.cc +@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss + *opt_ssl_crlpath= NULL; + + #ifdef HAVE_OPENSSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include + typedef struct CRYPTO_dynlock_value + { +@@ -2029,7 +2029,7 @@ static void clean_up_mutexes() + mysql_mutex_destroy(&LOCK_connection_count); + #ifdef HAVE_OPENSSL + mysql_mutex_destroy(&LOCK_des_key_file); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + for (int i= 0; i < CRYPTO_num_locks(); ++i) + mysql_rwlock_destroy(&openssl_stdlocks[i].lock); + OPENSSL_free(openssl_stdlocks); +@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc + + // Clean up errors now, before possibly waiting for a new connection. + #ifndef EMBEDDED_LIBRARY +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + #endif +@@ -4252,7 +4252,7 @@ static int init_thread_environment() + #ifdef HAVE_OPENSSL + mysql_mutex_init(key_LOCK_des_key_file, + &LOCK_des_key_file, MY_MUTEX_INIT_FAST); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() * + sizeof(openssl_lock_t)); + for (int i= 0; i < CRYPTO_num_locks(); ++i) +@@ -4301,7 +4301,7 @@ static int init_thread_environment() + OpenSSL 1.1 supports native platform threads, + so we don't need the following callback functions. + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + static unsigned long openssl_id_function() + { +@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc + static int init_ssl() + { + #ifdef HAVE_OPENSSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); +@@ -4392,7 +4392,7 @@ static int init_ssl() + opt_ssl_cipher, &error, + opt_ssl_crl, opt_ssl_crlpath); + DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + if (!ssl_acceptor_fd) Copied: branches/2020Q1/databases/mysql56-client/files/patch-vio_vio.c (from r528272, head/databases/mysql56-client/files/patch-vio_vio.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-vio_vio.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-vio_vio.c) @@ -0,0 +1,11 @@ +--- vio/vio.c.orig 2019-11-26 16:53:45 UTC ++++ vio/vio.c +@@ -394,7 +394,7 @@ void vio_end(void) + { + #if defined(HAVE_OPENSSL) + // This one is needed on the client side +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + ERR_free_strings(); Copied: branches/2020Q1/databases/mysql56-client/files/patch-vio_viossl.c (from r528272, head/databases/mysql56-client/files/patch-vio_viossl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-vio_viossl.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-vio_viossl.c) @@ -0,0 +1,11 @@ +--- vio/viossl.c.orig 2019-11-26 16:53:45 UTC ++++ vio/viossl.c +@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, + for (j = 0; j < n; j++) + { + SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c))); Copied: branches/2020Q1/databases/mysql56-client/files/patch-vio_viosslfactories.c (from r528272, head/databases/mysql56-client/files/patch-vio_viosslfactories.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-client/files/patch-vio_viosslfactories.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-client/files/patch-vio_viosslfactories.c) @@ -0,0 +1,20 @@ +--- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC ++++ vio/viosslfactories.c +@@ -91,7 +91,7 @@ static DH *get_dh2048(void) + DH_free(dh); + return NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + dh->p= p; + dh->g= g; + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + DBUG_RETURN(0); + + if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ? +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSLv23_client_method() : + SSLv23_server_method() + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ Modified: branches/2020Q1/databases/mysql56-server/Makefile ============================================================================== --- branches/2020Q1/databases/mysql56-server/Makefile Thu Mar 12 07:42:38 2020 (r528272) +++ branches/2020Q1/databases/mysql56-server/Makefile Thu Mar 12 07:47:46 2020 (r528273) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.6.47 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Modified: branches/2020Q1/databases/mysql56-server/files/patch-cmake_ssl.cmake ============================================================================== --- branches/2020Q1/databases/mysql56-server/files/patch-cmake_ssl.cmake Thu Mar 12 07:42:38 2020 (r528272) +++ branches/2020Q1/databases/mysql56-server/files/patch-cmake_ssl.cmake Thu Mar 12 07:47:46 2020 (r528273) @@ -1,11 +1,25 @@ ---- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC +--- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC +++ cmake/ssl.cmake -@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) +@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() +- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0") ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) + ADD_DEFINITIONS(-DHAVE_TLSv13) + ENDIF() IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" + OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ++ ) ++ SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ) SET(OPENSSL_FOUND TRUE) ELSE() Copied: branches/2020Q1/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc (from r528272, head/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc) @@ -0,0 +1,74 @@ +--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC ++++ mysys_ssl/my_aes_openssl.cc +@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); Copied: branches/2020Q1/databases/mysql56-server/files/patch-sql-common_client.c (from r528272, head/databases/mysql56-server/files/patch-sql-common_client.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-sql-common_client.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-sql-common_client.c) @@ -0,0 +1,15 @@ +--- sql-common/client.c.orig 2019-11-26 16:53:45 UTC ++++ sql-common/client.c +@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char + goto error; + } + +- cn= (char *) ASN1_STRING_data(cn_asn1); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ cn= (const char *) ASN1_STRING_data(cn_asn1); ++#else ++ cn= (const char *) ASN1_STRING_get0_data(cn_asn1); ++#endif + + // There should not be any NULL embedded in the CN + if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) Copied: branches/2020Q1/databases/mysql56-server/files/patch-sql_mysqld.cc (from r528272, head/databases/mysql56-server/files/patch-sql_mysqld.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-sql_mysqld.cc Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-sql_mysqld.cc) @@ -0,0 +1,65 @@ +--- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC ++++ sql/mysqld.cc +@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss + *opt_ssl_crlpath= NULL; + + #ifdef HAVE_OPENSSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include + typedef struct CRYPTO_dynlock_value + { +@@ -2029,7 +2029,7 @@ static void clean_up_mutexes() + mysql_mutex_destroy(&LOCK_connection_count); + #ifdef HAVE_OPENSSL + mysql_mutex_destroy(&LOCK_des_key_file); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + for (int i= 0; i < CRYPTO_num_locks(); ++i) + mysql_rwlock_destroy(&openssl_stdlocks[i].lock); + OPENSSL_free(openssl_stdlocks); +@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc + + // Clean up errors now, before possibly waiting for a new connection. + #ifndef EMBEDDED_LIBRARY +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + #endif +@@ -4252,7 +4252,7 @@ static int init_thread_environment() + #ifdef HAVE_OPENSSL + mysql_mutex_init(key_LOCK_des_key_file, + &LOCK_des_key_file, MY_MUTEX_INIT_FAST); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() * + sizeof(openssl_lock_t)); + for (int i= 0; i < CRYPTO_num_locks(); ++i) +@@ -4301,7 +4301,7 @@ static int init_thread_environment() + OpenSSL 1.1 supports native platform threads, + so we don't need the following callback functions. + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + static unsigned long openssl_id_function() + { +@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc + static int init_ssl() + { + #ifdef HAVE_OPENSSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); +@@ -4392,7 +4392,7 @@ static int init_ssl() + opt_ssl_cipher, &error, + opt_ssl_crl, opt_ssl_crlpath); + DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd)); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + if (!ssl_acceptor_fd) Copied: branches/2020Q1/databases/mysql56-server/files/patch-vio_vio.c (from r528272, head/databases/mysql56-server/files/patch-vio_vio.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-vio_vio.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-vio_vio.c) @@ -0,0 +1,11 @@ +--- vio/vio.c.orig 2019-11-26 16:53:45 UTC ++++ vio/vio.c +@@ -394,7 +394,7 @@ void vio_end(void) + { + #if defined(HAVE_OPENSSL) + // This one is needed on the client side +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_thread_state(0); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + ERR_free_strings(); Copied: branches/2020Q1/databases/mysql56-server/files/patch-vio_viossl.c (from r528272, head/databases/mysql56-server/files/patch-vio_viossl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-vio_viossl.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-vio_viossl.c) @@ -0,0 +1,11 @@ +--- vio/viossl.c.orig 2019-11-26 16:53:45 UTC ++++ vio/viossl.c +@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, + for (j = 0; j < n; j++) + { + SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c))); Copied: branches/2020Q1/databases/mysql56-server/files/patch-vio_viosslfactories.c (from r528272, head/databases/mysql56-server/files/patch-vio_viosslfactories.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql56-server/files/patch-vio_viosslfactories.c Thu Mar 12 07:47:46 2020 (r528273, copy of r528272, head/databases/mysql56-server/files/patch-vio_viosslfactories.c) @@ -0,0 +1,20 @@ +--- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC ++++ vio/viosslfactories.c +@@ -91,7 +91,7 @@ static DH *get_dh2048(void) + DH_free(dh); + return NULL; + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + dh->p= p; + dh->g= g; + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi + DBUG_RETURN(0); + + if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ? +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSLv23_client_method() : + SSLv23_server_method() + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ From owner-svn-ports-branches@freebsd.org Thu Mar 12 08:47:25 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D92EC259094; Thu, 12 Mar 2020 08:47:25 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dMs935ptz4X1t; Thu, 12 Mar 2020 08:47:25 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1023229C1; Thu, 12 Mar 2020 08:47:24 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02C8lO33041838; Thu, 12 Mar 2020 08:47:24 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02C8lNia041831; Thu, 12 Mar 2020 08:47:23 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202003120847.02C8lNia041831@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Thu, 12 Mar 2020 08:47:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528277 - in branches/2020Q1/www: py-django py-django111 py-django22 py-django30 X-SVN-Group: ports-branches X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in branches/2020Q1/www: py-django py-django111 py-django22 py-django30 X-SVN-Commit-Revision: 528277 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 08:47:25 -0000 Author: wen Date: Thu Mar 12 08:47:23 2020 New Revision: 528277 URL: https://svnweb.freebsd.org/changeset/ports/528277 Log: MFH: r528261 - Update Django to 3.0.4, 2.2.11 and 1.11.29(security release) Security: CVE-2020-9402 Approved by: ports-secteam@(joneum@) Modified: branches/2020Q1/www/py-django/Makefile branches/2020Q1/www/py-django111/Makefile branches/2020Q1/www/py-django111/distinfo branches/2020Q1/www/py-django22/Makefile branches/2020Q1/www/py-django22/distinfo branches/2020Q1/www/py-django30/Makefile branches/2020Q1/www/py-django30/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/www/py-django/Makefile ============================================================================== --- branches/2020Q1/www/py-django/Makefile Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django/Makefile Thu Mar 12 08:47:23 2020 (r528277) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.11.26 +PORTVERSION= 1.11.29 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2020Q1/www/py-django111/Makefile ============================================================================== --- branches/2020Q1/www/py-django111/Makefile Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django111/Makefile Thu Mar 12 08:47:23 2020 (r528277) @@ -4,7 +4,7 @@ # Remember to update www/py-django along with this port. PORTNAME= django -PORTVERSION= 1.11.28 +PORTVERSION= 1.11.29 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ Modified: branches/2020Q1/www/py-django111/distinfo ============================================================================== --- branches/2020Q1/www/py-django111/distinfo Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django111/distinfo Thu Mar 12 08:47:23 2020 (r528277) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580837913 -SHA256 (python/Django-1.11.28.tar.gz) = b33ce35f47f745fea6b5aa3cf3f4241069803a3712d423ac748bd673a39741eb -SIZE (python/Django-1.11.28.tar.gz) = 7852525 +TIMESTAMP = 1583938198 +SHA256 (python/Django-1.11.29.tar.gz) = 4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c +SIZE (python/Django-1.11.29.tar.gz) = 7977916 Modified: branches/2020Q1/www/py-django22/Makefile ============================================================================== --- branches/2020Q1/www/py-django22/Makefile Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django22/Makefile Thu Mar 12 08:47:23 2020 (r528277) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 2.2.10 +PORTVERSION= 2.2.11 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ Modified: branches/2020Q1/www/py-django22/distinfo ============================================================================== --- branches/2020Q1/www/py-django22/distinfo Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django22/distinfo Thu Mar 12 08:47:23 2020 (r528277) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580837915 -SHA256 (python/Django-2.2.10.tar.gz) = 1226168be1b1c7efd0e66ee79b0e0b58b2caa7ed87717909cd8a57bb13a7079a -SIZE (python/Django-2.2.10.tar.gz) = 8865888 +TIMESTAMP = 1583933729 +SHA256 (python/Django-2.2.11.tar.gz) = 65e2387e6bde531d3bb803244a2b74e0253550a9612c64a60c8c5be267b30f50 +SIZE (python/Django-2.2.11.tar.gz) = 9010479 Modified: branches/2020Q1/www/py-django30/Makefile ============================================================================== --- branches/2020Q1/www/py-django30/Makefile Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django30/Makefile Thu Mar 12 08:47:23 2020 (r528277) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 3.0.3 +PORTVERSION= 3.0.4 CATEGORIES= www python MASTER_SITES= CHEESESHOP \ https://www.djangoproject.com/m/releases/${PORTVERSION}/ Modified: branches/2020Q1/www/py-django30/distinfo ============================================================================== --- branches/2020Q1/www/py-django30/distinfo Thu Mar 12 08:42:59 2020 (r528276) +++ branches/2020Q1/www/py-django30/distinfo Thu Mar 12 08:47:23 2020 (r528277) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580837917 -SHA256 (python/Django-3.0.3.tar.gz) = 2f1ba1db8648484dd5c238fb62504777b7ad090c81c5f1fd8d5eb5ec21b5f283 -SIZE (python/Django-3.0.3.tar.gz) = 8932015 +TIMESTAMP = 1583735692 +SHA256 (python/Django-3.0.4.tar.gz) = 50b781f6cbeb98f673aa76ed8e572a019a45e52bdd4ad09001072dfd91ab07c8 +SIZE (python/Django-3.0.4.tar.gz) = 9060331 From owner-svn-ports-branches@freebsd.org Thu Mar 12 18:46:08 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23F41268774; Thu, 12 Mar 2020 18:46:08 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dd7z6wXlz3QHt; Thu, 12 Mar 2020 18:46:07 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D998F2993A; Thu, 12 Mar 2020 18:46:07 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02CIk7F4003673; Thu, 12 Mar 2020 18:46:07 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CIk7X7003672; Thu, 12 Mar 2020 18:46:07 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202003121846.02CIk7X7003672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 12 Mar 2020 18:46:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528311 - branches/2020Q1/irc/bitlbee-discord X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: branches/2020Q1/irc/bitlbee-discord X-SVN-Commit-Revision: 528311 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 18:46:08 -0000 Author: tcberner Date: Thu Mar 12 18:46:07 2020 New Revision: 528311 URL: https://svnweb.freebsd.org/changeset/ports/528311 Log: MFH: r528046 irc/bitlbee-discord: Update to 0.4.2-11 PR: 244392 Submitted by: Arthur Pirika (maintainer) Approved by: ports-secteam (joneum) Modified: branches/2020Q1/irc/bitlbee-discord/Makefile branches/2020Q1/irc/bitlbee-discord/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/irc/bitlbee-discord/Makefile ============================================================================== --- branches/2020Q1/irc/bitlbee-discord/Makefile Thu Mar 12 18:44:18 2020 (r528310) +++ branches/2020Q1/irc/bitlbee-discord/Makefile Thu Mar 12 18:46:07 2020 (r528311) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= bitlbee-discord -PORTVERSION= 0.4.2 +DISTVERSION= 0.4.2-11 +DISTVERSIONSUFFIX=-g3061edd CATEGORIES= irc MAINTAINER= arfy32@gmail.com @@ -13,13 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bitlbee:irc/bitlbee LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib -USES= autoreconf gettext-runtime gnome libtool pkgconfig +USES= autoreconf gnome libtool pkgconfig USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= sm00th +GH_TAGNAME= 3061edd283b4e886384e5e8cad10f92dc45f3ee7 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-plugindir=${PREFIX}/lib/bitlbee +CONFIGURE_ARGS= --with-plugindir=${PREFIX}/lib/bitlbee --with-bdatadir=${LOCALBASE}/share/bitlbee INSTALL_TARGET= install-strip PLIST_FILES= lib/bitlbee/discord.so \ Modified: branches/2020Q1/irc/bitlbee-discord/distinfo ============================================================================== --- branches/2020Q1/irc/bitlbee-discord/distinfo Thu Mar 12 18:44:18 2020 (r528310) +++ branches/2020Q1/irc/bitlbee-discord/distinfo Thu Mar 12 18:46:07 2020 (r528311) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544685263 -SHA256 (sm00th-bitlbee-discord-0.4.2_GH0.tar.gz) = de45b8bb05b513eb012e5a5992a87255de7cf2713bbe66d86457beb97a9b6c52 -SIZE (sm00th-bitlbee-discord-0.4.2_GH0.tar.gz) = 33704 +TIMESTAMP = 1582264649 +SHA256 (sm00th-bitlbee-discord-0.4.2-11-g3061edd-3061edd283b4e886384e5e8cad10f92dc45f3ee7_GH0.tar.gz) = 0f1553cb01a0331aa981f7c81f7176534f8ed58c9d3e7ed2316fa86837637315 +SIZE (sm00th-bitlbee-discord-0.4.2-11-g3061edd-3061edd283b4e886384e5e8cad10f92dc45f3ee7_GH0.tar.gz) = 34177 From owner-svn-ports-branches@freebsd.org Thu Mar 12 18:58:19 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A14FA268981; Thu, 12 Mar 2020 18:58:19 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48ddQ334Wgz4SSG; Thu, 12 Mar 2020 18:58:19 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09D1F29B04; Thu, 12 Mar 2020 18:58:19 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02CIwIto009975; Thu, 12 Mar 2020 18:58:18 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02CIwImf009974; Thu, 12 Mar 2020 18:58:18 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <202003121858.02CIwImf009974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Thu, 12 Mar 2020 18:58:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528313 - branches/2020Q1/mail/thunderbird X-SVN-Group: ports-branches X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: branches/2020Q1/mail/thunderbird X-SVN-Commit-Revision: 528313 X-SVN-Commit-Repository: ports 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.29 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, 12 Mar 2020 18:58:19 -0000 Author: cmt Date: Thu Mar 12 18:58:18 2020 New Revision: 528313 URL: https://svnweb.freebsd.org/changeset/ports/528313 Log: MFH: r528231 mail/thunderbird: update to 68.6.0 Releasenotes https://www.thunderbird.net/en-US/thunderbird/68.6.0/releasenotes/ Approved by: portmgr blanket "web browser alike" Modified: branches/2020Q1/mail/thunderbird/Makefile branches/2020Q1/mail/thunderbird/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/mail/thunderbird/Makefile ============================================================================== --- branches/2020Q1/mail/thunderbird/Makefile Thu Mar 12 18:52:29 2020 (r528312) +++ branches/2020Q1/mail/thunderbird/Makefile Thu Mar 12 18:58:18 2020 (r528313) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.5.0 -PORTREVISION= 1 +DISTVERSION= 68.6.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: branches/2020Q1/mail/thunderbird/distinfo ============================================================================== --- branches/2020Q1/mail/thunderbird/distinfo Thu Mar 12 18:52:29 2020 (r528312) +++ branches/2020Q1/mail/thunderbird/distinfo Thu Mar 12 18:58:18 2020 (r528313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581324235 -SHA256 (thunderbird-68.5.0.source.tar.xz) = 8b2c02a08c7f6e20e141461710dcd442426fd875c44d39d9b369eb82d965026d -SIZE (thunderbird-68.5.0.source.tar.xz) = 331328840 +TIMESTAMP = 1583928766 +SHA256 (thunderbird-68.6.0.source.tar.xz) = 4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51 +SIZE (thunderbird-68.6.0.source.tar.xz) = 339643212 From owner-svn-ports-branches@freebsd.org Thu Mar 12 19:39:24 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47DA1269A8D; Thu, 12 Mar 2020 19:39:24 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dfKR46Rmz3JPZ; Thu, 12 Mar 2020 19:39:23 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from freefall.freebsd.org (static-71-168-218-4.cmdnnj.fios.verizon.net [71.168.218.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id EFBDC8FBD; Thu, 12 Mar 2020 19:39:22 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Subject: Re: svn commit: r528268 - in branches/2020Q1/www: flashplayer linux-flashplayer To: Jochen Neumeister , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <202003120306.02C36SSk038133@repo.freebsd.org> <491d1e11-5772-7bd1-3c00-8d97723b1ffa@FreeBSD.org> From: Jung-uk Kim Autocrypt: addr=jkim@FreeBSD.org; prefer-encrypt=mutual; keydata= mQENBFJBztUBCAChqNyGqmFuNo0U7MBzsD+q/G6Cv0l7LGVrOAsgh34M8wIWhD+tztDWMVfn AhxNDd0ceCj2bYOe67sTQxAScEcbt2FfvPOLp9MEXb9qohZj172Gwkk7dnhOhZZKhVGVZKM4 NcsuBDUzgf4f3Vdzj4wg6WlqplnTZo8lPE4hZWvZHoFIyunPTJWenybeV1xnxK7JkUdSvQR0 fA59RfTTECMwTrSEfYGUnxIDBraxJ7Ecs/0hGQ7sljIj8WBvlRDU5fU1xfF35aw56T8POQRq F4E6RVJW3YGuTpSwgtGZOTfygcLRhAiq3dFC3JNLaTVTpM8PjOinJyt9AU6RoITGOKwDABEB AAG0Hkp1bmctdWsgS2ltIDxqa2ltQEZyZWVCU0Qub3JnPokBPQQTAQoAJwUCUkHO1QIbAwUJ E0/POwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRB8n5Ym/NvxRqyzB/wL7QtsIpeGfGIA ZPMtgXMucM3NWzomyQMln2j2efUkDKthzh9jBxgF53TjOr7imwIt0PT2k1bqctPrq5IRqnu9 mGroqaCLE3LG2/E3jEaao4k9PO6efwlioyivUo5NrqIQOQ4k3EAXw7d2y0Dk1VpTgdMrnUAB hj7lGlLqS4ydcrf24DdbCRGdEQwqd9DBeBgbWynxAJMgbZBhYVEyIHuQKkJ8qY0ibIPXXuF0 KYDeH0qUHtWV2K3srNyPtymUkBQD84Pl1GWRYx05XdUHDmnX0JV3lg0BfYJZgZv0ehPQrMfY Fd9abTkf9FHQYz1JtsC8wUuRgqElRd6+YAGf8Tt9uQENBFJBztUBCADLtSrP44El2VoJmH14 OFrlOgxzZnbn+Y/Gf1k12mJBiR+A+pBeRLD50p7AiTrjHRxO3cHcl9Dh0uf1VSbXgp8Or0ye iP/86fZPd4k5HXNmDTLL0HecPE08SCqGZ0W8vllQrokB1QxxRUB+fFMPJyMCjDAZ7P9fFTOS dTw1bJSTtOD8Sx8MpZUa9ti06bXFlVYDlaqSdgk181SSx+ZbSKkQR8CIMARlHwiLsa3Z9q9O EJr20HPyxe0AlTvwvFndH61hg7ds63eRvglwRnNON28VXO/lvKXq7Br/CiiyhFdKfINIx2Z5 htYq22tgGTW7mBURbIKoECFBTX9Lv6BXz6w9ABEBAAGJASUEGAEKAA8FAlJBztUCGwwFCRNP zzsACgkQfJ+WJvzb8UZcJQf+IsTCxUEqY7W/pT84sMg5/QD3s6ufTRncvq14fEOxCNq1Rf4Q 9P+tOFa8GZfKDGB2BFGIrW7uT5mlmKdK1vO6ZIA930y5kUsnCmBUEBJkE2ciSQk01aB/1o62 Q3Gk/F6BwtNY9OXiqF7AcAo+K/BMIaqb26QKeh+IIgK1NN9dQiq3ByTbl4zpGZa6MmsnnRTu mzGKt2nkz7vBzH6+hZp1OzGZikgjjhYWVFoJo1dvf/rv4obs0ZJEqFPQs/1Qa1dbkKBv6odB XJpPH0ssOluTY24d1XxTiKTwmWvHeQkOKRAIfD7VTtF4TesoZYkf7hsh3e3VwXhptSLFnEOi WwYofg== Message-ID: <5d740837-a773-2923-dac5-14fecfba1b4c@FreeBSD.org> Date: Thu, 12 Mar 2020 15:39:18 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <491d1e11-5772-7bd1-3c00-8d97723b1ffa@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 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, 12 Mar 2020 19:39:24 -0000 On 20. 3. 12., Jochen Neumeister wrote: > > Am 12.03.20 um 04:06 schrieb Jung-uk Kim: >> Author: jkim >> Date: Thu Mar 12 03:06:28 2020 >> New Revision: 528268 >> URL: https://svnweb.freebsd.org/changeset/ports/528268 >> >> Log: >>    MFH:    r528267 >>       Update to 32.0.0.344. >>       Approved by:    ports-secteam (blanket) > > > What exactly is the reason for MFH, and why then (blanket)? > I can't tell from the commit log. > > With hat: ports-secteam This blanket was confirmed by two people in 2017. -------- Forwarded Message -------- Subject: Re: MFH request r452900 to 2017Q4 Date: Thu, 26 Oct 2017 14:47:10 -0400 From: Steve Wills To: Jung-uk Kim , portmgr@FreeBSD.org, ports-secteam@FreeBSD.org Hi, On 10/26/2017 14:40, Jung-uk Kim wrote: > > INAL but I don't think we can "redistribute" it via distfile cache. > > http://www.adobe.com/products/players/flash-player-distribution.html Ah, ok, fair enough. > I thought so but I just needed ports-secteam's blessing. ;-) Then unless someone else objects, consider this ports-secteam@'s blessing. Steve and -------- Forwarded Message -------- Subject: Re: MFH request r454324 to 2017Q4 Date: Thu, 23 Nov 2017 01:27:13 -0800 From: Xin Li To: jkim@FreeBSD.org, portmgr@FreeBSD.org, ports-secteam@FreeBSD.org CC: d@delphij.net On 11/16/17 10:47, jkim@FreeBSD.org wrote: > Hello, > > Request from jkim to merge r454324 to branch 2017Q4 > using > > ${PORTSDIR}/Tools/scripts/mfh 2017Q4 454324 > > https://svnweb.freebsd.org/changeset/ports/454324 > > Commit message follows: > > ---------- > Update to 27.0.0.187. > > https://helpx.adobe.com/security/products/flash-player/apsb17-33.html > > MFH: 2017Q4 > ---------- ... Approved (portmgr: is there any objection if we grant a blanket approval for flashplayer and/or linux-* when the major version matches?) Do I have to explain this for every commit? :-( Jung-uk Kim From owner-svn-ports-branches@freebsd.org Fri Mar 13 04:48:59 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E0EF273EC3; Fri, 13 Mar 2020 04:48:59 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48dtWZ4g8lz4Z7C; Fri, 13 Mar 2020 04:48:58 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B791F8A7; Fri, 13 Mar 2020 04:48:57 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02D4mvP7066133; Fri, 13 Mar 2020 04:48:57 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02D4mvNU066132; Fri, 13 Mar 2020 04:48:57 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202003130448.02D4mvNU066132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Fri, 13 Mar 2020 04:48:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528329 - in branches/2020Q1/sysutils/py-diffoscope: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in branches/2020Q1/sysutils/py-diffoscope: . files X-SVN-Commit-Revision: 528329 X-SVN-Commit-Repository: ports 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.29 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, 13 Mar 2020 04:48:59 -0000 Author: koobs Date: Fri Mar 13 04:48:57 2020 New Revision: 528329 URL: https://svnweb.freebsd.org/changeset/ports/528329 Log: MFH: r528327 sysutils/py-diffoscope: Restore portability of zipinfo call /dev/stdin is a non-portable non-POSIX extension having different semantics on different operating systems. zininfo(1) exits with 9 when /dev/stdin is supplied on FreeBSD. In fact, unzip(1) explicitly documents that it does not support reading from stdin. [1] https://lists.reproducible-builds.org/pipermail/diffoscope/2020-March/002632.html PR: 244750 Submitted by: Michael Osipov Approved by: ports-secteam (blanket: runtime bugfix) Added: branches/2020Q1/sysutils/py-diffoscope/files/ - copied from r528327, head/sysutils/py-diffoscope/files/ Modified: branches/2020Q1/sysutils/py-diffoscope/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/sysutils/py-diffoscope/Makefile ============================================================================== --- branches/2020Q1/sysutils/py-diffoscope/Makefile Fri Mar 13 04:48:10 2020 (r528328) +++ branches/2020Q1/sysutils/py-diffoscope/Makefile Fri Mar 13 04:48:57 2020 (r528329) @@ -3,6 +3,7 @@ PORTNAME= diffoscope PORTVERSION= 108 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} From owner-svn-ports-branches@freebsd.org Sat Mar 14 00:45:31 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7117026F6BE; Sat, 14 Mar 2020 00:45:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fP4C0jkGz3HWF; Sat, 14 Mar 2020 00:45:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFFBBEACE; Sat, 14 Mar 2020 00:45:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E0jUrN010203; Sat, 14 Mar 2020 00:45:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E0jUs1010201; Sat, 14 Mar 2020 00:45:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003140045.02E0jUs1010201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 14 Mar 2020 00:45:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528395 - branches/2020Q1/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q1/emulators/citra X-SVN-Commit-Revision: 528395 X-SVN-Commit-Repository: ports 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.29 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, 14 Mar 2020 00:45:31 -0000 Author: jbeich Date: Sat Mar 14 00:45:30 2020 New Revision: 528395 URL: https://svnweb.freebsd.org/changeset/ports/528395 Log: MFH: r528394 emulators/citra: update to s20200312 Changes: https://github.com/citra-emu/citra/compare/2c0bd0f2a...ad3c464e2 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2020Q1/emulators/citra/Makefile branches/2020Q1/emulators/citra/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/emulators/citra/Makefile ============================================================================== --- branches/2020Q1/emulators/citra/Makefile Sat Mar 14 00:44:55 2020 (r528394) +++ branches/2020Q1/emulators/citra/Makefile Sat Mar 14 00:45:30 2020 (r528395) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200301 +PORTVERSION= s20200312 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 2c0bd0f2a +GH_TAGNAME= ad3c464e2 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ Modified: branches/2020Q1/emulators/citra/distinfo ============================================================================== --- branches/2020Q1/emulators/citra/distinfo Sat Mar 14 00:44:55 2020 (r528394) +++ branches/2020Q1/emulators/citra/distinfo Sat Mar 14 00:45:30 2020 (r528395) @@ -1,6 +1,6 @@ -TIMESTAMP = 1583002354 -SHA256 (citra-emu-citra-s20200301-2c0bd0f2a_GH0.tar.gz) = 57cda2e070fa449d9301ecc1af431fefc4d2c0385dbee42d9b8cf8da114c6dd4 -SIZE (citra-emu-citra-s20200301-2c0bd0f2a_GH0.tar.gz) = 5167026 +TIMESTAMP = 1583980959 +SHA256 (citra-emu-citra-s20200312-ad3c464e2_GH0.tar.gz) = 9e6b148dc2b1731fc654cebc37acb4a0f402cac1c6a7841e719d6d4503d084ab +SIZE (citra-emu-citra-s20200312-ad3c464e2_GH0.tar.gz) = 5188700 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Sat Mar 14 02:20:09 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39653273D70; Sat, 14 Mar 2020 02:20:09 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fR9N6Lfgz3JR9; Sat, 14 Mar 2020 02:20:08 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BD8FFC8C; Sat, 14 Mar 2020 02:20:08 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E2K8M0065079; Sat, 14 Mar 2020 02:20:08 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E2K7Oi065077; Sat, 14 Mar 2020 02:20:07 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <202003140220.02E2K7Oi065077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sat, 14 Mar 2020 02:20:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528398 - branches/2020Q1/sysutils/py-diffoscope X-SVN-Group: ports-branches X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: branches/2020Q1/sysutils/py-diffoscope X-SVN-Commit-Revision: 528398 X-SVN-Commit-Repository: ports 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.29 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, 14 Mar 2020 02:20:09 -0000 Author: koobs Date: Sat Mar 14 02:20:07 2020 New Revision: 528398 URL: https://svnweb.freebsd.org/changeset/ports/528398 Log: MFH: r526348 sysutils/py-diffoscope: Update to 136 Merge ports r526348 (update to 136, bugfix release) which should have been merged with ports r528329 PR: 244750 Approved by: ports-secteam (blanket: bugfix release, fix quarterly regression) Modified: branches/2020Q1/sysutils/py-diffoscope/Makefile branches/2020Q1/sysutils/py-diffoscope/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/sysutils/py-diffoscope/Makefile ============================================================================== --- branches/2020Q1/sysutils/py-diffoscope/Makefile Sat Mar 14 00:53:08 2020 (r528397) +++ branches/2020Q1/sysutils/py-diffoscope/Makefile Sat Mar 14 02:20:07 2020 (r528398) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= diffoscope -PORTVERSION= 108 +PORTVERSION= 136 PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP @@ -28,6 +28,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test --pytest-args="-rsx -l -vv" + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= .include Modified: branches/2020Q1/sysutils/py-diffoscope/distinfo ============================================================================== --- branches/2020Q1/sysutils/py-diffoscope/distinfo Sat Mar 14 00:53:08 2020 (r528397) +++ branches/2020Q1/sysutils/py-diffoscope/distinfo Sat Mar 14 02:20:07 2020 (r528398) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548740897 -SHA256 (diffoscope-108.tar.gz) = 247408365671cd19c1d16ece214677b5a52c53e278f4cce1117b4a5567ab4b6d -SIZE (diffoscope-108.tar.gz) = 9991633 +TIMESTAMP = 1581919566 +SHA256 (diffoscope-136.tar.gz) = 0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15 +SIZE (diffoscope-136.tar.gz) = 1557070