Drop MySQL

This is outdated and still on 5.0.x and nobody volunteered to
update this package.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/backup/includes/mysql b/config/backup/includes/mysql
deleted file mode 100644 (file)
index bcb837c..0000000
--- a/config/backup/includes/mysql
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/my.cnf
-/srv/mysql

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 486077a9e69e88c508d12f0893e01567d53a6544..aea72fc3f4c82d83aa7b2fc00cff0b46970bf09a 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -78,7 +78,6 @@ include "/etc/collectd.precache"
        Process "mpd"
        Process "asterisk"
        Process "java"
        Process "mpd"
        Process "asterisk"
        Process "java"

-       Process "mysqld"

        Process "spamd"
 </Plugin>
 
        Process "spamd"
 </Plugin>
 

diff --git a/config/etc/group b/config/etc/group
index 03f5dce0b954d02382715f61cd85b53d1316e9fb..198b68aa36f051fb2d5af20ad19129499f52a16e 100644 (file)
--- a/config/etc/group
+++ b/config/etc/group
@@ -17,7 +17,6 @@ utmp:x:22:
 squid:x:23:nobody
 ntp:x:38:
 dip:x:40:
 squid:x:23:nobody
 ntp:x:38:
 dip:x:40:

-mysql:x:41:

 ftp:x:45:
 rsyncd:x:48:
 stunnel:x:51:
 ftp:x:45:
 rsyncd:x:48:
 stunnel:x:51:

diff --git a/config/etc/passwd b/config/etc/passwd
index 247faa2a172c4ba103f80de6c6414430c4a320e4..7eb4718f147360d4d999c5b2a4aeb68b2e0905cf 100644 (file)
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -4,7 +4,6 @@ daemon:x:2:2:daemon:/sbin:/bin/false
 mail:x:8:12:mail:/var/spool/mail:/bin/false
 squid:x:23:23:ftp:/var/spool/squid:/bin/false
 ntp:x:38:38::/etc/ntp:/bin/false
 mail:x:8:12:mail:/var/spool/mail:/bin/false
 squid:x:23:23:ftp:/var/spool/squid:/bin/false
 ntp:x:38:38::/etc/ntp:/bin/false

-mysql:x:41:41:MySQL Server:/dev/null:/bin/false

 ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
 rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
 stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
 ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
 rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
 stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false

diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf
deleted file mode 100644 (file)
index d9b75e8..0000000
--- a/config/mysql/my.cnf
+++ /dev/null
@@ -1,23 +0,0 @@
-[client]
-password = mysqlfire
-port = 3306
-socket = /var/run/mysql/mysql.sock
-
-[mysqld]
-port = 3306
-socket = /var/run/mysql/mysql.sock
-datadir = /srv/mysql
-bind-address=127.0.0.1
-
-[mysql.server]
-user=mysql
-basedir=/var/lib
-
-[mysqld_safe]
-log-error=/var/log/mysqld.log
-#pid-file=/var/run/mysqld/mysqld.pid
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates

diff --git a/config/rootfiles/common/mysql-libs b/config/rootfiles/common/mysql-libs
deleted file mode 100644 (file)
index 6eb0384..0000000
--- a/config/rootfiles/common/mysql-libs
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libmysqlclient.so.15
-usr/lib/libmysqlclient.so.15.0.0
-usr/lib/libmysqlclient_r.so.15
-usr/lib/libmysqlclient_r.so.15.0.0
-usr/lib/mysql/libmysqlclient.so
-usr/lib/mysql/libmysqlclient.so.15
-usr/lib/mysql/libmysqlclient.so.15.0.0
-usr/lib/mysql/libmysqlclient_r.so
-usr/lib/mysql/libmysqlclient_r.so.15
-usr/lib/mysql/libmysqlclient_r.so.15.0.0

diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files
index 3190c396414c3b41dd9187c3b9a53bcebf6c3a58..57a75db9a8bf265cec5a760627921bada54e8968 100644 (file)
--- a/config/rootfiles/core/119/filelists/files
+++ b/config/rootfiles/core/119/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
 etc/system-release
 etc/issue

+etc/rc.d/init.d/cleanfs

 etc/rc.d/init.d/unbound
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 etc/rc.d/init.d/unbound
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi

diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh
index 9f29ce2ce24ce1ae3ee64b22547db40ca9a50584..161cb6242a33e22261cf001595551ce53b76cb65 100644 (file)
--- a/config/rootfiles/core/119/update.sh
+++ b/config/rootfiles/core/119/update.sh
@@ -57,7 +57,7 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # remove dropped packages
 /usr/local/bin/update-lang-cache
 
 # remove dropped packages

-for package in lcr; do
+for package in lcr mysql; do

        if [ -e /opt/pakfire/db/installed/meta-$package ]; then
                pakfire remove -y $package
        fi
        if [ -e /opt/pakfire/db/installed/meta-$package ]; then
                pakfire remove -y $package
        fi


@@ -66,6 +66,11 @@ for package in lcr; do
        rm -f /opt/pakfire/db/rootfiles/$package
 done
 
        rm -f /opt/pakfire/db/rootfiles/$package
 done
 

+# Remove more old files
+rm -vf \
+       /usr/lib/libmysqlclient* \
+       /usr/lib/mysql
+

 # Start services
 
 # This update need a reboot...
 # Start services
 
 # This update need a reboot...

diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
deleted file mode 100644 (file)
index 2923246..0000000
--- a/config/rootfiles/packages/mysql
+++ /dev/null
@@ -1,302 +0,0 @@
-etc/my.cnf
-etc/rc.d/init.d/mysql
-srv/mysql
-#srv/mysql/mysql
-#srv/mysql/mysql/columns_priv.MYD
-#srv/mysql/mysql/columns_priv.MYI
-#srv/mysql/mysql/columns_priv.frm
-#srv/mysql/mysql/db.MYD
-#srv/mysql/mysql/db.MYI
-#srv/mysql/mysql/db.frm
-#srv/mysql/mysql/func.MYD
-#srv/mysql/mysql/func.MYI
-#srv/mysql/mysql/func.frm
-#srv/mysql/mysql/help_category.MYD
-#srv/mysql/mysql/help_category.MYI
-#srv/mysql/mysql/help_category.frm
-#srv/mysql/mysql/help_keyword.MYD
-#srv/mysql/mysql/help_keyword.MYI
-#srv/mysql/mysql/help_keyword.frm
-#srv/mysql/mysql/help_relation.MYD
-#srv/mysql/mysql/help_relation.MYI
-#srv/mysql/mysql/help_relation.frm
-#srv/mysql/mysql/help_topic.MYD
-#srv/mysql/mysql/help_topic.MYI
-#srv/mysql/mysql/help_topic.frm
-#srv/mysql/mysql/host.MYD
-#srv/mysql/mysql/host.MYI
-#srv/mysql/mysql/host.frm
-#srv/mysql/mysql/proc.MYD
-#srv/mysql/mysql/proc.MYI
-#srv/mysql/mysql/proc.frm
-#srv/mysql/mysql/procs_priv.MYD
-#srv/mysql/mysql/procs_priv.MYI
-#srv/mysql/mysql/procs_priv.frm
-#srv/mysql/mysql/tables_priv.MYD
-#srv/mysql/mysql/tables_priv.MYI
-#srv/mysql/mysql/tables_priv.frm
-#srv/mysql/mysql/time_zone.MYD
-#srv/mysql/mysql/time_zone.MYI
-#srv/mysql/mysql/time_zone.frm
-#srv/mysql/mysql/time_zone_leap_second.MYD
-#srv/mysql/mysql/time_zone_leap_second.MYI
-#srv/mysql/mysql/time_zone_leap_second.frm
-#srv/mysql/mysql/time_zone_name.MYD
-#srv/mysql/mysql/time_zone_name.MYI
-#srv/mysql/mysql/time_zone_name.frm
-#srv/mysql/mysql/time_zone_transition.MYD
-#srv/mysql/mysql/time_zone_transition.MYI
-#srv/mysql/mysql/time_zone_transition.frm
-#srv/mysql/mysql/time_zone_transition_type.MYD
-#srv/mysql/mysql/time_zone_transition_type.MYI
-#srv/mysql/mysql/time_zone_transition_type.frm
-#srv/mysql/mysql/user.MYD
-#srv/mysql/mysql/user.MYI
-#srv/mysql/mysql/user.frm
-usr/bin/comp_err
-usr/bin/innochecksum
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisam_ftdump
-usr/bin/myisamchk
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/mysql
-usr/bin/mysql_client_test
-usr/bin/mysql_config
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_explain_log
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysql_fix_privilege_tables
-usr/bin/mysql_install_db
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tableinfo
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
-usr/bin/mysql_upgrade_shell
-usr/bin/mysql_waitpid
-usr/bin/mysql_zap
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqlbinlog
-usr/bin/mysqlbug
-usr/bin/mysqlcheck
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysqlhotcopy
-usr/bin/mysqlimport
-usr/bin/mysqlshow
-usr/bin/mysqltest
-usr/bin/mysqltestmanager
-usr/bin/mysqltestmanager-pwgen
-usr/bin/mysqltestmanagerc
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-#usr/include/mysql
-#usr/include/mysql/decimal.h
-#usr/include/mysql/errmsg.h
-#usr/include/mysql/keycache.h
-#usr/include/mysql/m_ctype.h
-#usr/include/mysql/m_string.h
-#usr/include/mysql/my_alloc.h
-#usr/include/mysql/my_attribute.h
-#usr/include/mysql/my_config.h
-#usr/include/mysql/my_dbug.h
-#usr/include/mysql/my_dir.h
-#usr/include/mysql/my_getopt.h
-#usr/include/mysql/my_global.h
-#usr/include/mysql/my_list.h
-#usr/include/mysql/my_net.h
-#usr/include/mysql/my_no_pthread.h
-#usr/include/mysql/my_pthread.h
-#usr/include/mysql/my_sys.h
-#usr/include/mysql/my_xml.h
-#usr/include/mysql/mysql.h
-#usr/include/mysql/mysql_com.h
-#usr/include/mysql/mysql_embed.h
-#usr/include/mysql/mysql_time.h
-#usr/include/mysql/mysql_version.h
-#usr/include/mysql/mysqld_ername.h
-#usr/include/mysql/mysqld_error.h
-#usr/include/mysql/raid.h
-#usr/include/mysql/sql_common.h
-#usr/include/mysql/sql_state.h
-#usr/include/mysql/sslopt-case.h
-#usr/include/mysql/sslopt-longopts.h
-#usr/include/mysql/sslopt-vars.h
-#usr/include/mysql/typelib.h
-#usr/lib/libmysqlclient.so
-#usr/lib/libmysqlclient.so.15
-#usr/lib/libmysqlclient.so.15.0.0
-#usr/lib/libmysqlclient_r.so
-#usr/lib/libmysqlclient_r.so.15
-#usr/lib/libmysqlclient_r.so.15.0.0
-#usr/lib/mysql
-#usr/lib/mysql/libdbug.a
-#usr/lib/mysql/libheap.a
-#usr/lib/mysql/libmyisam.a
-#usr/lib/mysql/libmyisammrg.a
-#usr/lib/mysql/libmysqlclient.a
-#usr/lib/mysql/libmysqlclient.la
-#usr/lib/mysql/libmysqlclient.so
-#usr/lib/mysql/libmysqlclient.so.15
-#usr/lib/mysql/libmysqlclient.so.15.0.0
-#usr/lib/mysql/libmysqlclient_r.a
-#usr/lib/mysql/libmysqlclient_r.la
-#usr/lib/mysql/libmysqlclient_r.so
-#usr/lib/mysql/libmysqlclient_r.so.15
-#usr/lib/mysql/libmysqlclient_r.so.15.0.0
-#usr/lib/mysql/libmystrings.a
-#usr/lib/mysql/libmysys.a
-#usr/lib/mysql/libvio.a
-usr/sbin/mysqld
-usr/sbin/mysqlmanager
-#usr/share/info/mysql.info
-#usr/share/man/man1/comp_err.1
-#usr/share/man/man1/innochecksum.1
-#usr/share/man/man1/msql2mysql.1
-#usr/share/man/man1/my_print_defaults.1
-#usr/share/man/man1/myisam_ftdump.1
-#usr/share/man/man1/myisamchk.1
-#usr/share/man/man1/myisamlog.1
-#usr/share/man/man1/myisampack.1
-#usr/share/man/man1/mysql-stress-test.pl.1
-#usr/share/man/man1/mysql-test-run.pl.1
-#usr/share/man/man1/mysql.1
-#usr/share/man/man1/mysql.server.1
-#usr/share/man/man1/mysql_client_test.1
-#usr/share/man/man1/mysql_config.1
-#usr/share/man/man1/mysql_convert_table_format.1
-#usr/share/man/man1/mysql_explain_log.1
-#usr/share/man/man1/mysql_find_rows.1
-#usr/share/man/man1/mysql_fix_extensions.1
-#usr/share/man/man1/mysql_fix_privilege_tables.1
-#usr/share/man/man1/mysql_install_db.1
-#usr/share/man/man1/mysql_secure_installation.1
-#usr/share/man/man1/mysql_setpermission.1
-#usr/share/man/man1/mysql_tableinfo.1
-#usr/share/man/man1/mysql_tzinfo_to_sql.1
-#usr/share/man/man1/mysql_upgrade.1
-#usr/share/man/man1/mysql_waitpid.1
-#usr/share/man/man1/mysql_zap.1
-#usr/share/man/man1/mysqlaccess.1
-#usr/share/man/man1/mysqladmin.1
-#usr/share/man/man1/mysqlbinlog.1
-#usr/share/man/man1/mysqlbug.1
-#usr/share/man/man1/mysqlcheck.1
-#usr/share/man/man1/mysqld_multi.1
-#usr/share/man/man1/mysqld_safe.1
-#usr/share/man/man1/mysqldump.1
-#usr/share/man/man1/mysqldumpslow.1
-#usr/share/man/man1/mysqlhotcopy.1
-#usr/share/man/man1/mysqlimport.1
-#usr/share/man/man1/mysqlman.1
-#usr/share/man/man1/mysqlshow.1
-#usr/share/man/man1/mysqltest.1
-#usr/share/man/man1/perror.1
-#usr/share/man/man1/replace.1
-#usr/share/man/man1/resolve_stack_dump.1
-#usr/share/man/man1/resolveip.1
-#usr/share/man/man1/safe_mysqld.1
-#usr/share/man/man8/mysqld.8
-#usr/share/man/man8/mysqlmanager.8
-usr/share/mysql
-#usr/share/mysql/binary-configure
-#usr/share/mysql/charsets
-#usr/share/mysql/charsets/Index.xml
-#usr/share/mysql/charsets/README
-#usr/share/mysql/charsets/armscii8.xml
-#usr/share/mysql/charsets/ascii.xml
-#usr/share/mysql/charsets/cp1250.xml
-#usr/share/mysql/charsets/cp1251.xml
-#usr/share/mysql/charsets/cp1256.xml
-#usr/share/mysql/charsets/cp1257.xml
-#usr/share/mysql/charsets/cp850.xml
-#usr/share/mysql/charsets/cp852.xml
-#usr/share/mysql/charsets/cp866.xml
-#usr/share/mysql/charsets/dec8.xml
-#usr/share/mysql/charsets/geostd8.xml
-#usr/share/mysql/charsets/greek.xml
-#usr/share/mysql/charsets/hebrew.xml
-#usr/share/mysql/charsets/hp8.xml
-#usr/share/mysql/charsets/keybcs2.xml
-#usr/share/mysql/charsets/koi8r.xml
-#usr/share/mysql/charsets/koi8u.xml
-#usr/share/mysql/charsets/latin1.xml
-#usr/share/mysql/charsets/latin2.xml
-#usr/share/mysql/charsets/latin5.xml
-#usr/share/mysql/charsets/latin7.xml
-#usr/share/mysql/charsets/macce.xml
-#usr/share/mysql/charsets/macroman.xml
-#usr/share/mysql/charsets/swe7.xml
-#usr/share/mysql/czech
-#usr/share/mysql/czech/errmsg.sys
-#usr/share/mysql/danish
-#usr/share/mysql/danish/errmsg.sys
-#usr/share/mysql/dutch
-#usr/share/mysql/dutch/errmsg.sys
-#usr/share/mysql/english
-#usr/share/mysql/english/errmsg.sys
-#usr/share/mysql/errmsg.txt
-#usr/share/mysql/estonian
-#usr/share/mysql/estonian/errmsg.sys
-#usr/share/mysql/fill_help_tables.sql
-#usr/share/mysql/french
-#usr/share/mysql/french/errmsg.sys
-#usr/share/mysql/german
-#usr/share/mysql/german/errmsg.sys
-#usr/share/mysql/greek
-#usr/share/mysql/greek/errmsg.sys
-#usr/share/mysql/hungarian
-#usr/share/mysql/hungarian/errmsg.sys
-#usr/share/mysql/italian
-#usr/share/mysql/italian/errmsg.sys
-#usr/share/mysql/japanese
-#usr/share/mysql/japanese/errmsg.sys
-#usr/share/mysql/korean
-#usr/share/mysql/korean/errmsg.sys
-#usr/share/mysql/mi_test_all
-#usr/share/mysql/mi_test_all.res
-#usr/share/mysql/my-huge.cnf
-#usr/share/mysql/my-innodb-heavy-4G.cnf
-#usr/share/mysql/my-large.cnf
-#usr/share/mysql/my-medium.cnf
-#usr/share/mysql/my-small.cnf
-#usr/share/mysql/mysql-log-rotate
-#usr/share/mysql/mysql.server
-#usr/share/mysql/mysql_fix_privilege_tables.sql
-#usr/share/mysql/mysql_system_tables.sql
-#usr/share/mysql/mysql_system_tables_data.sql
-#usr/share/mysql/mysql_test_data_timezone.sql
-#usr/share/mysql/mysqld_multi.server
-#usr/share/mysql/ndb-config-2-node.ini
-#usr/share/mysql/norwegian
-#usr/share/mysql/norwegian-ny
-#usr/share/mysql/norwegian-ny/errmsg.sys
-#usr/share/mysql/norwegian/errmsg.sys
-#usr/share/mysql/polish
-#usr/share/mysql/polish/errmsg.sys
-#usr/share/mysql/portuguese
-#usr/share/mysql/portuguese/errmsg.sys
-#usr/share/mysql/romanian
-#usr/share/mysql/romanian/errmsg.sys
-#usr/share/mysql/russian
-#usr/share/mysql/russian/errmsg.sys
-#usr/share/mysql/serbian
-#usr/share/mysql/serbian/errmsg.sys
-#usr/share/mysql/slovak
-#usr/share/mysql/slovak/errmsg.sys
-#usr/share/mysql/spanish
-#usr/share/mysql/spanish/errmsg.sys
-#usr/share/mysql/swedish
-#usr/share/mysql/swedish/errmsg.sys
-#usr/share/mysql/ukrainian
-#usr/share/mysql/ukrainian/errmsg.sys
-var/ipfire/backup/addons/includes/mysql
-#var/run/mysql

diff --git a/lfs/mysql b/lfs/mysql
deleted file mode 100644 (file)
index 8c739c2..0000000
--- a/lfs/mysql
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 5.0.96
-
-THISAPP    = mysql-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = mysql
-PAK_VER    = 3
-
-CFLAGS    += -fno-strict-aliasing
-CXXFLAGS  += -std=gnu++98
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                           --sysconfdir=/etc \
-                           --libexecdir=/usr/sbin \
-                           --localstatedir=/srv/mysql \
-                           --enable-thread-safe-client \
-                           --enable-assembler \
-                           --enable-local-infile \
-                           --with-unix-socket-path=/var/run/mysql/mysql.sock \
-                           --without-debug \
-                           --without-bench \
-                           --without-readline \
-                           --with-berkeley-db \
-                           --with-extra-charsets=all
-       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 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
-       mkdir -p /srv/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)

diff --git a/make.sh b/make.sh
index 6ac0c8a5104a4622295fab019c80ca39ca6e4be5..a7197f499e05a3b23afb22a4d91f673c5a65c049 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1174,7 +1174,6 @@ buildipfire() {
   lfsmake2 libxml2
   lfsmake2 libxslt
   lfsmake2 BerkeleyDB
   lfsmake2 libxml2
   lfsmake2 libxslt
   lfsmake2 BerkeleyDB

-  lfsmake2 mysql

   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2
   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2

diff --git a/src/initscripts/packages/mysql b/src/initscripts/packages/mysql
deleted file mode 100644 (file)
index 994e3c2..0000000
--- a/src/initscripts/packages/mysql
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/mysql
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-PIDFILE=/srv/mysql/`/bin/hostname`.pid
-KILLDELAY=20
-
-case "$1" in
-       start)
-               boot_mesg -n "Starting MySQL daemon..."
-               failure=0
-               if [ -f "$PIDFILE" ]
-               then
-                       if /bin/ps p `cat $PIDFILE` | grep mysqld >/dev/null
-                       then
-                               boot_mesg "mysqld already running!" ${WARNING}
-                               echo_warning
-                               exit 0
-                       else
-                               rm -f "$PIDFILE"
-                               if [ -f "$PIDFILE" ]
-                               then
-                                       failure=1
-                               fi
-                       fi
-               fi
-               if [ "$failure" = "1" ]
-               then
-                       echo ""
-                       echo_failure
-               else
-                       echo ""
-                       /usr/bin/mysqld_safe --user=mysql 2>&1 >/dev/null &
-                       evaluate_retval
-               fi
-               ;;
-
-       stop)
-               boot_mesg -n "Stopping MySQL daemon..."
-               if [ -e "$PIDFILE" ]
-               then
-                       echo ""
-                       killproc -p ${PIDFILE} /usr/bin/mysqld_safe
-               else
-                       boot_mesg "mysqld not running!" ${WARNING}
-                       echo_warning
-                       if [ -e "$PIDFILE" ]
-                       then
-                               rm -f $PIDFILE
-                       fi
-               fi
-               ;;
-
-       restart)
-               $0 stop
-               sleep 1
-               $0 start
-               ;;
-
-       status)
-               statusproc /usr/sbin/mysqld
-               ;;
-
-       *)
-               echo "Usage: $0 {start|stop|restart|status}"
-               exit 1
-               ;;
-esac
-
-# End $rc_base/init.d/mysql

diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs
index 2d5778df938102b0381fa63e6a1d9e1ddec34fec..28bafd2a10a17b42a57eb5138886e4feb2971094 100644 (file)
--- a/src/initscripts/system/cleanfs
+++ b/src/initscripts/system/cleanfs
@@ -97,10 +97,6 @@ case "${1}" in
                if [ ! -e /var/run/dbus ]; then
                        mkdir -p /var/run/dbus
                fi
                if [ ! -e /var/run/dbus ]; then
                        mkdir -p /var/run/dbus
                fi

-               if [ ! -e /var/run/mysql ]; then
-                       mkdir -p /var/run/mysql
-                       chown mysql:mysql /var/run/mysql
-               fi

                if [ ! -e /var/run/saslauthd ]; then
                        mkdir -p /var/run/saslauthd
                fi
                if [ ! -e /var/run/saslauthd ]; then
                        mkdir -p /var/run/saslauthd
                fi

diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh
deleted file mode 100644 (file)
index 1653c9a..0000000
--- a/src/paks/mysql/install.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-
-extract_files
-
-ln -svf  ../init.d/mysql /etc/rc.d/rc0.d/K26mysql
-ln -svf  ../init.d/mysql /etc/rc.d/rc3.d/S34mysql
-ln -svf  ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
-
-# Initialise database
-mysql_install_db --user=mysql
-
-restore_backup "${NAME}"
-
-start_service "${NAME}"
-
-COUNTER=0
-while [ "$COUNTER" -lt "10" ]; do
-       [ -e "/var/run/mysql/mysql.sock" ] && break
-       echo "MySQL server is still not running. Waiting 5 seconds."
-       sleep 5
-       COUNTER=$(($COUNTER + 1))
-done 
-
-[ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \
-       exit 1)
-
-mysqladmin -u root --password='' password 'mysqlfire'

diff --git a/src/paks/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh
deleted file mode 100644 (file)
index a312b2e..0000000
--- a/src/paks/mysql/uninstall.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-
-# Stop the mysql service
-stop_service "${NAME}"
-
-# Make backup
-make_backup "${NAME}"
-
-remove_files
-
-# Remove start links.
-rm -rvf /etc/rc.d/rc*.d/*mysql

diff --git a/src/paks/mysql/update.sh b/src/paks/mysql/update.sh
deleted file mode 100644 (file)
index 548b9db..0000000
--- a/src/paks/mysql/update.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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        #
-# (at your option) any later version.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-
-# Create backup include file if it is missing.
-if [ ! -e "/var/ipfire/backup/addons/includes/mysql" ]; then
-       cat <<EOF > /var/ipfire/backup/addons/includes/mysql
-/etc/my.cnf
-/srv/mysql
-EOF
-fi
-
-# Stop the mysql service
-stop_service "${NAME}"
-
-# Make backup
-make_backup "${NAME}"
-
-# Update files
-remove_files
-extract_files
-
-# Restore backup
-restore_backup "${NAME}"
-
-# Restart the service
-start_service "${NAME}"
-
-exit 0