18172887 Prepare Lighttpd for MySQL 5.1 EOF in S12
authorJiri Kukacka <jiri.kukacka@oracle.com>
Wed, 05 Feb 2014 04:10:56 -0800
changeset 1706 d5ac54d06cb3
parent 1705 f76a8a4838a4
child 1707 99c37525cdda
18172887 Prepare Lighttpd for MySQL 5.1 EOF in S12 18194646 Change mysql.sock path in Lighttpd modules
components/lighttpd/Makefile
components/lighttpd/patches/08-fix-mysql-sock-location.patch
components/lighttpd/resolve.deps
--- a/components/lighttpd/Makefile	Tue Feb 11 06:14:11 2014 -0800
+++ b/components/lighttpd/Makefile	Wed Feb 05 04:10:56 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -61,8 +61,8 @@
 CONFIGURE_OPTIONS +=	--with-lua
 CONFIGURE_OPTIONS +=	--with-openssl
 CONFIGURE_OPTIONS +=	--with-pcre
-CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.1/bin/64/mysql_config
-CONFIGURE_OPTIONS +=    CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.5/bin/mysql_config
+CONFIGURE_OPTIONS +=    CFLAGS="$(CFLAGS) -R/usr/mysql/5.5/lib/$(MACH64)"
 CONFIGURE_OPTIONS +=    PCRECONFIG="/usr/bin/$(MACH64)/pcre-config"
 
 # Enable ASLR for this component
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lighttpd/patches/08-fix-mysql-sock-location.patch	Wed Feb 05 04:10:56 2014 -0800
@@ -0,0 +1,15 @@
+Developed in-house, not fed back.
+Solaris specific - mysql.sock is located in different path than
+it is in Linux.
+
+--- doc/config/conf.d/mysql_vhost.conf	2014-02-06 04:31:05.628787703 -0800
++++ doc/config/conf.d/mysql_vhost.conf	2014-02-06 04:28:25.874018171 -0800
+@@ -12,7 +12,7 @@
+ ##
+ ## Local path to the mysql socket
+ ##
+-#mysql-vhost.sock           = "/var/lib/mysql/mysql.sock"
++#mysql-vhost.sock           = "/tmp/mysql.sock"
+ 
+ ##
+ ## Host of the MySQL server. 
--- a/components/lighttpd/resolve.deps	Tue Feb 11 06:14:11 2014 -0800
+++ b/components/lighttpd/resolve.deps	Wed Feb 05 04:10:56 2014 -0800
@@ -1,10 +1,9 @@
 compress/bzip2
-database/mysql-51/library
+database/mysql-55/library
 library/pcre
 library/security/openssl
 library/zlib
 runtime/lua
-shell/ksh93
 system/core-os
 system/library
 system/library/math