[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysqld-post.sh mysqld.service)

2013-02-17 Thread Bartłomiej Piotrowski 
Date: Sunday, February 17, 2013 @ 19:32:53
  Author: bpiotrowski
Revision: 178170

upgpkg: mysql 5.5.30-2

- use sha256sums
- install my-medium.cnf as default config (it's the same as the trunk's my.cnf 
is)
- add additional condiction to mysqld.post ('access denied' means that service 
is up)
- write PID file
- make mysql's tmp private

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld-post.sh
  mysql/trunk/mysqld.service
Deleted:
  mysql/trunk/my.cnf

+
 PKGBUILD   |   17 ++
 my.cnf |  145 ---
 mysqld-post.sh |3 -
 mysqld.service |   10 +++
 4 files changed, 17 insertions(+), 158 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-17 17:21:40 UTC (rev 178169)
+++ PKGBUILD2013-02-17 18:32:53 UTC (rev 178170)
@@ -5,26 +5,23 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz;
-'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('f0cdd56f89e781e800cf223bd9edd00c'
- '1351485633baf9894cfdf7c5bbffd7b5'
- '6ea6ceb360d09a774e87335ee098ddd5'
- '2fa6e456964d4ff5e6d4f9ff0126aed6'
- 'a0e1460c276a50a9666c331de83271f2')
+'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
+sha256sums=('909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053'
+'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
+'c34048bdc994f90b067204cf0e0b6a65cb6f38c30d1145186b6a7ae3b101fe84')
 
 build() {
   mkdir build
   cd build
 
-  # CFLAGS/CXXFLAGS as suggested upstream
-
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
@@ -107,7 +104,7 @@
   cd build
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
+  install -Dm644 ${pkgdir}/usr/share/mysql/my-medium.cnf 
${pkgdir}/etc/mysql/my.cnf
   install -Dm755 ${srcdir}/mysqld-post.sh ${pkgdir}/usr/bin/mysqld-post
   install -Dm644 ${srcdir}/mysqld-tmpfile.conf 
${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf
   install -d ${pkgdir}/usr/lib/systemd/system

Deleted: my.cnf
===
--- my.cnf  2013-02-17 17:21:40 UTC (rev 178169)
+++ my.cnf  2013-02-17 18:32:53 UTC (rev 178170)
@@ -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 = /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port   = 3306
-socket = /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) -
-#

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

2012-10-09 Thread Andrea Scarpino 
Date: Tuesday, October 9, 2012 @ 02:41:47
  Author: andrea
Revision: 168353

Fix socket path (FS#31841)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |2 +-
 my.cnf   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-09 04:09:46 UTC (rev 168352)
+++ PKGBUILD2012-10-09 06:41:47 UTC (rev 168353)
@@ -15,7 +15,7 @@
 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 
'mysqld.service')
 md5sums=('da8ddb3d00e6e159153d2444360f52a8'
  'e7eb2faeab755cbb2fe03542bf328da9'
- '1c949c0dbea5206af0db14942d9927b6'
+ '1351485633baf9894cfdf7c5bbffd7b5'
  '6ea6ceb360d09a774e87335ee098ddd5'
  '2fa6e456964d4ff5e6d4f9ff0126aed6'
  'a0e1460c276a50a9666c331de83271f2')

Modified: my.cnf
===
--- my.cnf  2012-10-09 04:09:46 UTC (rev 168352)
+++ my.cnf  2012-10-09 06:41:47 UTC (rev 168353)
@@ -18,14 +18,14 @@
 [client]
 #password  = your_password
 port   = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port   = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = /run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
 skip-external-locking
 key_buffer_size = 16M

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

2010-12-22 Thread Andrea Scarpino 
Date: Wednesday, December 22, 2010 @ 08:41:29
  Author: andrea
Revision: 103660

upgpkg: mysql 5.5.8-2
enable skip-networking in default config; fix plugins and localization path

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |   16 
 my.cnf   |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-22 13:39:56 UTC (rev 103659)
+++ PKGBUILD2010-12-22 13:41:29 UTC (rev 103660)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -17,7 +17,7 @@
 'my.cnf')
 md5sums=('42e866302b61f5e213afd33e04677017'
  '2234207625baa29b2ff7d7b4f088abce'
- '69336edb8a16294b18eaec22fee7ea68')
+ '1c949c0dbea5206af0db14942d9927b6')
 
 build() {
   cd ${srcdir}
@@ -34,9 +34,12 @@
 -DMYSQL_DATADIR=/var/lib/mysql \
 -DINSTALL_INFODIR=/usr/share/mysql/docs \
 -DINSTALL_MANDIR=/usr/share/man \
+-DINSTALL_PLUGINDIR=/usr/share/mysql/lib/plugin \
 -DINSTALL_SCRIPTDIR=/usr/bin \
 -DINSTALL_DOCREADMEDIR=/usr/share/mysql \
 -DINSTALL_SUPPORTFILESDIR=/usr/share/mysql \
+-DINSTALL_MYSQLSHAREDIR=/usr/share/mysql \
+-DINSTALL_SHAREDIR=/usr/share/mysql \
 -DWITH_READLINE=OFF \
 -DWITH_SSL=system \
 -DWITH_LIBWRAP=ON \
@@ -98,9 +101,7 @@
 
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -f ${pkgdir}/usr/lib/libmysqlclient*
-  rm -f ${pkgdir}/usr/lib/libmysqld.a
-  rm -f ${pkgdir}/usr/lib/libmysqlservices.a
+  rm -rf ${pkgdir}/usr/lib/
   rm -rf ${pkgdir}/usr/include/
   
   # provided by mysql-clients
@@ -108,11 +109,10 @@
 
   # not needed
   rm -rf ${pkgdir}/usr/{mysql-test,sql-bench}
-  rm -f ${pkgdir}/usr/lib/mysql/plugin/*.a
 
   # These shouldn't be here
   rm -rf ${pkgdir}/usr/docs
   install -d ${pkgdir}/var/lib/mysql
-  mv ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
-  chmod -R 700 ${pkgdir}/var/lib/mysql/
+  cp -rfa ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
+  rm -rf ${pkgdir}/usr/data
 }

Modified: my.cnf
===
--- my.cnf  2010-12-22 13:39:56 UTC (rev 103659)
+++ my.cnf  2010-12-22 13:41:29 UTC (rev 103660)
@@ -43,7 +43,7 @@
 # Note that using this option without enabling named pipes on Windows
 # (via the enable-named-pipe option) will render mysqld useless!
 # 
-#skip-networking
+skip-networking
 
 # Replication Master Server (default)
 # binary logging is required for replication

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysql.install mysqld)

2010-04-23 Thread Andrea Scarpino 
Date: Friday, April 23, 2010 @ 17:10:11
  Author: andrea
Revision: 78446

mysql_install_db will create /var/lib/mysql dir; fix skip-locking warning

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf
  mysql/trunk/mysql.install
  mysql/trunk/mysqld

---+
 PKGBUILD  |   11 +++
 my.cnf|2 +-
 mysql.install |3 ++-
 mysqld|2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-23 20:26:35 UTC (rev 78445)
+++ PKGBUILD2010-04-23 21:10:11 UTC (rev 78446)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.46
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://www.mysql.com/;
@@ -15,8 +15,8 @@
 
source=(http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/${pkgbase}-${pkgver}.tar.gz;
 'mysqld' 'my.cnf')
 md5sums=('04f7c1422199c73a88a3d408b9161b63'
- 'eb4104ab4cf0ba5b5232adaf78427db7'
- '5b197896a429537fea7cbe52bbe440bc')
+ '92dac61b92253e0878f27318da1dc45f'
+ '0337741fa9afbe57939993636081a827')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -102,7 +102,6 @@
   install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
-  options=('emptydirs') # we need the empty /var/lib/mysql directory
 
   cd ${srcdir}/${pkgbase}-${pkgver}  
   make DESTDIR=${pkgdir} install
@@ -110,10 +109,6 @@
   install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf || return 1
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
 
-  # create default MYSQLD_ROOT dir and set mysql rights
-  install -d ${pkgdir}/var/lib/mysql || return 1
-  chown 89:89 ${pkgdir}/var/lib/mysql
-
   # provided by libmysqlclient
   rm -f 
${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}

Modified: my.cnf
===
--- my.cnf  2010-04-23 20:26:35 UTC (rev 78445)
+++ my.cnf  2010-04-23 21:10:11 UTC (rev 78446)
@@ -21,7 +21,7 @@
 port   = 3306
 socket = /var/run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
-skip-locking
+skip-external-locking
 key_buffer = 16M
 max_allowed_packet = 1M
 table_cache = 64

Modified: mysql.install
===
--- mysql.install   2010-04-23 20:26:35 UTC (rev 78445)
+++ mysql.install   2010-04-23 21:10:11 UTC (rev 78446)
@@ -1,7 +1,8 @@
 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 --datadir=var/lib/mysql --user=mysql
+  usr/bin/mysql_install_db --user=mysql
+  chown -R mysql:mysql var/lib/mysql /dev/null
 }
 
 post_upgrade(){

Modified: mysqld
===
--- mysqld  2010-04-23 20:26:35 UTC (rev 78445)
+++ mysqld  2010-04-23 21:10:11 UTC (rev 78446)
@@ -16,7 +16,7 @@
   chown mysql:mysql /var/run/mysqld /dev/null
 fi
 if [ -z $(getPID) ]; then
-   /usr/bin/mysqld_safe /dev/null 
+   /usr/bin/mysqld_safe --user=mysql /dev/null 
   if [ $? -gt 0 ]; then
 stat_fail
 exit 1

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf)

2010-01-31 Thread Andrea Scarpino 
Date: Sunday, January 31, 2010 @ 20:41:19
  Author: andrea
Revision: 66605

removed wrong line (FS#18083)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf

--+
 PKGBUILD |4 ++--
 my.cnf   |1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-01 01:34:40 UTC (rev 66604)
+++ PKGBUILD2010-02-01 01:41:19 UTC (rev 66605)
@@ -18,7 +18,7 @@
 'mysqld.conf.d')
 md5sums=('451fd3e8c55eecdf4c3ed109dce62f01'
  '7e1c46ccbd91553cc11df7199fbfca32'
- '26589ea08b78fc38dd174caeb93b810c'
+ '5b197896a429537fea7cbe52bbe440bc'
 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
@@ -122,4 +122,4 @@
 
   # create directory for PID and sock files
   install -d ${pkgdir}/var/run/mysqld
-}
\ No newline at end of file
+}

Modified: my.cnf
===
--- my.cnf  2010-02-01 01:34:40 UTC (rev 66604)
+++ my.cnf  2010-02-01 01:41:19 UTC (rev 66605)
@@ -113,7 +113,6 @@
 #innodb_data_home_dir = /var/lib/mysql
 #innodb_data_file_path = ibdata1:10M:autoextend
 #innodb_log_group_home_dir = /var/lib/mysql
-#innodb_log_arch_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

[arch-commits] Commit in mysql/trunk (PKGBUILD my.cnf mysql.install)

2009-11-18 Thread Andrea Scarpino 
Date: Wednesday, November 18, 2009 @ 07:07:26
  Author: andrea
Revision: 58953

mysql.sock - mysqld.sock

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/my.cnf
Deleted:
  mysql/trunk/mysql.install

---+
 PKGBUILD  |5 ++---
 my.cnf|4 ++--
 mysql.install |4 
 3 files changed, 4 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 03:28:08 UTC (rev 58952)
+++ PKGBUILD2009-11-18 12:07:26 UTC (rev 58953)
@@ -19,8 +19,8 @@
 'mysqld.conf.d')
 md5sums=('32e7373c16271606007374396e6742ad'
  '09f64b1da689f0bc60e17172f9aa0b38'
- 'fcb0697f705fe129d50716b5057721f5'
- '4a9077fc95ec6db1d5420e0cdc74d31c')
+ '26589ea08b78fc38dd174caeb93b810c'
+'4a9077fc95ec6db1d5420e0cdc74d31c')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -110,7 +110,6 @@
   backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
-  install=mysql.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   pushd include || return

Modified: my.cnf
===
--- my.cnf  2009-11-18 03:28:08 UTC (rev 58952)
+++ my.cnf  2009-11-18 12:07:26 UTC (rev 58953)
@@ -12,14 +12,14 @@
 [client]
 #password  = your_password
 port   = 3306
-socket = /var/run/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port   = 3306
-socket = /var/run/mysqld/mysql.sock
+socket = /var/run/mysqld/mysqld.sock
 datadir= /var/lib/mysql
 skip-locking
 key_buffer = 16M

Deleted: mysql.install
===
--- mysql.install   2009-11-18 03:28:08 UTC (rev 58952)
+++ mysql.install   2009-11-18 12:07:26 UTC (rev 58953)
@@ -1,4 +0,0 @@
-post_upgrade() {
-  echo  MySQL configuration file now is into /etc/mysql/ directory.
-  echo  Remember to replace it with your old configuration file.
-}