LinHES 6.01.00

5 files changed, 20 insertions, 21 deletions

diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD
index 88460bc..11df8fb 100644
--- a/abs/core/mysql/PKGBUILD
+++ b/abs/core/mysql/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 2465 2008-06-02 11:38:50Z alexander $
+# $Id: PKGBUILD 23595 2009-01-11 13:14:19Z douglas $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgname=mysql
-pkgver=5.0.60
-pkgrel=1
+pkgver=5.0.75
+pkgrel=3
 pkgdesc="A fast SQL database server"
 arch=(i686 x86_64)
 backup=(etc/my.cnf etc/conf.d/mysqld)
@@ -11,8 +11,9 @@ depends=("mysql-clients>=${pkgver}" 'tcp_wrappers')
 makedepends=('libtool')
 url=('http://www.mysql.com/')
 options=('!libtool')
+optdepends=('perl-dbi' 'perl-dbd-mysql')
 license=('GPL')
-source=(http://mirror.provenscaling.com/mysql/enterprise/source/5.0/mysql-${pkgver}.tar.gz
+source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz
 	mysql-no-clients.patch
 	mysqld
 	my.cnf
@@ -27,7 +28,7 @@ build() {
     --with-innodb --enable-local-infile --with-openssl \
     --with-charset=latin1 --with-collation=latin1_general_ci \
     --with-extra-charsets=complex --enable-thread-safe-client \
-    --with-libwrap --with-berkeley-db
+    --with-libwrap --with-berkeley-db --with-embedded-server
 
   # fixes
   sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' include/config.h || return 1
@@ -47,8 +48,3 @@ build() {
   install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
   rm -f ${startdir}/pkg/usr/bin/mysql_config
 }
-md5sums=('2709a53f3da6f1cd868825ed2ea80431'
-         'e892aac36cbeb57f0e003ec0936afb3b'
-         '64d79a5a34043c1de949d734b720c217'
-         '0ee035590ffc61d32de994f461fd2bd2'
-         '4a9077fc95ec6db1d5420e0cdc74d31c')
diff --git a/abs/core/mysql/__changelog b/abs/core/mysql/__changelog
new file mode 100644
index 0000000..4fa7078
--- /dev/null
+++ b/abs/core/mysql/__changelog
@@ -0,0 +1,8 @@
+my.cnf
+-enable networking
+-datadir /data/srv/mysql
+
+mysqld
+	-redirect output to /dev/null
+	--skip-name-resolve 
+    replace mkdir with mkdir -p
diff --git a/abs/core/mysql/my.cnf b/abs/core/mysql/my.cnf
index 927b9c8..7202fcd 100644
--- a/abs/core/mysql/my.cnf
+++ b/abs/core/mysql/my.cnf
@@ -20,7 +20,7 @@ socket		= /tmp/mysql.sock
 [mysqld]
 port		= 3306
 socket		= /tmp/mysql.sock
-datadir		= /var/lib/mysql
+datadir		= /data/srv/mysql
 skip-locking
 key_buffer = 16M
 max_allowed_packet = 1M
@@ -35,7 +35,7 @@ myisam_sort_buffer_size = 8M
 # Note that using this option without enabling named pipes on Windows
 # (via the "enable-named-pipe" option) will render mysqld useless!
 # 
-skip-networking
+#skip-networking
 
 # Replication Master Server (default)
 # binary logging is required for replication
diff --git a/abs/core/mysql/mysqld b/abs/core/mysql/mysqld
index 0fcecf7..5857df8 100755
--- a/abs/core/mysql/mysqld
+++ b/abs/core/mysql/mysqld
@@ -22,21 +22,16 @@ if [ ! `egrep '^mysql:' /etc/passwd` ]; then
 fi
 
 if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
+  mkdir -p $MYSQLD_ROOT
+  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql 2>/dev/null 1>/dev/null
   chown -R mysql.mysql $MYSQLD_ROOT
 fi
 
-if [ ! -e /var/log/mysqld.log ]; then
-  touch /var/log/mysqld.log
-  chown mysql /var/log/mysqld.log
-fi
-
 case "$1" in
   start)
     stat_busy "Starting MySQL"
     if [ -z "$PID" ]; then
-       /usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT &>/dev/null &
+       /usr/bin/mysqld_safe --skip-name-resolve --datadir=$MYSQLD_ROOT >/dev/null 2>/dev/null &
       if [ $? -gt 0 ]; then
         stat_fail
         exit 1
diff --git a/abs/core/mysql/mysqld.conf.d b/abs/core/mysql/mysqld.conf.d
index 04752b1..10b7098 100644
--- a/abs/core/mysql/mysqld.conf.d
+++ b/abs/core/mysql/mysqld.conf.d
@@ -1 +1 @@
-MYSQLD_ROOT="/var/lib/mysql"
+MYSQLD_ROOT="/data/srv/mysql"