From 851123eccf46b1cf4ab1b96a013a4497b8852a71 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Fri, 15 Oct 2010 23:47:07 +0200
Subject: mysql, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/mysql/Pkgfile                           |  2 +-
 extra/mysql/my.cnf                            | 20 -------------------
 extra/mysql/mysql-5.1.46-skip-abi-check.patch | 28 ---------------------------
 extra/mysql/mysql.nutyx.patch                 | 27 --------------------------
 4 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 extra/mysql/my.cnf
 delete mode 100644 extra/mysql/mysql-5.1.46-skip-abi-check.patch
 delete mode 100644 extra/mysql/mysql.nutyx.patch

diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile
index 98a814ab7..d99dba427 100644
--- a/extra/mysql/Pkgfile
+++ b/extra/mysql/Pkgfile
@@ -8,7 +8,7 @@ name=mysql
 version=5.1.46
 release=2
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \
-        mysql-$version-skip-abi-check.patch )
+        http://nutyx.meticul.eu/files/patchs/$name/mysql-$version-skip-abi-check.patch )
 
 build () {
 	source /etc/blfs-bootscripts
diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf
deleted file mode 100644
index 37070a679..000000000
--- a/extra/mysql/my.cnf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/my.cnf
-#
-
-[mysqld]
-datadir  = /var/lib/mysql
-user     = daemon
-log      = /var/log/mysqld.log
-pid-file = /var/run/mysqld.pid
-socket   = /tmp/mysql.sock
-port     = 3306
-
-skip-networking
-skip-innodb
-
-[client]
-socket   = /tmp/mysql.sock
-port     = 3306
-
-# End of file
diff --git a/extra/mysql/mysql-5.1.46-skip-abi-check.patch b/extra/mysql/mysql-5.1.46-skip-abi-check.patch
deleted file mode 100644
index 46125c73e..000000000
--- a/extra/mysql/mysql-5.1.46-skip-abi-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mysql-5.1.45/Makefile.am.orig	2010-03-31 10:52:25.000000000 -0400
-+++ mysql-5.1.45/Makefile.am	2010-03-31 10:55:05.000000000 -0400
-@@ -312,24 +312,7 @@
- 	$(MAKE) abi_headers="$^" do_abi_check
- 
- do_abi_check:
--	set -ex; \
--	for file in $(abi_headers); do \
--	         @CC@ -E -nostdinc -dI \
--	                  -I$(top_srcdir)/include \
--	                  -I$(top_srcdir)/include/mysql \
--	                  -I$(top_srcdir)/sql \
--	                  -I$(top_builddir)/include \
--	                  -I$(top_builddir)/include/mysql \
--	                  -I$(top_builddir)/sql \
--	                                 $$file 2>/dev/null | \
--	                  @SED@ -e '/^# /d' \
--	                            -e '/^[ 	]*$$/d' \
--	                            -e '/^#pragma GCC set_debug_pwd/d' \
--	                            -e '/^#ident/d' > \
--	                                       $(top_builddir)/abi_check.out; \
--	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
--	                  @RM@ $(top_builddir)/abi_check.out; \
--	done
-+	echo "Skipping do_abi_check"
- 
- # Don't update the files from bitkeeper
- %::SCCS/s.%
diff --git a/extra/mysql/mysql.nutyx.patch b/extra/mysql/mysql.nutyx.patch
deleted file mode 100644
index cc1cdb43e..000000000
--- a/extra/mysql/mysql.nutyx.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- blfs-bootscripts-20090302/blfs/init.d/mysql	2005-08-01 19:29:19.000000000 +0000
-+++ blfs-bootscripts-20090302/blfs/init.d/mysql.nutyx	2009-06-26 06:55:05.000000000 +0000
-@@ -5,11 +5,23 @@
- # Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
- 
- #$LastChangedBy: bdubbs $
--#$Date: 2005-08-01 19:29:19 +0000 (Mon, 01 Aug 2005) $
-+#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
- 
- . /etc/sysconfig/rc
- . $rc_functions
- 
-+newgroup=mysql
-+newuser=mysql
-+newid=40
-+
-+# check for mysql group or add one
-+getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-+
-+# check for mysql user or add one
-+getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
-+-u $newid -d /dev/null \
-+-s /bin/false -c "MySQL Server" $newuser
-+
- PIDFILE=/srv/mysql/`/bin/hostname`.pid
- KILLDELAY=20
- 
-- 
cgit v1.2.3-70-g09d2