Refresh patch files
Kentaro Hayashi
3 years ago
|
0 |
From: Kentaro Hayashi <kenhys@gmail.com>
|
|
1 |
Date: Wed, 5 Feb 2020 20:08:19 +0900
|
|
2 |
Subject: Use user name with underline
|
|
3 |
|
|
4 |
---
|
|
5 |
data/groonga-httpd.conf.in | 2 +-
|
|
6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
7 |
|
|
8 |
diff --git a/data/groonga-httpd.conf.in b/data/groonga-httpd.conf.in
|
|
9 |
index 9aab975..e4d8aad 100644
|
|
10 |
--- a/data/groonga-httpd.conf.in
|
|
11 |
+++ b/data/groonga-httpd.conf.in
|
|
12 |
@@ -3,7 +3,7 @@ pid @GROONGA_HTTPD_PID_PATH@;
|
|
13 |
|
|
14 |
# Match this to the file owner of Groonga database files if groonga-httpd is
|
|
15 |
# run as root.
|
|
16 |
-user groonga groonga;
|
|
17 |
+user _groonga groonga;
|
|
18 |
|
|
19 |
env GRN_IN_VALUES_TOO_MANY_INDEX_MATCH_RATIO;
|
|
20 |
env GRN_BETWEEN_TOO_MANY_INDEX_MATCH_RATIO;
|
|
0 |
From: Kentaro Hayashi <kenhys@gmail.com>
|
|
1 |
Date: Sat, 2 Nov 2019 21:01:03 +0900
|
|
2 |
Subject: Remove needless groonga-keyring postrm
|
|
3 |
|
|
4 |
---
|
|
5 |
configure.ac | 1 -
|
|
6 |
1 file changed, 1 deletion(-)
|
|
7 |
|
|
8 |
diff --git a/configure.ac b/configure.ac
|
|
9 |
index 19f9705..4432e87 100644
|
|
10 |
--- a/configure.ac
|
|
11 |
+++ b/configure.ac
|
|
12 |
@@ -1851,7 +1851,6 @@ AC_CONFIG_FILES([
|
|
13 |
lib/mrb/scripts/query_logger/Makefile
|
|
14 |
lib/proc/Makefile
|
|
15 |
packages/Makefile
|
|
16 |
- packages/apt/debian/groonga-keyring.postrm
|
|
17 |
packages/apt/env.sh
|
|
18 |
packages/source/Makefile
|
|
19 |
packages/windows/Makefile
|
|
0 |
From: Kentaro Hayashi <hayashi@clear-code.com>
|
|
1 |
Date: Wed, 2 Dec 2020 17:24:45 +0900
|
|
2 |
Subject: Use _GNU_SOURCE on GNU/kFreeBSD
|
|
3 |
|
|
4 |
Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
|
|
5 |
platforms including GNU/kFreeBSD.
|
|
6 |
|
|
7 |
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826061#10
|
|
8 |
---
|
|
9 |
vendor/nginx-1.19.5/src/os/unix/ngx_posix_config.h | 3 ++-
|
|
10 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
11 |
|
|
12 |
diff --git a/vendor/nginx-1.19.5/src/os/unix/ngx_posix_config.h b/vendor/nginx-1.19.5/src/os/unix/ngx_posix_config.h
|
|
13 |
index 2a8c413..772cfa6 100644
|
|
14 |
--- a/vendor/nginx-1.19.5/src/os/unix/ngx_posix_config.h
|
|
15 |
+++ b/vendor/nginx-1.19.5/src/os/unix/ngx_posix_config.h
|
|
16 |
@@ -21,10 +21,11 @@
|
|
17 |
#endif
|
|
18 |
|
|
19 |
|
|
20 |
-#if (NGX_GNU_HURD)
|
|
21 |
+#if defined(__GLIBC__)
|
|
22 |
#ifndef _GNU_SOURCE
|
|
23 |
#define _GNU_SOURCE /* accept4() */
|
|
24 |
#endif
|
|
25 |
+
|
|
26 |
#define _FILE_OFFSET_BITS 64
|
|
27 |
#endif
|
|
28 |
|
|
0 |
From: Kentaro Hayashi <hayashi@clear-code.com>
|
|
1 |
Date: Wed, 2 Dec 2020 20:29:31 +0900
|
|
2 |
Subject: Enable user site configuration
|
|
3 |
|
|
4 |
---
|
|
5 |
data/groonga-httpd.conf.in | 2 ++
|
|
6 |
1 file changed, 2 insertions(+)
|
|
7 |
|
|
8 |
diff --git a/data/groonga-httpd.conf.in b/data/groonga-httpd.conf.in
|
|
9 |
index e4d8aad..d7788ff 100644
|
|
10 |
--- a/data/groonga-httpd.conf.in
|
|
11 |
+++ b/data/groonga-httpd.conf.in
|
|
12 |
@@ -78,4 +78,6 @@ http {
|
|
13 |
root html;
|
|
14 |
}
|
|
15 |
}
|
|
16 |
+ # Configure application
|
|
17 |
+ include /etc/groonga/httpd/conf.d/*.conf;
|
|
18 |
}
|
debian/patches/fix-nginx-FTBFS-on-kfreebsd.patch
less
more
0 | |
From: Steven Chamberlain <stevenc@debian.org>
|
1 | |
Date: Sat, 16 Jul 2016 23:52:50 +0100
|
2 | |
Subject: Use _GNU_SOURCE on GNU/kFreeBSD
|
3 | |
|
4 | |
Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
|
5 | |
platforms including GNU/kFreeBSD.
|
6 | |
|
7 | |
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826061#10
|
8 | |
---
|
9 | |
vendor/nginx-1.19.4/src/os/unix/ngx_posix_config.h | 5 ++++-
|
10 | |
1 file changed, 4 insertions(+), 1 deletion(-)
|
11 | |
|
12 | |
diff --git a/vendor/nginx-1.19.4/src/os/unix/ngx_posix_config.h b/vendor/nginx-1.19.4/src/os/unix/ngx_posix_config.h
|
13 | |
index 2a8c413..03f7e0a 100644
|
14 | |
--- a/vendor/nginx-1.19.4/src/os/unix/ngx_posix_config.h
|
15 | |
+++ b/vendor/nginx-1.19.4/src/os/unix/ngx_posix_config.h
|
16 | |
@@ -21,10 +21,13 @@
|
17 | |
#endif
|
18 | |
|
19 | |
|
20 | |
-#if (NGX_GNU_HURD)
|
21 | |
+#if defined(__GLIBC__)
|
22 | |
#ifndef _GNU_SOURCE
|
23 | |
#define _GNU_SOURCE /* accept4() */
|
24 | |
#endif
|
25 | |
+#endif
|
26 | |
+
|
27 | |
+#if (NGX_GNU_HURD)
|
28 | |
#define _FILE_OFFSET_BITS 64
|
29 | |
#endif
|
30 | |
|
debian/patches/prepend-underline-groonga-user.patch
less
more
0 | |
From: Kentaro Hayashi <kenhys@gmail.com>
|
1 | |
Date: Wed, 5 Feb 2020 20:08:19 +0900
|
2 | |
Subject: Use user name with underline
|
3 | |
|
4 | |
---
|
5 | |
data/groonga-httpd.conf.in | 2 +-
|
6 | |
1 file changed, 1 insertion(+), 1 deletion(-)
|
7 | |
|
8 | |
diff --git a/data/groonga-httpd.conf.in b/data/groonga-httpd.conf.in
|
9 | |
index 9aab975..e4d8aad 100644
|
10 | |
--- a/data/groonga-httpd.conf.in
|
11 | |
+++ b/data/groonga-httpd.conf.in
|
12 | |
@@ -3,7 +3,7 @@ pid @GROONGA_HTTPD_PID_PATH@;
|
13 | |
|
14 | |
# Match this to the file owner of Groonga database files if groonga-httpd is
|
15 | |
# run as root.
|
16 | |
-user groonga groonga;
|
17 | |
+user _groonga groonga;
|
18 | |
|
19 | |
env GRN_IN_VALUES_TOO_MANY_INDEX_MATCH_RATIO;
|
20 | |
env GRN_BETWEEN_TOO_MANY_INDEX_MATCH_RATIO;
|
debian/patches/remove-groonga-keyring-postrc.patch
less
more
0 | |
From: Kentaro Hayashi <kenhys@gmail.com>
|
1 | |
Date: Sat, 2 Nov 2019 21:01:03 +0900
|
2 | |
Subject: Remove needless groonga-keyring postrm
|
3 | |
|
4 | |
---
|
5 | |
configure.ac | 1 -
|
6 | |
1 file changed, 1 deletion(-)
|
7 | |
|
8 | |
diff --git a/configure.ac b/configure.ac
|
9 | |
index 19f9705..4432e87 100644
|
10 | |
--- a/configure.ac
|
11 | |
+++ b/configure.ac
|
12 | |
@@ -1851,7 +1851,6 @@ AC_CONFIG_FILES([
|
13 | |
lib/mrb/scripts/query_logger/Makefile
|
14 | |
lib/proc/Makefile
|
15 | |
packages/Makefile
|
16 | |
- packages/apt/debian/groonga-keyring.postrm
|
17 | |
packages/apt/env.sh
|
18 | |
packages/source/Makefile
|
19 | |
packages/windows/Makefile
|
0 | |
fix-nginx-FTBFS-on-kfreebsd.patch
|
1 | |
remove-groonga-keyring-postrc.patch
|
2 | |
prepend-underline-groonga-user.patch
|
|
0 |
0001-Use-user-name-with-underline.patch
|
|
1 |
0002-Remove-needless-groonga-keyring-postrm.patch
|
|
2 |
0003-Use-_GNU_SOURCE-on-GNU-kFreeBSD.patch
|
|
3 |
0004-Enable-user-site-configuration.patch
|