(18.06) mariadb: security bump to 10.1.37

[micmac1]

Notable Changes (copied from release notes):

Various fixes from MySQL 5.6.42: MDEV-17533, MDEV-17532, MDEV-17531
MDEV-16465: fixed a bug with DDL and FOREIGN KEY
Fulltext index fixes:
MDEV-12547: extended the range of innodb_ft_result_cache_limit on 64-bit systems
MDEV-16865: InnoDB fts_query() ignores KILL
Fixes for the following security vulnerabilities:
CVE-2018-3282
CVE-2016-9843
CVE-2018-3174
CVE-2018-3143
CVE-2018-3156
CVE-2018-3251

OpenWrt changes:

• dropped obsolete ucontext patch (issue fixed upstream)
• refreshed 130-c11_atomics.patch

Signed-off-by: Sebastian Kemper sebastian_ml@gmx.net

Maintainer: me
Compile tested: ar71xx
Run tested: ar71xx, dlink dir 825 c1, ran server, created db, added tables, queried tables

Description:
Hi all,

Minor version bump to address open CVEs.

Thanks to whoever commits this for me!

Kind regards,
Seb

[champtar]

Can you rebase on latest commit, I just pushed a fix for CircleCI

[micmac1]

Hello @champtar

Can you give me a hint on how to do that?

My situation is that I cloned packages to my github account. Then I cloned that to my local disc. Then I checked out openwrt-18.06 and created a branch for this PR (maria37). I pushed that branch to my github account and raised the PR.

How do I rebase my commit in this situation?

:)

Kind regards,
Seb

[hnyman]

How do I rebase my commit in this situation?

Assuming that the few new commits do no affect your own code changes and that you have defined the upstream repo github/openwrt/packages:

You checkout and update locally the underlying upstream branch (18.06 in this case), possibly update also your github fork, checkout your feature branch, and rebase it on top of the updated upstream branch, so that your commits get bumped to its current HEAD, and then you just force push the branch to publish the changes in the PR.

  ( git remote add upstream https://github.com/openwrt/packages.git  )  if you need to define upstream
git checkout openwrt-18.06
git pull upstream openwrt-18.06
  ( git push )  to update openwrt-18.06 in your own github fork. You can skip this if you want.
git checkout maria37
git rebase openwrt-18.06
  ( git log )  to verify
git push -f

That should work in the normal case, but I did not quite grasp if you have the vanilla fork, or more complicated structure. Should work as long as you have openwrt-18.06 and then maria37 is based on it.

[micmac1]

Thank you Hannu! I'll try that once I get home.

[micmac1]

Hello @hnyman

The rebase worked fine. I've made a note in case I need it again in the future :-) Thank you!

@champtar the build checks now ran fine, thanks for that, too!

Kind regards,
Seb

[champtar]

Thanks @micmac1