From dan@m8-64.freebsd.cz  Sat Feb  5 22:31:20 2011
Return-Path: <dan@m8-64.freebsd.cz>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 19AF1106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Feb 2011 22:31:20 +0000 (UTC)
	(envelope-from dan@m8-64.freebsd.cz)
Received: from m8-64.freebsd.cz (m8-64.freebsd.cz [195.113.20.201])
	by mx1.freebsd.org (Postfix) with ESMTP id 86E508FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  5 Feb 2011 22:31:18 +0000 (UTC)
Received: from m8-64.freebsd.cz (localhost [127.0.0.1])
	by m8-64.freebsd.cz (8.14.4/8.14.4) with ESMTP id p15MV63a016883
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 5 Feb 2011 23:31:06 +0100 (CET)
	(envelope-from dan@m8-64.freebsd.cz)
Received: (from root@localhost)
	by m8-64.freebsd.cz (8.14.4/8.14.4/Submit) id p15MV6Cf016857;
	Sat, 5 Feb 2011 23:31:06 +0100 (CET)
	(envelope-from dan)
Message-Id: <201102052231.p15MV6Cf016857@m8-64.freebsd.cz>
Date: Sat, 5 Feb 2011 23:31:06 +0100 (CET)
From: Dan Lukes <dan@obluda.cz>
Reply-To: Dan Lukes <dan@obluda.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ patch ] MySQL 55 client/server compiled with diferent behavior than MySQL 51 client/server
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         154538
>Category:       ports
>Synopsis:       [ patch ] MySQL 55 client/server compiled with diferent behavior than MySQL 51 client/server
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 05 22:40:08 UTC 2011
>Closed-Date:    Tue Feb 08 16:38:12 UTC 2011
>Last-Modified:  Tue Feb  8 16:40:11 UTC 2011
>Originator:     Dan Lukes
>Release:        FreeBSD 8.1-RELEASE-p2 amd64
>Organization:
Obludarium
>Environment:
databases/mysql55-client/Makefile,v 1.107 2011/01/13 09:15:22
databases/mysql55-server/Makefile,v 1.272 2011/01/13 09:15:22
>Description:
A)
Both MySQL 51 and MySQL 55 client can be compiled either with internal libedit (source's default) or system's libedit
The 51 client force unconditionally compilation with system libedit
The 55 client force unconditionally compilation with embedded libedit

Unfortunatelly, those libedits have diferent behavior so user interface changed. UI become diferent not only to previous
MySQL behavior, but it also diverge from UI of other system utilities that use system libedit
It cause unnecesarry discomfort to user as embedded libedit doesn't offer new or better function to user.
Even worse, both libedits have different format of history file, but store the data into same filename - so after
upgrade all users have they histories destroyed with no warning

B)
Both MySQL 51 and MySQL 55 server can be compiled either without (source's default) or with LIBWRAP
The 51 server force unconditionally compilation with libwrap
The 55 server force unconditionally compilation without libwrap

It cause diferent server behavior.
>How-To-Repeat:
>Fix:
It would be nice to either
1) restore same "port defaults" as has been forced in 51 - e.g. system libedit and use of libwrap
or
2) create WITH_* knobs that allow system administrator to request "51" compatible behavior

The attached patch implement 1) variant 
(e.g. non-configurable return to 51 behavior = unconditional compilation with system's libedit and libwrap)
	

--- databases/mysql55-client/Makefile.ORIG	2011-02-05 22:59:51.000000000 +0100
+++ databases/mysql55-client/Makefile	2011-02-05 22:57:55.000000000 +0100
@@ -21,7 +21,7 @@
 
 CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[0-46-9].*
 
-CMAKE_ARGS=	-DWITHOUT_SERVER=1
+CMAKE_ARGS=	-DWITH_LIBEDIT=OFF -DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
--- databases/mysql55-server/Makefile.ORIG	2011-01-13 17:56:45.000000000 +0100
+++ databases/mysql55-server/Makefile	2011-02-05 22:58:55.000000000 +0100
@@ -39,8 +39,10 @@
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql"
 
+CMAKE_ARGS+=	-DWITH_LIBWRAP=ON
+
 .ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .include <bsd.port.options.mk>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: arved 
Responsible-Changed-When: Sun Feb 6 10:34:27 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154538 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Tue Feb 8 16:37:57 UTC 2011 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154538 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154538: commit references a PR
Date: Tue,  8 Feb 2011 16:37:47 +0000 (UTC)

 ale         2011-02-08 16:37:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/mysql55-client Makefile pkg-plist 
     databases/mysql55-client/files patch-include_CMakeLists.txt 
                                    patch-support-files_CMakeLists.txt 
     databases/mysql55-server Makefile distinfo 
     databases/mysql55-server/files patch-include_CMakeLists.txt 
   Removed files:
     databases/mysql55-client/files patch-scripts_mysql_config.sh 
   Log:
   Update to 5.5.9 release [1]
   Use system readline instead of bundled libedit [2]
   Enable tcp wrappers [2]
   
   PR:             ports/154579 [1], ports/154538 [2]
   Submitted by:   mm [1], Dan Lukes <dan@obluda.cz> [2]
   Feature safe:   yes
   
   Revision  Changes    Path
   1.108     +0 -1      ports/databases/mysql55-client/Makefile
   1.2       +2 -10     ports/databases/mysql55-client/files/patch-include_CMakeLists.txt
   1.2       +0 -15     ports/databases/mysql55-client/files/patch-scripts_mysql_config.sh (dead)
   1.2       +6 -10     ports/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
   1.3       +0 -1      ports/databases/mysql55-client/pkg-plist
   1.273     +5 -3      ports/databases/mysql55-server/Makefile
   1.127     +2 -2      ports/databases/mysql55-server/distinfo
   1.2       +4 -6      ports/databases/mysql55-server/files/patch-include_CMakeLists.txt
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
