Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9625 from micmac1/18.06-mariadb10141

Browse source 
mariadb (18.06): security bump to 10.1.41
This commit is contained in:
Rosen Penev 2019-08-01 17:22:14 -07:00 committed by GitHub
commit b26ffad37e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/mariadb/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb PKG_NAME:=mariadb
PKG_VERSION:=10.1.39 PKG_VERSION:=10.1.41
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -18,7 +18,7 @@ PKG_SOURCE_URL := \
https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \
https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source
PKG_HASH:=6ebaa9424707b8f45ad45eaad37df0d39e77fc965309786d298d6baf3bd93a7e PKG_HASH:=2b47c3afdae81eab2b9c29ba6a10328acb8d07166e8112744f6d704cc70100f2
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

2
utils/mariadb/patches/100-fix_hostname.patch
View file

@ -1,6 +1,6 @@
--- a/scripts/mysql_install_db.sh --- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh
@@ -398,7 +398,7 @@ fi @@ -405,7 +405,7 @@ fi
# Try to determine the hostname # Try to determine the hostname

4
utils/mariadb/patches/130-c11_atomics.patch
View file

@ -46,7 +46,7 @@ Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+++ b/include/atomic/gcc_builtins.h +++ b/include/atomic/gcc_builtins.h
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
+#if defined (HAVE_GCC_ATOMIC_BUILTINS) +#if defined (HAVE_GCC_ATOMIC_BUILTINS)
#define make_atomic_add_body(S) \ #define make_atomic_add_body(S) \
@ -76,7 +76,7 @@ Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
--- a/include/atomic/nolock.h --- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h +++ b/include/atomic/nolock.h
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \ #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
- || defined(HAVE_GCC_ATOMIC_BUILTINS) \ - || defined(HAVE_GCC_ATOMIC_BUILTINS) \

2
utils/mariadb/patches/140-mips-connect-unaligned.patch
View file

@ -189,7 +189,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
CheckType(pv) CheckType(pv)
TYPE *lp = ((TYPBLK*)pv)->Typp; TYPE *lp = ((TYPBLK*)pv)->Typp;
- for (register int i = k; i < n; i++) // TODO - for (int i = k; i < n; i++) // TODO
- Typp[i] = lp[i]; - Typp[i] = lp[i];
+ memcpy(Typp + k, lp + k, sizeof(TYPE) * n); + memcpy(Typp + k, lp + k, sizeof(TYPE) * n);

8
utils/mariadb/patches/170-ppc-remove-glibc-dep.patch
View file

@ -27,7 +27,7 @@ directly was the first solution adopted in MariaDB [2].
--- a/storage/xtradb/include/ut0ut.h --- a/storage/xtradb/include/ut0ut.h
+++ b/storage/xtradb/include/ut0ut.h +++ b/storage/xtradb/include/ut0ut.h
@@ -86,8 +86,7 @@ private: @@ -84,8 +84,7 @@ private:
independent way by using YieldProcessor. */ independent way by using YieldProcessor. */
# define UT_RELAX_CPU() YieldProcessor() # define UT_RELAX_CPU() YieldProcessor()
# elif defined(__powerpc__) # elif defined(__powerpc__)
@ -37,7 +37,7 @@ directly was the first solution adopted in MariaDB [2].
# else # else
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif # endif
@@ -101,9 +100,8 @@ private: @@ -99,9 +98,8 @@ private:
#endif #endif
# if defined(HAVE_HMT_PRIORITY_INSTRUCTION) # if defined(HAVE_HMT_PRIORITY_INSTRUCTION)
@ -51,7 +51,7 @@ directly was the first solution adopted in MariaDB [2].
# define UT_RESUME_PRIORITY_CPU() ((void)0) # define UT_RESUME_PRIORITY_CPU() ((void)0)
--- a/storage/innobase/include/ut0ut.h --- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h
@@ -89,8 +89,7 @@ private: @@ -87,8 +87,7 @@ private:
independent way by using YieldProcessor. */ independent way by using YieldProcessor. */
# define UT_RELAX_CPU() YieldProcessor() # define UT_RELAX_CPU() YieldProcessor()
# elif defined(__powerpc__) # elif defined(__powerpc__)
@ -61,7 +61,7 @@ directly was the first solution adopted in MariaDB [2].
# else # else
# define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
# endif # endif
@@ -104,9 +103,8 @@ private: @@ -102,9 +101,8 @@ private:
#endif #endif
# if defined(HAVE_HMT_PRIORITY_INSTRUCTION) # if defined(HAVE_HMT_PRIORITY_INSTRUCTION)