chiark - git - mdw - termux-packages/blob - packages/mariadb/etc-my.cnf.patch

   1 diff -u -r ./cmake/install_layout.cmake ../src.orig/cmake/install_layout.cmake
   2 --- ./cmake/install_layout.cmake        2017-10-30 08:10:43.000000000 +0000
   3 +++ ../src.orig/cmake/install_layout.cmake      2017-12-09 20:12:27.748617252 +0000
   4 @@ -135,7 +135,7 @@
   5  SET(INSTALL_SBINDIR_RPM                 "sbin")
   6  SET(INSTALL_SCRIPTDIR_RPM               "bin")
   7  SET(INSTALL_SYSCONFDIR_RPM             "/etc")
   8 -SET(INSTALL_SYSCONF2DIR_RPM             "/etc/my.cnf.d")
   9 +SET(INSTALL_SYSCONF2DIR_RPM             "@TERMUX_PREFIX@/etc/my.cnf.d")
  10  #
  11  IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
  12    SET(INSTALL_LIBDIR_RPM                "lib64")
  13 diff -u -r ./support-files/mysql-multi.server.sh ../src.orig/support-files/mysql-multi.server.sh
  14 --- ./support-files/mysql-multi.server.sh       2017-10-30 08:10:49.000000000 +0000
  15 +++ ../src.orig/support-files/mysql-multi.server.sh     2017-12-09 20:12:10.456623540 +0000
  16 @@ -77,8 +77,8 @@
  17  then
  18    print_defaults="@bindir@/mysql_print_defaults"
  19  else
  20 -  # Try to find basedir in /etc/my.cnf
  21 -  conf=/etc/my.cnf
  22 +  # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
  23 +  conf=@TERMUX_PREFIX@/etc/my.cnf
  24    print_defaults=
  25    if test -r $conf
  26    then
  27 diff -u -r ./support-files/mysql.server.sh ../src.orig/support-files/mysql.server.sh
  28 --- ./support-files/mysql.server.sh     2017-10-30 08:10:49.000000000 +0000
  29 +++ ../src.orig/support-files/mysql.server.sh   2017-12-09 20:12:10.460623538 +0000
  30 @@ -159,8 +159,8 @@
  31  if test -x "$bindir/my_print_defaults";  then
  32    print_defaults="$bindir/my_print_defaults"
  33  else
  34 -  # Try to find basedir in /etc/my.cnf
  35 -  conf=/etc/my.cnf
  36 +  # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
  37 +  conf=@TERMUX_PREFIX@/etc/my.cnf
  38    print_defaults=
  39    if test -r $conf
  40    then
  41 diff -u -r ./support-files/policy/apparmor/usr.sbin.mysqld ../src.orig/support-files/policy/apparmor/usr.sbin.mysqld
  42 --- ./support-files/policy/apparmor/usr.sbin.mysqld     2017-10-30 08:10:49.000000000 +0000
  43 +++ ../src.orig/support-files/policy/apparmor/usr.sbin.mysqld   2017-12-09 20:12:10.432623549 +0000
  44 @@ -29,7 +29,7 @@
  45    /etc/hosts.deny r,
  46    /etc/ld.so.cache r,
  47    /etc/mtab r,
  48 -  /etc/my.cnf r,
  49 +  @TERMUX_PREFIX@/etc/my.cnf r,
  50    /etc/mysql/*.cnf r,
  51    /etc/mysql/*.pem r,
  52    /etc/mysql/conf.d/ r,
  53 @@ -81,7 +81,7 @@
  54      /bin/which rix,
  55      /dev/tty rw,
  56      /etc/ld.so.cache r,
  57 -    /etc/my.cnf r,
  58 +    @TERMUX_PREFIX@/etc/my.cnf r,
  59      /proc/ r,
  60      /proc/*/cmdline r,
  61      /proc/*/fd/ r,
  62 diff -u -r ./support-files/rpm/my.cnf ../src.orig/support-files/rpm/my.cnf
  63 --- ./support-files/rpm/my.cnf  2017-10-30 08:10:49.000000000 +0000
  64 +++ ../src.orig/support-files/rpm/my.cnf        2017-12-09 20:12:10.440623546 +0000
  65 @@ -7,5 +7,5 @@
  66  #
  67  # include all files from the config directory
  68  #
  69 -!includedir /etc/my.cnf.d
  70 +!includedir @TERMUX_PREFIX@/etc/my.cnf.d
  71