From 4ead96b8001644778e46298f4fe0efe5b36a7a54 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 25 Jul 2017 01:15:21 +0200 Subject: [PATCH] mariadb: Update from 10.2.6 to 10.2.7 --- packages/mariadb/build.sh | 5 ++--- packages/mariadb/include-my_dir.h.patch | 18 ------------------ 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 packages/mariadb/include-my_dir.h.patch diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index ef38983ad..74a9e20e5 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" -TERMUX_PKG_VERSION=10.2.6 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=10.2.7 +TERMUX_PKG_SHA256=225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBISON_EXECUTABLE=`which bison` -DBUILD_CONFIG=mysql_release diff --git a/packages/mariadb/include-my_dir.h.patch b/packages/mariadb/include-my_dir.h.patch deleted file mode 100644 index c231de4fd..000000000 --- a/packages/mariadb/include-my_dir.h.patch +++ /dev/null @@ -1,18 +0,0 @@ -Submitted upstream at https://github.com/MariaDB/server/pull/411 - -diff -u -r ../mariadb-10.2.6/include/my_dir.h ./include/my_dir.h ---- ../mariadb-10.2.6/include/my_dir.h 2017-05-15 01:13:15.000000000 +0200 -+++ ./include/my_dir.h 2017-06-30 23:02:54.725610371 +0200 -@@ -35,9 +35,9 @@ - #define MY_S_ISUID S_ISUID /* set user id on execution */ - #define MY_S_ISGID S_ISGID /* set group id on execution */ - #define MY_S_ISVTX S_ISVTX /* save swapped text even after use */ --#define MY_S_IREAD S_IREAD /* read permission, owner */ --#define MY_S_IWRITE S_IWRITE /* write permission, owner */ --#define MY_S_IEXEC S_IEXEC /* execute/search permission, owner */ -+#define MY_S_IREAD S_IRUSR /* read permission, owner */ -+#define MY_S_IWRITE S_IWUSR /* write permission, owner */ -+#define MY_S_IEXEC S_IXUSR /* execute/search permission, owner */ - - #define MY_S_ISDIR(m) (((m) & MY_S_IFMT) == MY_S_IFDIR) - #define MY_S_ISCHR(m) (((m) & MY_S_IFMT) == MY_S_IFCHR)