From 5209a633c057213baacfa5525a228576aa5cc6a1 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Tue, 9 Jul 2013 23:37:24 -0500
Subject: [PATCH] system/mariadb: Removed (included in Slackware 14.1)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/mariadb/README             |  20 ----
 system/mariadb/doinst.sh          |  32 ------
 system/mariadb/mariadb.SlackBuild | 170 ------------------------------
 system/mariadb/mariadb.info       |  10 --
 system/mariadb/rc.mysqld          |  89 ----------------
 system/mariadb/slack-desc         |  19 ----
 6 files changed, 340 deletions(-)
 delete mode 100644 system/mariadb/README
 delete mode 100644 system/mariadb/doinst.sh
 delete mode 100644 system/mariadb/mariadb.SlackBuild
 delete mode 100644 system/mariadb/mariadb.info
 delete mode 100644 system/mariadb/rc.mysqld
 delete mode 100644 system/mariadb/slack-desc

diff --git a/system/mariadb/README b/system/mariadb/README
deleted file mode 100644
index d4c88cdc14..0000000000
--- a/system/mariadb/README
+++ /dev/null
@@ -1,20 +0,0 @@
-MariaDB is a backward compatible, drop-in replacement branch of the
-MySQL(R) Database Server.  It includes all major open source storage
-engines, including the Aria storage engine.
-
-This conflicts with Slackware's mysql package. Do NOT install both!
-
-This conflicts with mytop, as MariaDB already ships with its own
-version of mytop.
-
-If you want to build the embedded mysql server (libmysqld), which
-you will need if you plan to (re)build amarok, then run the script
-with EMBEDDED=yes in the environment, but be aware that because
-mariadb builds this as shared library, applications linking it
-will no longer work with Slackware's mysql package.
-
-Note that the default storage engine for InnoDB tables in MariaDB is
-XtraDB. If you want to use Oracle's InnoDB plugin, read the notes
-in rc.mysqld.
-
-libevent is an optional dependency of mariadb.
diff --git a/system/mariadb/doinst.sh b/system/mariadb/doinst.sh
deleted file mode 100644
index 7d28e15d56..0000000000
--- a/system/mariadb/doinst.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.mysqld.new
-config etc/mysqlaccess.conf.new
-config etc/logrotate.d/mysql.new
-config etc/my.cnf.new
-config etc/my.cnf.d/client.cnf.new
-config etc/my.cnf.d/mysql-clients.cnf.new
-config etc/my.cnf.d/server.cnf.new
-
diff --git a/system/mariadb/mariadb.SlackBuild b/system/mariadb/mariadb.SlackBuild
deleted file mode 100644
index 70e5fe88a1..0000000000
--- a/system/mariadb/mariadb.SlackBuild
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# Copyright 2011-2012  Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Build and install MySQL on Slackware
-# by:  David Cantrell <david@slackware.com>
-# MySQL version maintained by:  Patrick Volkerding <volkerdi@slackware.com>
-# MariaDB version maintained by:  Heinz Wiesinger <pprkut@liwjatan.at>
-
-PRGNAM=mariadb
-VERSION=5.5.28a
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "${EMBEDDED:-no}" = "no" ]; then
-  embed="OFF"
-else
-  embed="ON"
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir build
-cd build
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \
-  -DBUILD_CONFIG=mysql_release \
-  -DFEATURE_SET="community" \
-  -DINSTALL_LAYOUT="RPM" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DINSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
-  -DINSTALL_SBINDIR=libexec \
-  -DINSTALL_INCLUDEDIR=include/mysql \
-  -DINSTALL_MYSQLSHAREDIR=share/mysql \
-  -DINSTALL_SQLBENCHDIR= \
-  -DINSTALL_MYSQLTESTDIR=mysql-test \
-  -DINSTALL_MANDIR=man \
-  -DINSTALL_PLUGINDIR="lib${LIBDIRSUFFIX}/mysql/plugin" \
-  -DINSTALL_SCRIPTDIR=bin \
-  -DINSTALL_SUPPORTFILESDIR=share/mysql \
-  -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \
-  -DINSTALL_DOCREADMEDIR="doc/$PRGNAM-$VERSION" \
-  -DINSTALL_DOCDIR="doc/$PRGNAM-$VERSION" \
-  -DMYSQL_DATADIR="/var/lib/mysql" \
-  -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \
-  -DWITH_EXTRA_CHARSETS=complex \
-  -DENABLED_LOCAL_INFILE=ON \
-  -DWITH_EMBEDDED_SERVER=$embed \
-  -DWITH_READLINE=ON \
-  -DWITH_SSL=system \
-  -DWITH_ZLIB=system \
-  -DUSE_ARIA_FOR_TMP_TABLES=ON \
-  -DMANUFACTURER="Slackware" \
-  ..
-
-make
-make install DESTDIR=$PKG
-
-# Leave build directory:
-cd ..
-
-# remove static client libraries
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.a
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqld.a
-
-# The ./configure option to omit this has gone away, so we'll omit it
-# the old-fashioned way.  It's all in the source tarball if you need it.
-rm -rf $PKG/usr/sql-bench
-
-# Do not include the test suite:
-rm -rf $PKG/usr/mysql-test
-
-# This is the directory where databases are stored
-mkdir -p $PKG/var/lib/mysql
-chown mysql.mysql $PKG/var/lib/mysql
-chmod 0750 $PKG/var/lib/mysql
-
-# This is where the socket is stored
-mkdir -p $PKG/var/run/mysql
-chown mysql.mysql $PKG/var/run/mysql
-chmod 0755 $PKG/var/run/mysql
-
-# Add init script:
-mkdir -p $PKG/etc/rc.d
-# This is intentionally chmod 644.
-cat $CWD/rc.mysqld > $PKG/etc/rc.d/rc.mysqld.new
-rm -rf $PKG/etc/init.d
-
-# Install mysqlaccess.conf
-install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new
-
-# Mark config files under /etc as .new
-mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new
-mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new
-for i in client mysql-clients server; do
-  mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new
-done
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mariadb/mariadb.info b/system/mariadb/mariadb.info
deleted file mode 100644
index f8aee2b176..0000000000
--- a/system/mariadb/mariadb.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mariadb"
-VERSION="5.5.28a"
-HOMEPAGE="http://mariadb.org/"
-DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz"
-MD5SUM="a2d20a040ef1e49944a4ffe65ed7fefa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-TermReadKey"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/mariadb/rc.mysqld b/system/mariadb/rc.mysqld
deleted file mode 100644
index 3dd1ce36f8..0000000000
--- a/system/mariadb/rc.mysqld
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# Start/stop/restart mysqld.
-#
-# Copyright 2003  Patrick J. Volkerding, Concord, CA
-# Copyright 2003  Slackware Linux, Inc., Concord, CA
-# Copyright 2008  Patrick J. Volkerding, Sebeka, MN
-#
-# This program comes with NO WARRANTY, to the extent permitted by law.
-# You may redistribute copies of this program under the terms of the
-# GNU General Public License.
-
-# To start MySQL automatically at boot, be sure this script is executable:
-# chmod 755 /etc/rc.d/rc.mysqld
-
-# Before you can run MySQL, you must have a database.  To install an initial
-# database, do this as root:
-#
-#   mysql_install_db --user=mysql
-#
-# Note that the mysql user must exist in /etc/passwd, and the created files
-# will be owned by this dedicated user.  This is important, or else mysql
-# (which runs as user "mysql") will not be able to write to the database
-# later (this can be fixed with 'chown -R mysql.mysql /var/lib/mysql').
-#
-# To increase system security, consider using "mysql_secure_installation"
-# as well.  For more information on this tool, please read:
-#   man mysql_secure_installation
-
-# To allow outside connections to the database comment out the next line.
-# If you don't need incoming network connections, then leave the line
-# uncommented to improve system security.
-SKIP="--skip-networking"
-
-# Uncomment the next line to use Oracle's InnoDB plugin instead of the included XtraDB
-#INNODB="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb.so"
-
-# Start mysqld:
-mysqld_start() {
-  if [ -x /usr/bin/mysqld_safe ]; then
-    # If there is an old PID file (no mysqld running), clean it up:
-    if [ -r /var/run/mysql/mysql.pid ]; then
-      if ! ps axc | grep mysqld 1> /dev/null 2> /dev/null ; then
-        echo "Cleaning up old /var/run/mysql/mysql.pid."
-        rm -f /var/run/mysql/mysql.pid
-      fi
-    fi
-    /usr/bin/mysqld_safe --datadir=/var/lib/mysql --pid-file=/var/run/mysql/mysql.pid $SKIP $INNODB &
-  fi
-}
-
-# Stop mysqld:
-mysqld_stop() {
-  # If there is no PID file, ignore this request...
-  if [ -r /var/run/mysql/mysql.pid ]; then
-    killall mysqld
-    # Wait at least one minute for it to exit, as we don't know how big the DB is...
-    for second in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 \
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 60 ; do
-      if [ ! -r /var/run/mysql/mysql.pid ]; then
-        break;
-      fi
-      sleep 1
-    done
-    if [ "$second" = "60" ]; then
-      echo "WARNING:  Gave up waiting for mysqld to exit!"
-      sleep 15
-    fi
-  fi
-}
-
-# Restart mysqld:
-mysqld_restart() {
-  mysqld_stop
-  mysqld_start
-}
-
-case "$1" in
-'start')
-  mysqld_start
-  ;;
-'stop')
-  mysqld_stop
-  ;;
-'restart')
-  mysqld_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/mariadb/slack-desc b/system/mariadb/slack-desc
deleted file mode 100644
index f046f37cf4..0000000000
--- a/system/mariadb/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-mariadb: mariadb (Drop-in replacement for the MySQL Database Server)
-mariadb:
-mariadb: MariaDB is a backward compatible, drop-in replacement branch of the
-mariadb: MySQL(R) Database Server. It includes all major open source storage
-mariadb: engines, including the Maria storage engine.
-mariadb:
-mariadb: Homepage: http://mariadb.org/
-mariadb:
-mariadb:
-mariadb:
-mariadb: