summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-26 21:45:20 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-26 21:45:20 -0300
commite5bcf4a12c8ca8014b3d3b21d6553c9195a8fcb3 (patch)
tree6f951a8a105d411bd5d104b7d4148ad5649a73d0 /libre
parent870a13606c5d9d797a9f4dd78c990ac72fb59125 (diff)
parentfe1e5b0c12de72e6ca27ad36b318603c1ad3ba28 (diff)
downloadabslibre-e5bcf4a12c8ca8014b3d3b21d6553c9195a8fcb3.tar.gz
abslibre-e5bcf4a12c8ca8014b3d3b21d6553c9195a8fcb3.tar.bz2
abslibre-e5bcf4a12c8ca8014b3d3b21d6553c9195a8fcb3.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/abuse-libre/PKGBUILD2
-rw-r--r--libre/atool-libre/PKGBUILD2
-rw-r--r--libre/audacity-libre/PKGBUILD2
-rw-r--r--libre/blackbox-libre/PKGBUILD2
-rw-r--r--libre/blender-addon-luxrender/PKGBUILD2
-rw-r--r--libre/epdfview-libre/PKGBUILD2
-rw-r--r--libre/lilo/PKGBUILD2
-rw-r--r--libre/mariadb/PKGBUILD141
-rw-r--r--libre/mariadb/mariadb.install26
-rwxr-xr-xlibre/mariadb/mariadbd77
-rw-r--r--libre/mariadb/my.cnf145
-rw-r--r--libre/mariadb/mysql.install26
-rw-r--r--libre/mariadb/mysqld77
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD2
14 files changed, 8 insertions, 500 deletions
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 196fb2c85..1b7ed9072 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
# Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=abuse
pkgname=abuse-libre
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index ea1dfec52..0745630ad 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: leif_thande <leif.thande@gmail.com>
# Contributor: tranquility <trankas@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=atool
pkgname=atool-libre
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index 6d6f287b3..610404545 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=audacity
pkgname=audacity-libre
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index c76d7cba5..1c0c49a15 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: durbatuluk <dvdscripter@gmail.org>
# Contributor: Steve Ponsford <sp4d@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=blackbox
pkgname=${_pkgname}-libre
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 6637e134c..040eeccf4 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=blender-addon-luxrender
_pkgname=${pkgname:14:3}${pkgname::5}25
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 28c77eed8..626e653f2 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Tom K <tomk@runbox.com>
# Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=epdfview-libre
_pkgname=epdfview
diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD
index a896613ee..7bca08571 100644
--- a/libre/lilo/PKGBUILD
+++ b/libre/lilo/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=lilo
pkgver=23.2
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD
deleted file mode 100644
index a5b733e9f..000000000
--- a/libre/mariadb/PKGBUILD
+++ /dev/null
@@ -1,141 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
-
-falsename=mysql
-_falsename=MySQL
-pkgbase=mariadb
-_pkgbase=MariaDB
-pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}")
-pkgver=5.5.23
-pkgrel=1.5
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.${pkgbase}.org/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz"
- "${falsename}d"
- 'my.cnf')
-md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f'
- '2234207625baa29b2ff7d7b4f088abce'
- '1c949c0dbea5206af0db14942d9927b6')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
-
- # CFLAGS/CXXFLAGS as suggested upstream
- CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
- CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONFDIR=/etc/${falsename} \
- -DMYSQL_DATADIR=/var/lib/${falsename} \
- -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_unicode_ci \
- -DENABLED_LOCAL_INFILE=ON \
- -DINSTALL_INFODIR=share/${falsename}/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/${falsename} \
- -DINSTALL_DOCREADMEDIR=share/${falsename} \
- -DINSTALL_SUPPORTFILESDIR=share/${falsename} \
- -DINSTALL_MYSQLSHAREDIR=share/${falsename} \
- -DINSTALL_DOCDIR=share/${falsename}/docs \
- -DINSTALL_SHAREDIR=share/${falsename} \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_LIBWRAP=OFF \
- -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITH_PBXT_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-
- make
-}
-
-package_libmariadbclient(){
- pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})"
- depends=('openssl')
- conflicts=("lib${falsename}client")
- provides=("lib${falsename}client=${pkgver}")
-
- cd "${srcdir}"/build
- for dir in include lib${falsename} lib${falsename}d libservices; do
- make -C ${dir} DESTDIR="${pkgdir}" install
- done
-
- install -d "${pkgdir}"/usr/bin
- install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/
- install -d "${pkgdir}"/usr/share/man/man1
- for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do
- install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-}
-
-package_mariadb-clients(){
- pkgdesc="${_pkgbase} client tools (branch of ${_falsename})"
- depends=("lib${pkgbase}client")
- conflicts=("${falsename}-clients")
- provides=("${falsename}-clients=${pkgver}")
-
- cd "${srcdir}"/build
- make -C client DESTDIR="${pkgdir}" install
-
- # install man pages
- install -d "${pkgdir}"/usr/share/man/man1
- for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do
- install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
- done
-
- # provided by mariadb
- rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test}
-}
-
-package_mariadb(){
- pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}"
- backup=("etc/${pkgbase}/my.cnf")
- install=${falsename}.install
- depends=("${pkgbase}-clients")
- optdepends=('perl-dbi' "perl-dbd-${falsename}")
- conflicts=("${falsename}")
- provides=("${falsename}=${pkgver}")
- options=('emptydirs')
-
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf
- install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d
-
- # provided by libmariadbclient
- rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}
- rm "${pkgdir}"/usr/lib/lib${falsename}*
- rm -r "${pkgdir}"/usr/include/
- rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1
-
- # provided by mariadb-clients
- rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}
- rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1
-
- # not needed
- rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench}
- rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1
-
- install -dm700 "${pkgdir}"/var/lib/${falsename}
-}
diff --git a/libre/mariadb/mariadb.install b/libre/mariadb/mariadb.install
deleted file mode 100644
index f56a0dcaa..000000000
--- a/libre/mariadb/mariadb.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
- groupadd -g 89 mysql &>/dev/null
- useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null
- /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb
- chown -R mysql:mysql /var/lib/mariadb &>/dev/null
-}
-
-post_upgrade(){
- getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
- getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null
-
- if [ "$(vercmp $2 5.5)" -lt 0 ]; then
- echo " >> "
- echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
- echo " >> "
- fi
-}
-
-post_remove(){
- if getent passwd mysql >/dev/null 2>&1; then
- userdel mysql
- fi
- if getent group mysql >/dev/null 2>&1; then
- groupdel mysql
- fi
-}
diff --git a/libre/mariadb/mariadbd b/libre/mariadb/mariadbd
deleted file mode 100755
index 3ae612096..000000000
--- a/libre/mariadb/mariadbd
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
- echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
- start)
- stat_busy "Starting MariaDB Server"
- [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null
- if [ -z "$(getPID)" ]; then
- /usr/bin/mysqld_safe --user=mysql &>/dev/null &
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- timeo=30
- while [ $timeo -gt 0 ]; do
- response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
- echo "$response" | grep -q "mysqld is alive" && break
- sleep 1
- let timeo=${timeo}-1
- done
- if [ $timeo -eq 0 ]; then
- stat_fail
- exit 1
- else
- echo $(getPID) > /var/run/mariadb/mariadb.pid
- add_daemon mysqld
- stat_done
- fi
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping MariaDB Server"
- if [ ! -z "$(getPID)" ]; then
- timeo=30
- kill $(getPID) &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- fi
- while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
- sleep 1
- let timeo=${timeo}-1
- done
- if [ -z "$(getPID)" ]; then
- rm -f /var/run/mariadb/mariadb.pid &>/dev/null
- rm_daemon mysqld
- stat_done
- else
- stat_fail
- exit 1
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/libre/mariadb/my.cnf b/libre/mariadb/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/libre/mariadb/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password = your_password
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-datadir = /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id = 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-# the syntax is:
-#
-# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-# MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-# where you replace <host>, <user>, <password> by quoted strings and
-# <port> by the master's port number (3306 by default).
-#
-# Example:
-#
-# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-# MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-# start replication for the first time (even unsuccessfully, for example
-# if you mistyped the password in master-password and the slave fails to
-# connect), the slave will create a master.info file, and any later
-# change in this file to the variables' values below will be ignored and
-# overridden by the content of the master.info file, unless you shutdown
-# the slave server, delete master.info and restart the slaver server.
-# For that reason, you may want to leave the lines below untouched
-# (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id = 2
-#
-# The replication master for this slave - required
-#master-host = <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user = <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password = <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port = <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install
deleted file mode 100644
index 9a4479215..000000000
--- a/libre/mariadb/mysql.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install(){
- groupadd -g 89 mysql &>/dev/null
- useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
- usr/bin/mysql_install_db --user=mysql --basedir=/usr
- chown -R mysql:mysql var/lib/mysql &>/dev/null
-}
-
-post_upgrade(){
- getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
- getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
- if [ "$(vercmp $2 5.5)" -lt 0 ]; then
- echo " >> "
- echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
- echo " >> "
- fi
-}
-
-post_remove(){
- if getent passwd mysql >/dev/null 2>&1; then
- userdel mysql
- fi
- if getent group mysql >/dev/null 2>&1; then
- groupdel mysql
- fi
-}
diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld
deleted file mode 100644
index 1ac88a7cc..000000000
--- a/libre/mariadb/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
- echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
- start)
- stat_busy "Starting MySQL Server"
- [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
- if [ -z "$(getPID)" ]; then
- /usr/bin/mysqld_safe --user=mysql &>/dev/null &
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- timeo=30
- while [ $timeo -gt 0 ]; do
- response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
- echo "$response" | grep -q "mysqld is alive" && break
- sleep 1
- let timeo=${timeo}-1
- done
- if [ $timeo -eq 0 ]; then
- stat_fail
- exit 1
- else
- echo $(getPID) > /var/run/mysqld/mysqld.pid
- add_daemon mysqld
- stat_done
- fi
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping MySQL Server"
- if [ ! -z "$(getPID)" ]; then
- timeo=30
- kill $(getPID) &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- fi
- while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
- sleep 1
- let timeo=${timeo}-1
- done
- if [ -z "$(getPID)" ]; then
- rm -f /var/run/mysqld/mysqld.pid &>/dev/null
- rm_daemon mysqld
- stat_done
- else
- stat_fail
- exit 1
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 0d1d14cd0..b2e362899 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Figue <ffigue at gmail>
# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>