From owner-svn-ports-branches@freebsd.org Sun Sep 18 10:39:39 2016 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 B30C8BD7920; Sun, 18 Sep 2016 10:39:39 +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 90FC5846; Sun, 18 Sep 2016 10:39:39 +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 u8IAdcYr064908; Sun, 18 Sep 2016 10:39:38 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8IAdcVX064906; Sun, 18 Sep 2016 10:39:38 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201609181039.u8IAdcVX064906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 18 Sep 2016 10:39:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422368 - in branches/2016Q3/databases/mariadb101-server: . 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, 18 Sep 2016 10:39:39 -0000 Author: brnrd Date: Sun Sep 18 10:39:38 2016 New Revision: 422368 URL: https://svnweb.freebsd.org/changeset/ports/422368 Log: MFH: r418977 databases/mariadb101-server: Fix lz4 linking fix - Remove some testing leftover - Fix patch error Approved by: ports-secteam Modified: branches/2016Q3/databases/mariadb101-server/Makefile branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/mariadb101-server/Makefile ============================================================================== --- branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:38:16 2016 (r422367) +++ branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:39:38 2016 (r422368) @@ -27,7 +27,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client -USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix +USES= bison:build cmake compiler:c++11-lib cpe execinfo ssl shebangfix USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source @@ -95,7 +95,6 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESU mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes @@ -105,8 +104,8 @@ USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part -USE_MYSQL= yes -WANT_MYSQL_VER= 101m +USES+= mysql:101m +USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql @@ -123,6 +122,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}= GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h +MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy @@ -172,4 +172,10 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +.if exists(${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt) +post-configure: + @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ + ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt +.endif + .include Modified: branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h ============================================================================== --- branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:38:16 2016 (r422367) +++ branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:39:38 2016 (r422368) @@ -3,15 +3,6 @@ https://jira.mariadb.org/projects/MDEV/i --- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC +++ storage/oqgraph/oqgraph_shim.h -@@ -254,7 +254,7 @@ namespace boost - typedef no_property type; - }; - --#if BOOST_VERSION >= 104601 -+#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900 - template <> - struct graph_bundle_type - { @@ -274,6 +274,33 @@ namespace boost }; #endif From owner-svn-ports-branches@freebsd.org Sun Sep 18 11:54:59 2016 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 5D44CBDFFDB; Sun, 18 Sep 2016 11:54:59 +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 C79FA3F9; Sun, 18 Sep 2016 11:54:58 +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 u8IBsvEf095559; Sun, 18 Sep 2016 11:54:57 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8IBsvOe095557; Sun, 18 Sep 2016 11:54:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201609181154.u8IBsvOe095557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 18 Sep 2016 11:54:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422379 - branches/2016Q3/devel/vasm 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, 18 Sep 2016 11:54:59 -0000 Author: riggs Date: Sun Sep 18 11:54:57 2016 New Revision: 422379 URL: https://svnweb.freebsd.org/changeset/ports/422379 Log: MFH: r422374 (only the MASTER_SITES fix from r422374) Detailed log: - Changed MASTER_SITES, to avoid fetching rolling releases PR: 211110 Submitted by: cs@innolan.dk (new maintainer) Approved by: ports-secteam (build fix blanket) Modified: branches/2016Q3/devel/vasm/Makefile branches/2016Q3/devel/vasm/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/vasm/Makefile ============================================================================== --- branches/2016Q3/devel/vasm/Makefile Sun Sep 18 11:54:53 2016 (r422378) +++ branches/2016Q3/devel/vasm/Makefile Sun Sep 18 11:54:57 2016 (r422379) @@ -4,8 +4,9 @@ PORTNAME= vasm PORTVERSION= 1.7a CATEGORIES= devel -MASTER_SITES= http://sun.hasenbraten.de/vasm/release/ -DISTNAME= ${PORTNAME} +MASTER_SITES= http://server.owl.de/%SUBDIR%/ +MASTER_SITE_SUBDIR= ~frank/tags/ +DISTNAME= vasm1_7a MAINTAINER= uffe@uffe.org COMMENT= Portable 6502 6800 arm c16x jagrisc m68k ppc vidcore x86 z80 assembler @@ -13,6 +14,7 @@ COMMENT= Portable 6502 6800 arm c16x jag LEGAL_TEXT= This archive may be redistributed without modifications and used for non-commercial purposes. USES= gmake pathfix +WRKSRC= ${WRKDIR}/vasm CPU_LIST= 6502 6800 arm c16x jagrisc m68k ppc test vidcore x86 z80 SYNTAX_LIST= std mot oldstyle test Modified: branches/2016Q3/devel/vasm/distinfo ============================================================================== --- branches/2016Q3/devel/vasm/distinfo Sun Sep 18 11:54:53 2016 (r422378) +++ branches/2016Q3/devel/vasm/distinfo Sun Sep 18 11:54:57 2016 (r422379) @@ -1,2 +1,3 @@ -SHA256 (vasm.tar.gz) = d97cc9e3eb1f175e1187ef0773d8f3a267bdf97939ef0b97a719a98b8de7b6be -SIZE (vasm.tar.gz) = 337992 +TIMESTAMP = 1474197218 +SHA256 (vasm1_7a.tar.gz) = e5e272fbdb64b175b22e8bbe423a1a6b3b84e8be776919d17dec7577374de734 +SIZE (vasm1_7a.tar.gz) = 341838 From owner-svn-ports-branches@freebsd.org Mon Sep 19 08:45:15 2016 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 E9C1BBE0875; Mon, 19 Sep 2016 08:45:15 +0000 (UTC) (envelope-from tz@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 B9CECCD7; Mon, 19 Sep 2016 08:45:15 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8J8jEiC065229; Mon, 19 Sep 2016 08:45:14 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8J8jEpj065227; Mon, 19 Sep 2016 08:45:14 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201609190845.u8J8jEpj065227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 19 Sep 2016 08:45:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422416 - branches/2016Q3/www/wordpress 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: Mon, 19 Sep 2016 08:45:16 -0000 Author: tz Date: Mon Sep 19 08:45:14 2016 New Revision: 422416 URL: https://svnweb.freebsd.org/changeset/ports/422416 Log: MFH: r422132 www/wordpress: Update from 4.6 to 4.6.1 Changes: https://codex.wordpress.org/Version_4.6.1 PR: 212627 Submitted by: Jochen Neumeister (maintainer) Approved by: swills (mentor) Approved by: ports-secteam (feld) Modified: branches/2016Q3/www/wordpress/Makefile branches/2016Q3/www/wordpress/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/wordpress/Makefile ============================================================================== --- branches/2016Q3/www/wordpress/Makefile Mon Sep 19 08:28:01 2016 (r422415) +++ branches/2016Q3/www/wordpress/Makefile Mon Sep 19 08:45:14 2016 (r422416) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.5.3 +PORTVERSION= 4.6.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2016Q3/www/wordpress/distinfo ============================================================================== --- branches/2016Q3/www/wordpress/distinfo Mon Sep 19 08:28:01 2016 (r422415) +++ branches/2016Q3/www/wordpress/distinfo Mon Sep 19 08:45:14 2016 (r422416) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466883810 -SHA256 (wordpress-4.5.3.tar.gz) = fd94288cd6fc657b2d8061737fcb121fc6acbe18acfcff80661e49fd2d3ee17c -SIZE (wordpress-4.5.3.tar.gz) = 7773389 +TIMESTAMP = 1473265458 +SHA256 (wordpress-4.6.1.tar.gz) = 873f562cdea14d6305b9ad2f41f18a557d99cd8694b4a0056a33970e127abfee +SIZE (wordpress-4.6.1.tar.gz) = 7961036 From owner-svn-ports-branches@freebsd.org Mon Sep 19 12:28:55 2016 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 EC14BBE1A54; Mon, 19 Sep 2016 12:28:55 +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 B183494B; Mon, 19 Sep 2016 12:28:55 +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 u8JCSsV8049254; Mon, 19 Sep 2016 12:28:54 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JCSrAh049243; Mon, 19 Sep 2016 12:28:53 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201609191228.u8JCSrAh049243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 19 Sep 2016 12:28:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422430 - in branches/2016Q3/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/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: Mon, 19 Sep 2016 12:28:56 -0000 Author: riggs Date: Mon Sep 19 12:28:53 2016 New Revision: 422430 URL: https://svnweb.freebsd.org/changeset/ports/422430 Log: MFH: r422257 Update to upstream version 5.7.15; fixes zero-day remote vuln CVE-2016-6662 PR: 212690 Submitted by: mokhi64@gmail.com (maintainer) Security: CVE 2016-6662 Approved by: ports-secteam (feld) Added: branches/2016Q3/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake - copied unchanged from r422257, head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake Deleted: branches/2016Q3/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake Modified: branches/2016Q3/databases/mysql57-client/Makefile branches/2016Q3/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake branches/2016Q3/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc branches/2016Q3/databases/mysql57-server/Makefile branches/2016Q3/databases/mysql57-server/distinfo branches/2016Q3/databases/mysql57-server/files/mysql-server.in branches/2016Q3/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc branches/2016Q3/databases/mysql57-server/files/patch-sql_CMakeLists.txt branches/2016Q3/databases/mysql57-server/pkg-message branches/2016Q3/databases/mysql57-server/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/databases/mysql57-client/Makefile ============================================================================== --- branches/2016Q3/databases/mysql57-client/Makefile Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-client/Makefile Mon Sep 19 12:28:53 2016 (r422430) @@ -10,6 +10,7 @@ COMMENT= Multithreaded SQL database (cli LICENSE+= LGPL21 BROKEN_powerpc64= Does not build +BROKEN_powerpc64= Does not build: reports unsupported compiler MASTERDIR= ${.CURDIR}/../mysql57-server Modified: branches/2016Q3/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake ============================================================================== --- branches/2016Q3/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake Mon Sep 19 12:28:53 2016 (r422430) @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-03-28 18:06:12 UTC +--- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC +++ cmake/build_configurations/compiler_options.cmake -@@ -28,7 +28,7 @@ IF(UNIX) +@@ -29,7 +29,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,12 +9,12 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -37,7 +37,7 @@ IF(UNIX) +@@ -42,7 +42,7 @@ IF(UNIX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") + # GCC 6 has C++14 as default, set it explicitly to the old default. + EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion + OUTPUT_VARIABLE GXX_VERSION) Modified: branches/2016Q3/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc ============================================================================== --- branches/2016Q3/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc Mon Sep 19 12:28:53 2016 (r422430) @@ -1,6 +1,6 @@ ---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC +--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/my_default.cc -@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; +@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,18 +9,48 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -1409,7 +1409,10 @@ static const char **init_default_directo +@@ -914,6 +914,14 @@ static int search_default_file_with_ext( + return 1; /* Ignore wrong files */ + } - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) ++ if (strstr(name, "/etc") == name) + { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; + } - #endif /* DEFAULT_SYSCONFDIR */ ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) + { + line++; +@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1411,13 +1420,8 @@ static const char **init_default_directo + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif -@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f + +@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) Modified: branches/2016Q3/databases/mysql57-server/Makefile ============================================================================== --- branches/2016Q3/databases/mysql57-server/Makefile Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/Makefile Mon Sep 19 12:28:53 2016 (r422430) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.13 +PORTVERSION= 5.7.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 @@ -51,12 +51,12 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ - -DSYSCONFDIR="${ETCDIR}" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ - -DWITH_ZLIB=system + -DWITH_ZLIB=system \ + -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -133,23 +133,21 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--s ### Just for the sake of FreeBSD 9.X ### .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -.if !defined(CLIENT_ONLY) +. if !defined(CLIENT_ONLY) EXTRA_PATCHES+= ${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc -.endif -WITH_OPENSSL_PORT= yes -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} +. endif +### Just like deperecated `WITH_OPENSSL_PORT=yes` a workaround for building on 9.X ### +DEFAULT_VERSIONS+=ssl=openssl .endif .include -### FreeBSD Version > 9.X ### -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 .if ${SSL_DEFAULT} == base +BROKEN_FreeBSD_9= FreeBSD 9.x requires SSL from ports CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif -.endif post-extract: @${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h Modified: branches/2016Q3/databases/mysql57-server/distinfo ============================================================================== --- branches/2016Q3/databases/mysql57-server/distinfo Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/distinfo Mon Sep 19 12:28:53 2016 (r422430) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465065317 -SHA256 (mysql-boost-5.7.13.tar.gz) = 2a768682c37dfbca286912bd137f1a526075ac1f00a6a46da8b6fe63f6fcfa37 -SIZE (mysql-boost-5.7.13.tar.gz) = 60561931 +TIMESTAMP = 1473858917 +SHA256 (mysql-boost-5.7.15.tar.gz) = 7342a3a3e40878378dfaee252d42a3a5b06c58237f49c2544424d27316738945 +SIZE (mysql-boost-5.7.15.tar.gz) = 60583907 Modified: branches/2016Q3/databases/mysql57-server/files/mysql-server.in ============================================================================== --- branches/2016Q3/databases/mysql57-server/files/mysql-server.in Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/files/mysql-server.in Mon Sep 19 12:28:53 2016 (r422430) @@ -64,9 +64,11 @@ mysql_prestart() { if [ -f "${mysql_dbdir}/my.cnf" ]; then echo "" - echo "Please keep in mind that the default location for my.cnf will be changed" - echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near" - echo "future. If you do not want to move your my.cnf to the new location then" + echo "Please keep in mind that the default location for my.cnf has changed" + echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". " + echo "Please merge your existing my.cnf with the new default and move" + echo "it to \"%%ETCDIR%%/my.cnf\"." + echo "If you do not want to move your my.cnf to the new location then" echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"." echo "" fi Modified: branches/2016Q3/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc ============================================================================== --- branches/2016Q3/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc Mon Sep 19 12:28:53 2016 (r422430) @@ -1,6 +1,6 @@ ---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC +--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/my_default.cc -@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; +@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,18 +9,48 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -1409,7 +1409,10 @@ static const char **init_default_directo +@@ -914,6 +914,14 @@ static int search_default_file_with_ext( + return 1; /* Ignore wrong files */ + } - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) ++ if (strstr(name, "/etc") == name) + { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; + } - #endif /* DEFAULT_SYSCONFDIR */ ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) + { + line++; +@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1411,13 +1420,8 @@ static const char **init_default_directo + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif -@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f + +@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) Copied: branches/2016Q3/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (from r422257, head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake Mon Sep 19 12:28:53 2016 (r422430, copy of r422257, head/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake) @@ -0,0 +1,15 @@ +--- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC ++++ rapid/plugin/x/mysqlx_configure.cmake +@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src + CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h ) + ++IF(FALSE) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h + DESTINATION ${INSTALL_INCLUDEDIR} + COMPONENT Developement) +@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h + DESTINATION ${INSTALL_INCLUDEDIR} + COMPONENT Developement) ++ENDIF() Modified: branches/2016Q3/databases/mysql57-server/files/patch-sql_CMakeLists.txt ============================================================================== --- branches/2016Q3/databases/mysql57-server/files/patch-sql_CMakeLists.txt Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/files/patch-sql_CMakeLists.txt Mon Sep 19 12:28:53 2016 (r422430) @@ -1,4 +1,4 @@ ---- sql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- sql/CMakeLists.txt.orig 2016-08-25 11:52:06 UTC +++ sql/CMakeLists.txt @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} @@ -6,6 +6,6 @@ ${CMAKE_BINARY_DIR}/sql + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR} + ${LZ4_INCLUDE_DIR} ) - SET(CONF_SOURCES Modified: branches/2016Q3/databases/mysql57-server/pkg-message ============================================================================== --- branches/2016Q3/databases/mysql57-server/pkg-message Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/pkg-message Mon Sep 19 12:28:53 2016 (r422430) @@ -11,9 +11,10 @@ in /root/.mysql_secret ***************************************************************************** -Please keep in mind that the default location for my.cnf will be changed -from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near -future. If you do not want to move your my.cnf to the new location then -you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf". +The default location for my.cnf has changed from "/var/db/mysql/my.cnf" to +"/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged manually +with the new default and moved to the new location. To continue using the +my.cnf file at the old location, set "mysql_optfile" in /etc/rc.conf to +point to the location of the existing my.cnf file. ***************************************************************************** Modified: branches/2016Q3/databases/mysql57-server/pkg-plist ============================================================================== --- branches/2016Q3/databases/mysql57-server/pkg-plist Mon Sep 19 11:38:49 2016 (r422429) +++ branches/2016Q3/databases/mysql57-server/pkg-plist Mon Sep 19 12:28:53 2016 (r422430) @@ -62,6 +62,8 @@ lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so +lib/mysql/plugin/keyring_udf.so +lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc From owner-svn-ports-branches@freebsd.org Mon Sep 19 15:27:33 2016 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 6A733BE038D; Mon, 19 Sep 2016 15:27:33 +0000 (UTC) (envelope-from pi@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 3C06AB72; Mon, 19 Sep 2016 15:27:33 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JFRWck018147; Mon, 19 Sep 2016 15:27:32 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JFRVkT018140; Mon, 19 Sep 2016 15:27:31 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201609191527.u8JFRVkT018140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 19 Sep 2016 15:27:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422446 - in branches/2016Q3/net-mgmt: zabbix3-frontend zabbix3-server zabbix3-server/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: Mon, 19 Sep 2016 15:27:33 -0000 Author: pi Date: Mon Sep 19 15:27:31 2016 New Revision: 422446 URL: https://svnweb.freebsd.org/changeset/ports/422446 Log: net-mgmt/zabbix3-server: merge several changes to quarterly MFH: r422063 r422263 r422386 - Simplify FreeBSD 9 SSL check, ignore LibreSSL - update to 3.0.4 and add many fixes PR: 209893 Security: https://support.zabbix.com/browse/ZBX-11023 Changes: http://www.zabbix.com/rn3.0.4.php Submitted by: Pakhom Golynga (maintainer), chris@chrullrich.net Approved by: ports-secteam (feld) Modified: branches/2016Q3/net-mgmt/zabbix3-frontend/Makefile branches/2016Q3/net-mgmt/zabbix3-server/Makefile branches/2016Q3/net-mgmt/zabbix3-server/distinfo branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_agentd.in branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_proxy.in branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_server.in branches/2016Q3/net-mgmt/zabbix3-server/pkg-plist.frontend Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/zabbix3-frontend/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-frontend/Makefile Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-frontend/Makefile Mon Sep 19 15:27:31 2016 (r422446) @@ -5,6 +5,11 @@ PORTNAME= zabbix3 CATEGORIES= net-mgmt PKGNAMESUFFIX= -frontend +MAINTAINER= pg@pakhom.spb.ru +COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS + +LICENSE= GPLv2 + MASTERDIR= ${.CURDIR}/../zabbix3-server NO_BUILD= yes @@ -14,10 +19,11 @@ PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap -WANT_PHP_WEB= yes + +USES= php:web gettext OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE -OPTIONS_DEFAULT= MYSQL MYSQLI +OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend .include @@ -40,7 +46,7 @@ USE_PHP+= sqlite3 .if ${PORT_OPTIONS:MORACLE} ZABBIX_REQUIRE= -CONFIGURE_ARGS+= --with-oracle +CONFIGURE_ARGS+= --with-oracle .endif do-install: Modified: branches/2016Q3/net-mgmt/zabbix3-server/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/Makefile Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/Makefile Mon Sep 19 15:27:31 2016 (r422446) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix3 -PORTVERSION= 3.0.2 +PORTVERSION= 3.0.4 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} @@ -14,15 +14,13 @@ COMMENT= Enterprise-class open source di LICENSE= GPLv2 -CONFLICTS= ${PKGBASE}-1.[0-8]* +LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp + +CONFLICTS= zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* IGNORE_WITH_PHP= 52 IGNORE_WITH_MYSQL= 41 -.if ${PKGNAMESUFFIX} != "-agent" -CONFLICTS+= ${PORTNAME}-1.[0-8]* -.endif - ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings @@ -60,7 +58,6 @@ CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" -LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp USES+= execinfo CPPFLAGS+= ${EXECINFO_CPPFLAGS} @@ -73,7 +70,7 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 -OPTIONS_DEFAULT= FPING JABBER CURL UNIXODBC MYSQL SSH OPENSSL +OPTIONS_DEFAULT= IPV6 FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes CURL_DESC= Support for web monitoring @@ -93,13 +90,13 @@ OPTIONS_SINGLE_ODBC= IODBC UNIXODBC OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL MYSQL_CONFIGURE_WITH= mysql -MYSQL_USE= MYSQL=yes +MYSQL_USES+= mysql PGSQL_CONFIGURE_WITH= postgresql -PGSQL_USES= pgsql +PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USES= sqlite:3 +SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle @@ -126,8 +123,8 @@ IODBC_LIB_DEPENDS= libiodbc.so:databases UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 @@ -141,19 +138,23 @@ JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 -OPENSSL_CONFIGURE_WITH= openssl -OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_WITH= openssl +OPENSSL_USES= ssl GNUTLS_CONFIGURE_WITH= gnutls -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls POLARSSL_CONFIGURE_WITH=mbedtls POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${SSL_DEFAULT} == base -IGNORE= OpenSSL from the base system is too old, add DEFAULT_VERSIONS+=ssl=openssl to your /etc/make.conf and rebuild everything that needs SSL. +.if ${SSL_DEFAULT} == base +IGNORE_FreeBSD_9= Requires newer OpenSSL (set SSL_DEFAULT=openssl) +.endif + +.if ${SSL_DEFAULT:Mlibressl*} +IGNORE= requires PSK which is unsupported by the selected LibreSSL .endif post-patch: @@ -162,6 +163,21 @@ post-patch: @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ ${WRKSRC}/conf/zabbix_*.conf +.if ${ZABBIX_BUILD} == "server" + @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ + ${WRKSRC}/conf/zabbix_server*.conf +.endif + +.if ${ZABBIX_BUILD} == "proxy" + @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ + ${WRKSRC}/conf/zabbix_proxy*.conf +.endif + +.if ${ZABBIX_BUILD} == "agent" + @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ + ${WRKSRC}/conf/zabbix_agentd*.conf +.endif + .if ${ZABBIX_BUILD} != "agent" . for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} \ Modified: branches/2016Q3/net-mgmt/zabbix3-server/distinfo ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/distinfo Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/distinfo Mon Sep 19 15:27:31 2016 (r422446) @@ -1,2 +1,3 @@ -SHA256 (zabbix-3.0.2.tar.gz) = e432fc86ea16956d52a9d8754b1b84456d11d96e1534fe1006f055a87208bff5 -SIZE (zabbix-3.0.2.tar.gz) = 15391497 +TIMESTAMP = 1474053011 +SHA256 (zabbix-3.0.4.tar.gz) = 9fa47d97843b6ca9f550d706b40ee6b35b76c5165ff32ff11ef0474f161e7700 +SIZE (zabbix-3.0.4.tar.gz) = 15403727 Modified: branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_agentd.in Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_agentd.in Mon Sep 19 15:27:31 2016 (r422446) @@ -9,10 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. -# zabbix_agentd_paths (string): Set to standard path by default. Set a search -# if you have custom userparams that need binaries elsewhere. # zabbix_agentd_config (string): Set to the standard config file path by # default. +# zabbix_agentd_pidfile (string): Location of the zabbix_agent pid file +# Default is /var/run/zabbix/zabbix_agentd.pid # . /etc/rc.subr @@ -20,27 +20,29 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name -: ${zabbix_agentd_enable="NO"} -: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} -: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} +: ${zabbix_agentd_enable:=NO} +: ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf} +: ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_agentd_config}" -start_precmd="find_pidfile" -status_precmd="find_pidfile" -stop_precmd="find_pidfile" -find_pidfile() +start_precmd=zabbix_agentd_precmd +status_precmd=zabbix_agentd_precmd +stop_precmd=zabbix_agentd_precmd + +zabbix_agentd_precmd() { if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then pidfile="$_pidfile_from_conf" else - pidfile="/tmp/${name}.pid" + pidfile=${zabbix_agentd_pidfile} + local rundir=${zabbix_agentd_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o zabbix -g zabbix $rundir + fi fi # This shouldn't be necessary with pidfile, but empirically it was the @@ -50,6 +52,4 @@ find_pidfile() rc_pid=$(check_pidfile ${pidfile} ${command}) } -export PATH="${zabbix_agentd_paths}" - run_rc_command "$1" Modified: branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_proxy.in Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_proxy.in Mon Sep 19 15:27:31 2016 (r422446) @@ -11,10 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. -# zabbix_proxy_paths (string): Set to standard path by default. Set a search -# if you have custom externals that need binaries elsewhere. # zabbix_proxy_config (string): Set to the standard config file path by # default. +# zabbix_proxy_pidfile (string): Location of the zabbix_proxy pid file +# Default is /var/run/zabbix/zabbix_proxy.pid # . /etc/rc.subr @@ -24,23 +24,27 @@ rcvar=zabbix_proxy_enable load_rc_config $name -: ${zabbix_proxy_enable="NO"} -: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} -: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} +: ${zabbix_proxy_enable:=NO} +: ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf} +: ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_proxy_config}" -start_precmd="find_pidfile" -status_precmd="find_pidfile" -stop_precmd="find_pidfile" +start_precmd=zabbix_proxy_precmd +status_precmd=zabbix_proxy_precmd +stop_precmd=zabbix_proxy_precmd -find_pidfile() +zabbix_proxy_precmd() { - if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then pidfile="$_pidfile_from_conf" else - pidfile="/tmp/${name}.pid" + pidfile=${zabbix_proxy_pidfile} + local rundir=${zabbix_proxy_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o zabbix -g zabbix $rundir + fi fi # This shouldn't be necessary with pidfile, but empirically it was the @@ -50,6 +54,4 @@ find_pidfile() rc_pid=$(check_pidfile ${pidfile} ${command}) } -export PATH="${zabbix_proxy_paths}" - run_rc_command "$1" Modified: branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_server.in ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_server.in Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/files/zabbix_server.in Mon Sep 19 15:27:31 2016 (r422446) @@ -11,10 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. -# zabbix_server_paths (string): Set to standard path by default. Set a search -# if you have custom externals that need binaries elsewhere. # zabbix_server_config (string): Set to the standard config file path by # default. +# zabbix_server_pidfile (string): Location of the zabbix_server pid file +# Default is /var/run/zabbix/zabbix_server.pid # . /etc/rc.subr @@ -24,22 +24,27 @@ rcvar=zabbix_server_enable load_rc_config $name -: ${zabbix_server_enable="NO"} -: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} -: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} +: ${zabbix_server_enable:=NO} +: ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} +: ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_server_config}" -start_precmd="find_pidfile" -status_precmd="find_pidfile" -stop_precmd="find_pidfile" -find_pidfile() +start_precmd=zabbix_server_precmd +status_precmd=zabbix_server_precmd +stop_precmd=zabbix_server_precmd + +zabbix_server_precmd() { if get_pidfile_from_conf PidFile ${zabbix_server_config}; then pidfile="$_pidfile_from_conf" else - pidfile="/tmp/${name}.pid" + pidfile=${zabbix_server_pidfile} + local rundir=${zabbix_server_pidfile%/*} + if [ ! -d $rundir ] ; then + install -d -m 0755 -o zabbix -g zabbix $rundir + fi fi # This shouldn't be necessary with pidfile, but empirically it was the @@ -49,6 +54,4 @@ find_pidfile() rc_pid=$(check_pidfile ${pidfile} ${command}) } -export PATH="${zabbix_server_paths}" - run_rc_command "$1" Modified: branches/2016Q3/net-mgmt/zabbix3-server/pkg-plist.frontend ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/pkg-plist.frontend Mon Sep 19 15:22:11 2016 (r422445) +++ branches/2016Q3/net-mgmt/zabbix3-server/pkg-plist.frontend Mon Sep 19 15:27:31 2016 (r422446) @@ -397,6 +397,8 @@ %%WWWDIR%%/include/classes/screens/CScreenTriggersInfo.php %%WWWDIR%%/include/classes/screens/CScreenTriggersOverview.php %%WWWDIR%%/include/classes/screens/CScreenUrl.php +%%WWWDIR%%/include/classes/screens/CScreenDiscovery.php +%%WWWDIR%%/include/classes/screens/CScreenHttpTest.php %%WWWDIR%%/include/classes/server/CZabbixServer.php %%WWWDIR%%/include/classes/services/CServicesSlaCalculator.php %%WWWDIR%%/include/classes/setup/CFrontendSetup.php From owner-svn-ports-branches@freebsd.org Mon Sep 19 17:24:00 2016 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 F2AA0BE14DD; Mon, 19 Sep 2016 17:24:00 +0000 (UTC) (envelope-from feld@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 C05BAE3E; Mon, 19 Sep 2016 17:24:00 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JHNxQI063724; Mon, 19 Sep 2016 17:23:59 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JHNxAT063723; Mon, 19 Sep 2016 17:23:59 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201609191723.u8JHNxAT063723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 19 Sep 2016 17:23:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422452 - branches/2016Q3/lang/phantomjs 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: Mon, 19 Sep 2016 17:24:01 -0000 Author: feld Date: Mon Sep 19 17:23:59 2016 New Revision: 422452 URL: https://svnweb.freebsd.org/changeset/ports/422452 Log: MFH: r422451 lang/phantomjs: Remove hack for FreeBSD 9 and use compiler:c++11-lang Approved by: ports-secteam (with hat) Modified: branches/2016Q3/lang/phantomjs/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/phantomjs/Makefile ============================================================================== --- branches/2016Q3/lang/phantomjs/Makefile Mon Sep 19 17:22:44 2016 (r422451) +++ branches/2016Q3/lang/phantomjs/Makefile Mon Sep 19 17:23:59 2016 (r422452) @@ -20,7 +20,7 @@ LIB_DEPENDS= libfreetype.so:print/freety libpng.so:graphics/png PROJECTHOST= phantomjs -USES= bison:build compiler gmake gperf jpeg perl5 pkgconfig python:build zip +USES= bison:build compiler:c++11-lang gmake gperf jpeg perl5 pkgconfig python:build zip USE_PERL5= build USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes @@ -31,11 +31,6 @@ NO_CCACHE= yes USE_XORG= x11 -# Hack for FreeBSD 9. Without it mysteriously switches from -# clang++ to c++ which ends in build failure. -CC=clang -CXX=clang++ - # NOTE: # build.sh --qtwebkit=system requires Qt 5.3.x. We cannot use it. From owner-svn-ports-branches@freebsd.org Wed Sep 21 15:52:18 2016 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 46AE1BE4268; Wed, 21 Sep 2016 15:52:18 +0000 (UTC) (envelope-from pi@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 17397FFA; Wed, 21 Sep 2016 15:52:18 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LFqHQY025290; Wed, 21 Sep 2016 15:52:17 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LFqHfD025289; Wed, 21 Sep 2016 15:52:17 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201609211552.u8LFqHfD025289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 21 Sep 2016 15:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422570 - branches/2016Q3/net-mgmt/zabbix3-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: Wed, 21 Sep 2016 15:52:18 -0000 Author: pi Date: Wed Sep 21 15:52:17 2016 New Revision: 422570 URL: https://svnweb.freebsd.org/changeset/ports/422570 Log: net-mgmt/zabbix3-server: unbreak build MFH: r422524 PR: 209893 Submitted by: antoine Approved by: ports-secteam (feld) Modified: branches/2016Q3/net-mgmt/zabbix3-server/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/zabbix3-server/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/zabbix3-server/Makefile Wed Sep 21 15:43:47 2016 (r422569) +++ branches/2016Q3/net-mgmt/zabbix3-server/Makefile Wed Sep 21 15:52:17 2016 (r422570) @@ -60,8 +60,7 @@ CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD .if ${ZABBIX_BUILD} != "agent" USES+= execinfo -CPPFLAGS+= ${EXECINFO_CPPFLAGS} -LDFLAGS+= ${EXECINFO_LDFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message From owner-svn-ports-branches@freebsd.org Wed Sep 21 16:20:04 2016 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 88B38BE4B98; Wed, 21 Sep 2016 16:20:04 +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 3EC141046; Wed, 21 Sep 2016 16:20:04 +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 u8LGK3hB034082; Wed, 21 Sep 2016 16:20:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LGK3oX034079; Wed, 21 Sep 2016 16:20:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609211620.u8LGK3oX034079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 21 Sep 2016 16:20:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422572 - in branches/2016Q3/www: firefox firefox-i18n 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, 21 Sep 2016 16:20:04 -0000 Author: jbeich Date: Wed Sep 21 16:20:03 2016 New Revision: 422572 URL: https://svnweb.freebsd.org/changeset/ports/422572 Log: MFH: r422207 r422321 www/firefox: update to 49.0 (rc4) Changes: https://hg.mozilla.org/releases/mozilla-release/pushloghtml?startdate=2016-09-08&enddate=2016-09-17 Approved by: ports-secteam (feld) Modified: branches/2016Q3/www/firefox-i18n/Makefile branches/2016Q3/www/firefox/Makefile branches/2016Q3/www/firefox/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/firefox-i18n/Makefile ============================================================================== --- branches/2016Q3/www/firefox-i18n/Makefile Wed Sep 21 16:08:00 2016 (r422571) +++ branches/2016Q3/www/firefox-i18n/Makefile Wed Sep 21 16:20:03 2016 (r422572) @@ -5,7 +5,7 @@ PORTNAME= firefox-i18n PORTVERSION= 49.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2016Q3/www/firefox/Makefile ============================================================================== --- branches/2016Q3/www/firefox/Makefile Wed Sep 21 16:08:00 2016 (r422571) +++ branches/2016Q3/www/firefox/Makefile Wed Sep 21 16:20:03 2016 (r422572) @@ -4,11 +4,11 @@ PORTNAME= firefox DISTVERSION= 49.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 1 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: branches/2016Q3/www/firefox/distinfo ============================================================================== --- branches/2016Q3/www/firefox/distinfo Wed Sep 21 16:08:00 2016 (r422571) +++ branches/2016Q3/www/firefox/distinfo Wed Sep 21 16:20:03 2016 (r422572) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473148535 -SHA256 (firefox-49.0.source.tar.xz) = feaded1735a270a0e66ea93262d28e210c6e348ee3af62d93da9d615ea9063b1 -SIZE (firefox-49.0.source.tar.xz) = 189545372 +TIMESTAMP = 1474027771 +SHA256 (firefox-49.0.source.tar.xz) = 6f7069fa94688f9fb5aa3bbb2ffa78456825067dd984afa714d74b3f0c6eaf63 +SIZE (firefox-49.0.source.tar.xz) = 189615184 From owner-svn-ports-branches@freebsd.org Wed Sep 21 19:54:09 2016 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 BEC9BBE4A2E; Wed, 21 Sep 2016 19:54:09 +0000 (UTC) (envelope-from feld@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 57E5F5E8; Wed, 21 Sep 2016 19:54:07 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LJs6EF018902; Wed, 21 Sep 2016 19:54:06 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LJs6Tr018900; Wed, 21 Sep 2016 19:54:06 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201609211954.u8LJs6Tr018900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 21 Sep 2016 19:54:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422576 - branches/2016Q3/ftp/curl 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, 21 Sep 2016 19:54:09 -0000 Author: feld Date: Wed Sep 21 19:54:05 2016 New Revision: 422576 URL: https://svnweb.freebsd.org/changeset/ports/422576 Log: MFH: r422575 ftp/curl: Update to 7.50.3 - Update installed docs PR: 212677 Security: CVE-2016-7167 Approved by: ports-secteam (with hat) Modified: branches/2016Q3/ftp/curl/Makefile branches/2016Q3/ftp/curl/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/ftp/curl/Makefile ============================================================================== --- branches/2016Q3/ftp/curl/Makefile Wed Sep 21 19:53:33 2016 (r422575) +++ branches/2016Q3/ftp/curl/Makefile Wed Sep 21 19:54:05 2016 (r422576) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.50.1 +PORTVERSION= 7.50.3 CATEGORIES= ftp www MASTER_SITES= http://curl.haxx.se/download/ \ LOCAL/sunpoet @@ -61,11 +61,11 @@ PORTEXAMPLES= * CPE_VENDOR= haxx -DOCS= BINDINGS BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE FAQ \ - FEATURES HISTORY HTTP-COOKIES.md HTTP2.md INSTALL \ - INSTALL.devcpp INTERNALS KNOWN_BUGS LICENSE-MIXING \ +DOCS= BINDINGS BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ + FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ + INSTALL.devcpp INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md \ MAIL-ETIQUETTE MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md \ - SECURITY SSL-PROBLEMS SSLCERTS THANKS TODO \ + SECURITY.md SSL-PROBLEMS.md SSLCERTS.md THANKS TODO \ TheArtOfHttpScripting VERSIONS curl-config.html \ curl-config.pdf curl.html curl.pdf index.html \ mk-ca-bundle.html mk-ca-bundle.pdf Modified: branches/2016Q3/ftp/curl/distinfo ============================================================================== --- branches/2016Q3/ftp/curl/distinfo Wed Sep 21 19:53:33 2016 (r422575) +++ branches/2016Q3/ftp/curl/distinfo Wed Sep 21 19:54:05 2016 (r422576) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470305524 -SHA256 (curl-7.50.1.tar.lzma) = b2b176f3ef39d945d31e68e788be8564a7e16478af1dfe732462a300c7c58361 -SIZE (curl-7.50.1.tar.lzma) = 5994956 +TIMESTAMP = 1474487464 +SHA256 (curl-7.50.3.tar.lzma) = 8c5457e2ecfc38d7e1103bf5e0f87895222340200de9ceefd300c3420698f5ea +SIZE (curl-7.50.3.tar.lzma) = 6003154 From owner-svn-ports-branches@freebsd.org Wed Sep 21 20:56:37 2016 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 2B781BE48DC; Wed, 21 Sep 2016 20:56:37 +0000 (UTC) (envelope-from feld@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 D3454B36; Wed, 21 Sep 2016 20:56:36 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LKuaYo041834; Wed, 21 Sep 2016 20:56:36 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LKuZgN041831; Wed, 21 Sep 2016 20:56:35 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201609212056.u8LKuZgN041831@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 21 Sep 2016 20:56:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422580 - branches/2016Q3/irc/irssi 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, 21 Sep 2016 20:56:37 -0000 Author: feld Date: Wed Sep 21 20:56:35 2016 New Revision: 422580 URL: https://svnweb.freebsd.org/changeset/ports/422580 Log: MFH: r422579 irc/irssi: Update to 0.8.20 - Add gettext-runtime to USES per poudriere's warning https://irssi.org/security/irssi_sa_2016.txt PR: 212888 Security: CVE-2016-7044 Security: CVE-2016-7045 Approved by: ports-secteam (with hat) Modified: branches/2016Q3/irc/irssi/Makefile branches/2016Q3/irc/irssi/distinfo branches/2016Q3/irc/irssi/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/irc/irssi/Makefile ============================================================================== --- branches/2016Q3/irc/irssi/Makefile Wed Sep 21 20:56:01 2016 (r422579) +++ branches/2016Q3/irc/irssi/Makefile Wed Sep 21 20:56:35 2016 (r422580) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= irssi -PORTVERSION= 0.8.19 -PORTREVISION?= 1 +PORTVERSION= 0.8.20 +PORTREVISION?= 0 CATEGORIES?= irc MASTER_SITES= https://github.com/irssi/irssi/releases/download/${PORTVERSION}/ @@ -15,7 +15,7 @@ LIB_DEPENDS= libglib-2.0.so:devel/glib20 CONFLICTS= irssi-devel-[0-9]* zh-irssi-[0-9]* -USES= gmake libtool ncurses pkgconfig tar:xz +USES= gettext-runtime gmake libtool ncurses pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ncurses=${NCURSESBASE} INSTALL_TARGET= install-strip Modified: branches/2016Q3/irc/irssi/distinfo ============================================================================== --- branches/2016Q3/irc/irssi/distinfo Wed Sep 21 20:56:01 2016 (r422579) +++ branches/2016Q3/irc/irssi/distinfo Wed Sep 21 20:56:35 2016 (r422580) @@ -1,2 +1,3 @@ -SHA256 (irssi-0.8.19.tar.xz) = 4ca0040548e814ea93eb7d602ab7d6d379afcbbdf10e84160523ce69c73ee5d3 -SIZE (irssi-0.8.19.tar.xz) = 1006140 +TIMESTAMP = 1474490964 +SHA256 (irssi-0.8.20.tar.xz) = 7882c4e821f5aac469c5e69e69d7e235f4986101285c675e81a9a95bfb20505a +SIZE (irssi-0.8.20.tar.xz) = 1007252 Modified: branches/2016Q3/irc/irssi/pkg-plist ============================================================================== --- branches/2016Q3/irc/irssi/pkg-plist Wed Sep 21 20:56:01 2016 (r422579) +++ branches/2016Q3/irc/irssi/pkg-plist Wed Sep 21 20:56:35 2016 (r422580) @@ -214,12 +214,14 @@ man/man1/irssi.1.gz %%DATADIR%%/help/rmreconns %%DATADIR%%/help/rmrejoins %%DATADIR%%/help/save +%%DATADIR%%/help/servlist %%DATADIR%%/help/sconnect %%DATADIR%%/help/script %%DATADIR%%/help/scrollback %%DATADIR%%/help/server %%DATADIR%%/help/set %%DATADIR%%/help/silence +%%DATADIR%%/help/squery %%DATADIR%%/help/squit %%DATADIR%%/help/stats %%DATADIR%%/help/statusbar From owner-svn-ports-branches@freebsd.org Wed Sep 21 20:59:26 2016 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 AE047BE4CAC; Wed, 21 Sep 2016 20:59:26 +0000 (UTC) (envelope-from swills@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 7D16EDC1; Wed, 21 Sep 2016 20:59:26 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LKxP2P042087; Wed, 21 Sep 2016 20:59:25 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LKxPZm042085; Wed, 21 Sep 2016 20:59:25 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201609212059.u8LKxPZm042085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 21 Sep 2016 20:59:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422581 - branches/2016Q3/misc/py-progressbar 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, 21 Sep 2016 20:59:26 -0000 Author: swills Date: Wed Sep 21 20:59:25 2016 New Revision: 422581 URL: https://svnweb.freebsd.org/changeset/ports/422581 Log: MFH: r422578 MFH for rerolled distfile misc/py-progressbar: fix MASTER_SITES Modified: branches/2016Q3/misc/py-progressbar/Makefile branches/2016Q3/misc/py-progressbar/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/misc/py-progressbar/Makefile ============================================================================== --- branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 20:56:35 2016 (r422580) +++ branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 20:59:25 2016 (r422581) @@ -4,7 +4,7 @@ PORTNAME= progressbar PORTVERSION= 2.3 CATEGORIES= misc python -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2016Q3/misc/py-progressbar/distinfo ============================================================================== --- branches/2016Q3/misc/py-progressbar/distinfo Wed Sep 21 20:56:35 2016 (r422580) +++ branches/2016Q3/misc/py-progressbar/distinfo Wed Sep 21 20:59:25 2016 (r422581) @@ -1,2 +1,3 @@ -SHA256 (progressbar-2.3.tar.gz) = 00a316c1a99b70a803d7430fd088da24f37dbfb64f81c4772b97fbc1e8031de4 -SIZE (progressbar-2.3.tar.gz) = 9802 +TIMESTAMP = 1474489431 +SHA256 (progressbar-2.3.tar.gz) = b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254 +SIZE (progressbar-2.3.tar.gz) = 9420 From owner-svn-ports-branches@freebsd.org Wed Sep 21 21:01:58 2016 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 7FED7BE4F8E; Wed, 21 Sep 2016 21:01:58 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D13C2FF; Wed, 21 Sep 2016 21:01:58 +0000 (UTC) (envelope-from freebsd.contact@marino.st) Received: from [127.0.0.1] (ip70-178-28-115.ks.ks.cox.net [70.178.28.115]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id 3773543C16; Wed, 21 Sep 2016 16:01:48 -0500 (CDT) Subject: Re: svn commit: r422581 - branches/2016Q3/misc/py-progressbar To: Steve Wills , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201609212059.u8LKxPZm042085@repo.freebsd.org> Reply-To: marino@freebsd.org From: John Marino Message-ID: <7e7765b0-7700-8da7-bd50-61ae4e1d16b1@marino.st> Date: Wed, 21 Sep 2016 16:01:55 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <201609212059.u8LKxPZm042085@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 160921-4, 09/21/2016), Outbound message X-Antivirus-Status: Clean 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, 21 Sep 2016 21:01:58 -0000 On 9/21/2016 15:59, Steve Wills wrote: > Author: swills > Date: Wed Sep 21 20:59:25 2016 > New Revision: 422581 > URL: https://svnweb.freebsd.org/changeset/ports/422581 > > Log: > MFH: r422578 > > MFH for rerolled distfile > > misc/py-progressbar: fix MASTER_SITES > > Modified: > branches/2016Q3/misc/py-progressbar/Makefile > branches/2016Q3/misc/py-progressbar/distinfo > Directory Properties: > branches/2016Q3/ (props changed) > > Modified: branches/2016Q3/misc/py-progressbar/Makefile > ============================================================================== > --- branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 20:56:35 2016 (r422580) > +++ branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 20:59:25 2016 (r422581) > @@ -4,7 +4,7 @@ > PORTNAME= progressbar > PORTVERSION= 2.3 > CATEGORIES= misc python > -MASTER_SITES= GOOGLE_CODE > +MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > > MAINTAINER= sunpoet@FreeBSD.org > > Modified: branches/2016Q3/misc/py-progressbar/distinfo > ============================================================================== > --- branches/2016Q3/misc/py-progressbar/distinfo Wed Sep 21 20:56:35 2016 (r422580) > +++ branches/2016Q3/misc/py-progressbar/distinfo Wed Sep 21 20:59:25 2016 (r422581) > @@ -1,2 +1,3 @@ > -SHA256 (progressbar-2.3.tar.gz) = 00a316c1a99b70a803d7430fd088da24f37dbfb64f81c4772b97fbc1e8031de4 > -SIZE (progressbar-2.3.tar.gz) = 9802 > +TIMESTAMP = 1474489431 > +SHA256 (progressbar-2.3.tar.gz) = b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254 > +SIZE (progressbar-2.3.tar.gz) = 9420 > Don't forget to bump the PORTREVISION on this one too. --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus From owner-svn-ports-branches@freebsd.org Wed Sep 21 21:37:41 2016 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 7421CBE453D; Wed, 21 Sep 2016 21:37:41 +0000 (UTC) (envelope-from swills@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 46CFF5DF; Wed, 21 Sep 2016 21:37:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LLbegw057811; Wed, 21 Sep 2016 21:37:40 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LLbe0a057810; Wed, 21 Sep 2016 21:37:40 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201609212137.u8LLbe0a057810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 21 Sep 2016 21:37:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422586 - branches/2016Q3/misc/py-progressbar 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, 21 Sep 2016 21:37:41 -0000 Author: swills Date: Wed Sep 21 21:37:40 2016 New Revision: 422586 URL: https://svnweb.freebsd.org/changeset/ports/422586 Log: MFH: r422585 misc/py-progressbar: bump PORTREVISION for rerolled distfile Modified: branches/2016Q3/misc/py-progressbar/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/misc/py-progressbar/Makefile ============================================================================== --- branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 21:37:01 2016 (r422585) +++ branches/2016Q3/misc/py-progressbar/Makefile Wed Sep 21 21:37:40 2016 (r422586) @@ -3,6 +3,7 @@ PORTNAME= progressbar PORTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= misc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} From owner-svn-ports-branches@freebsd.org Thu Sep 22 05:41:24 2016 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 6F094BE5A44; Thu, 22 Sep 2016 05:41:24 +0000 (UTC) (envelope-from antoine@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 41B1E29B; Thu, 22 Sep 2016 05:41:24 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8M5fN61038425; Thu, 22 Sep 2016 05:41:23 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8M5fN33038406; Thu, 22 Sep 2016 05:41:23 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201609220541.u8M5fN33038406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 22 Sep 2016 05:41:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422589 - branches/2016Q3/misc/py-progressbar 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, 22 Sep 2016 05:41:24 -0000 Author: antoine Date: Thu Sep 22 05:41:23 2016 New Revision: 422589 URL: https://svnweb.freebsd.org/changeset/ports/422589 Log: MFH: r422588 - Make usable as a regular user [1] - Remove dependency on the python2 symlink Reported by: pkg-fallout [1] Modified: branches/2016Q3/misc/py-progressbar/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/misc/py-progressbar/Makefile ============================================================================== --- branches/2016Q3/misc/py-progressbar/Makefile Thu Sep 22 05:39:01 2016 (r422588) +++ branches/2016Q3/misc/py-progressbar/Makefile Thu Sep 22 05:41:23 2016 (r422589) @@ -3,7 +3,7 @@ PORTNAME= progressbar PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,8 +14,9 @@ COMMENT= Text progressbar library for py LICENSE= BSD3CLAUSE USE_PYTHON= autoplist distutils -USES= python:2 +USES= python:2.7 -PROJECTHOST= python-${PORTNAME} +post-extract: + @${CHMOD} -R a+rX ${WRKSRC} .include From owner-svn-ports-branches@freebsd.org Thu Sep 22 13:04:44 2016 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 B9B0FBE31B7; Thu, 22 Sep 2016 13:04:44 +0000 (UTC) (envelope-from tz@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 6FB5EFEA; Thu, 22 Sep 2016 13:04:44 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8MD4hZf009450; Thu, 22 Sep 2016 13:04:43 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8MD4hHV009447; Thu, 22 Sep 2016 13:04:43 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201609221304.u8MD4hHV009447@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 22 Sep 2016 13:04:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422611 - in branches/2016Q3: lang/php70 www/php70-opcache 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, 22 Sep 2016 13:04:44 -0000 Author: tz Date: Thu Sep 22 13:04:43 2016 New Revision: 422611 URL: https://svnweb.freebsd.org/changeset/ports/422611 Log: MFH: r422609 lang/php70: Update from 7.0.10 to 7.0.11 Security: CVE-2016-7416 Security: CVE-2016-7412 Security: CVE-2016-7414 Security: CVE-2016-7417 Security: CVE-2016-7413 Security: CVE-2016-7418 Approved by: pi (mentor) Approved by: ports-secteam (feld) Modified: branches/2016Q3/lang/php70/Makefile branches/2016Q3/lang/php70/distinfo branches/2016Q3/www/php70-opcache/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/php70/Makefile ============================================================================== --- branches/2016Q3/lang/php70/Makefile Thu Sep 22 13:03:33 2016 (r422610) +++ branches/2016Q3/lang/php70/Makefile Thu Sep 22 13:04:43 2016 (r422611) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.10 +PORTVERSION= 7.0.11 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions @@ -84,7 +84,7 @@ CONFIGURE_ARGS+=--enable-fpm \ .if defined(PKGNAMEPREFIX) USES+= php -PHP_DEFAULT= 7.0 +PHP_VER= 70 IGNORE_WITH_PHP= 55 56 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" Modified: branches/2016Q3/lang/php70/distinfo ============================================================================== --- branches/2016Q3/lang/php70/distinfo Thu Sep 22 13:03:33 2016 (r422610) +++ branches/2016Q3/lang/php70/distinfo Thu Sep 22 13:04:43 2016 (r422611) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471602535 -SHA256 (php-7.0.10.tar.xz) = 348476ff7ba8d95a1e28e1059430c10470c5f8110f6d9133d30153dda4cdf56a -SIZE (php-7.0.10.tar.xz) = 12474728 +TIMESTAMP = 1474368102 +SHA256 (php-7.0.11.tar.xz) = d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 +SIZE (php-7.0.11.tar.xz) = 12258500 Modified: branches/2016Q3/www/php70-opcache/Makefile ============================================================================== --- branches/2016Q3/www/php70-opcache/Makefile Thu Sep 22 13:03:33 2016 (r422610) +++ branches/2016Q3/www/php70-opcache/Makefile Thu Sep 22 13:04:43 2016 (r422611) @@ -1,7 +1,6 @@ # Created by: Martin Matuska # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php70 From owner-svn-ports-branches@freebsd.org Fri Sep 23 13:00:08 2016 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 95E65BE68AE; Fri, 23 Sep 2016 13:00:08 +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 71434B08; Fri, 23 Sep 2016 13:00:08 +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 u8ND07Ow056727; Fri, 23 Sep 2016 13:00:07 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8ND07wj056725; Fri, 23 Sep 2016 13:00:07 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201609231300.u8ND07wj056725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 23 Sep 2016 13:00:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422669 - in branches/2016Q3/security/openssl: . 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: Fri, 23 Sep 2016 13:00:08 -0000 Author: brnrd Date: Fri Sep 23 13:00:07 2016 New Revision: 422669 URL: https://svnweb.freebsd.org/changeset/ports/422669 Log: MFH: r422668 security/openssl: Update to 1.0.2i - Update to 1.0.2i - Move from PORTREVISION to PORTVERSION updates - Remove patches that are included upstream Reviewed by: mat, delphij Sponsored by: EuroBSDcon 2016 DevSummit Differential Revision: D8006 Approved by: ports-secteam (delphij) Deleted: branches/2016Q3/security/openssl/files/patch-dsa_ossl.c branches/2016Q3/security/openssl/files/patch-s3_srvr.c branches/2016Q3/security/openssl/files/patch-ssl_sess.c branches/2016Q3/security/openssl/files/patch-t1_lib.c Modified: branches/2016Q3/security/openssl/Makefile branches/2016Q3/security/openssl/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/security/openssl/Makefile ============================================================================== --- branches/2016Q3/security/openssl/Makefile Fri Sep 23 12:54:20 2016 (r422668) +++ branches/2016Q3/security/openssl/Makefile Fri Sep 23 13:00:07 2016 (r422669) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= openssl -PORTVERSION= 1.0.2 -DISTVERSIONSUFFIX= h -PORTREVISION= 14 +PORTVERSION= 1.0.2i +PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/source/ \ ftp://ftp.openssl.org/source/ \ @@ -182,7 +181,6 @@ pre-everything:: @${ECHO_CMD} "# please use DEFAULT_VERSIONS+= ssl=base instead." @${ECHO_CMD} "#" @${FALSE} - .endif post-patch: Modified: branches/2016Q3/security/openssl/distinfo ============================================================================== --- branches/2016Q3/security/openssl/distinfo Fri Sep 23 12:54:20 2016 (r422668) +++ branches/2016Q3/security/openssl/distinfo Fri Sep 23 13:00:07 2016 (r422669) @@ -1,10 +1,11 @@ -SHA256 (openssl-1.0.2h/openssl-1.0.2h.tar.gz) = 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 -SIZE (openssl-1.0.2h/openssl-1.0.2h.tar.gz) = 5274412 -SHA256 (openssl-1.0.2h/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7 -SIZE (openssl-1.0.2h/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717 -SHA256 (openssl-1.0.2h/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260 -SIZE (openssl-1.0.2h/1002-backport-changes-from-upstream-padlock-module.patch) = 5770 -SHA256 (openssl-1.0.2h/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea -SIZE (openssl-1.0.2h/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20935 -SHA256 (openssl-1.0.2h/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 97eb4411d0fc0890e94bc7c2d682f68b71135da782af769ca73914b37da2b1fd -SIZE (openssl-1.0.2h/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 832 +TIMESTAMP = 1474552146 +SHA256 (openssl-1.0.2i/openssl-1.0.2i.tar.gz) = 9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f +SIZE (openssl-1.0.2i/openssl-1.0.2i.tar.gz) = 5308232 +SHA256 (openssl-1.0.2i/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7 +SIZE (openssl-1.0.2i/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717 +SHA256 (openssl-1.0.2i/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260 +SIZE (openssl-1.0.2i/1002-backport-changes-from-upstream-padlock-module.patch) = 5770 +SHA256 (openssl-1.0.2i/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea +SIZE (openssl-1.0.2i/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20935 +SHA256 (openssl-1.0.2i/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 97eb4411d0fc0890e94bc7c2d682f68b71135da782af769ca73914b37da2b1fd +SIZE (openssl-1.0.2i/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 832 From owner-svn-ports-branches@freebsd.org Fri Sep 23 13:48:00 2016 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 C9282BDC06C; Fri, 23 Sep 2016 13:48:00 +0000 (UTC) (envelope-from tz@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 804507E2; Fri, 23 Sep 2016 13:48:00 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NDlxPF077340; Fri, 23 Sep 2016 13:47:59 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NDlxTv077337; Fri, 23 Sep 2016 13:47:59 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201609231347.u8NDlxTv077337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 23 Sep 2016 13:47:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422677 - in branches/2016Q3: lang/php56 www/php56-opcache 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, 23 Sep 2016 13:48:00 -0000 Author: tz Date: Fri Sep 23 13:47:59 2016 New Revision: 422677 URL: https://svnweb.freebsd.org/changeset/ports/422677 Log: MFH: r422652 lang/php56: Update from 5.6.25 to 5.6.26 Security: CVE-2016-7416 Security: CVE-2016-7412 Security: CVE-2016-7414 Security: CVE-2016-7417 Security: CVE-2016-7411 Security: CVE-2016-7413 Security: CVE-2016-7418 Approved by: swills (mentor) Approved by: ports-secteam (mat) Modified: branches/2016Q3/lang/php56/Makefile branches/2016Q3/lang/php56/distinfo branches/2016Q3/www/php56-opcache/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/php56/Makefile ============================================================================== --- branches/2016Q3/lang/php56/Makefile Fri Sep 23 13:37:02 2016 (r422676) +++ branches/2016Q3/lang/php56/Makefile Fri Sep 23 13:47:59 2016 (r422677) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.25 -PORTREVISION?= 0 +PORTVERSION= 5.6.26 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} Modified: branches/2016Q3/lang/php56/distinfo ============================================================================== --- branches/2016Q3/lang/php56/distinfo Fri Sep 23 13:37:02 2016 (r422676) +++ branches/2016Q3/lang/php56/distinfo Fri Sep 23 13:47:59 2016 (r422677) @@ -1,5 +1,3 @@ -TIMESTAMP = 1472238006 -SHA256 (php-5.6.25.tar.xz) = 7535cd6e20040ccec4594cc386c6f15c3f2c88f24163294a31068cf7dfe7f644 -SIZE (php-5.6.25.tar.xz) = 12406072 -SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed -SIZE (php-5.5.x-mail-header.patch) = 4426 +TIMESTAMP = 1474538003 +SHA256 (php-5.6.26.tar.xz) = 203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 +SIZE (php-5.6.26.tar.xz) = 12412992 Modified: branches/2016Q3/www/php56-opcache/Makefile ============================================================================== --- branches/2016Q3/www/php56-opcache/Makefile Fri Sep 23 13:37:02 2016 (r422676) +++ branches/2016Q3/www/php56-opcache/Makefile Fri Sep 23 13:47:59 2016 (r422677) @@ -1,7 +1,6 @@ # Created by: Martin Matuska # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php56 From owner-svn-ports-branches@freebsd.org Fri Sep 23 14:50:10 2016 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 E83ABBE6D61; Fri, 23 Sep 2016 14:50:10 +0000 (UTC) (envelope-from mat@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 B940BEF0; Fri, 23 Sep 2016 14:50:10 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NEo9f7000511; Fri, 23 Sep 2016 14:50:09 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NEo9dv000510; Fri, 23 Sep 2016 14:50:09 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201609231450.u8NEo9dv000510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 23 Sep 2016 14:50:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422681 - branches/2016Q3/lang/php56 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, 23 Sep 2016 14:50:11 -0000 Author: mat Date: Fri Sep 23 14:50:09 2016 New Revision: 422681 URL: https://svnweb.freebsd.org/changeset/ports/422681 Log: MFH: r422680 Put back the mail-header patch. Pointy hat: tz Sponsored by: Absolight Modified: branches/2016Q3/lang/php56/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/php56/distinfo ============================================================================== --- branches/2016Q3/lang/php56/distinfo Fri Sep 23 14:46:34 2016 (r422680) +++ branches/2016Q3/lang/php56/distinfo Fri Sep 23 14:50:09 2016 (r422681) @@ -1,3 +1,5 @@ TIMESTAMP = 1474538003 SHA256 (php-5.6.26.tar.xz) = 203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 SIZE (php-5.6.26.tar.xz) = 12412992 +SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed +SIZE (php-5.5.x-mail-header.patch) = 4426 From owner-svn-ports-branches@freebsd.org Fri Sep 23 17:06:55 2016 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 E2B14BE6A10; Fri, 23 Sep 2016 17:06:55 +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 B554EF1B; Fri, 23 Sep 2016 17:06:55 +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 u8NH6s5F053057; Fri, 23 Sep 2016 17:06:54 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NH6sKi053055; Fri, 23 Sep 2016 17:06:54 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201609231706.u8NH6sKi053055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 23 Sep 2016 17:06:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422687 - branches/2016Q3/sysutils/megacli 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, 23 Sep 2016 17:06:56 -0000 Author: riggs Date: Fri Sep 23 17:06:54 2016 New Revision: 422687 URL: https://svnweb.freebsd.org/changeset/ports/422687 Log: MFH: r422685 Make build more robust: add mirror to MASTER_SITES; add TIMESTAMP PR: 212878 Submitted by: samflanker@gmail.com (maintainer) Approved by: ports-secteam (build fix blanket) Modified: branches/2016Q3/sysutils/megacli/Makefile branches/2016Q3/sysutils/megacli/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/sysutils/megacli/Makefile ============================================================================== --- branches/2016Q3/sysutils/megacli/Makefile Fri Sep 23 16:57:42 2016 (r422686) +++ branches/2016Q3/sysutils/megacli/Makefile Fri Sep 23 17:06:54 2016 (r422687) @@ -4,7 +4,8 @@ PORTNAME= megacli DISTVERSION= 8-07-14 CATEGORIES= sysutils -MASTER_SITES= http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/ +MASTER_SITES= http://www.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/ \ + http://ftp.wsisiz.edu.pl/pub/pc/drivers/lsi/ DISTNAME= ${DISTVERSION}_MegaCLI MAINTAINER= samflanker@gmail.com Modified: branches/2016Q3/sysutils/megacli/distinfo ============================================================================== --- branches/2016Q3/sysutils/megacli/distinfo Fri Sep 23 16:57:42 2016 (r422686) +++ branches/2016Q3/sysutils/megacli/distinfo Fri Sep 23 17:06:54 2016 (r422687) @@ -1,2 +1,3 @@ +TIMESTAMP = 1474466414 SHA256 (8-07-14_MegaCLI.zip) = d9b152ae3dab76a334b9251702dba3311ceed91b58aaf52d916eb4ba1c2ab6e9 SIZE (8-07-14_MegaCLI.zip) = 7939395 From owner-svn-ports-branches@freebsd.org Fri Sep 23 18:22:52 2016 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 5BFCBBE6C1A; Fri, 23 Sep 2016 18:22:52 +0000 (UTC) (envelope-from rm@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 2BA7F633; Fri, 23 Sep 2016 18:22:52 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NIMpig082757; Fri, 23 Sep 2016 18:22:51 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NIMpn2082755; Fri, 23 Sep 2016 18:22:51 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201609231822.u8NIMpn2082755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Fri, 23 Sep 2016 18:22:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422689 - branches/2016Q3/multimedia/cheese 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, 23 Sep 2016 18:22:52 -0000 Author: rm Date: Fri Sep 23 18:22:51 2016 New Revision: 422689 URL: https://svnweb.freebsd.org/changeset/ports/422689 Log: MFH: r422684 multimedia/cheese: fix packaging - fix packaging when MANPAGES option is off PR: 202342 Reported by: sub.mesa@gmail.com Obtained from: gnome development repo With hat: gnome Approved by: ports-secteam (feld) Modified: branches/2016Q3/multimedia/cheese/Makefile branches/2016Q3/multimedia/cheese/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/multimedia/cheese/Makefile ============================================================================== --- branches/2016Q3/multimedia/cheese/Makefile Fri Sep 23 18:20:11 2016 (r422688) +++ branches/2016Q3/multimedia/cheese/Makefile Fri Sep 23 18:22:51 2016 (r422689) @@ -37,6 +37,7 @@ INSTALL_TARGET= install-strip DOCS= AUTHORS COPYING ChangeLog NEWS README GLIB_SCHEMAS= org.gnome.Cheese.gschema.xml +OPTIONS_SUB= yes OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES Modified: branches/2016Q3/multimedia/cheese/pkg-plist ============================================================================== --- branches/2016Q3/multimedia/cheese/pkg-plist Fri Sep 23 18:20:11 2016 (r422688) +++ branches/2016Q3/multimedia/cheese/pkg-plist Fri Sep 23 18:22:51 2016 (r422689) @@ -19,7 +19,7 @@ lib/libcheese.so.8.0.3 libdata/pkgconfig/cheese-gtk.pc libdata/pkgconfig/cheese.pc libexec/gnome-camera-service -man/man1/cheese.1.gz +%%MANPAGES%%man/man1/cheese.1.gz share/appdata/org.gnome.Cheese.appdata.xml share/applications/org.gnome.Cheese.desktop share/dbus-1/services/org.gnome.Camera.service