Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=ce7c67722a7912111ac64f7d5886d79f2d392a97

commit ce7c67722a7912111ac64f7d5886d79f2d392a97
Author: crazy <cr...@frugalware.org>
Date:   Fri Feb 2 15:23:48 2018 +0100

postgresql-10.1-2-x86_64

* rebuild with tc / py / tcl
* added packport patch from :
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=e3fdb7c00e783ed4b490554ab6bbaccad341c244

diff --git a/source/apps-extra/postgresql/FrugalBuild 
b/source/apps-extra/postgresql/FrugalBuild
index c47af1b..92a8c18 100644
--- a/source/apps-extra/postgresql/FrugalBuild
+++ b/source/apps-extra/postgresql/FrugalBuild
@@ -6,25 +6,26 @@ USE_TCL=${USE_TCL:-"y"}

pkgname=postgresql
pkgver=10.1
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced Object-Relational database management system (DBMS)"
url="http://www.postgresql.org/";
-depends=('openssl>=1.0.2-8' 'readline>=6.3-14' 'libxml2>=2.9.4-3' 
'ncurses>=6.0-16')
+depends=('openssl>=1.0.2-20' 'readline>=7.0-2' 'libxml2>=2.9.4-3' 
'ncurses>=6.1-2')
makedepends=('libxslt>=1.1.28-3')
rodepends=("libpq>=$pkgver")
groups=('apps-extra')
archs=('x86_64')
_F_archive_grepv="beta\|rc[0-9]"
up2date="Flastverdir https://ftp.postgresql.org/pub/source/ | sed 's/v//'"
-source=(https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
 postgresql.service pg_setup)
+source=(https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
 glibc.patch postgresql.service pg_setup)
sha1sums=('4adcfd527ec1652ecd7a22eb71541928d3d37277' \
+          '79e41a69725604051ed29c2ceca14fb4236a332c' \
'41423e125d1f8f5f6c57bcddd5eb5ad326b22561' \
'30c843fe478fadcd3d8a1d80f7b12a7bccb41efb')

subpkgs=('libpq' "$pkgname-extras" "$pkgname-plperl" "$pkgname-plpython")
subdescs=('PostgreSQL Library.' 'PostgreSQL extra tools' \
"PostgreSQL perl bindings" "PostgreSQL python bindings")
-subdepends=('openssl>=1.0.2-8' 'openssl>=1.0.2-8 libxml2>=2.9.4-3'  
'perl>=2.24.0-6' 'python>=2.7.13-2')
+subdepends=('openssl>=1.0.2-8' 'openssl>=1.0.2-8 libxml2>=2.9.4-3'  
'perl>=2.26.1' 'python>=2.7.14-2')
subrodepends=('' "libpq>=$pkgver" "$pkgname>=$pkgver" "$pkgname>=$pkgver")
subgroups=('lib' 'apps-extra' 'devel-extra' 'devel-extra')
subarchs=('x86_64' 'x86_64' 'x86_64' 'x86_64')
@@ -35,7 +36,7 @@ subconflicts=('' '' "$pkgname-perl" "$pkgname-python")
if Fuse $USE_TCL; then
subpkgs+=("$pkgname-pltcl")
subdescs+=("PostgreSQL tcl bindings")
-       subdepends+=("tcl>=8.6.6-3")
+       subdepends+=("tcl>=8.6.8")
subrodepends+=("$pkgname>=$pkgver")
subgroups+=("devel-extra")
subarchs+=("x86_64")
@@ -53,6 +54,8 @@ Finclude systemd

build()
{
+
+       Fpatchall
Fmake \
--datadir=/usr/share/pgsql \
--localstatedir=/var/lib/pgsql \
diff --git a/source/apps-extra/postgresql/glibc.patch 
b/source/apps-extra/postgresql/glibc.patch
new file mode 100644
index 0000000..50a3bad
--- /dev/null
+++ b/source/apps-extra/postgresql/glibc.patch
@@ -0,0 +1,64 @@
+From: Andres Freund <and...@anarazel.de>
+Date: Wed, 3 Jan 2018 20:00:11 +0000 (-0800)
+Subject: Rename pg_rewind's copy_file_range() to avoid conflict with new linux 
syscall.
+X-Git-Url: 
http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=e3fdb7c00e783ed4b490554ab6bbaccad341c244
+
+Rename pg_rewind's copy_file_range() to avoid conflict with new linux syscall.
+
+Upcoming versions of glibc will contain copy_file_range(2), a wrapper
+around a new linux syscall for in-kernel copying of data ranges. This
+conflicts with pg_rewinds function of the same name.
+
+Therefore rename pg_rewinds version. As our version isn't a generic
+copying facility we decided to choose a rewind specific function name.
+
+Per buildfarm animal caiman and subsequent discussion with Tom Lane.
+
+Author: Andres Freund
+Discussion:
+    https://postgr.es/m/20180103033425.w7jkljth3e26s...@alap3.anarazel.de
+    https://postgr.es/m/31122.1514951...@sss.pgh.pa.us
+Backpatch: 9.5-, where pg_rewind was introduced
+---
+
+diff --git a/src/bin/pg_rewind/copy_fetch.c b/src/bin/pg_rewind/copy_fetch.c
+index f7ac5b30b5..a1b85f7706 100644
+--- a/src/bin/pg_rewind/copy_fetch.c
++++ b/src/bin/pg_rewind/copy_fetch.c
+@@ -156,7 +156,7 @@ recurse_dir(const char *datadir, const char *parentpath,
+  * If 'trunc' is true, any existing file with the same name is truncated.
+  */
+ static void
+-copy_file_range(const char *path, off_t begin, off_t end, bool trunc)
++rewind_copy_file_range(const char *path, off_t begin, off_t end, bool trunc)
+ {
+       char            buf[BLCKSZ];
+       char            srcpath[MAXPGPATH];
+@@ -222,7 +222,7 @@ copy_executeFileMap(filemap_t *map)
+                               break;
+
+                       case FILE_ACTION_COPY:
+-                              copy_file_range(entry->path, 0, entry->newsize, 
true);
++                              rewind_copy_file_range(entry->path, 0, 
entry->newsize, true);
+                               break;
+
+                       case FILE_ACTION_TRUNCATE:
+@@ -230,7 +230,8 @@ copy_executeFileMap(filemap_t *map)
+                               break;
+
+                       case FILE_ACTION_COPY_TAIL:
+-                              copy_file_range(entry->path, entry->oldsize, 
entry->newsize, false);
++                              rewind_copy_file_range(entry->path, 
entry->oldsize,
++                                                                         
entry->newsize, false);
+                               break;
+
+                       case FILE_ACTION_CREATE:
+@@ -257,7 +258,7 @@ execute_pagemap(datapagemap_t *pagemap, const char *path)
+       while (datapagemap_next(iter, &blkno))
+       {
+               offset = blkno * BLCKSZ;
+-              copy_file_range(path, offset, offset + BLCKSZ, false);
++              rewind_copy_file_range(path, offset, offset + BLCKSZ, false);
+               /* Ok, this block has now been copied from new data dir to old 
*/
+       }
+       pg_free(iter);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to