From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 20 16:30:14 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 272CF106567C for ; Fri, 20 Apr 2012 16:30:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BD2FD8FC24 for ; Fri, 20 Apr 2012 16:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3KGU9Za057479 for ; Fri, 20 Apr 2012 16:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3KGU9n5057478; Fri, 20 Apr 2012 16:30:09 GMT (envelope-from gnats) Resent-Date: Fri, 20 Apr 2012 16:30:09 GMT Resent-Message-Id: <201204201630.q3KGU9n5057478@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Geoffroy Desvernay Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2E26106564A; Fri, 20 Apr 2012 16:28:07 +0000 (UTC) (envelope-from root@dgeo.sysadm.ec-m.fr) Received: from meli.ec-m.fr (meli.ec-m.fr [147.94.19.138]) by mx1.freebsd.org (Postfix) with ESMTP id 5508C8FC16; Fri, 20 Apr 2012 16:28:07 +0000 (UTC) Received: from amavis3.serv.int (amavis3.serv.int [10.3.0.47]) by meli.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 12068278AEF; Fri, 20 Apr 2012 18:28:08 +0200 (CEST) Received: from meli.ec-m.fr ([10.3.0.12]) by amavis3.serv.int (amavis3.serv.int [10.3.0.47]) (amavisd-new, port 10024) with LMTP id FP24vyzEZhzI; Fri, 20 Apr 2012 18:28:02 +0200 (CEST) Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169]) by meli.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 7130A278AED; Fri, 20 Apr 2012 18:28:04 +0200 (CEST) Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0) id A82171CD57; Fri, 20 Apr 2012 18:28:02 +0200 (CEST) Message-Id: <20120420162802.A82171CD57@dgeo.sysadm.ec-m.fr> Date: Fri, 20 Apr 2012 18:28:02 +0200 (CEST) From: Geoffroy Desvernay To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Doug Barton , secteam@FreeBSD.org Subject: ports/167125: [MAINTAINER] databases/mariadb-server: update to 5.3.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2012 16:30:14 -0000 >Number: 167125 >Category: ports >Synopsis: [MAINTAINER] databases/mariadb-server: update to 5.3.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 20 16:30:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Geoffroy Desvernay >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Ecole Centrale de Marseille >Environment: System: FreeBSD dgeo.sysadm.ec-m.fr 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sun Jan 15 17:00:54 CET 2012 >Description: - Fix security hole http://bugs.mysql.com/bug.php?id=64884 - Update to 5.3.6 Removed file(s): - files/patch-plugin__auth_pam__auth_pam.c (patch applied upstream) Generated with FreeBSD Port Tools 0.99_5 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- mariadb-server-5.3.6.patch begins here --- diff -ruN --exclude=CVS ../mariadb-server.orig/Makefile ./Makefile --- ../mariadb-server.orig/Makefile 2012-01-05 03:13:36.000000000 +0100 +++ ./Makefile 2012-04-20 18:23:03.000000000 +0200 @@ -5,7 +5,7 @@ # $FreeBSD: ports/databases/mariadb-server/Makefile,v 1.15 2012/01/05 02:13:36 dougb Exp $ PORTNAME= mariadb -PORTVERSION= 5.2.10 +PORTVERSION= 5.3.6 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ @@ -77,6 +77,7 @@ OQGRAPH "Open Query Graph Computation engine" Off \ PBXT "MVCC-based transactional engine" Off \ PARTITION "Partitioning support" Off \ + HANDLERSOCKET "HandlerSocket support" On \ NDB "Enable NDB support (implies PARTITION)" Off \ EXAMPLES "Example engine,daemon and ftsearch plugins" Off .endif # .if !defined(MARIADB_CLIENT_SLAVE) @@ -169,6 +170,13 @@ CONFIGURE_ARGS+= --without-plugin-xtradb PLIST_SUB+= XTRADB="@comment " .endif +.if defined(WITH_HANDLERSOCKET) +PLIST_SUB+= HANDLERSOCKET="" +PLUGINS+= handlersocket +.else +CONFIGURE_ARGS+= --without-plugin-handlersocket +PLIST_SUB+= HANDLERSOCKET="@comment " +.endif .if defined(WITH_OQGRAPH) CONFIGURE_ARGS+= --with-plugin-oqgraph PLIST_SUB+= OQGRAPH="" diff -ruN --exclude=CVS ../mariadb-server.orig/distinfo ./distinfo --- ../mariadb-server.orig/distinfo 2012-01-05 03:13:36.000000000 +0100 +++ ./distinfo 2012-04-15 21:03:03.000000000 +0200 @@ -1,2 +1,2 @@ -SIZE (mariadb-5.2.10.tar.gz) = 25242675 -SHA256 (mariadb-5.2.10.tar.gz) = dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3 +SIZE (mariadb-5.3.6.tar.gz) = 26724631 +SHA256 (mariadb-5.3.6.tar.gz) = 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 diff -ruN --exclude=CVS ../mariadb-server.orig/files/mysql-server.in ./files/mysql-server.in --- ../mariadb-server.orig/files/mysql-server.in 2012-01-05 03:13:36.000000000 +0100 +++ ./files/mysql-server.in 2012-01-14 09:55:29.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -# $FreeBSD: ports/databases/mariadb-server/files/mysql-server.in,v 1.5 2012/01/05 02:13:36 dougb Exp $ +# $FreeBSD: ports/databases/mariadb-server/files/mysql-server.in,v 1.7 2012/01/14 08:55:29 dougb Exp $ # # PROVIDE: mysql # REQUIRE: LOGIN @@ -22,13 +22,14 @@ . /etc/rc.subr name="mysql" -rcvar=`set_rcvar` +rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_user="mysql"} +: ${mysql_limits_args="-e -U $mysql_user"} : ${mysql_dbdir="/var/db/mysql"} command="/usr/sbin/daemon" @@ -41,13 +42,12 @@ load_rc_config ${name}_${instance} case "$mysql_instances" in "$2 "*|*" $2 "*|*" $2"|"$2") - eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}" - eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" - eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - eval _limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}" - [ -z "$_limits_args" ] && eval _limits_args=\"-e -U $_user\" - pidfile="${_dbdir}/`/bin/hostname`.pid" + eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" + eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" + eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" + eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}" + pidfile="${mysql_dbdir}/`/bin/hostname`.pid" ;; *) err 1 "$2 not found in mysql_instances" ;; @@ -85,29 +85,26 @@ exit 0 else pidfile="${mysql_dbdir}/`/bin/hostname`.pid" - _dbdir="/var/db/mysql" - _user="mysql" - _limits_args="-e -U ${_user}" fi fi mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--ldata=${_dbdir}" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}" +mysql_install_db_args="--ldata=${mysql_dbdir}" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" mysql_create_auth_tables() { - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${_user}:${_user} ${_dbdir} + eval $mysql_install_db $mysql_install_db_args + [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir} } mysql_prestart() { - if [ ! -d "${_dbdir}/mysql/." ]; then + if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi if checkyesno mysql_limits; then - eval `/usr/bin/limits $_limits_args` 2>/dev/null + eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null else return 0 fi diff -ruN --exclude=CVS ../mariadb-server.orig/files/patch-plugin__auth_pam__auth_pam.c ./files/patch-plugin__auth_pam__auth_pam.c --- ../mariadb-server.orig/files/patch-plugin__auth_pam__auth_pam.c 2012-01-05 03:13:36.000000000 +0100 +++ ./files/patch-plugin__auth_pam__auth_pam.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- plugin/auth_pam/auth_pam.c.orig 2012-01-04 14:17:30.000000000 +0100 -+++ plugin/auth_pam/auth_pam.c 2012-01-04 14:17:36.000000000 +0100 -@@ -1,7 +1,6 @@ - #include - #include - #include --#include - - struct param { - unsigned char buf[10240], *ptr; diff -ruN --exclude=CVS ../mariadb-server.orig/pkg-plist ./pkg-plist --- ../mariadb-server.orig/pkg-plist 2012-01-05 03:13:36.000000000 +0100 +++ ./pkg-plist 2012-04-20 18:19:28.000000000 +0200 @@ -10,6 +10,8 @@ bin/myisamchk bin/myisamlog bin/myisampack +bin/mytop +%%HANDLERSOCKET%%bin/hsclient bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_find_rows @@ -48,6 +50,21 @@ bin/resolve_stack_dump bin/resolveip %%PBXT%%bin/xtstat +%%HANDLERSOCKET%%include/handlersocket/allocator.hpp +%%HANDLERSOCKET%%include/handlersocket/config.hpp +%%HANDLERSOCKET%%include/handlersocket/mutex.hpp +%%HANDLERSOCKET%%include/handlersocket/string_util.hpp +%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp +%%HANDLERSOCKET%%include/handlersocket/escape.hpp +%%HANDLERSOCKET%%include/handlersocket/socket.hpp +%%HANDLERSOCKET%%include/handlersocket/thread.hpp +%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp +%%HANDLERSOCKET%%include/handlersocket/fatal.hpp +%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp +%%HANDLERSOCKET%%include/handlersocket/util.hpp +%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp +%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp +%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h @@ -80,6 +97,10 @@ %%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h %%ARIADB%%lib/mysql/libaria.a +%%HANDLERSOCKET%%lib/libhsclient.so.0 +%%HANDLERSOCKET%%lib/libhsclient.so +%%HANDLERSOCKET%%lib/libhsclient.la +%%HANDLERSOCKET%%lib/libhsclient.a lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -96,7 +117,10 @@ %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a -%%STATIC%%lib/mysql/plugin/auth_pam.a +%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0 +%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so +%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.la +%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a %%STATIC%%lib/mysql/plugin/auth_pam.la %%STATIC%%lib/mysql/plugin/auth_pam.so %%STATIC%%lib/mysql/plugin/auth_pam.so.0 @@ -104,15 +128,12 @@ %%STATIC%%lib/mysql/plugin/dialog.la %%STATIC%%lib/mysql/plugin/dialog.so %%STATIC%%lib/mysql/plugin/dialog.so.0 -%%STATIC%%lib/mysql/plugin/feedback.a %%STATIC%%lib/mysql/plugin/feedback.la %%STATIC%%lib/mysql/plugin/feedback.so %%STATIC%%lib/mysql/plugin/feedback.so.0 -%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 -%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 @@ -132,7 +153,6 @@ %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.la %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 -%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 @@ -151,7 +171,6 @@ %%SPHINX%%lib/mysql/plugin/sphinx.la %%SPHINX%%lib/mysql/plugin/sphinx.so %%SPHINX%%lib/mysql/plugin/sphinx.so.0 -%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.a %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.la %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 --- mariadb-server-5.3.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: