From 79f1c0fc3ae10cd5e1a7320e9231fe96be2781959ced177a29ee933112c704a6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Apr 2023 11:59:06 +0000 Subject: [PATCH] - Add 0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=46 --- ...e-extraneous-DEFAULT-keyword-in-clas.patch | 28 +++++++++++++++++++ gromox.changes | 1 + gromox.spec | 3 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch diff --git a/0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch b/0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch new file mode 100644 index 0000000..428c26b --- /dev/null +++ b/0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch @@ -0,0 +1,28 @@ +From 6a53ab4e03588a26dcaf77c1948ac843c9366898 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 16 Apr 2023 14:31:08 +0200 +Subject: [PATCH] dbop_mysql: remove extraneous DEFAULT keyword in "classes" + table CREATE statement + +Fixes: gromox-2.7-154-g7d7944f9d +References: GXF-991 +--- + lib/dbop_mysql.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git lib/dbop_mysql.cpp lib/dbop_mysql.cpp +index 2a172a38d..ea091ed5c 100644 +--- lib/dbop_mysql.cpp ++++ lib/dbop_mysql.cpp +@@ -428,7 +428,7 @@ static constexpr char tbl_classes_top[] = + "CREATE TABLE `classes` (" + " `id` int(10) unsigned NOT NULL AUTO_INCREMENT," + " `classname` varchar(128) NOT NULL," +-" `listname` varchar(320) CHARACTER SET ascii DEFAULT NOT NULL," ++" `listname` varchar(320) CHARACTER SET ascii NOT NULL," + " `filters` TEXT," + " `domain_id` int(10) unsigned NOT NULL," + " PRIMARY KEY (`id`)," +-- +2.40.0 + diff --git a/gromox.changes b/gromox.changes index 9302696..b28e932 100644 --- a/gromox.changes +++ b/gromox.changes @@ -11,6 +11,7 @@ Sat Apr 15 10:07:22 UTC 2023 - Jan Engelhardt OL/g-web) is no longer tied to visibility in the GAL. * Support for non-default stores in the IMAP and POP3 protocols; use "actualusername!sharedmbox" as the username for login. +- Add 0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch ------------------------------------------------------------------- Fri Mar 24 01:13:00 UTC 2023 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index a0e551d..a8e14b5 100644 --- a/gromox.spec +++ b/gromox.spec @@ -28,6 +28,7 @@ URL: https://grommunio.com/ Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.zst Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.asc Source8: %name.keyring +Patch1: 0001-dbop_mysql-remove-extraneous-DEFAULT-keyword-in-clas.patch BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -119,7 +120,7 @@ ready-to-run installation of Gromox. %build autoreconf -fi -%configure CFLAGS="%optflags -Og" CXXFLAGS="%optflags -Og" +%configure %make_build V=1 %install