postgresql: update patches

This commit is contained in:
Leonid Pliushch 2020-11-22 15:59:48 +00:00
parent a29657b770
commit 8155cc414a
1 changed files with 10 additions and 14 deletions

View File

@ -1,7 +1,7 @@
diff -u -r ../postgresql-10.1/src/timezone/zic.c ./src/timezone/zic.c
--- ../postgresql-10.1/src/timezone/zic.c 2017-11-07 01:46:52.000000000 +0100
+++ ./src/timezone/zic.c 2017-11-11 19:32:52.836782026 +0100
@@ -17,6 +17,12 @@
diff -uNr postgresql-13.1/src/timezone/zic.c postgresql-13.1.mod/src/timezone/zic.c
--- postgresql-13.1/src/timezone/zic.c 2020-11-09 22:24:30.000000000 +0000
+++ postgresql-13.1.mod/src/timezone/zic.c 2020-11-22 15:38:54.515342643 +0000
@@ -19,6 +19,12 @@
#include "private.h"
#include "tzfile.h"
@ -14,20 +14,16 @@ diff -u -r ../postgresql-10.1/src/timezone/zic.c ./src/timezone/zic.c
#define ZIC_VERSION_PRE_2013 '2'
#define ZIC_VERSION '3'
@@ -889,8 +895,16 @@
progname, directory, fromfield, strerror(EPERM));
@@ -1015,8 +1021,12 @@
progname, directory, target, strerror(EPERM));
exit(EXIT_FAILURE);
}
+#if 1
+ /*
+ * Android does not support hard links starting from 6.0
+ * so always use symlinks.
+ */
+ staysymlink = true;
+ staysymlink = true;
+#else
if (staysymlink)
staysymlink = itssymlink(tofield);
staysymlink = itssymlink(linkname);
+#endif
if (remove(tofield) == 0)
todirs_made = true;
if (remove(linkname) == 0)
linkdirs_made = true;
else if (errno != ENOENT)