From owner-svn-ports-branches@freebsd.org Sun Mar 19 09:14:11 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E163BD08444; Sun, 19 Mar 2017 09:14:11 +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 mx1.freebsd.org (Postfix) with ESMTPS id 86AA317C4; Sun, 19 Mar 2017 09:14:11 +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 v2J9EAlu035936; Sun, 19 Mar 2017 09:14:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2J9EAh9035934; Sun, 19 Mar 2017 09:14:10 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201703190914.v2J9EAh9035934@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 19 Mar 2017 09:14:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436479 - in branches/2017Q1/security/sssd: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 19 Mar 2017 09:14:12 -0000 Author: riggs Date: Sun Mar 19 09:14:10 2017 New Revision: 436479 URL: https://svnweb.freebsd.org/changeset/ports/436479 Log: MFH: r436401 Add support of krb5 1.15; bump PORTREVISION PR: 204827 Submitted by: joris.dedieu@gmail.com Approved by: lukas.slebodnik@intrak.sk (maintainer) Approved by: ports-secteam (feld) Added: branches/2017Q1/security/sssd/files/patch-src_external_pac__responder.m4 - copied unchanged from r436401, head/security/sssd/files/patch-src_external_pac__responder.m4 Deleted: branches/2017Q1/security/sssd/files/patch-src__external__pac_responder.m4 Modified: branches/2017Q1/security/sssd/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/security/sssd/Makefile ============================================================================== --- branches/2017Q1/security/sssd/Makefile Sun Mar 19 09:01:57 2017 (r436478) +++ branches/2017Q1/security/sssd/Makefile Sun Mar 19 09:14:10 2017 (r436479) @@ -3,7 +3,7 @@ PORTNAME= sssd PORTVERSION= 1.11.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ Copied: branches/2017Q1/security/sssd/files/patch-src_external_pac__responder.m4 (from r436401, head/security/sssd/files/patch-src_external_pac__responder.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/security/sssd/files/patch-src_external_pac__responder.m4 Sun Mar 19 09:14:10 2017 (r436479, copy of r436401, head/security/sssd/files/patch-src_external_pac__responder.m4) @@ -0,0 +1,22 @@ +--- src/external/pac_responder.m4.orig 2014-09-17 13:01:37 UTC ++++ src/external/pac_responder.m4 +@@ -14,14 +14,17 @@ then + PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes, + AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac])) + +- AC_PATH_PROG(KRB5_CONFIG, krb5-config) ++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) + AC_MSG_CHECKING(for supported MIT krb5 version) + KRB5_VERSION="`$KRB5_CONFIG --version`" + case $KRB5_VERSION in + Kerberos\ 5\ release\ 1.9* | \ + Kerberos\ 5\ release\ 1.10* | \ + Kerberos\ 5\ release\ 1.11* | \ +- Kerberos\ 5\ release\ 1.12*) ++ Kerberos\ 5\ release\ 1.12* | \ ++ Kerberos\ 5\ release\ 1.13* | \ ++ Kerberos\ 5\ release\ 1.14* | \ ++ Kerberos\ 5\ release\ 1.15*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; From owner-svn-ports-branches@freebsd.org Sun Mar 19 10:55:59 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3CD4D12C94; Sun, 19 Mar 2017 10:55:59 +0000 (UTC) (envelope-from ehaupt@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 mx1.freebsd.org (Postfix) with ESMTPS id BBA296C9; Sun, 19 Mar 2017 10:55:59 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2JAtwFo077505; Sun, 19 Mar 2017 10:55:58 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2JAtw6K077503; Sun, 19 Mar 2017 10:55:58 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201703191055.v2JAtw6K077503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Sun, 19 Mar 2017 10:55:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436482 - branches/2017Q1/graphics/py-graph-core X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 19 Mar 2017 10:56:00 -0000 Author: ehaupt Date: Sun Mar 19 10:55:58 2017 New Revision: 436482 URL: https://svnweb.freebsd.org/changeset/ports/436482 Log: Merge revision 436481 Approved by: ports-secteam (blanket) - Unbreak port by using CHEESESHOP master site instead of GOOGLE_CODE as this port is still needed by ports (eg. mail/cleanup-maildir) - While here add LICENSE - The distfile checksums differ due to some minor changes [1], therefore also bump PORTREVISION [1] --- distfile changes begin here --- diff -Nur google/python-graph-core-1.8.2/PKG-INFO cheeseshop/python-graph-core-1.8.2/PKG-INFO --- google/python-graph-core-1.8.2/PKG-INFO 2012-07-14 23:12:33.000000000 +0200 +++ cheeseshop/python-graph-core-1.8.2/PKG-INFO 2015-03-26 22:07:53.000000000 +0100 @@ -1,4 +1,4 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: python-graph-core Version: 1.8.2 Summary: A library for working with graphs in Python diff -Nur google/python-graph-core-1.8.2/pygraph/algorithms/minmax.py cheeseshop/python-graph-core-1.8.2/pygraph/algorithms/minmax.py --- google/python-graph-core-1.8.2/pygraph/algorithms/minmax.py 2012-02-19 20:36:08.000000000 +0100 +++ cheeseshop/python-graph-core-1.8.2/pygraph/algorithms/minmax.py 2014-03-11 00:04:22.000000000 +0100 @@ -132,6 +132,13 @@ # Shortest Path +def path(st, target): + if (target is None): + return [] + else: + return [target] + path(st, st[target]) + + def shortest_path(graph, source): """ Return the shortest path distance between source and all other nodes using Dijkstra's diff -Nur google/python-graph-core-1.8.2/python_graph_core.egg-info/PKG-INFO cheeseshop/python-graph-core-1.8.2/python_graph_core.egg-info/PKG-INFO --- google/python-graph-core-1.8.2/python_graph_core.egg-info/PKG-INFO 2012-07-14 23:12:33.000000000 +0200 +++ cheeseshop/python-graph-core-1.8.2/python_graph_core.egg-info/PKG-INFO 2015-03-26 22:07:51.000000000 +0100 @@ -1,4 +1,4 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: python-graph-core Version: 1.8.2 Summary: A library for working with graphs in Python diff -Nur google/python-graph-core-1.8.2/python_graph_core.egg-info/top_level.txt cheeseshop/python-graph-core-1.8.2/python_graph_core.egg-info/top_level.txt --- google/python-graph-core-1.8.2/python_graph_core.egg-info/top_level.txt 2012-07-14 23:12:33.000000000 +0200 +++ cheeseshop/python-graph-core-1.8.2/python_graph_core.egg-info/top_level.txt 2015-03-26 22:07:51.000000000 +0100 @@ -1,5 +1,5 @@ -pygraph/classes -pygraph/readwrite pygraph -pygraph/mixins pygraph/algorithms +pygraph/classes +pygraph/mixins +pygraph/readwrite --- distfile changes end here --- Modified: branches/2017Q1/graphics/py-graph-core/Makefile branches/2017Q1/graphics/py-graph-core/distinfo Modified: branches/2017Q1/graphics/py-graph-core/Makefile ============================================================================== --- branches/2017Q1/graphics/py-graph-core/Makefile Sun Mar 19 10:45:37 2017 (r436481) +++ branches/2017Q1/graphics/py-graph-core/Makefile Sun Mar 19 10:55:58 2017 (r436482) @@ -3,18 +3,17 @@ PORTNAME= graph-core PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= python-${PORTNAME}-${PORTVERSION} MAINTAINER= demon@FreeBSD.org COMMENT= Library for working with graphs in Python, core module -BROKEN= Unfetchable (google code has gone away) +LICENSE= MIT -PROJECTHOST= python-graph USES= python USE_PYTHON= distutils autoplist Modified: branches/2017Q1/graphics/py-graph-core/distinfo ============================================================================== --- branches/2017Q1/graphics/py-graph-core/distinfo Sun Mar 19 10:45:37 2017 (r436481) +++ branches/2017Q1/graphics/py-graph-core/distinfo Sun Mar 19 10:55:58 2017 (r436482) @@ -1,2 +1,3 @@ -SHA256 (python-graph-core-1.8.2.tar.gz) = 90834ed30d2c8d1ade30550d82dae2a3bf274270d5bef51d26e7f35b6262ae32 -SIZE (python-graph-core-1.8.2.tar.gz) = 27361 +TIMESTAMP = 1489918992 +SHA256 (python-graph-core-1.8.2.tar.gz) = 503fa45f42b3bfa8b62db1357afaec52fe0e9104e27e905e24784ef62347fc21 +SIZE (python-graph-core-1.8.2.tar.gz) = 27414 From owner-svn-ports-branches@freebsd.org Sun Mar 19 11:50:35 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D3C8D11FEC; Sun, 19 Mar 2017 11:50:35 +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 mx1.freebsd.org (Postfix) with ESMTPS id 26AFD1F90; Sun, 19 Mar 2017 11:50:35 +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 v2JBoYId098465; Sun, 19 Mar 2017 11:50:34 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2JBoXSG098459; Sun, 19 Mar 2017 11:50:33 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201703191150.v2JBoXSG098459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 19 Mar 2017 11:50:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436487 - in branches/2017Q1/databases: mariadb101-client mariadb101-client/files mariadb101-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 19 Mar 2017 11:50:35 -0000 Author: brnrd Date: Sun Mar 19 11:50:33 2017 New Revision: 436487 URL: https://svnweb.freebsd.org/changeset/ports/436487 Log: MFH: r436392 databases/madiadb101-server: Update to 10.1.22 - Update to 10.1.22 [1] - Add upstream patch for WITHOUT_SERVER build failure [1]: https://mariadb.com/kb/en/mariadb/mariadb-10122-release-notes/ Security: 4d2f9d09-ddb7-11e6-a9a5-b499baebfeaf Security: 7c27192f-0bc3-11e7-9940-b499baebfeaf Security: CVE-2017-3313 Security: CVE-2017-3302 Approved by: ports-secteam (feld) Added: branches/2017Q1/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 - copied unchanged from r436392, head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 Modified: branches/2017Q1/databases/mariadb101-client/Makefile branches/2017Q1/databases/mariadb101-client/pkg-plist branches/2017Q1/databases/mariadb101-server/Makefile branches/2017Q1/databases/mariadb101-server/distinfo branches/2017Q1/databases/mariadb101-server/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/databases/mariadb101-client/Makefile ============================================================================== --- branches/2017Q1/databases/mariadb101-client/Makefile Sun Mar 19 11:35:43 2017 (r436486) +++ branches/2017Q1/databases/mariadb101-client/Makefile Sun Mar 19 11:50:33 2017 (r436487) @@ -29,7 +29,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} . endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 -. for b in dialog.so mysql_clear_password.so +. for b in dialog.so mysql_clear_password.so client_ed25519.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b} . endfor # Fix https://mariadb.atlassian.net/browse/MDEV-9388 Copied: branches/2017Q1/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 (from r436392, head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/databases/mariadb101-client/files/patch-build-fail-MDEV-12261 Sun Mar 19 11:50:33 2017 (r436487, copy of r436392, head/databases/mariadb101-client/files/patch-build-fail-MDEV-12261) @@ -0,0 +1,236 @@ +From 2c2bd8c1556b081fccd0fc3e010dc3ea2c38fffb Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Wed, 15 Mar 2017 11:46:54 +0100 +Subject: [PATCH] MDEV-12261 build failure without P_S + +restore mysql_file_delete_with_symlink() but let it use +new my_handler_delete_with_symlink() mysys helper. +--- + include/my_sys.h | 3 +-- + include/mysql/psi/mysql_file.h | 44 ++++++++++++++++++++++++++++++++++++++++ + mysys/my_symlink2.c | 14 ++++++------- + sql/handler.cc | 2 +- + sql/sql_db.cc | 6 +++--- + sql/table.cc | 2 +- + storage/maria/ma_delete_table.c | 8 ++++---- + storage/myisam/mi_delete_table.c | 8 ++++---- + 8 files changed, 64 insertions(+), 23 deletions(-) + +diff --git a/include/my_sys.h b/include/my_sys.h +index 4e129cc..5b0a114 100644 +--- include/my_sys.h.orig ++++ include/my_sys.h +@@ -597,8 +597,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, + myf MyFlags); + extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); + extern int my_symlink(const char *content, const char *linkname, myf MyFlags); +-extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir); ++extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); + + extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); + extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, +diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h +index aca66bd..df94603 100644 +--- include/mysql/psi/mysql_file.h.orig ++++ include/mysql/psi/mysql_file.h +@@ -442,6 +442,20 @@ + #endif + + /** ++ @def mysql_file_delete_with_symlink(K, P1, P2, P3) ++ Instrumented delete with symbolic link. ++ @c mysql_file_delete_with_symlink is a replacement ++ for @c my_handler_delete_with_symlink. ++*/ ++#ifdef HAVE_PSI_FILE_INTERFACE ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) ++#else ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(P1, P2, P3) ++#endif ++ ++/** + @def mysql_file_rename_with_symlink(K, P1, P2, P3) + Instrumented rename with symbolic link. + @c mysql_file_rename_with_symlink is a replacement +@@ -1294,6 +1308,7 @@ inline_mysql_file_rename( + return result; + } + ++ + static inline File + inline_mysql_file_create_with_symlink( + #ifdef HAVE_PSI_FILE_INTERFACE +@@ -1325,6 +1340,35 @@ inline_mysql_file_create_with_symlink( + + + static inline int ++inline_mysql_file_delete_with_symlink( ++#ifdef HAVE_PSI_FILE_INTERFACE ++ PSI_file_key key, const char *src_file, uint src_line, ++#endif ++ const char *name, const char *ext, myf flags) ++{ ++ int result; ++ char fullname[FN_REFLEN]; ++ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); ++#ifdef HAVE_PSI_FILE_INTERFACE ++ struct PSI_file_locker *locker; ++ PSI_file_locker_state state; ++ locker= PSI_FILE_CALL(get_thread_file_name_locker) ++ (&state, key, PSI_FILE_DELETE, fullname, &locker); ++ if (likely(locker != NULL)) ++ { ++ PSI_FILE_CALL(start_file_close_wait)(locker, src_file, src_line); ++ result= my_handler_delete_with_symlink(fullname, flags); ++ PSI_FILE_CALL(end_file_close_wait)(locker, result); ++ return result; ++ } ++#endif ++ ++ result= my_handler_delete_with_symlink(fullname, flags); ++ return result; ++} ++ ++ ++static inline int + inline_mysql_file_rename_with_symlink( + #ifdef HAVE_PSI_FILE_INTERFACE + PSI_file_key key, const char *src_file, uint src_line, +diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c +index defcb59..c851468 100644 +--- mysys/my_symlink2.c.orig ++++ mysys/my_symlink2.c +@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) + in this case both the symlink and the symlinked file are deleted, + but only if the symlinked file is not in the datadir. + */ +-int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir) ++int my_handler_delete_with_symlink(const char *filename, myf sync_dir) + { +- char orig[FN_REFLEN], real[FN_REFLEN]; ++ char real[FN_REFLEN]; + int res= 0; + DBUG_ENTER("my_handler_delete_with_symlink"); + +- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); +- if (my_is_symlink(orig)) ++ if (my_is_symlink(filename)) + { + /* + Delete the symlinked file only if the symlink is not + pointing into datadir. + */ +- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) +- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | sync_dir)); ++ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) ++ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); + } +- DBUG_RETURN(mysql_file_delete(key, orig, MYF(sync_dir)) || res); ++ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); + } +diff --git a/sql/handler.cc b/sql/handler.cc +index 7fa8afd..fc70ed5 100644 +--- sql/handler.cc.orig ++++ sql/handler.cc +@@ -3850,7 +3850,7 @@ int handler::delete_table(const char *name) + + for (const char **ext=bas_ext(); *ext ; ext++) + { +- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) ++ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) + { + if (my_errno != ENOENT) + { +diff --git a/sql/sql_db.cc b/sql/sql_db.cc +index 3f43a33..6c8c384 100644 +--- sql/sql_db.cc.orig ++++ sql/sql_db.cc +@@ -815,7 +815,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) + if there exists a table with the name 'db', so let's just do it + separately. We know this file exists and needs to be deleted anyway. + */ +- if (my_handler_delete_with_symlink(key_file_misc, path, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, path, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), path, my_errno); +@@ -1119,7 +1119,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, + We ignore ENOENT error in order to skip files that was deleted + by concurrently running statement like REPAIR TABLE ... + */ +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), filePath, my_errno); +@@ -1235,7 +1235,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) + continue; + } + strxmov(filePath, org_path, "/", file->name, NullS); +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) + { + goto err; + } +diff --git a/sql/table.cc b/sql/table.cc +index 80d0e02..975d9d5 100644 +--- sql/table.cc.orig ++++ sql/table.cc +@@ -569,7 +569,7 @@ enum open_frm_error open_table_def(THD *thd, TABLE_SHARE *share, uint flags) + { + DBUG_ASSERT(flags & GTS_TABLE); + DBUG_ASSERT(flags & GTS_USE_DISCOVERY); +- my_handler_delete_with_symlink(key_file_frm, path, "", MYF(0)); ++ mysql_file_delete_with_symlink(key_file_frm, path, "", MYF(0)); + file= -1; + } + else +diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c +index a9ab8e5..186075d 100644 +--- storage/maria/ma_delete_table.c.orig ++++ storage/maria/ma_delete_table.c +@@ -86,13 +86,13 @@ int maria_delete_table_files(const char + { + DBUG_ENTER("maria_delete_table_files"); + +- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) || +- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir))) ++ if (mysql_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, MYF(MY_WME | sync_dir)) || ++ mysql_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, MYF(MY_WME | sync_dir))) + DBUG_RETURN(my_errno); + + if (!temporary) { +- my_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0)); +- my_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0)); ++ mysql_handler_delete_with_symlink(key_file_dfile, name, ".TMD", MYF(0)); ++ mysql_handler_delete_with_symlink(key_file_dfile, name, ".OLD", MYF(0)); + } + DBUG_RETURN(0); + } +diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c +index 3422e6b..d766fb2 100644 +--- storage/myisam/mi_delete_table.c.orig ++++ storage/myisam/mi_delete_table.c +@@ -34,14 +34,14 @@ int mi_delete_table(const char *name) + check_table_is_closed(name,"delete"); + #endif + +- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || +- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, MYF(MY_WME)) || ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, MYF(MY_WME))) + DBUG_RETURN(my_errno); + + + // optionally present: +- my_handler_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); +- my_handler_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".OLD", MYF(0)); ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, ".TMD", MYF(0)); + + DBUG_RETURN(0); + } Modified: branches/2017Q1/databases/mariadb101-client/pkg-plist ============================================================================== --- branches/2017Q1/databases/mariadb101-client/pkg-plist Sun Mar 19 11:35:43 2017 (r436486) +++ branches/2017Q1/databases/mariadb101-client/pkg-plist Sun Mar 19 11:50:33 2017 (r436487) @@ -64,6 +64,7 @@ include/mysql/psi/mysql_statement.h include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h +include/mysql/service_base64.h include/mysql/service_debug_sync.h include/mysql/service_encryption.h include/mysql/service_encryption_scheme.h @@ -73,9 +74,11 @@ include/mysql/service_md5.h include/mysql/service_my_snprintf.h include/mysql/service_progress_report.h include/mysql/service_sha1.h +include/mysql/service_sha2.h include/mysql/service_thd_alloc.h include/mysql/service_thd_autoinc.h include/mysql/service_thd_error_context.h +include/mysql/service_thd_rnd.h include/mysql/service_thd_specifics.h include/mysql/service_thd_timezone.h include/mysql/service_thd_wait.h @@ -94,11 +97,10 @@ lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so -%%DATADIR%%/maria_add_gis_sp.sql -%%DATADIR%%/maria_add_gis_sp_bootstrap.sql man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz Modified: branches/2017Q1/databases/mariadb101-server/Makefile ============================================================================== --- branches/2017Q1/databases/mariadb101-server/Makefile Sun Mar 19 11:35:43 2017 (r436486) +++ branches/2017Q1/databases/mariadb101-server/Makefile Sun Mar 19 11:50:33 2017 (r436487) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.21 +PORTVERSION= 10.1.22 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ @@ -142,7 +142,8 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ - ${STAGEDIR}${PREFIX}/bin/mysqlaccess + ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ + ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/share/pkgconfig .endif # defined(CLIENT_ONLY) Modified: branches/2017Q1/databases/mariadb101-server/distinfo ============================================================================== --- branches/2017Q1/databases/mariadb101-server/distinfo Sun Mar 19 11:35:43 2017 (r436486) +++ branches/2017Q1/databases/mariadb101-server/distinfo Sun Mar 19 11:50:33 2017 (r436487) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484755161 -SHA256 (mariadb-10.1.21.tar.gz) = 5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 -SIZE (mariadb-10.1.21.tar.gz) = 61406584 +TIMESTAMP = 1489523834 +SHA256 (mariadb-10.1.22.tar.gz) = bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce +SIZE (mariadb-10.1.22.tar.gz) = 61542321 Modified: branches/2017Q1/databases/mariadb101-server/pkg-plist ============================================================================== --- branches/2017Q1/databases/mariadb101-server/pkg-plist Sun Mar 19 11:35:43 2017 (r436486) +++ branches/2017Q1/databases/mariadb101-server/pkg-plist Sun Mar 19 11:50:33 2017 (r436487) @@ -46,7 +46,6 @@ include/mysql/private/atomic/generic-msv include/mysql/private/atomic/nolock.h include/mysql/private/atomic/solaris.h include/mysql/private/atomic/x86-gcc.h -include/mysql/private/base64.h include/mysql/private/config.h include/mysql/private/ft_global.h include/mysql/private/embedded_priv.h @@ -90,8 +89,6 @@ include/mysql/private/probes_mysql_nodtr include/mysql/private/queues.h include/mysql/private/rijndael.h include/mysql/private/service_versions.h -include/mysql/private/sha1.h -include/mysql/private/sha2.h include/mysql/private/t_ctype.h include/mysql/private/thr_alarm.h include/mysql/private/thr_lock.h @@ -107,6 +104,7 @@ lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so +lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so From owner-svn-ports-branches@freebsd.org Tue Mar 21 08:24:12 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 164A2D1696D; Tue, 21 Mar 2017 08:24:12 +0000 (UTC) (envelope-from royger@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 mx1.freebsd.org (Postfix) with ESMTPS id D7EA61B30; Tue, 21 Mar 2017 08:24:11 +0000 (UTC) (envelope-from royger@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L8OBej001412; Tue, 21 Mar 2017 08:24:11 GMT (envelope-from royger@FreeBSD.org) Received: (from royger@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L8OAcV001404; Tue, 21 Mar 2017 08:24:10 GMT (envelope-from royger@FreeBSD.org) Message-Id: <201703210824.v2L8OAcV001404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: royger set sender to royger@FreeBSD.org using -f From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Date: Tue, 21 Mar 2017 08:24:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436570 - in branches/2017Q1: emulators/xen-kernel emulators/xen-kernel/files sysutils/xen-tools sysutils/xen-tools/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 21 Mar 2017 08:24:12 -0000 Author: royger (src committer) Date: Tue Mar 21 08:24:10 2017 New Revision: 436570 URL: https://svnweb.freebsd.org/changeset/ports/436570 Log: MFH: r436536 xen: update to 4.7.2 Apply build fixes for clang 4.0 (picked from upstream) and XSA-211. Reviewed by: bapt Sponsored by: AsiaBSDCon Approved by: ports-secteam (junovitch) Added: branches/2017Q1/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch - copied unchanged from r436536, head/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch branches/2017Q1/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch - copied unchanged from r436536, head/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch branches/2017Q1/sysutils/xen-tools/files/kdd.patch - copied unchanged from r436536, head/sysutils/xen-tools/files/kdd.patch branches/2017Q1/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch - copied unchanged from r436536, head/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch Deleted: branches/2017Q1/emulators/xen-kernel/files/xsa191.patch branches/2017Q1/emulators/xen-kernel/files/xsa192.patch branches/2017Q1/emulators/xen-kernel/files/xsa193-4.7.patch branches/2017Q1/emulators/xen-kernel/files/xsa194.patch branches/2017Q1/emulators/xen-kernel/files/xsa195.patch branches/2017Q1/emulators/xen-kernel/files/xsa200-4.7.patch branches/2017Q1/emulators/xen-kernel/files/xsa202.patch branches/2017Q1/emulators/xen-kernel/files/xsa204-4.7.patch branches/2017Q1/sysutils/xen-tools/files/xsa197-qemuu.patch branches/2017Q1/sysutils/xen-tools/files/xsa198.patch branches/2017Q1/sysutils/xen-tools/files/xsa208-qemuu.patch branches/2017Q1/sysutils/xen-tools/files/xsa209-pre-qemuu.patch branches/2017Q1/sysutils/xen-tools/files/xsa209-qemuu.patch Modified: branches/2017Q1/emulators/xen-kernel/Makefile branches/2017Q1/emulators/xen-kernel/distinfo branches/2017Q1/sysutils/xen-tools/Makefile branches/2017Q1/sysutils/xen-tools/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/emulators/xen-kernel/Makefile ============================================================================== --- branches/2017Q1/emulators/xen-kernel/Makefile Tue Mar 21 08:16:00 2017 (r436569) +++ branches/2017Q1/emulators/xen-kernel/Makefile Tue Mar 21 08:24:10 2017 (r436570) @@ -2,8 +2,8 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel -PORTVERSION= 4.7.1 -PORTREVISION= 3 +PORTVERSION= 4.7.2 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -40,14 +40,8 @@ PLIST_FILES= /boot/xen \ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patch:-p1 \ ${FILESDIR}/0002-xen-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p1 \ ${FILESDIR}/kconf_arch.patch:-p1 \ - ${FILESDIR}/xsa191.patch \ - ${FILESDIR}/xsa192.patch \ - ${FILESDIR}/xsa193-4.7.patch \ - ${FILESDIR}/xsa194.patch \ - ${FILESDIR}/xsa195.patch \ - ${FILESDIR}/xsa200-4.7.patch \ - ${FILESDIR}/xsa204-4.7.patch \ - ${FILESDIR}/xsa202.patch + ${FILESDIR}/0001-x86-drop-unneeded-__packed-attributes.patch:-p1 \ + ${FILESDIR}/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch:-p1 .include Modified: branches/2017Q1/emulators/xen-kernel/distinfo ============================================================================== --- branches/2017Q1/emulators/xen-kernel/distinfo Tue Mar 21 08:16:00 2017 (r436569) +++ branches/2017Q1/emulators/xen-kernel/distinfo Tue Mar 21 08:24:10 2017 (r436570) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480690512 -SHA256 (xen-4.7.1.tar.gz) = e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe -SIZE (xen-4.7.1.tar.gz) = 20706864 +TIMESTAMP = 1489059095 +SHA256 (xen-4.7.2.tar.gz) = 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 +SIZE (xen-4.7.2.tar.gz) = 20714281 Copied: branches/2017Q1/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch (from r436536, head/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch Tue Mar 21 08:24:10 2017 (r436570, copy of r436536, head/emulators/xen-kernel/files/0001-x86-drop-unneeded-__packed-attributes.patch) @@ -0,0 +1,122 @@ +From 7de7d07d47cc389bc341f5524ea8415c3c78e378 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= +Date: Fri, 10 Mar 2017 01:05:51 +0900 +Subject: [PATCH 1/2] x86: drop unneeded __packed attributes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There where a couple of unneeded packed attributes in several x86-specific +structures, that are obviously aligned. The only non-trivial one is +vmcb_struct, which has been checked to have the same layout with and without +the packed attribute using pahole. In that case add a build-time size check to +be on the safe side. + +No functional change is expected as a result of this commit. + +Signed-off-by: Roger Pau Monné +Reviewed-by: Jan Beulich +Reviewed-by: Boris Ostrovsky +--- + xen/arch/x86/hvm/svm/vmcb.c | 3 +++ + xen/arch/x86/x86_emulate/x86_emulate.h | 4 ++-- + xen/include/asm-x86/hvm/svm/vmcb.h | 12 ++++++------ + 3 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c +index 9ea014f..f982fc9 100644 +--- a/xen/arch/x86/hvm/svm/vmcb.c ++++ b/xen/arch/x86/hvm/svm/vmcb.c +@@ -72,6 +72,9 @@ static int construct_vmcb(struct vcpu *v) + struct arch_svm_struct *arch_svm = &v->arch.hvm_svm; + struct vmcb_struct *vmcb = arch_svm->vmcb; + ++ /* Build-time check of the size of VMCB AMD structure. */ ++ BUILD_BUG_ON(sizeof(*vmcb) != PAGE_SIZE); ++ + vmcb->_general1_intercepts = + GENERAL1_INTERCEPT_INTR | GENERAL1_INTERCEPT_NMI | + GENERAL1_INTERCEPT_SMI | GENERAL1_INTERCEPT_INIT | +diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h +index 17c86f3..bbdf16a 100644 +--- a/xen/arch/x86/x86_emulate/x86_emulate.h ++++ b/xen/arch/x86/x86_emulate/x86_emulate.h +@@ -71,7 +71,7 @@ enum x86_swint_emulation { + * Attribute for segment selector. This is a copy of bit 40:47 & 52:55 of the + * segment descriptor. It happens to match the format of an AMD SVM VMCB. + */ +-typedef union __packed segment_attributes { ++typedef union segment_attributes { + uint16_t bytes; + struct + { +@@ -91,7 +91,7 @@ typedef union __packed segment_attributes { + * Full state of a segment register (visible and hidden portions). + * Again, this happens to match the format of an AMD SVM VMCB. + */ +-struct __packed segment_register { ++struct segment_register { + uint16_t sel; + segment_attributes_t attr; + uint32_t limit; +diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h +index bad2382..a3cd1b1 100644 +--- a/xen/include/asm-x86/hvm/svm/vmcb.h ++++ b/xen/include/asm-x86/hvm/svm/vmcb.h +@@ -308,7 +308,7 @@ enum VMEXIT_EXITCODE + /* Definition of segment state is borrowed by the generic HVM code. */ + typedef struct segment_register svm_segment_register_t; + +-typedef union __packed ++typedef union + { + u64 bytes; + struct +@@ -322,7 +322,7 @@ typedef union __packed + } fields; + } eventinj_t; + +-typedef union __packed ++typedef union + { + u64 bytes; + struct +@@ -340,7 +340,7 @@ typedef union __packed + } fields; + } vintr_t; + +-typedef union __packed ++typedef union + { + u64 bytes; + struct +@@ -357,7 +357,7 @@ typedef union __packed + } fields; + } ioio_info_t; + +-typedef union __packed ++typedef union + { + u64 bytes; + struct +@@ -366,7 +366,7 @@ typedef union __packed + } fields; + } lbrctrl_t; + +-typedef union __packed ++typedef union + { + uint32_t bytes; + struct +@@ -401,7 +401,7 @@ typedef union __packed + #define IOPM_SIZE (12 * 1024) + #define MSRPM_SIZE (8 * 1024) + +-struct __packed vmcb_struct { ++struct vmcb_struct { + u32 _cr_intercepts; /* offset 0x00 - cleanbit 0 */ + u32 _dr_intercepts; /* offset 0x04 - cleanbit 0 */ + u32 _exception_intercepts; /* offset 0x08 - cleanbit 0 */ +-- +2.10.1 (Apple Git-78) + Copied: branches/2017Q1/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch (from r436536, head/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch Tue Mar 21 08:24:10 2017 (r436570, copy of r436536, head/emulators/xen-kernel/files/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch) @@ -0,0 +1,69 @@ +From e5a1bf46187b0d39ec7e8c46e11c42027840747c Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Fri, 10 Mar 2017 01:08:26 +0900 +Subject: [PATCH 2/2] build/clang: fix XSM dummy policy when using clang 4.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There seems to be some weird bug in clang 4.0 that prevents xsm_pmu_op from +working as expected, and vpmu.o ends up with a reference to +__xsm_action_mismatch_detected which makes the build fail: + +[...] +ld -melf_x86_64_fbsd -T xen.lds -N prelink.o \ + xen/common/symbols-dummy.o -o xen/.xen-syms.0 +prelink.o: In function `xsm_default_action': +xen/include/xsm/dummy.h:80: undefined reference to `__xsm_action_mismatch_detected' +xen/xen/include/xsm/dummy.h:80: relocation truncated to fit: R_X86_64_PC32 against undefined symbol `__xsm_action_mismatch_detected' +ld: xen/xen/.xen-syms.0: hidden symbol `__xsm_action_mismatch_detected' isn't defined + +Then doing a search in the objects files: + +# find xen/ -type f -name '*.o' -print0 | xargs -0 bash -c \ + 'for filename; do nm "$filename" | \ + grep -q __xsm_action_mismatch_detected && echo "$filename"; done' bash +xen/arch/x86/prelink.o +xen/arch/x86/cpu/vpmu.o +xen/arch/x86/cpu/built_in.o +xen/arch/x86/built_in.o + +The current patch is the only way I've found to fix this so far, by simply +moving the XSM_PRIV check into the default case in xsm_pmu_op. This also fixes +the behavior of do_xenpmu_op, which will now return -EINVAL for unknown +XENPMU_* operations, instead of -EPERM when called by a privileged domain. + +Signed-off-by: Roger Pau Monné +--- +Cc: Daniel De Graaf +--- + xen/include/xsm/dummy.h | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h +index abbe282..0039c39 100644 +--- a/xen/include/xsm/dummy.h ++++ b/xen/include/xsm/dummy.h +@@ -711,18 +711,13 @@ static XSM_INLINE int xsm_pmu_op (XSM_DEFAULT_ARG struct domain *d, unsigned int + XSM_ASSERT_ACTION(XSM_OTHER); + switch ( op ) + { +- case XENPMU_mode_set: +- case XENPMU_mode_get: +- case XENPMU_feature_set: +- case XENPMU_feature_get: +- return xsm_default_action(XSM_PRIV, d, current->domain); + case XENPMU_init: + case XENPMU_finish: + case XENPMU_lvtpc_set: + case XENPMU_flush: + return xsm_default_action(XSM_HOOK, d, current->domain); + default: +- return -EPERM; ++ return xsm_default_action(XSM_PRIV, d, current->domain); + } + } + +-- +2.10.1 (Apple Git-78) + Modified: branches/2017Q1/sysutils/xen-tools/Makefile ============================================================================== --- branches/2017Q1/sysutils/xen-tools/Makefile Tue Mar 21 08:16:00 2017 (r436569) +++ branches/2017Q1/sysutils/xen-tools/Makefile Tue Mar 21 08:24:10 2017 (r436570) @@ -2,8 +2,8 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -PORTVERSION= 4.7.1 -PORTREVISION= 5 +PORTVERSION= 4.7.2 +PORTREVISION= 0 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -44,10 +44,10 @@ QEMU_ARGS= --disable-gtk \ --cxx=c++ EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 \ - ${FILESDIR}/xsa198.patch:-p1 \ - ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch \ - ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch \ - ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch + ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch:-p1 \ + ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch:-p1 \ + ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch:-p1 \ + ${FILESDIR}/kdd.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" \ --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin Modified: branches/2017Q1/sysutils/xen-tools/distinfo ============================================================================== --- branches/2017Q1/sysutils/xen-tools/distinfo Tue Mar 21 08:16:00 2017 (r436569) +++ branches/2017Q1/sysutils/xen-tools/distinfo Tue Mar 21 08:24:10 2017 (r436570) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480690512 -SHA256 (xen-4.7.1.tar.gz) = e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe -SIZE (xen-4.7.1.tar.gz) = 20706864 +TIMESTAMP = 1489085975 +SHA256 (xen-4.7.2.tar.gz) = 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 +SIZE (xen-4.7.2.tar.gz) = 20714281 Copied: branches/2017Q1/sysutils/xen-tools/files/kdd.patch (from r436536, head/sysutils/xen-tools/files/kdd.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/xen-tools/files/kdd.patch Tue Mar 21 08:24:10 2017 (r436570, copy of r436536, head/sysutils/xen-tools/files/kdd.patch) @@ -0,0 +1,36 @@ +Subject: [PATCH] tools/kdd: don't use a pointer to an unaligned field. + +The 'val' field in the packet is byte-aligned (because it is part of a +packed struct), but the pointer argument to kdd_rdmsr() has the normal +alignment constraints for a uint64_t *. Use a local variable to make sure +the passed pointer has the correct alignment. + +Reported-by: Roger Pau Monné +Signed-off-by: Tim Deegan +--- + tools/debugger/kdd/kdd.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c +index 70f007e..1bd5dd5 100644 +--- a/tools/debugger/kdd/kdd.c ++++ b/tools/debugger/kdd/kdd.c +@@ -710,11 +710,13 @@ static void kdd_handle_read_ctrl(kdd_state *s) + static void kdd_handle_read_msr(kdd_state *s) + { + uint32_t msr = s->rxp.cmd.msr.msr; ++ uint64_t val; + int ok; + KDD_LOG(s, "Read MSR 0x%"PRIx32"\n", msr); + +- ok = (kdd_rdmsr(s->guest, s->cpuid, msr, &s->txp.cmd.msr.val) == 0); ++ ok = (kdd_rdmsr(s->guest, s->cpuid, msr, &val) == 0); + s->txp.cmd.msr.msr = msr; ++ s->txp.cmd.msr.val = val; + s->txp.cmd.msr.status = (ok ? KDD_STATUS_SUCCESS : KDD_STATUS_FAILURE); + kdd_send_cmd(s, KDD_CMD_READ_MSR, 0); + } +-- +2.7.4 + + Copied: branches/2017Q1/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch (from r436536, head/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch Tue Mar 21 08:24:10 2017 (r436570, copy of r436536, head/sysutils/xen-tools/files/xsa211-qemuu-4.7.patch) @@ -0,0 +1,259 @@ +From 9de536fbc2be97ae887560f08f0fd824efa3d5db Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Tue, 14 Feb 2017 19:09:59 +0100 +Subject: [PATCH] cirrus/vnc: zap bitblit support from console code. + +There is a special code path (dpy_gfx_copy) to allow graphic emulation +notify user interface code about bitblit operations carryed out by +guests. It is supported by cirrus and vnc server. The intended purpose +is to optimize display scrolls and just send over the scroll op instead +of a full display update. + +This is rarely used these days though because modern guests simply don't +use the cirrus blitter any more. Any linux guest using the cirrus drm +driver doesn't. Any windows guest newer than winxp doesn't ship with a +cirrus driver any more and thus uses the cirrus as simple framebuffer. + +So this code tends to bitrot and bugs can go unnoticed for a long time. +See for example commit "3e10c3e vnc: fix qemu crash because of SIGSEGV" +which fixes a bug lingering in the code for almost a year, added by +commit "c7628bf vnc: only alloc server surface with clients connected". + +Also the vnc server will throttle the frame rate in case it figures the +network can't keep up (send buffers are full). This doesn't work with +dpy_gfx_copy, for any copy operation sent to the vnc client we have to +send all outstanding updates beforehand, otherwise the vnc client might +run the client side blit on outdated data and thereby corrupt the +display. So this dpy_gfx_copy "optimization" might even make things +worse on slow network links. + +Lets kill it once for all. + +Signed-off-by: Gerd Hoffmann +--- + hw/display/cirrus_vga.c | 12 ++----- + include/ui/console.h | 7 ---- + ui/console.c | 28 --------------- + ui/vnc.c | 91 ------------------------------------------------- + 4 files changed, 3 insertions(+), 135 deletions(-) + +diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c +index 5901250..2841676 100644 +--- a/hw/display/cirrus_vga.c ++++ b/hw/display/cirrus_vga.c +@@ -758,11 +758,6 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) + } + } + +- /* we have to flush all pending changes so that the copy +- is generated at the appropriate moment in time */ +- if (notify) +- graphic_hw_update(s->vga.con); +- + (*s->cirrus_rop) (s, s->vga.vram_ptr + + (s->cirrus_blt_dstaddr & s->cirrus_addr_mask), + s->vga.vram_ptr + +@@ -771,10 +766,9 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h) + s->cirrus_blt_width, s->cirrus_blt_height); + + if (notify) { +- qemu_console_copy(s->vga.con, +- sx, sy, dx, dy, +- s->cirrus_blt_width / depth, +- s->cirrus_blt_height); ++ dpy_gfx_update(s->vga.con, dx, dy, ++ s->cirrus_blt_width / depth, ++ s->cirrus_blt_height); + } + + /* we don't have to notify the display that this portion has +diff --git a/include/ui/console.h b/include/ui/console.h +index 047a2b4..ed07065 100644 +--- a/include/ui/console.h ++++ b/include/ui/console.h +@@ -166,9 +166,6 @@ typedef struct DisplayChangeListenerOps { + int x, int y, int w, int h); + void (*dpy_gfx_switch)(DisplayChangeListener *dcl, + struct DisplaySurface *new_surface); +- void (*dpy_gfx_copy)(DisplayChangeListener *dcl, +- int src_x, int src_y, +- int dst_x, int dst_y, int w, int h); + bool (*dpy_gfx_check_format)(DisplayChangeListener *dcl, + pixman_format_code_t format); + +@@ -233,8 +230,6 @@ int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info); + void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h); + void dpy_gfx_replace_surface(QemuConsole *con, + DisplaySurface *surface); +-void dpy_gfx_copy(QemuConsole *con, int src_x, int src_y, +- int dst_x, int dst_y, int w, int h); + void dpy_text_cursor(QemuConsole *con, int x, int y); + void dpy_text_update(QemuConsole *con, int x, int y, int w, int h); + void dpy_text_resize(QemuConsole *con, int w, int h); +@@ -329,8 +324,6 @@ void text_consoles_set_display(DisplayState *ds); + void console_select(unsigned int index); + void console_color_init(DisplayState *ds); + void qemu_console_resize(QemuConsole *con, int width, int height); +-void qemu_console_copy(QemuConsole *con, int src_x, int src_y, +- int dst_x, int dst_y, int w, int h); + DisplaySurface *qemu_console_surface(QemuConsole *con); + + /* console-gl.c */ +diff --git a/ui/console.c b/ui/console.c +index 75fc492..72d91cb 100644 +--- a/ui/console.c ++++ b/ui/console.c +@@ -1495,27 +1495,6 @@ static void dpy_refresh(DisplayState *s) + } + } + +-void dpy_gfx_copy(QemuConsole *con, int src_x, int src_y, +- int dst_x, int dst_y, int w, int h) +-{ +- DisplayState *s = con->ds; +- DisplayChangeListener *dcl; +- +- if (!qemu_console_is_visible(con)) { +- return; +- } +- QLIST_FOREACH(dcl, &s->listeners, next) { +- if (con != (dcl->con ? dcl->con : active_console)) { +- continue; +- } +- if (dcl->ops->dpy_gfx_copy) { +- dcl->ops->dpy_gfx_copy(dcl, src_x, src_y, dst_x, dst_y, w, h); +- } else { /* TODO */ +- dcl->ops->dpy_gfx_update(dcl, dst_x, dst_y, w, h); +- } +- } +-} +- + void dpy_text_cursor(QemuConsole *con, int x, int y) + { + DisplayState *s = con->ds; +@@ -1968,13 +1947,6 @@ void qemu_console_resize(QemuConsole *s, int width, int height) + dpy_gfx_replace_surface(s, surface); + } + +-void qemu_console_copy(QemuConsole *con, int src_x, int src_y, +- int dst_x, int dst_y, int w, int h) +-{ +- assert(con->console_type == GRAPHIC_CONSOLE); +- dpy_gfx_copy(con, src_x, src_y, dst_x, dst_y, w, h); +-} +- + DisplaySurface *qemu_console_surface(QemuConsole *console) + { + return console->surface; +diff --git a/ui/vnc.c b/ui/vnc.c +index 52c6809..61ab611 100644 +--- a/ui/vnc.c ++++ b/ui/vnc.c +@@ -908,96 +908,6 @@ int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) + return n; + } + +-static void vnc_copy(VncState *vs, int src_x, int src_y, int dst_x, int dst_y, int w, int h) +-{ +- /* send bitblit op to the vnc client */ +- vnc_lock_output(vs); +- vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE); +- vnc_write_u8(vs, 0); +- vnc_write_u16(vs, 1); /* number of rects */ +- vnc_framebuffer_update(vs, dst_x, dst_y, w, h, VNC_ENCODING_COPYRECT); +- vnc_write_u16(vs, src_x); +- vnc_write_u16(vs, src_y); +- vnc_unlock_output(vs); +- vnc_flush(vs); +-} +- +-static void vnc_dpy_copy(DisplayChangeListener *dcl, +- int src_x, int src_y, +- int dst_x, int dst_y, int w, int h) +-{ +- VncDisplay *vd = container_of(dcl, VncDisplay, dcl); +- VncState *vs, *vn; +- uint8_t *src_row; +- uint8_t *dst_row; +- int i, x, y, pitch, inc, w_lim, s; +- int cmp_bytes; +- +- vnc_refresh_server_surface(vd); +- QTAILQ_FOREACH_SAFE(vs, &vd->clients, next, vn) { +- if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) { +- vs->force_update = 1; +- vnc_update_client(vs, 1, true); +- /* vs might be free()ed here */ +- } +- } +- +- /* do bitblit op on the local surface too */ +- pitch = vnc_server_fb_stride(vd); +- src_row = vnc_server_fb_ptr(vd, src_x, src_y); +- dst_row = vnc_server_fb_ptr(vd, dst_x, dst_y); +- y = dst_y; +- inc = 1; +- if (dst_y > src_y) { +- /* copy backwards */ +- src_row += pitch * (h-1); +- dst_row += pitch * (h-1); +- pitch = -pitch; +- y = dst_y + h - 1; +- inc = -1; +- } +- w_lim = w - (VNC_DIRTY_PIXELS_PER_BIT - (dst_x % VNC_DIRTY_PIXELS_PER_BIT)); +- if (w_lim < 0) { +- w_lim = w; +- } else { +- w_lim = w - (w_lim % VNC_DIRTY_PIXELS_PER_BIT); +- } +- for (i = 0; i < h; i++) { +- for (x = 0; x <= w_lim; +- x += s, src_row += cmp_bytes, dst_row += cmp_bytes) { +- if (x == w_lim) { +- if ((s = w - w_lim) == 0) +- break; +- } else if (!x) { +- s = (VNC_DIRTY_PIXELS_PER_BIT - +- (dst_x % VNC_DIRTY_PIXELS_PER_BIT)); +- s = MIN(s, w_lim); +- } else { +- s = VNC_DIRTY_PIXELS_PER_BIT; +- } +- cmp_bytes = s * VNC_SERVER_FB_BYTES; +- if (memcmp(src_row, dst_row, cmp_bytes) == 0) +- continue; +- memmove(dst_row, src_row, cmp_bytes); +- QTAILQ_FOREACH(vs, &vd->clients, next) { +- if (!vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) { +- set_bit(((x + dst_x) / VNC_DIRTY_PIXELS_PER_BIT), +- vs->dirty[y]); +- } +- } +- } +- src_row += pitch - w * VNC_SERVER_FB_BYTES; +- dst_row += pitch - w * VNC_SERVER_FB_BYTES; +- y += inc; +- } +- +- QTAILQ_FOREACH(vs, &vd->clients, next) { +- if (vnc_has_feature(vs, VNC_FEATURE_COPYRECT)) { +- vnc_copy(vs, src_x, src_y, dst_x, dst_y, w, h); +- } +- } +-} +- + static void vnc_mouse_set(DisplayChangeListener *dcl, + int x, int y, int visible) + { +@@ -3131,7 +3041,6 @@ static void vnc_listen_websocket_read(void *opaque) + static const DisplayChangeListenerOps dcl_ops = { + .dpy_name = "vnc", + .dpy_refresh = vnc_refresh, +- .dpy_gfx_copy = vnc_dpy_copy, + .dpy_gfx_update = vnc_dpy_update, + .dpy_gfx_switch = vnc_dpy_switch, + .dpy_gfx_check_format = qemu_pixman_check_format, +-- +2.1.4 + From owner-svn-ports-branches@freebsd.org Tue Mar 21 17:40:48 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B48FD164BC; Tue, 21 Mar 2017 17:40:48 +0000 (UTC) (envelope-from jgh@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 mx1.freebsd.org (Postfix) with ESMTPS id 038631D40; Tue, 21 Mar 2017 17:40:47 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LHel81032856; Tue, 21 Mar 2017 17:40:47 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LHekRl032852; Tue, 21 Mar 2017 17:40:46 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201703211740.v2LHekRl032852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Tue, 21 Mar 2017 17:40:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436624 - branches/2017Q1/x11/xlockmore X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 21 Mar 2017 17:40:48 -0000 Author: jgh Date: Tue Mar 21 17:40:46 2017 New Revision: 436624 URL: https://svnweb.freebsd.org/changeset/ports/436624 Log: MFH: r436623 - update to version 5.51 - address issue with fortune [1] - address master_sites for distribution as main site is no longer operational - attach xorg library dependencies - attach license - adjust make_args for destdir support PR: 217182 [1] Reported by:>>>>Richard Narron Approved by: ports-secteam (with hat) Modified: branches/2017Q1/x11/xlockmore/Makefile branches/2017Q1/x11/xlockmore/distinfo branches/2017Q1/x11/xlockmore/pkg-descr Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/x11/xlockmore/Makefile ============================================================================== --- branches/2017Q1/x11/xlockmore/Makefile Tue Mar 21 17:37:09 2017 (r436623) +++ branches/2017Q1/x11/xlockmore/Makefile Tue Mar 21 17:40:46 2017 (r436624) @@ -2,15 +2,16 @@ # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.46 -PORTREVISION= 1 +PORTVERSION= 5.51 CATEGORIES?= x11 -MASTER_SITES= http://www.tux.org/~bagleyd/xlock/ \ +MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Like XLock session locker/screen saver, but just more +LICENSE= BSD2CLAUSE + USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ @@ -18,7 +19,7 @@ CONFIGURE_ARGS= --without-motif --withou --without-gtk --without-esound --disable-setuid USE_GNOME= # -USE_XORG= x11 xaw ice +USE_XORG= x11 xaw ice sm xpm xext xinerama LIB_DEPENDS+= libfreetype.so:print/freetype2 @@ -46,9 +47,9 @@ OPTIONS_RADIO_ONE= PAM XLOCK_GROUP NO_OPTIONS_SORT=yes -MAKE_ARGS+= bindir=${STAGEDIR}${PREFIX}/bin \ - mandir=${STAGEDIR}${PREFIX}/man/man1 \ - datarootdir=${STAGEDIR}${PREFIX}/share \ +MAKE_ARGS+= bindir=${PREFIX}/bin \ + mandir=${PREFIX}/man/man1 \ + datarootdir=${PREFIX}/share \ xapploaddir=${PREFIX}/lib/X11/app-defaults .include @@ -158,6 +159,9 @@ pre-extract: post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in +.if ${OSVERSION} > 1003500 + @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in +.endif post-configure: ${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile Modified: branches/2017Q1/x11/xlockmore/distinfo ============================================================================== --- branches/2017Q1/x11/xlockmore/distinfo Tue Mar 21 17:37:09 2017 (r436623) +++ branches/2017Q1/x11/xlockmore/distinfo Tue Mar 21 17:40:46 2017 (r436624) @@ -1,2 +1,3 @@ -SHA256 (xlockmore-5.46.tar.xz) = 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df -SIZE (xlockmore-5.46.tar.xz) = 1610356 +TIMESTAMP = 1490033477 +SHA256 (xlockmore-5.51.tar.xz) = 47118e718e5c892e52ecb21ff4ccfc65592643696768c57c388095732f42608d +SIZE (xlockmore-5.51.tar.xz) = 1633736 Modified: branches/2017Q1/x11/xlockmore/pkg-descr ============================================================================== --- branches/2017Q1/x11/xlockmore/pkg-descr Tue Mar 21 17:37:09 2017 (r436623) +++ branches/2017Q1/x11/xlockmore/pkg-descr Tue Mar 21 17:40:46 2017 (r436624) @@ -12,4 +12,4 @@ password Control-U and Control-H are act erase respectively. To return to the locked screen, click in the small icon version of the changing pattern. -WWW: http://www.tux.org/~bagleyd/xlockmore.html +WWW: http://sillycycle.com/xlockmore.html From owner-svn-ports-branches@freebsd.org Tue Mar 21 20:01:20 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33012CD789C; Tue, 21 Mar 2017 20:01:20 +0000 (UTC) (envelope-from jgh@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 mx1.freebsd.org (Postfix) with ESMTPS id D9F2F1B83; Tue, 21 Mar 2017 20:01:19 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LK1Iqk089877; Tue, 21 Mar 2017 20:01:18 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LK1I5j089874; Tue, 21 Mar 2017 20:01:18 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201703212001.v2LK1I5j089874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Tue, 21 Mar 2017 20:01:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436633 - in branches/2017Q1/databases/pg_activity: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 21 Mar 2017 20:01:20 -0000 Author: jgh Date: Tue Mar 21 20:01:18 2017 New Revision: 436633 URL: https://svnweb.freebsd.org/changeset/ports/436633 Log: MFH: r436632 - update to 1.3.1 - while here regenerated patch file (portlint warning) PR: 217964 Reported by: Marcelo Moreira Martins Approved by: ports-secteam (with hat) Modified: branches/2017Q1/databases/pg_activity/Makefile branches/2017Q1/databases/pg_activity/distinfo branches/2017Q1/databases/pg_activity/files/patch-setup.py Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/databases/pg_activity/Makefile ============================================================================== --- branches/2017Q1/databases/pg_activity/Makefile Tue Mar 21 19:59:39 2017 (r436632) +++ branches/2017Q1/databases/pg_activity/Makefile Tue Mar 21 20:01:18 2017 (r436633) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pg_activity -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 DISTVERSIONPREFIX= v CATEGORIES= databases python Modified: branches/2017Q1/databases/pg_activity/distinfo ============================================================================== --- branches/2017Q1/databases/pg_activity/distinfo Tue Mar 21 19:59:39 2017 (r436632) +++ branches/2017Q1/databases/pg_activity/distinfo Tue Mar 21 20:01:18 2017 (r436633) @@ -1,2 +1,3 @@ -SHA256 (julmon-pg_activity-v1.3.0_GH0.tar.gz) = 0a86d680934249af9a63534a908d6416f606298cd2daea7b3f243d18954ccd83 -SIZE (julmon-pg_activity-v1.3.0_GH0.tar.gz) = 89750 +TIMESTAMP = 1490118791 +SHA256 (julmon-pg_activity-v1.3.1_GH0.tar.gz) = 98a5804f853dfcaa049179f7d82eb9f1e7937d49e5fe08e6d8ebdfd51433e602 +SIZE (julmon-pg_activity-v1.3.1_GH0.tar.gz) = 89506 Modified: branches/2017Q1/databases/pg_activity/files/patch-setup.py ============================================================================== --- branches/2017Q1/databases/pg_activity/files/patch-setup.py Tue Mar 21 19:59:39 2017 (r436632) +++ branches/2017Q1/databases/pg_activity/files/patch-setup.py Tue Mar 21 20:01:18 2017 (r436633) @@ -1,6 +1,6 @@ ---- ./setup.py.orig 2013-08-22 23:42:26.000000000 -0700 -+++ ./setup.py 2013-08-22 23:42:36.000000000 -0700 -@@ -27,4 +27,5 @@ +--- setup.py.orig 2016-10-04 13:50:12 UTC ++++ setup.py +@@ -26,4 +26,5 @@ setup( "psycopg2 >= 2.2.1", ], data_files = data_files, From owner-svn-ports-branches@freebsd.org Wed Mar 22 06:52:31 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 736ADD16C31; Wed, 22 Mar 2017 06:52:31 +0000 (UTC) (envelope-from krion@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 mx1.freebsd.org (Postfix) with ESMTPS id 3FD501688; Wed, 22 Mar 2017 06:52:31 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2M6qUOh062145; Wed, 22 Mar 2017 06:52:30 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2M6qUVg062143; Wed, 22 Mar 2017 06:52:30 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201703220652.v2M6qUVg062143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarew Date: Wed, 22 Mar 2017 06:52:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436678 - in branches/2017Q1/net/hostapd: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 22 Mar 2017 06:52:31 -0000 Author: krion Date: Wed Mar 22 06:52:29 2017 New Revision: 436678 URL: https://svnweb.freebsd.org/changeset/ports/436678 Log: MFH: r436625 Update net/hostapd to 2.6 and fix multiple vulnerabilities PR: 217907 Submitted by: maintainer Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D10051 Approved by: ports-secteam Deleted: branches/2017Q1/net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c branches/2017Q1/net/hostapd/files/patch-src_crypto_tls__openssl.c Modified: branches/2017Q1/net/hostapd/Makefile branches/2017Q1/net/hostapd/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/net/hostapd/Makefile ============================================================================== --- branches/2017Q1/net/hostapd/Makefile Wed Mar 22 06:37:14 2017 (r436677) +++ branches/2017Q1/net/hostapd/Makefile Wed Mar 22 06:52:29 2017 (r436678) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hostapd -PORTVERSION= 2.5 +PORTVERSION= 2.6 CATEGORIES= net MASTER_SITES= http://w1.fi/releases/ Modified: branches/2017Q1/net/hostapd/distinfo ============================================================================== --- branches/2017Q1/net/hostapd/distinfo Wed Mar 22 06:37:14 2017 (r436677) +++ branches/2017Q1/net/hostapd/distinfo Wed Mar 22 06:52:29 2017 (r436678) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467776602 -SHA256 (hostapd-2.5.tar.gz) = 8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a -SIZE (hostapd-2.5.tar.gz) = 1720783 +TIMESTAMP = 1489911667 +SHA256 (hostapd-2.6.tar.gz) = 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d +SIZE (hostapd-2.6.tar.gz) = 1822341 From owner-svn-ports-branches@freebsd.org Wed Mar 22 11:12:47 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D83AAD17A2D; Wed, 22 Mar 2017 11:12:47 +0000 (UTC) (envelope-from garga@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 mx1.freebsd.org (Postfix) with ESMTPS id B27A71EB1; Wed, 22 Mar 2017 11:12:47 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MBCksx068098; Wed, 22 Mar 2017 11:12:46 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MBCkc7068094; Wed, 22 Mar 2017 11:12:46 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201703221112.v2MBCkc7068094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Wed, 22 Mar 2017 11:12:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436687 - in branches/2017Q1/devel/git: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 22 Mar 2017 11:12:48 -0000 Author: garga Date: Wed Mar 22 11:12:46 2017 New Revision: 436687 URL: https://svnweb.freebsd.org/changeset/ports/436687 Log: MFH: r431794 r433740 r433768 r436592 Remove dependency of DEPRECATED mail/p5-Net-SMTP-SSL from devel/git PR: 214335 Obtained from: git development mailing list Sponsored by: Rubicon Communications (Netgate) Update devel/git to 2.11.1 Sponsored by: Rubicon Communications (Netgate) Fix devel/git PLIST when HTMLDOCS is on Reported by: dankm on IRC - Update devel/git to 2.12.1 - Replace git-send-email patch by a version that works [1] PR: 214335 [1] Submitted by: OlivierW [1] Sponsored by: Rubicon Communications (Netgate) Approved by: ports-secteam (junovitch) Added: branches/2017Q1/devel/git/files/patch-git-send-email.perl - copied, changed from r431794, head/devel/git/files/patch-git-send-email.perl Modified: branches/2017Q1/devel/git/Makefile branches/2017Q1/devel/git/distinfo branches/2017Q1/devel/git/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/git/Makefile ============================================================================== --- branches/2017Q1/devel/git/Makefile Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/Makefile Wed Mar 22 11:12:46 2017 (r436687) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= git -DISTVERSION= 2.11.0 -PORTREVISION= 3 +DISTVERSION= 2.12.1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -71,8 +70,7 @@ PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= libpcre SEND_EMAIL_IMPLIES= PERL -SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \ - p5-Authen-SASL>=0:security/p5-Authen-SASL +SEND_EMAIL_RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL ICONV_USES= iconv ICONV_MAKE_ARGS_OFF= NO_ICONV=1 Modified: branches/2017Q1/devel/git/distinfo ============================================================================== --- branches/2017Q1/devel/git/distinfo Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/distinfo Wed Mar 22 11:12:46 2017 (r436687) @@ -1,7 +1,7 @@ -TIMESTAMP = 1480520106 -SHA256 (git-2.11.0.tar.xz) = 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b -SIZE (git-2.11.0.tar.xz) = 4197984 -SHA256 (git-manpages-2.11.0.tar.xz) = b3d3e78829c0b69b727aaca407ecfe239a46db3f354f16189f7a7c10af9528d8 -SIZE (git-manpages-2.11.0.tar.xz) = 399992 -SHA256 (git-htmldocs-2.11.0.tar.xz) = 3975399f1be3d959edf0fded03eab8fbf94787bfd0318b7644c77cf61e4a7b48 -SIZE (git-htmldocs-2.11.0.tar.xz) = 1080584 +TIMESTAMP = 1490090877 +SHA256 (git-2.12.1.tar.xz) = db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 +SIZE (git-2.12.1.tar.xz) = 4271828 +SHA256 (git-manpages-2.12.1.tar.xz) = fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce +SIZE (git-manpages-2.12.1.tar.xz) = 402644 +SHA256 (git-htmldocs-2.12.1.tar.xz) = 10598f2f2693e066b58e8d269c3d682595a99340f29e8e7a66dda5e226fd181e +SIZE (git-htmldocs-2.12.1.tar.xz) = 1091792 Copied and modified: branches/2017Q1/devel/git/files/patch-git-send-email.perl (from r431794, head/devel/git/files/patch-git-send-email.perl) ============================================================================== --- head/devel/git/files/patch-git-send-email.perl Wed Jan 18 12:40:53 2017 (r431794, copy source) +++ branches/2017Q1/devel/git/files/patch-git-send-email.perl Wed Mar 22 11:12:46 2017 (r436687) @@ -1,48 +1,49 @@ -Refactor send_message() to remove dependency on deprecated -Net::SMTP::SSL: - - - -Signed-off-by: Mike Fisher ---- git-send-email.perl.orig 2016-11-29 21:06:51 UTC +--- git-send-email.perl.orig 2017-03-21 10:10:31 UTC +++ git-send-email.perl -@@ -1335,10 +1335,13 @@ Message-Id: $message_id - die "The required SMTP server is not properly defined." - } +@@ -27,6 +27,7 @@ use Term::ANSIColor; + use File::Temp qw/ tempdir tempfile /; + use File::Spec::Functions qw(catfile); + use Error qw(:try); ++use Net::SMTP 2.34; + use Git; + use Git::I18N; + +@@ -1355,7 +1356,6 @@ EOF -+ require Net::SMTP; -+ $smtp_domain ||= maildomain(); -+ my $smtp_ssl = 0; -+ if ($smtp_encryption eq 'ssl') { $smtp_server_port ||= 465; # ssmtp - require Net::SMTP::SSL; -- $smtp_domain ||= maildomain(); -+ $smtp_ssl = 1; + $smtp_domain ||= maildomain(); require IO::Socket::SSL; - # Suppress "variable accessed once" warning. -@@ -1347,37 +1350,31 @@ Message-Id: $message_id +@@ -1365,35 +1365,22 @@ EOF $IO::Socket::SSL::DEBUG = 1; } - # Net::SMTP::SSL->new() does not forward any SSL options - IO::Socket::SSL::set_client_defaults( - ssl_verify_params()); +- IO::Socket::SSL::set_client_defaults( +- ssl_verify_params()); - $smtp ||= Net::SMTP::SSL->new($smtp_server, - Hello => $smtp_domain, - Port => $smtp_server_port, - Debug => $debug_net_smtp); ++ $smtp = Net::SMTP->new($smtp_server, ++ Hello => $smtp_domain, ++ Port => $smtp_server_port, ++ SSL => 1, ++ ssl_verify_params(), ++ Debug => $debug_net_smtp); } else { - require Net::SMTP; - $smtp_domain ||= maildomain(); $smtp_server_port ||= 25; - $smtp ||= Net::SMTP->new($smtp_server, -- Hello => $smtp_domain, -- Debug => $debug_net_smtp, -- Port => $smtp_server_port); -- if ($smtp_encryption eq 'tls' && $smtp) { ++ $smtp = Net::SMTP->new($smtp_server, + Hello => $smtp_domain, + Debug => $debug_net_smtp, + Port => $smtp_server_port); + if ($smtp_encryption eq 'tls' && $smtp) { - require Net::SMTP::SSL; - $smtp->command('STARTTLS'); - $smtp->response(); @@ -55,28 +56,8 @@ Signed-off-by: Mike Fisher hello($smtp_domain); - } else { -- die "Server does not support STARTTLS! ".$smtp->message; -- } -+ } -+ -+ $smtp ||= Net::SMTP->new($smtp_server, -+ Hello => $smtp_domain, -+ Port => $smtp_server_port, -+ Debug => $debug_net_smtp, -+ SSL => $smtp_ssl); -+ -+ if ($smtp_encryption eq 'tls' && $smtp) { -+ $smtp->command('STARTTLS'); -+ $smtp->response(); -+ if ($smtp->code == 220) { -+ $smtp->starttls(ssl_verify_params()) -+ or die "STARTTLS failed! ".IO::Socket::SSL::errstr(); -+ $smtp_encryption = ''; -+ # Send EHLO again to receive fresh -+ # supported commands -+ $smtp->hello($smtp_domain); -+ } else { -+ die "Server does not support STARTTLS! ".$smtp->message; ++ $smtp->starttls(ssl_verify_params()); ++ if ($smtp->code != 250) { + die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message); + } } - } - Modified: branches/2017Q1/devel/git/pkg-plist ============================================================================== --- branches/2017Q1/devel/git/pkg-plist Wed Mar 22 11:11:53 2017 (r436686) +++ branches/2017Q1/devel/git/pkg-plist Wed Mar 22 11:12:46 2017 (r436687) @@ -133,7 +133,6 @@ libexec/git-core/git-rebase--interactive libexec/git-core/git-rebase--merge libexec/git-core/git-receive-pack libexec/git-core/git-reflog -libexec/git-core/git-relink libexec/git-core/git-remote libexec/git-core/git-remote-ext libexec/git-core/git-remote-fd @@ -312,7 +311,6 @@ man/man1/git-read-tree.1.gz man/man1/git-rebase.1.gz man/man1/git-receive-pack.1.gz man/man1/git-reflog.1.gz -man/man1/git-relink.1.gz man/man1/git-remote-ext.1.gz man/man1/git-remote-fd.1.gz man/man1/git-remote-testgit.1.gz @@ -626,7 +624,11 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.10.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.11.1.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.0.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.12.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt @@ -905,8 +907,6 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/git-receive-pack.txt %%HTMLDOCS%%%%DOCSDIR%%/git-reflog.html %%HTMLDOCS%%%%DOCSDIR%%/git-reflog.txt -%%HTMLDOCS%%%%DOCSDIR%%/git-relink.html -%%HTMLDOCS%%%%DOCSDIR%%/git-relink.txt %%HTMLDOCS%%%%DOCSDIR%%/git-remote-ext.html %%HTMLDOCS%%%%DOCSDIR%%/git-remote-ext.txt %%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html @@ -1123,8 +1123,6 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html -%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt @@ -1186,6 +1184,7 @@ man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/technical/signature-format.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.html %%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt +%%HTMLDOCS%%%%DOCSDIR%%/transfer-data-leaks.txt %%HTMLDOCS%%%%DOCSDIR%%/urls-remotes.txt %%HTMLDOCS%%%%DOCSDIR%%/urls.txt %%HTMLDOCS%%%%DOCSDIR%%/user-manual.html @@ -1210,6 +1209,7 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/strbuf.cocci +%%CONTRIB%%share/git-core/contrib/coccinelle/swap.cocci %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh @@ -1220,8 +1220,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/contacts/git-contacts %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt %%CONTRIB%%share/git-core/contrib/convert-grafts-to-replace-refs.sh -%%CONTRIB%%share/git-core/contrib/convert-objects/convert-objects.c -%%CONTRIB%%share/git-core/contrib/convert-objects/git-convert-objects.txt %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/.gitignore %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c @@ -1254,6 +1252,7 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/examples/git-clean.sh %%CONTRIB%%share/git-core/contrib/examples/git-clone.sh %%CONTRIB%%share/git-core/contrib/examples/git-commit.sh +%%CONTRIB%%share/git-core/contrib/examples/git-difftool.perl %%CONTRIB%%share/git-core/contrib/examples/git-fetch.sh %%CONTRIB%%share/git-core/contrib/examples/git-gc.sh %%CONTRIB%%share/git-core/contrib/examples/git-log.sh @@ -1285,8 +1284,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/git-shell-commands/README %%CONTRIB%%share/git-core/contrib/git-shell-commands/help %%CONTRIB%%share/git-core/contrib/git-shell-commands/list -%%CONTRIB%%share/git-core/contrib/gitview/gitview -%%CONTRIB%%share/git-core/contrib/gitview/gitview.txt %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt %%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES @@ -1363,6 +1360,8 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/svn-fe/svnrdump_sim.py %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh +%%CONTRIB%%share/git-core/contrib/update-unicode/README +%%CONTRIB%%share/git-core/contrib/update-unicode/update_unicode.sh %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir share/git-core/templates/description share/git-core/templates/hooks/applypatch-msg.sample @@ -1411,6 +1410,7 @@ share/git-core/templates/info/exclude %%GUI%%share/git-gui/lib/msgs/ja.msg %%GUI%%share/git-gui/lib/msgs/nb.msg %%GUI%%share/git-gui/lib/msgs/pt_br.msg +%%GUI%%share/git-gui/lib/msgs/pt_pt.msg %%GUI%%share/git-gui/lib/msgs/ru.msg %%GUI%%share/git-gui/lib/msgs/sv.msg %%GUI%%share/git-gui/lib/msgs/vi.msg @@ -1440,6 +1440,7 @@ share/git-core/templates/info/exclude %%GUI%%share/gitk/lib/msgs/it.msg %%GUI%%share/gitk/lib/msgs/ja.msg %%GUI%%share/gitk/lib/msgs/pt_br.msg +%%GUI%%share/gitk/lib/msgs/pt_pt.msg %%GUI%%share/gitk/lib/msgs/ru.msg %%GUI%%share/gitk/lib/msgs/sv.msg %%GUI%%share/gitk/lib/msgs/vi.msg From owner-svn-ports-branches@freebsd.org Thu Mar 23 12:55:43 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15686D1811E; Thu, 23 Mar 2017 12:55:43 +0000 (UTC) (envelope-from robak@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 mx1.freebsd.org (Postfix) with ESMTPS id D65981015; Thu, 23 Mar 2017 12:55:42 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2NCtfw3009778; Thu, 23 Mar 2017 12:55:41 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2NCtfLn009777; Thu, 23 Mar 2017 12:55:41 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201703231255.v2NCtfLn009777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Thu, 23 Mar 2017 12:55:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436770 - branches/2017Q1/devel/py-canonicaljson X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 23 Mar 2017 12:55:43 -0000 Author: robak Date: Thu Mar 23 12:55:41 2017 New Revision: 436770 URL: https://svnweb.freebsd.org/changeset/ports/436770 Log: MFH: r436686 devel/py-canonicaljson: fix missing dependencies PR: 217986 Submitted by: Anton Yuzhaninov Approved by: blanket Approved by: ports-secteam Modified: branches/2017Q1/devel/py-canonicaljson/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/py-canonicaljson/Makefile ============================================================================== --- branches/2017Q1/devel/py-canonicaljson/Makefile Thu Mar 23 12:54:46 2017 (r436769) +++ branches/2017Q1/devel/py-canonicaljson/Makefile Thu Mar 23 12:55:41 2017 (r436770) @@ -4,6 +4,7 @@ PORTNAME= canonicaljson PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,6 +14,8 @@ COMMENT= Canonical JSON LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest USES= python From owner-svn-ports-branches@freebsd.org Thu Mar 23 22:03:53 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F376DCA1F69; Thu, 23 Mar 2017 22:03:53 +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 mx1.freebsd.org (Postfix) with ESMTPS id C022E19FF; Thu, 23 Mar 2017 22:03:53 +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 v2NM3q5w034710; Thu, 23 Mar 2017 22:03:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2NM3qKs034708; Thu, 23 Mar 2017 22:03:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201703232203.v2NM3qKs034708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 23 Mar 2017 22:03:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436783 - branches/2017Q1/devel/git-cinnabar X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 23 Mar 2017 22:03:54 -0000 Author: jbeich Date: Thu Mar 23 22:03:52 2017 New Revision: 436783 URL: https://svnweb.freebsd.org/changeset/ports/436783 Log: MFH: r433742 r436594 devel/git-cinnabar: update to 0.4.0.5 Changes: https://github.com/glandium/git-cinnabar/compare/0.4.0...cd0e1bb Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/devel/git-cinnabar/Makefile branches/2017Q1/devel/git-cinnabar/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/git-cinnabar/Makefile ============================================================================== --- branches/2017Q1/devel/git-cinnabar/Makefile Thu Mar 23 21:53:58 2017 (r436782) +++ branches/2017Q1/devel/git-cinnabar/Makefile Thu Mar 23 22:03:52 2017 (r436783) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.4.0 +DISTVERSION= 0.4.0-5 +DISTVERSIONSUFFIX= -gb07881f CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: branches/2017Q1/devel/git-cinnabar/distinfo ============================================================================== --- branches/2017Q1/devel/git-cinnabar/distinfo Thu Mar 23 21:53:58 2017 (r436782) +++ branches/2017Q1/devel/git-cinnabar/distinfo Thu Mar 23 22:03:52 2017 (r436783) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484726701 -SHA256 (glandium-git-cinnabar-0.4.0_GH0.tar.gz) = 8cd9526060301aabb6749c013447053bfa1caf9c2cf5661b2a90fd5147de1f00 -SIZE (glandium-git-cinnabar-0.4.0_GH0.tar.gz) = 90603 +TIMESTAMP = 1488356456 +SHA256 (glandium-git-cinnabar-0.4.0-5-gb07881f_GH0.tar.gz) = 8e08a6795ca8fe22666c5e5b3fd1410d2d90256a4130e1590f5b2c67d07e5f58 +SIZE (glandium-git-cinnabar-0.4.0-5-gb07881f_GH0.tar.gz) = 90682 From owner-svn-ports-branches@freebsd.org Fri Mar 24 19:58:29 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DB25D1C5B7; Fri, 24 Mar 2017 19:58:29 +0000 (UTC) (envelope-from mandree@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 mx1.freebsd.org (Postfix) with ESMTPS id 62757134E; Fri, 24 Mar 2017 19:58:29 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OJwSnU072880; Fri, 24 Mar 2017 19:58:28 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OJwSRW072878; Fri, 24 Mar 2017 19:58:28 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201703241958.v2OJwSRW072878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 24 Mar 2017 19:58:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436856 - branches/2017Q1/textproc/xmlto X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 24 Mar 2017 19:58:29 -0000 Author: mandree Date: Fri Mar 24 19:58:28 2017 New Revision: 436856 URL: https://svnweb.freebsd.org/changeset/ports/436856 Log: MFH: r436855 Invoking blanket approval for a "fix that do[es] not result in a change in contents of the resulting package.": Chase distfile removal/relocation. Approved by: ports-secteam (blanket) Modified: branches/2017Q1/textproc/xmlto/Makefile branches/2017Q1/textproc/xmlto/pkg-descr Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/textproc/xmlto/Makefile ============================================================================== --- branches/2017Q1/textproc/xmlto/Makefile Fri Mar 24 19:54:39 2017 (r436855) +++ branches/2017Q1/textproc/xmlto/Makefile Fri Mar 24 19:58:28 2017 (r436856) @@ -4,7 +4,7 @@ PORTNAME= xmlto PORTVERSION= 0.0.28 CATEGORIES= textproc -MASTER_SITES= https://fedorahosted.org/releases/x/m/xmlto/:xmlto \ +MASTER_SITES= https://releases.pagure.org/xmlto/:xmlto \ LOCAL/mandree/:xmlto \ http://www.antennahouse.com/XSLsample/sample-xsl-xhtml2fo/:xsl \ LOCAL/mandree/:xsl Modified: branches/2017Q1/textproc/xmlto/pkg-descr ============================================================================== --- branches/2017Q1/textproc/xmlto/pkg-descr Fri Mar 24 19:54:39 2017 (r436855) +++ branches/2017Q1/textproc/xmlto/pkg-descr Fri Mar 24 19:58:28 2017 (r436856) @@ -8,4 +8,4 @@ htmlhelp, javahelp, man, pdf, ps, txt, x Currently the only XSL-T processor supported is xsltproc (textproc/libxslt). For DVI, PDF and PostScript output, PassiveTeX (print/passivetex) is required. -WWW: http://fedorahosted.org/xmlto/ +WWW: https://pagure.io/xmlto/ From owner-svn-ports-branches@freebsd.org Sat Mar 25 03:43:12 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D420D1C0DB; Sat, 25 Mar 2017 03:43: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 mx1.freebsd.org (Postfix) with ESMTPS id 1A082121B; Sat, 25 Mar 2017 03:43: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 v2P3hBE1064550; Sat, 25 Mar 2017 03:43:11 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P3hBdA064548; Sat, 25 Mar 2017 03:43:11 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201703250343.v2P3hBdA064548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 25 Mar 2017 03:43:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436875 - branches/2017Q1/devel/nspr X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 25 Mar 2017 03:43:12 -0000 Author: jbeich Date: Sat Mar 25 03:43:10 2017 New Revision: 436875 URL: https://svnweb.freebsd.org/changeset/ports/436875 Log: MFH: r436850 devel/nspr: update to 4.14 Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-14-Release-td364465.html ABI: https://abi-laboratory.pro/tracker/timeline/nspr/ Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/devel/nspr/Makefile branches/2017Q1/devel/nspr/distinfo Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/nspr/Makefile ============================================================================== --- branches/2017Q1/devel/nspr/Makefile Sat Mar 25 03:29:09 2017 (r436874) +++ branches/2017Q1/devel/nspr/Makefile Sat Mar 25 03:43:10 2017 (r436875) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.13.1 +DISTVERSION= 4.14 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src Modified: branches/2017Q1/devel/nspr/distinfo ============================================================================== --- branches/2017Q1/devel/nspr/distinfo Sat Mar 25 03:29:09 2017 (r436874) +++ branches/2017Q1/devel/nspr/distinfo Sat Mar 25 03:43:10 2017 (r436875) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477039138 -SHA256 (nspr-4.13.1.tar.gz) = 5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab -SIZE (nspr-4.13.1.tar.gz) = 1136646 +TIMESTAMP = 1490352601 +SHA256 (nspr-4.14.tar.gz) = 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 +SIZE (nspr-4.14.tar.gz) = 1136626 From owner-svn-ports-branches@freebsd.org Sat Mar 25 20:39:47 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D41FD1D584; Sat, 25 Mar 2017 20:39:47 +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 mx1.freebsd.org (Postfix) with ESMTPS id 17B0A1130; Sat, 25 Mar 2017 20:39:47 +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 v2PKdkqt074012; Sat, 25 Mar 2017 20:39:46 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2PKdjIQ074008; Sat, 25 Mar 2017 20:39:45 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201703252039.v2PKdjIQ074008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 25 Mar 2017 20:39:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r436915 - in branches/2017Q1: devel/kf5-kio devel/kf5-kio/files x11/kdelibs4 x11/kdelibs4/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 25 Mar 2017 20:39:47 -0000 Author: tcberner Date: Sat Mar 25 20:39:45 2017 New Revision: 436915 URL: https://svnweb.freebsd.org/changeset/ports/436915 Log: MFH: r435896 r431563 Adress CVE-2017-6410 in devel/kf5-kio and x11/kdelibs4 Using a malicious PAC file, and then using exfiltration methods in the PAC function FindProxyForURL() enables the attacker to expose full https URLs. This is a security issue since https URLs may contain sensitive information in the URL authentication part (user:password@host), and in the path and the query (e.g. access tokens). This attack can be carried out remotely (over the LAN) since proxy settings allow ``Detect Proxy Configuration Automatically'' This setting uses WPAD to retrieve the PAC file, and an attacker who has access to the victim's LAN can interfere with the WPAD protocols (DHCP/DNS+HTTP) and inject his/her own malicious PAC instead of the legitimate one. Reviewed by: mat, rakuco Approved by: rakuco (mentor), mat (mentor) Obtained from: https://marc.info/?l=kde-announce&m=148831226706885&w=2 Security: CVE-2017-6410 Differential Revision: https://reviews.freebsd.org/D9908 Centralize all cmake/modules/FindHUNSPELL.cmake patches in one file. While here, note that the addition of hunspell-1.6 was done upstream too. Approved by: ports-secteam (junovitch), rakuco (mentor) Added: branches/2017Q1/devel/kf5-kio/files/ - copied from r435896, head/devel/kf5-kio/files/ branches/2017Q1/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake - copied unchanged from r431563, head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake branches/2017Q1/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 - copied unchanged from r435896, head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 Deleted: branches/2017Q1/x11/kdelibs4/files/patch-git_2ab2745 branches/2017Q1/x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake Modified: branches/2017Q1/devel/kf5-kio/Makefile branches/2017Q1/x11/kdelibs4/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/kf5-kio/Makefile ============================================================================== --- branches/2017Q1/devel/kf5-kio/Makefile Sat Mar 25 20:29:13 2017 (r436914) +++ branches/2017Q1/devel/kf5-kio/Makefile Sat Mar 25 20:39:45 2017 (r436915) @@ -3,6 +3,7 @@ PORTNAME= kio PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org Modified: branches/2017Q1/x11/kdelibs4/Makefile ============================================================================== --- branches/2017Q1/x11/kdelibs4/Makefile Sat Mar 25 20:29:13 2017 (r436914) +++ branches/2017Q1/x11/kdelibs4/Makefile Sat Mar 25 20:39:45 2017 (r436915) @@ -3,7 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_KDELIBS_VERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2017Q1/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake (from r431563, head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake Sat Mar 25 20:39:45 2017 (r436915, copy of r431563, head/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake) @@ -0,0 +1,27 @@ +Includes the following two upstream commits: + +commit c828f8592fcfd6c2a66ebc18a826de38d6a2fef2 +Author: Pino Toscano +Date: Sat Dec 31 12:08:59 2016 +0100 + + cmake: look for hunspell-1.6 as well + +commit 2ab2745eb01f73355c490ac8d5d1837dec84fd6c +Author: Wolfgang Bauer +Date: Thu Oct 20 15:51:29 2016 +0200 + + Support newer hunspell versions in FindHUNSPELL.cmake + + REVIEW: 128600 + +--- cmake/modules/FindHUNSPELL.cmake ++++ cmake/modules/FindHUNSPELL.cmake +@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) + + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) + +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) + + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if + # all listed variables are TRUE Copied: branches/2017Q1/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 (from r435896, head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410 Sat Mar 25 20:39:45 2017 (r436915, copy of r435896, head/x11/kdelibs4/files/patch-git_1804c2f_cve-2017-6410) @@ -0,0 +1,39 @@ +From 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 28 Feb 2017 19:08:50 +0100 +Subject: [PATCH] Sanitize URLs before passing them to FindProxyForURL + +Remove user/password information +For https: remove path and query + +Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 +--- + kio/misc/kpac/script.cpp | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp +index a595301307..9ab360a0b5 100644 +--- kio/misc/kpac/script.cpp ++++ kio/misc/kpac/script.cpp +@@ -754,9 +754,16 @@ namespace KPAC + } + } + ++ KUrl cleanUrl = url; ++ cleanUrl.setUserInfo(QString()); ++ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { ++ cleanUrl.setPath(QString()); ++ cleanUrl.setQuery(QString()); ++ } ++ + QScriptValueList args; +- args << url.url(); +- args << url.host(); ++ args << cleanUrl.url(); ++ args << cleanUrl.host(); + + QScriptValue result = func.call(QScriptValue(), args); + if (result.isError()) { +-- +2.11.1 +