summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Bukowski2018-03-21 14:03:37 +0100
committerBenjamin Bukowski2018-03-21 14:03:37 +0100
commit28ea57643cb3766f9d4456e2092f982a15f6e1c8 (patch)
tree1ad703e03f7f79f3a7d02eaf3e69dd40079432a2
parentc24f5f58d9b4ee1d7a1e8f84c78f1e7f1d238e53 (diff)
downloadaur-28ea57643cb3766f9d4456e2092f982a15f6e1c8.tar.gz
Fix issue where fbserver was unable to load fbintl.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--firebird.service1
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3378ce57815..c635dbe6a86a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Mar 12 10:43:17 UTC 2018
+# Wed Mar 21 12:59:04 UTC 2018
pkgbase = firebird-superserver
pkgdesc = A open source SQL relational database management system (RDMS)
pkgver = 2.5.8.27089
- pkgrel = 1
+ pkgrel = 2
url = http://www.firebirdsql.org/
install = firebird-superserver.install
arch = i686
@@ -27,7 +27,7 @@ pkgbase = firebird-superserver
md5sums = ee601f52f1ba2481fe1f05b25d000bb8
md5sums = 79a1416e307e4dfb99640311b8defe07
md5sums = a43ab472f4d95e48ac21910bb33a5e86
- md5sums = bd75e6d2afcbc000e3593b1a66ea4ef7
+ md5sums = 90b4631c9bff99aab08511b3a184593e
md5sums = 70197fc801f9c66a6a1d7710e0c63718
md5sums = 9ab88cfcda674f9d28850a4f86f23741
diff --git a/PKGBUILD b/PKGBUILD
index 685cbce2bf1a..58009bb9b61d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=firebird-superserver
_pkgver=2.5.8
pkgver=$_pkgver.27089
-pkgrel=1
+pkgrel=2
pkgdesc="A open source SQL relational database management system (RDMS)"
arch=('i686' 'x86_64')
url="http://www.firebirdsql.org/"
@@ -25,7 +25,7 @@ md5sums=('38862a3da39cf91f4f2366fb510f18a6'
'ee601f52f1ba2481fe1f05b25d000bb8'
'79a1416e307e4dfb99640311b8defe07'
'a43ab472f4d95e48ac21910bb33a5e86'
- 'bd75e6d2afcbc000e3593b1a66ea4ef7'
+ '90b4631c9bff99aab08511b3a184593e'
'70197fc801f9c66a6a1d7710e0c63718'
'9ab88cfcda674f9d28850a4f86f23741')
@@ -47,7 +47,6 @@ build() {
--with-fbhelp=/usr/share/doc/firebird/help \
--with-fbinclude=/usr/include/firebird \
--with-fblib=/usr/lib \
- --with-fblock=/run/firebird \
--with-fblog=/var/log/ \
--with-fbmsg=/usr/lib/firebird/msg \
--with-fbplugins=/usr/lib/firebird/plugins \
@@ -62,8 +61,7 @@ build() {
--with-system-icu \
--with-system-editline
- #CXXFLAGS+=' -flifetime-dse=1' make
- make
+ make
}
package() {
@@ -74,7 +72,7 @@ package() {
cd $srcdir/Firebird-$pkgver-0
cp -av gen/buildroot/* $pkgdir/
-
+
install -Dm644 $srcdir/firebird-tmpfiles.conf $pkgdir/usr/lib/tmpfiles.d/firebird.conf
install -Dm644 $srcdir/firebird-sysusers.conf $pkgdir/usr/lib/sysusers.d/firebird.conf
install -Dm644 $srcdir/firebird.service $pkgdir/usr/lib/systemd/system/firebird.service
diff --git a/firebird.service b/firebird.service
index 4e928c1428ec..6565a6bf4c23 100644
--- a/firebird.service
+++ b/firebird.service
@@ -7,6 +7,7 @@ User=firebird
Group=firebird
Type=forking
PIDFile=/run/firebird/default.pid
+Environment=LD_PRELOAD=libfbclient.so.2
ExecStart=/usr/lib/firebird/bin/fbguard -pidfile /run/firebird/default.pid -daemon -forever
SyslogIdentifier=firebird