vpnmain.cgi: Disable compression by default

[ipfire-2.x.git] / lfs / mysql

diff --git a/lfs/mysql b/lfs/mysql
index 5fcd7b3acfafee2bfd1e676d03d15f9ead01f4a5..8c739c26acecdd0b6bbc5a98ac8e5fba1eadff13 100644 (file)
--- a/lfs/mysql
+++ b/lfs/mysql
@@ -32,7 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mysql
-PAK_VER    = 2
+PAK_VER    = 3
+
+CFLAGS    += -fno-strict-aliasing
+CXXFLAGS  += -std=gnu++98
 
 ###############################################################################
 # Top-level Rules
@@ -75,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 \
@@ -95,9 +98,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
        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)