Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 549d76c21f4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67f6e1768257
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 17, 2018

  1. mariadb: 10.2.13 -> 10.2.17 

    Bump to latest stable version of the 10.2.x branch. Besides many bug fixes the
following security related issues have been fixed:
 - CVE-2018-3060
 - CVE-2018-3064
 - CVE-2018-3063
 - CVE-2018-3058
 - CVE-2018-3066
 (probably more from before 10.2.16)

Release notes: https://mariadb.com/kb/en/library/mariadb-10217-release-notes/

(cherry picked from commit 6c3d99c7645f7c7f8331c1c7ff7453bfaeb21cc2)
    @andir @vcunat
    andir authored and vcunat committed Aug 17, 2018
    Copy the full SHA
    8a804f7 View commit details

  2. Merge #40007: mariadb: Fix mariadb_config include path 

    (cherry picked from commit 89bed5b)
    @vcunat
    vcunat committed Aug 17, 2018
    Copy the full SHA
    67f6e17 View commit details
Showing with 20 additions and 4 deletions.
  1. +7 −4 pkgs/servers/sql/mariadb/default.nix
  2. +13 −0 pkgs/servers/sql/mariadb/include-dirs-path.patch
11 changes: 7 additions & 4 deletions pkgs/servers/sql/mariadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,14 @@ mariadb = everything // {
};

common = rec { # attributes common to both builds
version = "10.2.13";
version = "10.2.17";

src = fetchurl {
url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz";
sha256 = "0ly7dxc7rk327liya4kalgsw8irlxl0pl8gq0agdl18a63cpwbi7";
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7";
name = "mariadb-${version}.tar.gz";
};

@@ -34,7 +37,7 @@ common = rec { # attributes common to both builds
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
'';

patches = [ ./cmake-includedir.patch ]
patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;

cmakeFlags = [
13 changes: 13 additions & 0 deletions pkgs/servers/sql/mariadb/include-dirs-path.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
index 45d2f4e..e5666db 100644
--- a/libmariadb/mariadb_config/mariadb_config.c.in
+++ b/libmariadb/mariadb_config/mariadb_config.c.in
@@ -5,7 +5,7 @@

static char *mariadb_progname;

-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE