HAYASHI Kentaro
null+****@clear*****
Tue Mar 31 14:18:47 JST 2015
HAYASHI Kentaro 2015-03-31 14:18:47 +0900 (Tue, 31 Mar 2015) New Revision: 4d10df1cf8b9f09445d1b51703c502c5d2ac9926 https://github.com/groonga/groonga/commit/4d10df1cf8b9f09445d1b51703c502c5d2ac9926 Message: rpm centos: drop workaround patch for CentOS 7 We will plan to release Groonga 5.0.2, immediately Removed files: packages/yum/patches/fix-crash-by-missing-libedit-initialization.patch Modified files: packages/rpm/centos/groonga.spec.in Modified: packages/rpm/centos/groonga.spec.in (+0 -2) =================================================================== --- packages/rpm/centos/groonga.spec.in 2015-03-31 13:56:23 +0900 (16a2225) +++ packages/rpm/centos/groonga.spec.in 2015-03-31 14:18:47 +0900 (7aa910a) @@ -16,7 +16,6 @@ Group: Applications/Text License: LGPLv2 URL: http://groonga.org/ Source0: http://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz -Patch0: fix-crash-by-missing-libedit-initialization.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) %if %{use_mecab} @@ -172,7 +171,6 @@ Munin plugins for Groonga %prep #% define optflags -O0 %setup -q -%patch0 -p1 %build Deleted: packages/yum/patches/fix-crash-by-missing-libedit-initialization.patch (+0 -34) 100644 =================================================================== --- packages/yum/patches/fix-crash-by-missing-libedit-initialization.patch 2015-03-31 13:56:23 +0900 (cf50694) +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur groonga-5.0.1.orig/src/groonga.c groonga-5.0.1/src/groonga.c ---- groonga-5.0.1.orig/src/groonga.c 2015-03-24 18:18:35.586093947 +0900 -+++ groonga-5.0.1/src/groonga.c 2015-03-30 18:12:03.064053676 +0900 -@@ -2139,7 +2139,8 @@ - ACTION_ERROR - }; - --#define ACTION_MASK (0x0f) -+#define ACTION_MASK (0x0f) -+#define MODE_MASK (0xf0) - #define FLAG_MODE_ALONE (1 << 4) - #define FLAG_MODE_CLIENT (1 << 5) - #define FLAG_MODE_DAEMON (1 << 6) -@@ -2759,6 +2760,10 @@ - return EXIT_FAILURE; - } - -+ if ((flags & MODE_MASK) == 0) { -+ flags |= FLAG_MODE_ALONE; -+ } -+ - if (port_arg) { - const char * const end = port_arg + strlen(port_arg); - const char *rest = NULL; -@@ -2908,7 +2913,8 @@ - } - } - -- if ((flags & FLAG_MODE_CLIENT) && !batchmode) { -+ if ((flags & (FLAG_MODE_ALONE | FLAG_MODE_CLIENT)) && -+ !batchmode) { - need_line_editor = GRN_TRUE; - } - -------------- next part -------------- HTML����������������������������...Download