From owner-svn-ports-branches@freebsd.org Sun Jun 21 13:32:32 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 78BF634FAA9; Sun, 21 Jun 2020 13:32:32 +0000 (UTC) (envelope-from brnrd@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49qYPV6v2Mz3yt7; Sun, 21 Jun 2020 13:32:30 +0000 (UTC) (envelope-from brnrd@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 40B4D1E20F; Sun, 21 Jun 2020 13:32:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05LDWSWp058236; Sun, 21 Jun 2020 13:32:28 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05LDWQxi058226; Sun, 21 Jun 2020 13:32:26 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202006211332.05LDWQxi058226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 21 Jun 2020 13:32:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539762 - in branches/2020Q2/databases: mariadb104-client mariadb104-client/files mariadb104-server mariadb104-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2020Q2/databases: mariadb104-client mariadb104-client/files mariadb104-server mariadb104-server/files X-SVN-Commit-Revision: 539762 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2020 13:32:32 -0000 Author: brnrd Date: Sun Jun 21 13:32:26 2020 New Revision: 539762 URL: https://svnweb.freebsd.org/changeset/ports/539762 Log: MFH: r536602 databases/mariadb104-server: Fix configuration location / overhaul * Fix configuration location [1] * Share patches between client and server * Provide minimal configuration for client and server * Make the wsrep config a sample only * Fixup plists PR: 246694 [1] Reported by: Approved by: ports-secteam (joneum) Added: branches/2020Q2/databases/mariadb104-server/files/client.cnf.sample.in - copied unchanged from r536602, head/databases/mariadb104-server/files/client.cnf.sample.in branches/2020Q2/databases/mariadb104-server/files/my.cnf.sample.in - copied unchanged from r536602, head/databases/mariadb104-server/files/my.cnf.sample.in branches/2020Q2/databases/mariadb104-server/files/server.cnf.sample.in - copied unchanged from r536602, head/databases/mariadb104-server/files/server.cnf.sample.in Deleted: branches/2020Q2/databases/mariadb104-client/files/ branches/2020Q2/databases/mariadb104-server/files/patch-man_CMakeLists.txt Modified: branches/2020Q2/databases/mariadb104-client/Makefile branches/2020Q2/databases/mariadb104-client/pkg-plist branches/2020Q2/databases/mariadb104-server/Makefile branches/2020Q2/databases/mariadb104-server/files/pkg-message.in branches/2020Q2/databases/mariadb104-server/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/databases/mariadb104-client/Makefile ============================================================================== --- branches/2020Q2/databases/mariadb104-client/Makefile Sun Jun 21 11:54:47 2020 (r539761) +++ branches/2020Q2/databases/mariadb104-client/Makefile Sun Jun 21 13:32:26 2020 (r539762) @@ -10,8 +10,6 @@ BROKEN_i386= compile error: undeclared identifier 'my_ MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= databases/mytop Modified: branches/2020Q2/databases/mariadb104-client/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb104-client/pkg-plist Sun Jun 21 11:54:47 2020 (r539761) +++ branches/2020Q2/databases/mariadb104-client/pkg-plist Sun Jun 21 13:32:26 2020 (r539762) @@ -36,6 +36,8 @@ bin/mysqlslap bin/mytop bin/replace @comment bin/wsrep_sst_rsync_wan +@sample %%ETCDIR%%/my.cnf.sample +@sample %%ETCDIR%%/conf.d/client.cnf.sample include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h @@ -65,7 +67,6 @@ lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlservices.a @comment lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini @@ -161,15 +162,10 @@ man/man1/mysqlslap.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz -@comment man/man1/tokuft_logprint.1.gz -@comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz @comment man/man1/wsrep_sst_mariabackup.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz @comment man/man1/wsrep_sst_rsync_wan.1.gz -@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz -@comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz -@comment share/aclocal/mysql.m4 libdata/pkgconfig/mariadb.pc Modified: branches/2020Q2/databases/mariadb104-server/Makefile ============================================================================== --- branches/2020Q2/databases/mariadb104-server/Makefile Sun Jun 21 11:54:47 2020 (r539761) +++ branches/2020Q2/databases/mariadb104-server/Makefile Sun Jun 21 13:32:26 2020 (r539762) @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.4.13 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -98,6 +98,7 @@ DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAM EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql +ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ @@ -118,6 +119,7 @@ CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql +SUB_FILES+= my.cnf.sample client.cnf.sample .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:104m @@ -127,6 +129,7 @@ USERS= mysql GROUPS= mysql CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT +SUB_FILES+= server.cnf.sample .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO @@ -199,6 +202,7 @@ CMAKE_OFF+= WITH_TOKUDB post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ @@ -210,8 +214,14 @@ post-configure: -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c +pre-install: + ${MKDIR} -p ${STAGEDIR}${ETCDIR}/conf.d + .if ${PKGNAMESUFFIX:M*-client} post-install: + ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample + ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ + ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ @@ -223,11 +233,17 @@ post-install-GSSAPI_NONE-off: .else # ! ${PKGNAMESUFFIX:M*-client} post-install: + ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \ + ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample + +post-install-WSREP-on: + ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ + ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include Copied: branches/2020Q2/databases/mariadb104-server/files/client.cnf.sample.in (from r536602, head/databases/mariadb104-server/files/client.cnf.sample.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mariadb104-server/files/client.cnf.sample.in Sun Jun 21 13:32:26 2020 (r539762, copy of r536602, head/databases/mariadb104-server/files/client.cnf.sample.in) @@ -0,0 +1,52 @@ +# Options specific to client applications, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups + +# Options specific to all client programs +[client] +# port = 3306 # set in %%ETCDIR%%/my.cnf +# socket = /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf + +# Options specific to MariaDB client programs +[client-mariadb] + +# +## Options for specific client Tools +# + +# Options read by `mysql` +# Renamed from [mysql] starting with MariaDB 10.4.6. +[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6. +prompt = \u@\h [\d]>\_ +no_auto_rehash + +# Options read by `mysqldump` +# Renamed from [mysqldump] starting with MariaDB 10.4.6. +[mariadb-dump] +max_allowed_packet = 256M +quote_names +quick + +# Options read by `mysqladmin` +# Renamed from [mysqladmin] starting with MariaDB 10.4.6. +[mariadb-admin] + +# Options read by `mysqlbinlog` +# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. +[mariadb-binlog] + +# Options read by `mysqlcheck` +# Renamed from [mysqlcheck] starting with MariaDB 10.4.6. +[mariadb-check] + +# Options read by `mysqlimport` +# Renamed from [mysqlimport] starting with MariaDB 10.4.6. +[mariadb-import] + +# Options read by `mysqlshow` +# Renamed from [mysqlshow] starting with MariaDB 10.4.6. +[mariadb-show] + +# Options read by `mysqlslap` +# Renamed from [mysqlslap] starting with MariaDB 10.4.6. +[mariadb-slap] + Copied: branches/2020Q2/databases/mariadb104-server/files/my.cnf.sample.in (from r536602, head/databases/mariadb104-server/files/my.cnf.sample.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mariadb104-server/files/my.cnf.sample.in Sun Jun 21 13:32:26 2020 (r539762, copy of r536602, head/databases/mariadb104-server/files/my.cnf.sample.in) @@ -0,0 +1,13 @@ +# +# This group is read both by the client and the server +# use it for options that affect everything, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups +# +[client-server] +port = 3306 +socket = /var/run/mysql/mysql.sock + +# +# include *.cnf from the config directory +# +!includedir %%ETCDIR%%/conf.d/ Modified: branches/2020Q2/databases/mariadb104-server/files/pkg-message.in ============================================================================== --- branches/2020Q2/databases/mariadb104-server/files/pkg-message.in Sun Jun 21 11:54:47 2020 (r539761) +++ branches/2020Q2/databases/mariadb104-server/files/pkg-message.in Sun Jun 21 13:32:26 2020 (r539762) @@ -3,7 +3,9 @@ message: < flag) +Remember to run mariadb-upgrade (with the optional --datadir= flag) the first time you start the MySQL server after an upgrade from an earlier version. EOM } -] + Copied: branches/2020Q2/databases/mariadb104-server/files/server.cnf.sample.in (from r536602, head/databases/mariadb104-server/files/server.cnf.sample.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/databases/mariadb104-server/files/server.cnf.sample.in Sun Jun 21 13:32:26 2020 (r539762, copy of r536602, head/databases/mariadb104-server/files/server.cnf.sample.in) @@ -0,0 +1,59 @@ +# Options specific to server applications, see +# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups + +# Options specific to all server programs +[server] + +# Options specific to MariaDB server programs +[server-mariadb] + +# +# Options for specific server tools +# + +[mysqld] +user = mysql +# port = 3306 # set in %%ETCDIR%%/my.cnf +# socket = /var/run/mysql/mysql.sock # set in %%ETCDIR%%/my.cnf +bind-address = 127.0.0.1 +basedir = %%PREFIX%% +datadir = /var/db/mysql +net_retry_count = 16384 +# [mysqld] configuration for ZFS +# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar +# Create separate datasets for data and logs, eg +# zroot/mysql compression=on recordsize=128k atime=off +# zroot/mysql/data recordsize=16k +# zroot/mysql/logs +# datadir = /var/db/mysql/data +# innodb_log_group_home_dir = /var/db/mysql/log +# audit_log_file = /var/db/mysql/log/audit.log +# general_log_file = /var/db/mysql/log/general.log +# log_bin = /var/db/mysql/log/mysql-bin +# relay_log = /var/db/mysql/log/relay-log +# slow_query_log_file = /var/db/mysql/log/slow.log +# innodb_doublewrite = 0 +# innodb_flush_method = O_DSYNC + +# Options read by `mysqld_safe` +# Renamed from [mysqld_safe] starting with MariaDB 10.4.6. +[mariadb_safe] + +# Options read my `mariabackup` +[mariabackup] + +# Options read by `mysql_upgrade` +# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6. +[mariadb-upgrade] + +# Specific options read by the mariabackup SST method +[sst] + +# Options read by `mysqlbinlog` +# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. +[mariadb-binlog] + +# Options read by `mysqladmin` +# Renamed from [mysqladmin] starting with MariaDB 10.4.6. +[mariadb-admin] + Modified: branches/2020Q2/databases/mariadb104-server/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb104-server/pkg-plist Sun Jun 21 11:54:47 2020 (r539761) +++ branches/2020Q2/databases/mariadb104-server/pkg-plist Sun Jun 21 13:32:26 2020 (r539762) @@ -53,7 +53,9 @@ bin/resolveip %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan -@sample etc/mysql/user_map.conf.sample +@sample %%ETCDIR%%/conf.d/server.cnf.sample +%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample +@sample %%ETCDIR%%/user_map.conf.sample @comment data/test/db.opt include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h @@ -309,7 +311,6 @@ man/man8/mysqld.8.gz %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys -%%WSREP%%%%DATADIR%%/wsrep.cnf %%WSREP%%%%DATADIR%%/wsrep_notify @comment %%DOCSDIR%%/COPYING %%DOCSDIR%%/INSTALL-BINARY @@ -392,8 +393,6 @@ man/man8/mysqld.8.gz @comment lib/mysql/plugin/mysql_clear_password.so @comment lib/mysql/plugin/sha256_password.so @comment libdata/pkgconfig/libmariadb.pc -@comment man/man1/mysql_convert_table_format.1.gz -@comment man/man1/mariadb.1.gz @comment man/man1/mariadb-access.1.gz @comment man/man1/mariadb-admin.1.gz @comment man/man1/mariadb-binlog.1.gz @@ -406,14 +405,39 @@ man/man8/mysqld.8.gz @comment man/man1/mariadb-hotcopy.1.gz @comment man/man1/mariadb-import.1.gz @comment man/man1/mariadb-plugin.1.gz +@comment man/man1/mariadb-service-convert.1.gz @comment man/man1/mariadb-setpermission.1.gz @comment man/man1/mariadb-show.1.gz @comment man/man1/mariadb-slap.1.gz @comment man/man1/mariadb-test-embedded.1.gz @comment man/man1/mariadb-test.1.gz man/man1/mariadb-waitpid.1.gz +@comment man/man1/mariadb.1.gz +@comment man/man1/msql2mysql.1.gz +@comment man/man1/my_safe_process.1.gz +@comment man/man1/mysql-stress-test.pl.1.gz +@comment man/man1/mysql-test-run.pl.1.gz +@comment man/man1/mysql.1.gz +@comment man/man1/mysql_client_test.1.gz +@comment man/man1/mysql_client_test_embedded.1.gz +@comment man/man1/mysql_config.1.gz +@comment man/man1/mysql_convert_table_format.1.gz +@comment man/man1/mysql_embedded.1.gz +@comment man/man1/mysql_find_rows.1.gz +@comment man/man1/mysql_plugin.1.gz @comment man/man1/mysql_setpermission.1.gz +@comment man/man1/mysql_waitpid.1.gz +@comment man/man1/mysqlaccess.1.gz +@comment man/man1/mysqladmin.1.gz +@comment man/man1/mysqlbinlog.1.gz +@comment man/man1/mysqlcheck.1.gz +@comment man/man1/mysqldump.1.gz @comment man/man1/mysqlhotcopy.1.gz +@comment man/man1/mysqlimport.1.gz +@comment man/man1/mysqlshow.1.gz +@comment man/man1/mysqlslap.1.gz @comment man/man1/mysqltest.1.gz +@comment man/man1/mysqltest_embedded.1.gz @comment man/man1/replace.1.gz @comment share/pkgconfig/mariadb.pc + From owner-svn-ports-branches@freebsd.org Mon Jun 22 11:05: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 C50E2347F3C; Mon, 22 Jun 2020 11:05:03 +0000 (UTC) (envelope-from dbaio@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49r64v4tnFz4b15; Mon, 22 Jun 2020 11:05:03 +0000 (UTC) (envelope-from dbaio@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 8930BD0EA; Mon, 22 Jun 2020 11:05:03 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05MB53YI051776; Mon, 22 Jun 2020 11:05:03 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05MB53bv051774; Mon, 22 Jun 2020 11:05:03 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202006221105.05MB53bv051774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Mon, 22 Jun 2020 11:05:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539801 - branches/2020Q2/lang/python35 X-SVN-Group: ports-branches X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: branches/2020Q2/lang/python35 X-SVN-Commit-Revision: 539801 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.33 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, 22 Jun 2020 11:05:03 -0000 Author: dbaio Date: Mon Jun 22 11:05:02 2020 New Revision: 539801 URL: https://svnweb.freebsd.org/changeset/ports/539801 Log: MFH: r533797 r539739 python 3.5 will reach End-of-life on 2020-09-13 lang/python35: Fix security issues The patches for CVE-2019-18348 and CVE-2020-8492 are in the 3.5 branch and will be present in a next release. PR: 246984 Approved by: python (with hat) Security: ca595a25-91d8-11ea-b470-080027846a02 (CVE-2019-18348) Security: a27b0bb6-84fc-11ea-b5b4-641c67a117d8 (CVE-2020-8492) Approved by: ports-secteam (blanket, backport of security fix) Modified: branches/2020Q2/lang/python35/Makefile branches/2020Q2/lang/python35/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/lang/python35/Makefile ============================================================================== --- branches/2020Q2/lang/python35/Makefile Mon Jun 22 10:08:59 2020 (r539800) +++ branches/2020Q2/lang/python35/Makefile Mon Jun 22 11:05:02 2020 (r539801) @@ -3,7 +3,7 @@ PORTNAME= python PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -12,12 +12,17 @@ DIST_SUBDIR= python # Resolve sinpi name clash with libm (IEEE-754 violation) PATCH_SITES= https://github.com/python/cpython/commit/ -PATCHFILES= f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch:-p1 +PATCHFILES= f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch:-p1 \ + 37fe316479e0b6906a74b0c0a5e495c55037fdfd.patch:-p1 \ + 09d8172837b6985c4ad90ee025f6b5a554a9f0ac.patch:-p1 MAINTAINER= python@FreeBSD.org COMMENT= Interpreted object-oriented programming language LICENSE= PSFL + +DEPRECATED= Deprecated upstream +EXPIRATION_DATE= 2020-09-13 USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz USE_CSTD= c99 Modified: branches/2020Q2/lang/python35/distinfo ============================================================================== --- branches/2020Q2/lang/python35/distinfo Mon Jun 22 10:08:59 2020 (r539800) +++ branches/2020Q2/lang/python35/distinfo Mon Jun 22 11:05:02 2020 (r539801) @@ -1,5 +1,9 @@ -TIMESTAMP = 1575745214 +TIMESTAMP = 1592656701 SHA256 (python/Python-3.5.9.tar.xz) = c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049 SIZE (python/Python-3.5.9.tar.xz) = 15388876 SHA256 (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 44340896504b297bbab06db0bb0a71ddf9f25bbe02ab3dcdfeec2772c957b69f SIZE (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 2542 +SHA256 (python/37fe316479e0b6906a74b0c0a5e495c55037fdfd.patch) = b576605d75b265b25cebe7ad166bacce417bfc68fa7cdc0902026b5eb7e4df26 +SIZE (python/37fe316479e0b6906a74b0c0a5e495c55037fdfd.patch) = 10880 +SHA256 (python/09d8172837b6985c4ad90ee025f6b5a554a9f0ac.patch) = 5780700c549f81323cf07d6637584c3bbca45afa84b3e9febbba54db07544ccf +SIZE (python/09d8172837b6985c4ad90ee025f6b5a554a9f0ac.patch) = 6643 From owner-svn-ports-branches@freebsd.org Tue Jun 23 00:29:14 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 9CF59342480; Tue, 23 Jun 2020 00:29:14 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rRwp3hyTz4drt; Tue, 23 Jun 2020 00:29:14 +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 7A0AE16AFB; Tue, 23 Jun 2020 00:29:14 +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 05N0TEXd059189; Tue, 23 Jun 2020 00:29:14 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N0TDb5059186; Tue, 23 Jun 2020 00:29:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006230029.05N0TDb5059186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 23 Jun 2020 00:29:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539951 - branches/2020Q2/multimedia/dav1d X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/multimedia/dav1d X-SVN-Commit-Revision: 539951 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 00:29:14 -0000 Author: jbeich Date: Tue Jun 23 00:29:13 2020 New Revision: 539951 URL: https://svnweb.freebsd.org/changeset/ports/539951 Log: MFH: r539947 multimedia/dav1d: update to 0.7.1 Changes: https://code.videolan.org/videolan/dav1d/tags/0.7.1 Changes: https://code.videolan.org/videolan/dav1d/blob/0.7.1/NEWS Changes: https://code.videolan.org/videolan/dav1d/compare/0.7.0...0.7.1 Reported by: Repology Approved by: ports-secteam blanket (required by Firefox 79) Modified: branches/2020Q2/multimedia/dav1d/Makefile branches/2020Q2/multimedia/dav1d/distinfo branches/2020Q2/multimedia/dav1d/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/dav1d/Makefile ============================================================================== --- branches/2020Q2/multimedia/dav1d/Makefile Tue Jun 23 00:28:29 2020 (r539950) +++ branches/2020Q2/multimedia/dav1d/Makefile Tue Jun 23 00:29:13 2020 (r539951) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= dav1d -DISTVERSION= 0.7.0 +DISTVERSION= 0.7.1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -19,7 +19,7 @@ USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan -GL_COMMIT= df40d36d84fbdd3aae827b36d1a15739efb9225b +GL_COMMIT= e9df70c4348a3f9ba7269feacd17cfb57bf23852 OPTIONS_DEFINE= SDL TEST OPTIONS_SUB= yes @@ -31,7 +31,7 @@ SDL_LIB_DEPENDS= libplacebo.so:graphics/libplacebo \ libvulkan.so:graphics/vulkan-loader SDL_MESON_TRUE= enable_examples -TEST_GL_TUPLE= videolan:dav1d-test-data:0ce3de3b6f581e44a763fd4b79d32576f998d629:testdata/tests/dav1d-test-data +TEST_GL_TUPLE= videolan:dav1d-test-data:4e3d3de97b643c3bbb027005d5ecc005fa3e5d98:testdata/tests/dav1d-test-data TEST_MESON_TRUE=enable_tests testdata_tests .if make(makesum) # for optional distfiles Modified: branches/2020Q2/multimedia/dav1d/distinfo ============================================================================== --- branches/2020Q2/multimedia/dav1d/distinfo Tue Jun 23 00:28:29 2020 (r539950) +++ branches/2020Q2/multimedia/dav1d/distinfo Tue Jun 23 00:29:13 2020 (r539951) @@ -1,5 +1,5 @@ -TIMESTAMP = 1589951284 -SHA256 (videolan-dav1d-df40d36d84fbdd3aae827b36d1a15739efb9225b_GL0.tar.gz) = 501de7d8ab8072614ec23a7d890b7e413404af87fb08a6dfa448108dfe91ed67 -SIZE (videolan-dav1d-df40d36d84fbdd3aae827b36d1a15739efb9225b_GL0.tar.gz) = 821932 -SHA256 (videolan-dav1d-test-data-0ce3de3b6f581e44a763fd4b79d32576f998d629_GL0.tar.gz) = 0cd1cc68c3e32a2ca059adcd86eb7900f1afd9dbdc1d6d30697f23a4bd3d8fff -SIZE (videolan-dav1d-test-data-0ce3de3b6f581e44a763fd4b79d32576f998d629_GL0.tar.gz) = 50234222 +TIMESTAMP = 1592690579 +SHA256 (videolan-dav1d-e9df70c4348a3f9ba7269feacd17cfb57bf23852_GL0.tar.gz) = 90002f27418d622dd762723f41b3f5dc448d720402d5fc52e229d70b471f84fc +SIZE (videolan-dav1d-e9df70c4348a3f9ba7269feacd17cfb57bf23852_GL0.tar.gz) = 854884 +SHA256 (videolan-dav1d-test-data-4e3d3de97b643c3bbb027005d5ecc005fa3e5d98_GL0.tar.gz) = a8c74bd386865d82cb1107cb43cff61b1865baab1d91204f4095903ab0de6579 +SIZE (videolan-dav1d-test-data-4e3d3de97b643c3bbb027005d5ecc005fa3e5d98_GL0.tar.gz) = 50246844 Modified: branches/2020Q2/multimedia/dav1d/pkg-plist ============================================================================== --- branches/2020Q2/multimedia/dav1d/pkg-plist Tue Jun 23 00:28:29 2020 (r539950) +++ branches/2020Q2/multimedia/dav1d/pkg-plist Tue Jun 23 00:29:13 2020 (r539951) @@ -8,5 +8,5 @@ include/dav1d/picture.h include/dav1d/version.h lib/libdav1d.so lib/libdav1d.so.4 -lib/libdav1d.so.4.0.1 +lib/libdav1d.so.4.0.2 libdata/pkgconfig/dav1d.pc From owner-svn-ports-branches@freebsd.org Tue Jun 23 00:29:42 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 ACA5F342417; Tue, 23 Jun 2020 00:29:42 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rRxL46Vzz4f85; Tue, 23 Jun 2020 00:29:42 +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 8889516A79; Tue, 23 Jun 2020 00:29:42 +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 05N0TgPO059339; Tue, 23 Jun 2020 00:29:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N0TgNV059338; Tue, 23 Jun 2020 00:29:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006230029.05N0TgNV059338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 23 Jun 2020 00:29:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539952 - branches/2020Q2/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/citra X-SVN-Commit-Revision: 539952 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 00:29:42 -0000 Author: jbeich Date: Tue Jun 23 00:29:41 2020 New Revision: 539952 URL: https://svnweb.freebsd.org/changeset/ports/539952 Log: MFH: r539948 emulators/citra: update to s20200621 Changes: https://github.com/citra-emu/citra/compare/8ce81b19b...7444c9513 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2020Q2/emulators/citra/Makefile branches/2020Q2/emulators/citra/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/citra/Makefile ============================================================================== --- branches/2020Q2/emulators/citra/Makefile Tue Jun 23 00:29:13 2020 (r539951) +++ branches/2020Q2/emulators/citra/Makefile Tue Jun 23 00:29:41 2020 (r539952) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20200619 +PORTVERSION= s20200621 PORTREVISION?= 0 CATEGORIES= emulators @@ -21,7 +21,7 @@ LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COP USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 8ce81b19b +GH_TAGNAME= 7444c9513 GH_TUPLE= citra-emu:ext-boost:36603a1:boost/externals/boost \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ Modified: branches/2020Q2/emulators/citra/distinfo ============================================================================== --- branches/2020Q2/emulators/citra/distinfo Tue Jun 23 00:29:13 2020 (r539951) +++ branches/2020Q2/emulators/citra/distinfo Tue Jun 23 00:29:41 2020 (r539952) @@ -1,6 +1,6 @@ -TIMESTAMP = 1592575845 -SHA256 (citra-emu-citra-s20200619-8ce81b19b_GH0.tar.gz) = d3520e4fdec53dec8e8e7d1e407f82038933f9cb860684d0455ea7aaba7c13b3 -SIZE (citra-emu-citra-s20200619-8ce81b19b_GH0.tar.gz) = 5254068 +TIMESTAMP = 1592768785 +SHA256 (citra-emu-citra-s20200621-7444c9513_GH0.tar.gz) = 84c94d779312bbc570a7607f56bf530cd2735c3e764de08705cecf7bddc91e36 +SIZE (citra-emu-citra-s20200621-7444c9513_GH0.tar.gz) = 5261199 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 From owner-svn-ports-branches@freebsd.org Tue Jun 23 01:19:12 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 CBB9A3432E0; Tue, 23 Jun 2020 01:19:12 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rT2S51ntz3ScF; Tue, 23 Jun 2020 01:19:12 +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 A7A0C176A0; Tue, 23 Jun 2020 01:19:12 +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 05N1JCfj089812; Tue, 23 Jun 2020 01:19:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N1JCUZ089811; Tue, 23 Jun 2020 01:19:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006230119.05N1JCUZ089811@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 23 Jun 2020 01:19:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539956 - branches/2020Q2/multimedia/dav1d X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/multimedia/dav1d X-SVN-Commit-Revision: 539956 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 01:19:12 -0000 Author: jbeich Date: Tue Jun 23 01:19:12 2020 New Revision: 539956 URL: https://svnweb.freebsd.org/changeset/ports/539956 Log: MFH: r539955 multimedia/dav1d: unbreak on 12.1 i386 after r539947 ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output >>> defined in src/25a6634@@dav1d@sha/mc_sse.obj >>> referenced by ../src/x86/mc_sse.asm >>> src/25a6634@@dav1d@sha/mc_sse.obj:(.text+0x6969) Reported by: pkg-fallout Approved by: ports-secteam blanket Modified: branches/2020Q2/multimedia/dav1d/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/dav1d/Makefile ============================================================================== --- branches/2020Q2/multimedia/dav1d/Makefile Tue Jun 23 01:18:45 2020 (r539955) +++ branches/2020Q2/multimedia/dav1d/Makefile Tue Jun 23 01:19:12 2020 (r539956) @@ -20,6 +20,7 @@ USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan GL_COMMIT= e9df70c4348a3f9ba7269feacd17cfb57bf23852 +LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE= SDL TEST OPTIONS_SUB= yes From owner-svn-ports-branches@freebsd.org Tue Jun 23 08:11:37 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 AAA7E34D872; Tue, 23 Jun 2020 08:11:37 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rfBK41cWz4Bx5; Tue, 23 Jun 2020 08:11:37 +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 852591D1E8; Tue, 23 Jun 2020 08:11:37 +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 05N8BbGh044890; Tue, 23 Jun 2020 08:11:37 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05N8BatD044887; Tue, 23 Jun 2020 08:11:36 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202006230811.05N8BatD044887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 23 Jun 2020 08:11:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539963 - in branches/2020Q2/multimedia: mencoder mplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2020Q2/multimedia: mencoder mplayer X-SVN-Commit-Revision: 539963 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 08:11:37 -0000 Author: riggs Date: Tue Jun 23 08:11:36 2020 New Revision: 539963 URL: https://svnweb.freebsd.org/changeset/ports/539963 Log: MFH: r539962 Update to recent upstream snapshot 2020-06-21 Approved by: ports-secteam (riggs) Modified: branches/2020Q2/multimedia/mencoder/distinfo branches/2020Q2/multimedia/mplayer/Makefile.common branches/2020Q2/multimedia/mplayer/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/mencoder/distinfo ============================================================================== --- branches/2020Q2/multimedia/mencoder/distinfo Tue Jun 23 08:10:07 2020 (r539962) +++ branches/2020Q2/multimedia/mencoder/distinfo Tue Jun 23 08:11:36 2020 (r539963) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585395307 -SHA256 (mplayer-1.4.0.20200328.tar.xz) = 9f8de9a48ca567dfd6c1facb4c28acc608e32cde829b36727715c5ea2815e533 -SIZE (mplayer-1.4.0.20200328.tar.xz) = 5187592 +TIMESTAMP = 1592753415 +SHA256 (mplayer-1.4.0.20200621.tar.xz) = b324707bc9ea6f11dcd15767bffb50f52091e86da2715be60ce6feec668f4377 +SIZE (mplayer-1.4.0.20200621.tar.xz) = 5189620 Modified: branches/2020Q2/multimedia/mplayer/Makefile.common ============================================================================== --- branches/2020Q2/multimedia/mplayer/Makefile.common Tue Jun 23 08:10:07 2020 (r539962) +++ branches/2020Q2/multimedia/mplayer/Makefile.common Tue Jun 23 08:11:36 2020 (r539963) @@ -5,7 +5,7 @@ # $FreeBSD$ MPLAYER_PORT_VERSION= 1.4.0 -MPLAYER_SNAPSHOT_DATE= 2020-03-28 +MPLAYER_SNAPSHOT_DATE= 2020-06-21 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} Modified: branches/2020Q2/multimedia/mplayer/distinfo ============================================================================== --- branches/2020Q2/multimedia/mplayer/distinfo Tue Jun 23 08:10:07 2020 (r539962) +++ branches/2020Q2/multimedia/mplayer/distinfo Tue Jun 23 08:11:36 2020 (r539963) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585395286 -SHA256 (mplayer-1.4.0.20200328.tar.xz) = 9f8de9a48ca567dfd6c1facb4c28acc608e32cde829b36727715c5ea2815e533 -SIZE (mplayer-1.4.0.20200328.tar.xz) = 5187592 +TIMESTAMP = 1592753394 +SHA256 (mplayer-1.4.0.20200621.tar.xz) = b324707bc9ea6f11dcd15767bffb50f52091e86da2715be60ce6feec668f4377 +SIZE (mplayer-1.4.0.20200621.tar.xz) = 5189620 From owner-svn-ports-branches@freebsd.org Tue Jun 23 17:26:07 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 B288733395A; Tue, 23 Jun 2020 17:26:07 +0000 (UTC) (envelope-from fluffy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49rtV74GM9z3bcp; Tue, 23 Jun 2020 17:26:07 +0000 (UTC) (envelope-from fluffy@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 8889423C59; Tue, 23 Jun 2020 17:26:07 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05NHQ78U085866; Tue, 23 Jun 2020 17:26:07 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05NHQ7bK085865; Tue, 23 Jun 2020 17:26:07 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202006231726.05NHQ7bK085865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Tue, 23 Jun 2020 17:26:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539988 - in branches/2020Q2/databases/py-mysqlclient: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in branches/2020Q2/databases/py-mysqlclient: . files X-SVN-Commit-Revision: 539988 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 17:26:07 -0000 Author: fluffy Date: Tue Jun 23 17:26:07 2020 New Revision: 539988 URL: https://svnweb.freebsd.org/changeset/ports/539988 Log: MFH: r539884 databases/py-mysqlclient: revert gc threaded patch It caused python sigabort with a "GC object already tracked" message in singlethreaded app. This happens only with a fetchmany() on a streaming cursor, MySQLdb.cursors.SSCursor. PR: 246313 Reported by: Jeroen Pulles Approved by: ports-secteam (joneum) Deleted: branches/2020Q2/databases/py-mysqlclient/files/ Modified: branches/2020Q2/databases/py-mysqlclient/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/databases/py-mysqlclient/Makefile ============================================================================== --- branches/2020Q2/databases/py-mysqlclient/Makefile Tue Jun 23 17:22:19 2020 (r539987) +++ branches/2020Q2/databases/py-mysqlclient/Makefile Tue Jun 23 17:26:07 2020 (r539988) @@ -2,7 +2,7 @@ PORTNAME= mysqlclient DISTVERSION= 1.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} From owner-svn-ports-branches@freebsd.org Wed Jun 24 14:23: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 C9C8F3500BE; Wed, 24 Jun 2020 14:23:19 +0000 (UTC) (envelope-from cy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49sQNl4yWQz4Brr; Wed, 24 Jun 2020 14:23:19 +0000 (UTC) (envelope-from cy@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 A51081302F; Wed, 24 Jun 2020 14:23:19 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05OENJ62064352; Wed, 24 Jun 2020 14:23:19 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05OENJLh064351; Wed, 24 Jun 2020 14:23:19 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202006241423.05OENJLh064351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 24 Jun 2020 14:23:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540065 - branches/2020Q2/net/ntp X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: branches/2020Q2/net/ntp X-SVN-Commit-Revision: 540065 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.33 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, 24 Jun 2020 14:23:19 -0000 Author: cy Date: Wed Jun 24 14:23:18 2020 New Revision: 540065 URL: https://svnweb.freebsd.org/changeset/ports/540065 Log: MFH: r540010 Update 4.2.8p14 --> 4.2.8p15 Summary: Systems that use a CMAC algorithm in ntp.keys will not release a bit of memory on each packet that uses a CMAC keyid, eventually causing ntpd to run out of memory and fail. The CMAC cleanup from https://bugs.ntp.org/3447, part of ntp-4.2.8p11, introduced a bug whereby the CMAC data structure was no longer completely removed. Security: NTP Bug 3661 Approved by: portmgr (joneum) Modified: branches/2020Q2/net/ntp/Makefile branches/2020Q2/net/ntp/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/net/ntp/Makefile ============================================================================== --- branches/2020Q2/net/ntp/Makefile Wed Jun 24 14:10:56 2020 (r540064) +++ branches/2020Q2/net/ntp/Makefile Wed Jun 24 14:23:18 2020 (r540065) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p14 +PORTVERSION= 4.2.8p15 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ Modified: branches/2020Q2/net/ntp/distinfo ============================================================================== --- branches/2020Q2/net/ntp/distinfo Wed Jun 24 14:10:56 2020 (r540064) +++ branches/2020Q2/net/ntp/distinfo Wed Jun 24 14:23:18 2020 (r540065) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583329796 -SHA256 (ntp-4.2.8p14.tar.gz) = 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 -SIZE (ntp-4.2.8p14.tar.gz) = 7007263 +TIMESTAMP = 1592955783 +SHA256 (ntp-4.2.8p15.tar.gz) = f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 +SIZE (ntp-4.2.8p15.tar.gz) = 7015970 From owner-svn-ports-branches@freebsd.org Wed Jun 24 20:54: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 34B6234347D; Wed, 24 Jun 2020 20:54:29 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49sb450WYrz46Hj; Wed, 24 Jun 2020 20:54:29 +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 0D0A818080; Wed, 24 Jun 2020 20:54:29 +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 05OKsSOb038620; Wed, 24 Jun 2020 20:54:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05OKsSRW038618; Wed, 24 Jun 2020 20:54:28 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006242054.05OKsSRW038618@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 24 Jun 2020 20:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540348 - branches/2020Q2/devel/nspr X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/devel/nspr X-SVN-Commit-Revision: 540348 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.33 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, 24 Jun 2020 20:54:29 -0000 Author: jbeich Date: Wed Jun 24 20:54:28 2020 New Revision: 540348 URL: https://svnweb.freebsd.org/changeset/ports/540348 Log: MFH: r540345 devel/nspr: update to 4.26 Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-26-Release-td385653.html ABI: https://abi-laboratory.pro/tracker/timeline/nspr/ Reported by: Repology Approved by: ports-secteam blanket (required by Firefox 79) Modified: branches/2020Q2/devel/nspr/Makefile branches/2020Q2/devel/nspr/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/devel/nspr/Makefile ============================================================================== --- branches/2020Q2/devel/nspr/Makefile Wed Jun 24 20:52:34 2020 (r540347) +++ branches/2020Q2/devel/nspr/Makefile Wed Jun 24 20:54:28 2020 (r540348) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.25 +DISTVERSION= 4.26 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src Modified: branches/2020Q2/devel/nspr/distinfo ============================================================================== --- branches/2020Q2/devel/nspr/distinfo Wed Jun 24 20:52:34 2020 (r540347) +++ branches/2020Q2/devel/nspr/distinfo Wed Jun 24 20:54:28 2020 (r540348) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580503070 -SHA256 (nspr-4.25.tar.gz) = 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 -SIZE (nspr-4.25.tar.gz) = 1079633 +TIMESTAMP = 1593005169 +SHA256 (nspr-4.26.tar.gz) = fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d +SIZE (nspr-4.26.tar.gz) = 1079778 From owner-svn-ports-branches@freebsd.org Fri Jun 26 08:44:35 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 E4270351773; Fri, 26 Jun 2020 08:44:35 +0000 (UTC) (envelope-from jrm@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49tVmz0vdwz4GXg; Fri, 26 Jun 2020 08:44:34 +0000 (UTC) (envelope-from jrm@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 6CBC611B01; Fri, 26 Jun 2020 08:44:33 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05Q8iXP8066459; Fri, 26 Jun 2020 08:44:33 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05Q8iWYC066454; Fri, 26 Jun 2020 08:44:32 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <202006260844.05Q8iWYC066454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Fri, 26 Jun 2020 08:44:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540450 - in branches/2020Q2/www/chromium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in branches/2020Q2/www/chromium: . files X-SVN-Commit-Revision: 540450 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.33 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, 26 Jun 2020 08:44:36 -0000 Author: jrm Date: Fri Jun 26 08:44:32 2020 New Revision: 540450 URL: https://svnweb.freebsd.org/changeset/ports/540450 Log: MFH: r540411 www/chromium: Update to 83.0.4103.106 and fix synchronization PR: 244185, 246387 Reported by: bourne.identity@hotmail.com Approved by: ports-secteam (implicit), chromium@ (rene), cem Obtained from: Robert Nagy via OpenBSD port Security: https://www.vuxml.org/freebsd/6a5d15b6-b661-11ea-8015-e09467587c17.html Differential Revision: https://reviews.freebsd.org/D25449 Added: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc - copied unchanged from r540411, head/www/chromium/files/patch-base_system_sys__info.cc Deleted: branches/2020Q2/www/chromium/files/patch-components_sync__device__info_device__info__sync__bridge.cc Modified: branches/2020Q2/www/chromium/Makefile branches/2020Q2/www/chromium/distinfo branches/2020Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/www/chromium/Makefile ============================================================================== --- branches/2020Q2/www/chromium/Makefile Fri Jun 26 08:44:29 2020 (r540449) +++ branches/2020Q2/www/chromium/Makefile Fri Jun 26 08:44:32 2020 (r540450) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 83.0.4103.97 +PORTVERSION= 83.0.4103.106 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts Modified: branches/2020Q2/www/chromium/distinfo ============================================================================== --- branches/2020Q2/www/chromium/distinfo Fri Jun 26 08:44:29 2020 (r540449) +++ branches/2020Q2/www/chromium/distinfo Fri Jun 26 08:44:32 2020 (r540450) @@ -1,7 +1,7 @@ -TIMESTAMP = 1591262286 -SHA256 (chromium-83.0.4103.97.tar.xz) = 12c405f61284cfc78f8c2b6600f3c1ae61a83b639c41087bb4f74fcaab036f83 -SIZE (chromium-83.0.4103.97.tar.xz) = 802603824 -SHA256 (chromium-83.0.4103.97-testdata.tar.xz) = b8787a82efe64d12b0ca7ee0af9eb0e27aa1a85bc75649ab6aef1f5e9ea9f6f4 -SIZE (chromium-83.0.4103.97-testdata.tar.xz) = 257142948 +TIMESTAMP = 1593091518 +SHA256 (chromium-83.0.4103.106.tar.xz) = cfd153a2e10b0bb0fb3b7e6be543aef0915181f5fbdbea893d08465afd097e2f +SIZE (chromium-83.0.4103.106.tar.xz) = 802630620 +SHA256 (chromium-83.0.4103.106-testdata.tar.xz) = bf0c38e3d59fc346788eb25487956ae40490a88dfd6b1d4c8edacb075873678e +SIZE (chromium-83.0.4103.106-testdata.tar.xz) = 257157012 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Copied: branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc (from r540411, head/www/chromium/files/patch-base_system_sys__info.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/www/chromium/files/patch-base_system_sys__info.cc Fri Jun 26 08:44:32 2020 (r540450, copy of r540411, head/www/chromium/files/patch-base_system_sys__info.cc) @@ -0,0 +1,11 @@ +--- base/system/sys_info.cc.orig 2020-06-25 12:19:57 UTC ++++ base/system/sys_info.cc +@@ -102,7 +102,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback + + #include "base/logging.h" ++#include "base/strings/string_util.h" + namespace base { int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -62,6 +67,17 @@ } + return static_cast(limit); ++} ++ ++SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { ++ HardwareInfo info; ++ // Set the manufacturer to "FreeBSD" and the model to ++ // an empty string. ++ info.manufacturer = "FreeBSD"; ++ info.model = HardwareModelName(); ++ DCHECK(IsStringUTF8(info.manufacturer)); ++ DCHECK(IsStringUTF8(info.model)); ++ return info; } -- + } // namespace base From owner-svn-ports-branches@freebsd.org Sat Jun 27 18:04: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 2AAF5358CC0; Sat, 27 Jun 2020 18:04:50 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49vM8y0LBTz4H0w; Sat, 27 Jun 2020 18:04:50 +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 06C379624; Sat, 27 Jun 2020 18:04:50 +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 05RI4n55011786; Sat, 27 Jun 2020 18:04:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RI4nYe011782; Sat, 27 Jun 2020 18:04:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006271804.05RI4nYe011782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Jun 2020 18:04:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540628 - branches/2020Q2/devel/rust-cbindgen X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/devel/rust-cbindgen X-SVN-Commit-Revision: 540628 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.33 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, 27 Jun 2020 18:04:50 -0000 Author: jbeich Date: Sat Jun 27 18:04:49 2020 New Revision: 540628 URL: https://svnweb.freebsd.org/changeset/ports/540628 Log: MFH: r540346 devel/rust-cbindgen: update to 0.14.3 Changes: https://github.com/eqrion/cbindgen/compare/v0.14.2...v0.14.3 Reported by: GitHub (watch releases) Approved by: ports-secteam blanket (required by Firefox 79) Modified: branches/2020Q2/devel/rust-cbindgen/Makefile branches/2020Q2/devel/rust-cbindgen/distinfo Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/devel/rust-cbindgen/Makefile ============================================================================== --- branches/2020Q2/devel/rust-cbindgen/Makefile Sat Jun 27 18:00:55 2020 (r540627) +++ branches/2020Q2/devel/rust-cbindgen/Makefile Sat Jun 27 18:04:49 2020 (r540628) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cbindgen -DISTVERSION= 0.14.2 +DISTVERSION= 0.14.3 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Modified: branches/2020Q2/devel/rust-cbindgen/distinfo ============================================================================== --- branches/2020Q2/devel/rust-cbindgen/distinfo Sat Jun 27 18:00:55 2020 (r540627) +++ branches/2020Q2/devel/rust-cbindgen/distinfo Sat Jun 27 18:04:49 2020 (r540628) @@ -1,6 +1,6 @@ -TIMESTAMP = 1588287166 -SHA256 (rust/crates/cbindgen-0.14.2.tar.gz) = 104ca409bbff8293739438c71820a2606111b5f8f81835536dc673dfd807369e -SIZE (rust/crates/cbindgen-0.14.2.tar.gz) = 165699 +TIMESTAMP = 1593012744 +SHA256 (rust/crates/cbindgen-0.14.3.tar.gz) = e6e03a705df2e735cc5486f104a48e25a8f72ae06eaea5b7753a81270ed00859 +SIZE (rust/crates/cbindgen-0.14.3.tar.gz) = 165874 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 Sat Jun 27 18:10: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 1F58C359135; Sat, 27 Jun 2020 18:10:46 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49vMHn64L8z4HGb; Sat, 27 Jun 2020 18:10:45 +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 CA56B926A; Sat, 27 Jun 2020 18:10:45 +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 05RIAjBc013255; Sat, 27 Jun 2020 18:10:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RIAjVs012905; Sat, 27 Jun 2020 18:10:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006271810.05RIAjVs012905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Jun 2020 18:10:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540630 - in branches/2020Q2/emulators: ppsspp ppsspp-qt5 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2/emulators: ppsspp ppsspp-qt5 X-SVN-Commit-Revision: 540630 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.33 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, 27 Jun 2020 18:10:46 -0000 Author: jbeich Date: Sat Jun 27 18:10:45 2020 New Revision: 540630 URL: https://svnweb.freebsd.org/changeset/ports/540630 Log: MFH: r540629 emulators/ppsspp: use system snappy after r483177 https://github.com/hrydgard/ppsspp/commit/8ba1f049dae9 Approved by: ports-secteam blanket (regression fix) Modified: branches/2020Q2/emulators/ppsspp-qt5/Makefile branches/2020Q2/emulators/ppsspp/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/ppsspp-qt5/Makefile ============================================================================== --- branches/2020Q2/emulators/ppsspp-qt5/Makefile Sat Jun 27 18:10:08 2020 (r540629) +++ branches/2020Q2/emulators/ppsspp-qt5/Makefile Sat Jun 27 18:10:45 2020 (r540630) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp Modified: branches/2020Q2/emulators/ppsspp/Makefile ============================================================================== --- branches/2020Q2/emulators/ppsspp/Makefile Sat Jun 27 18:10:08 2020 (r540629) +++ branches/2020Q2/emulators/ppsspp/Makefile Sat Jun 27 18:10:45 2020 (r540630) @@ -3,7 +3,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.9.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage @@ -39,7 +39,7 @@ EXCLUDE= libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= gl glew glu USE_SDL= sdl2 # joystick -CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_WAYLAND_WSI +CMAKE_ON= USE_SYSTEM_FFMPEG USE_SYSTEM_LIBZIP USE_SYSTEM_SNAPPY USE_WAYLAND_WSI CMAKE_OFF= USE_DISCORD SUB_FILES= pkg-message PORTDATA= assets ${PORTNAME} From owner-svn-ports-branches@freebsd.org Sat Jun 27 23:25: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 0B3B335EDFD; Sat, 27 Jun 2020 23:25: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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49vVGy6V4wz4bc4; Sat, 27 Jun 2020 23:25:30 +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 D9FE4D310; Sat, 27 Jun 2020 23:25: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 05RNPUkI010672; Sat, 27 Jun 2020 23:25:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RNPUUn010671; Sat, 27 Jun 2020 23:25:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006272325.05RNPUUn010671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Jun 2020 23:25:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540657 - branches/2020Q2/emulators/ppsspp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/ppsspp/files X-SVN-Commit-Revision: 540657 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.33 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, 27 Jun 2020 23:25:31 -0000 Author: jbeich Date: Sat Jun 27 23:25:30 2020 New Revision: 540657 URL: https://svnweb.freebsd.org/changeset/ports/540657 Log: MFH: r540655 emulators/ppsspp: unbreak OLDJOY after r512863 SDL/SDLJoystick.cpp:24:13: error: no member named 'bPS3Controller' in 'Config' g_Config.bPS3Controller = true; ~~~~~~~~ ^ SDL/SDLJoystick.cpp:27:22: error: no member named 'bPS3Controller' in 'Config' if (g_Config.bPS3Controller) ~~~~~~~~ ^ Approved by: ports-secteam blanket Modified: branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy ============================================================================== --- branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Sat Jun 27 23:24:36 2020 (r540656) +++ branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Sat Jun 27 23:25:30 2020 (r540657) @@ -8,8 +8,19 @@ https://github.com/hrydgard/ppsspp/commit/d6b81236626f https://github.com/hrydgard/ppsspp/commit/b058b987ad0f https://github.com/hrydgard/ppsspp/commit/1b699363ca4d https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 +https://github.com/hrydgard/ppsspp/commit/53daa0d844af ---- SDL/SDLJoystick.cpp.orig 2017-10-04 19:26:40 UTC +--- Core/Config.h.orig 2019-10-16 19:38:27 UTC ++++ Core/Config.h +@@ -83,6 +83,7 @@ struct Config { (public) + bool bPauseExitsEmulator; + + bool bPauseMenuExitsEmulator; ++ bool bPS3Controller; + + // Core + bool bIgnoreBadMemAccess; +--- SDL/SDLJoystick.cpp.orig 2019-10-16 19:38:27 UTC +++ SDL/SDLJoystick.cpp @@ -1,13 +1,8 @@ #include "SDL/SDLJoystick.h" @@ -324,11 +335,11 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 - return it->second; + return -1; } ---- SDL/SDLJoystick.h.orig 2017-10-04 19:26:40 UTC +--- SDL/SDLJoystick.h.orig 2019-10-16 19:38:27 UTC +++ SDL/SDLJoystick.h @@ -1,9 +1,11 @@ #pragma once - #ifdef _WIN32 + #ifdef _MSC_VER #include "SDL/SDL.h" +#include "SDL/SDL_joystick.h" #include "SDL/SDL_thread.h" @@ -464,3 +475,25 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 + + int getDeviceIndex(int instanceId); }; +--- SDL/SDLMain.cpp.orig 2019-10-16 19:38:27 UTC ++++ SDL/SDLMain.cpp +@@ -417,7 +417,7 @@ int main(int argc, char *argv[]) { + NativeGetAppInfo(&app_name, &app_name_nice, &landscape, &version); + + bool joystick_enabled = true; +- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0) { ++ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { + fprintf(stderr, "Failed to initialize SDL with joystick support. Retrying without.\n"); + joystick_enabled = false; + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { +--- UI/NativeApp.cpp.orig 2019-10-16 19:38:27 UTC ++++ UI/NativeApp.cpp +@@ -555,6 +555,8 @@ void NativeInit(int argc, const char *argv[], const ch + fileToLog = argv[i] + strlen("--log="); + if (!strncmp(argv[i], "--state=", strlen("--state=")) && strlen(argv[i]) > strlen("--state=")) + stateToLoad = argv[i] + strlen("--state="); ++ if (!strncmp(argv[1], "--PS3", strlen("--PS3"))) ++ g_Config.bPS3Controller = true; + #if !defined(MOBILE_DEVICE) + if (!strncmp(argv[i], "--escape-exit", strlen("--escape-exit"))) + g_Config.bPauseExitsEmulator = true;