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

[Bartłomiej Piotrowski]

Date: Monday, February 25, 2013 @ 17:42:59
  Author: bpiotrowski
Revision: 178549

upgpkg: mysql 5.5.30-5

Simplify install script.

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |2 +-
 mysql.install |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 16:39:24 UTC (rev 178548)
+++ PKGBUILD2013-02-25 16:42:59 UTC (rev 178549)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;

Modified: mysql.install
===
--- mysql.install   2013-02-25 16:39:24 UTC (rev 178548)
+++ mysql.install   2013-02-25 16:42:59 UTC (rev 178549)
@@ -1,7 +1,7 @@
+datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+[[ -z $datadir ]]  datadir=/var/lib/mysql 
+
 post_install(){
-  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
-  [[ -z $datadir ]]  datadir=/var/lib/mysql
-
   groupadd -g 89 mysql /dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql /dev/null
 
@@ -16,7 +16,7 @@
 
 post_upgrade(){
   getent group mysql /dev/null 21 || groupadd -g 89 mysql /dev/null
-  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
/var/lib/mysql -s /bin/false mysql /dev/null
+  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d $datadir -s 
/bin/false mysql /dev/null
 
   if [ $(vercmp $2 5.5) -lt 0 ]; then
 echo   

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

[Bartłomiej Piotrowski]

Date: Monday, February 25, 2013 @ 18:58:07
  Author: bpiotrowski
Revision: 178604

upgpkg: mysql 5.5.30-6

- check if my_print_defaults is available
- pass $datadir to mysql_install_db

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |2 +-
 mysql.install |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-25 17:50:13 UTC (rev 178603)
+++ PKGBUILD2013-02-25 17:58:07 UTC (rev 178604)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;

Modified: mysql.install
===
--- mysql.install   2013-02-25 17:50:13 UTC (rev 178603)
+++ mysql.install   2013-02-25 17:58:07 UTC (rev 178604)
@@ -1,4 +1,6 @@
-datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+if [[ $(command -v my_print_defaults /dev/null 21) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+fi
 [[ -z $datadir ]]  datadir=/var/lib/mysql 
 
 post_install(){
@@ -7,7 +9,7 @@
 
   if [[ ! -e $datadir ]]; then
 install -dm700 $datadir
-usr/bin/mysql_install_db --user=mysql --basedir=/usr
+usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
 chown -R mysql:mysql var/lib/mysql /dev/null
   fi
 

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

[Bartłomiej Piotrowski]

Date: Wednesday, February 20, 2013 @ 18:18:07
  Author: bpiotrowski
Revision: 178354

upgpkg: mysql 5.5.30-4

- don't ship /var/lib/mysql in package
- run mysql_install_db only if MySQL datadir is not present
- enable ARCHIVE and BLACKHOLE storage engines (FS#33935)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |8 
 mysql.install |   13 ++---
 2 files changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 17:01:28 UTC (rev 178353)
+++ PKGBUILD2013-02-20 17:18:07 UTC (rev 178354)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url=https://www.mysql.com/products/community/;
@@ -53,9 +53,9 @@
 -DWITH_EMBEDDED_SERVER=ON \
 -DWITH_INNOBASE_STORAGE_ENGINE=1 \
 -DWITH_PARTITION_STORAGE_ENGINE=1 \
+-DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+-DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
--DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
--DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
 -DCMAKE_C_FLAGS=-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-fomit-frame-pointer \
 -DCMAKE_CXX_FLAGS=-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 
-felide-constructors -fno-rtti
@@ -127,5 +127,5 @@
   rm -r ${pkgdir}/usr/{data,mysql-test,sql-bench}
   rm ${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1
 
-  install -dm700 ${pkgdir}/var/lib/mysql
+  #install -dm700 ${pkgdir}/var/lib/mysql
 }

Modified: mysql.install
===
--- mysql.install   2013-02-20 17:01:28 UTC (rev 178353)
+++ mysql.install   2013-02-20 17:18:07 UTC (rev 178354)
@@ -1,9 +1,16 @@
 post_install(){
+  datadir=$(my_print_defaults mysqld | sed -n s/^--datadir=//p)
+  [[ -z $datadir ]]  datadir=/var/lib/mysql
+
   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
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql /dev/null
 
+  if [[ ! -e $datadir ]]; then
+install -dm700 $datadir
+usr/bin/mysql_install_db --user=mysql --basedir=/usr
+chown -R mysql:mysql var/lib/mysql /dev/null
+  fi
+
   usr/bin/systemd-tmpfiles --create mysqld.conf
 }
 

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

[Andrea Scarpino]

Date: Tuesday, March 23, 2010 @ 13:37:18
  Author: andrea
Revision: 73176

set rights in PKGBUILD

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |5 +
 mysql.install |   11 +++
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-23 17:11:52 UTC (rev 73175)
+++ PKGBUILD2010-03-23 17:37:18 UTC (rev 73176)
@@ -108,6 +108,7 @@
   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
@@ -117,6 +118,10 @@
   install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld || return 1
   install -Dm644 ${srcdir}/mysqld.conf.d ${pkgdir}/etc/conf.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: mysql.install
===
--- mysql.install   2010-03-23 17:11:52 UTC (rev 73175)
+++ mysql.install   2010-03-23 17:37:18 UTC (rev 73176)
@@ -1,17 +1,12 @@
-MYSQLD_ROOT=/var/lib/mysql
-
 post_install(){
   groupadd -g 89 mysql /dev/null
-  useradd -u 89 -g mysql -d ${MYSQLD_ROOT} -s /bin/false mysql /dev/null
-  usr/bin/mysql_install_db --datadir=${MYSQLD_ROOT#/} --user=mysql
-  chown -R mysql:mysql ${MYSQLD_ROOT#/} /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
 }
 
 post_upgrade(){
-  [ -f etc/conf.d/mysqld ]  source etc/conf.d/mysqld /dev/null
   getent group mysql /dev/null 21 || groupadd -g 89 mysql /dev/null
-  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
${MYSQLD_ROOT} -s /bin/false mysql /dev/null
-  chown -R mysql:mysql ${MYSQLD_ROOT#/} /dev/null
+  getent passwd mysql /dev/null 21 || useradd -u 89 -g mysql -d 
/var/lib/mysql -s /bin/false mysql /dev/null
 }
 
 post_remove(){

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

[Andrea Scarpino]

Date: Wednesday, November 18, 2009 @ 10:09:53
  Author: andrea
Revision: 58956

upgpkg: mysql 5.1.41-1
upstream release; create group and user in .install; fix /var/run/mysql 
permission

Added:
  mysql/trunk/mysql.install
Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysqld

---+
 PKGBUILD  |9 +
 mysql.install |   17 +
 mysqld|   18 --
 3 files changed, 22 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 12:52:13 UTC (rev 58955)
+++ PKGBUILD2009-11-18 15:09:53 UTC (rev 58956)
@@ -5,8 +5,8 @@
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.1.40
-pkgrel=2
+pkgver=5.1.41
+pkgrel=1
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,8 +17,8 @@
 'mysqld'
 'my.cnf'
 'mysqld.conf.d')
-md5sums=('32e7373c16271606007374396e6742ad'
- '09f64b1da689f0bc60e17172f9aa0b38'
+md5sums=('b5d39e8789174753f3c782959729e68c'
+ '7e1c46ccbd91553cc11df7199fbfca32'
  '26589ea08b78fc38dd174caeb93b810c'
 '4a9077fc95ec6db1d5420e0cdc74d31c')
 
@@ -108,6 +108,7 @@
 
 package_mysql(){
   backup=('etc/my.cnf' 'etc/mysql/my.cnf' 'etc/conf.d/mysqld')
+  install=mysql.install
   depends=('mysql-clients')
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 

Added: mysql.install
===
--- mysql.install   (rev 0)
+++ mysql.install   2009-11-18 15:09:53 UTC (rev 58956)
@@ -0,0 +1,17 @@
+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
+  chown -R mysql:mysql var/lib/mysql  /dev/null
+  chown mysql:mysql var/run/mysqld  /dev/null
+}
+
+post_upgrade(){
+  chown -R mysql:mysql var/lib/mysql  /dev/null
+  chown mysql:mysql var/run/mysqld
+}
+
+post_remove(){
+  userdel mysql /dev/null
+  groupdel mysql /dev/null
+}

Modified: mysqld
===
--- mysqld  2009-11-18 12:52:13 UTC (rev 58955)
+++ mysqld  2009-11-18 15:09:53 UTC (rev 58956)
@@ -12,24 +12,6 @@
echo $(pgrep -u mysql mysqld);
 }
 
-if [ ! `egrep '^mysql:' /etc/group` ]; then
-  stat_busy Adding mysql group
-  groupadd -g 89 mysql
-  stat_done
-fi
-if [ ! `egrep '^mysql:' /etc/passwd` ]; then
-  stat_busy Adding mysql user
-  useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
-  [ -d $MYSQLD_ROOT ]  chown -R mysql:mysql $MYSQLD_ROOT
-  stat_done
-fi
-
-if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql
-  chown -R mysql:mysql $MYSQLD_ROOT
-fi
-
 case $1 in
   start)
 stat_busy Starting MySQL

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

[Andrea Scarpino]

Date: Wednesday, November 18, 2009 @ 21:03:21
  Author: andrea
Revision: 58999

set socket path as option in configure; remove useless make; create the user 
and the group if don't exist

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---+
 PKGBUILD  |   49 +++--
 mysql.install |8 +---
 2 files changed, 20 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-18 21:06:15 UTC (rev 58998)
+++ PKGBUILD2009-11-19 02:03:21 UTC (rev 58999)
@@ -6,7 +6,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.1.41
-pkgrel=1
+pkgrel=2
 pkgdesc=A fast SQL database server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -33,12 +33,14 @@
 --without-readline \
 --with-ssl \
 --with-libwrap \
---with-charset=latin1 \
---with-collation=latin1_general_ci \
+--with-charset=utf8 \
+--with-collation=utf8_general_ci \
 --with-extra-charsets=complex \
 --with-embedded-server \
+--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
 --enable-local-infile \
-
--with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,ndbcluster
+
--with-plugins=partition,ftexample,archive,blackhole,federated,heap,innobase,innodb_plugin,ndbcluster
+  make || return 1
 }
 
 package_libmysqlclient(){
@@ -46,24 +48,18 @@
   depends=('openssl' 'zlib' 'gcc-libs' 'tcp_wrappers')
   
   cd ${srcdir}/${pkgbase}-${pkgver}
-  for dir in include strings mysys dbug storage regex extra vio sql; do
-pushd ${dir} || return 1
-make || return 1
-popd
-  done
   for dir in libmysql libmysql_r libmysqld; do
 pushd ${dir} || return 1
-make link_sources
-make || return 1
-make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install
 popd
   done
+  
   cd include
   make DESTDIR=${pkgdir} install
-
   # Copy missing includes
   install -m644 *.h ${pkgdir}/usr/include/mysql
 
+  # mysql_config
   cd ../scripts
   make mysql_config
   install -d ${pkgdir}/usr/bin
@@ -83,27 +79,17 @@
   depends=(libmysqlclient=${pkgver})
   
   cd ${srcdir}/${pkgbase}-${pkgver}
-  pushd include || return
-make || return 1
-  popd
-
   pushd libmysql
 make link_sources get_password.lo || return
-  popd 
+  popd
   
-  for dir in strings regex mysys dbug extra; do
-pushd ${dir} || return 1
-make || return 1
-popd
-  done
-
   cd client
-  make link_sources
-  make || return 1
   make DESTDIR=${pkgdir} install
 
-  # Removing libmysql stuff
+  # Removing libmysqlclient stuff
   rm -rf $pkgdir/usr/lib/
+  # These will be provided by mysql
+  rm -f ${pkgdir}/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
 }
 
 package_mysql(){
@@ -113,15 +99,10 @@
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
-  pushd include || return
-make || return 1
-  popd
-
   pushd libmysql
 make link_sources get_password.lo || return
   popd
   
-  make || return 1
   make DESTDIR=${pkgdir} install
 
   rm -rf ${pkgdir}/usr/{mysql-test,sql-bench,lib,include}
@@ -129,8 +110,8 @@
   install -D -m755 ../mysqld ${pkgdir}/etc/rc.d/mysqld
   install -D -m644 ../mysqld.conf.d ${pkgdir}/etc/conf.d/mysqld
 
-  # Cleanup files provided by the other packages
-  rm -f 
${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest,mysqltest_embedded}
+  # Cleanup files provided by the others packages
+  rm -f 
${pkgdir}/usr/bin/{mysql,mysql_config,mysql_client_test_embedded,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest_embedded}
   rm -rf ${pkgdir}/usr/{include,lib}
 
   # create directory for PID and sock files

Modified: mysql.install
===
--- mysql.install   2009-11-18 21:06:15 UTC (rev 58998)
+++ mysql.install   2009-11-19 02:03:21 UTC (rev 58999)
@@ -7,11 +7,13 @@
 }
 
 post_upgrade(){
+  getent group mysql /dev/null || groupadd -g 89 mysql /dev/null
+  getent passwd mysql /dev/null || useradd -u 89 -g mysql -d /var/lib/mysql 
-s /bin/false mysql /dev/null
   chown -R mysql:mysql var/lib/mysql  /dev/null
-  chown mysql:mysql var/run/mysqld
+  chown mysql:mysql var/run/mysqld  /dev/null
 }
 
 post_remove(){
-  userdel mysql /dev/null
-  groupdel mysql /dev/null
+  getent passwd mysql /dev/null || userdel mysql /dev/null
+  getent group mysql /dev/null || groupdel mysql /dev/null
 }

Re: [arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Andrea Scarpino]

On 19/11/2009, Andrea Scarpino and...@archlinux.org wrote:
 Date: Wednesday, November 18, 2009 @ 21:03:21
   Author: andrea
 Revision: 58999

 set socket path as option in configure; remove useless make; create the user
 and the group if don't exist
changed default charset to utf8; enabled the new innodb plugin;

-- 
Andrea `bash` Scarpino
Arch Linux Developer