X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fmysql;h=8c739c26acecdd0b6bbc5a98ac8e5fba1eadff13;hb=120d77b33cc106a67bfb7e88aee5ae115be18c97;hp=5f87c2f2db52a55501e04ea6457c588e842a612f;hpb=e8babc92b0c612fe53d8695bfef871a77f453c32;p=ipfire-2.x.git

diff --git a/lfs/mysql b/lfs/mysql
index 5f87c2f2db..8c739c26ac 100644
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 5.0.24a
+VER        = 5.0.96
 
 THISAPP    = mysql-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mysql
-PAK_VER    = 1
+PAK_VER    = 3
+
+CFLAGS    += -fno-strict-aliasing
+CXXFLAGS  += -std=gnu++98
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6b07546389f75c52611adb7af38c3667
+$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79
 
 install : $(TARGET)
 
@@ -77,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && C_EXTRA_FLAGS=-fno-strict-aliasing
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 		            --sysconfdir=/etc \
 		            --libexecdir=/usr/sbin \
@@ -91,15 +92,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		            --without-readline \
 		            --with-berkeley-db \
 		            --with-extra-charsets=all
-	cd $(DIR_APP) && make testdir=/tmp/mysql
+	cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING)
 	cd $(DIR_APP) && make testdir=/tmp/mysql install
 	rm -rf /tmp/mysql
 	cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
-	install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+	install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
 	mkdir -p /srv/mysql
-	mysql_install_db --user=mysql --force
-	chgrp -v mysql /srv/mysql{,/test,/mysql}
 	chown mysql.mysql /srv/mysql/
 	install -v -m755 -o mysql -g mysql -d /var/run/mysql
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \
+		/var/ipfire/backup/addons/includes/mysql
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,mysql)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)