summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schnaidt2019-11-07 13:19:46 +0100
committerAlexander Schnaidt2019-11-07 13:19:46 +0100
commita6a0c87a2745f8b66954dda06429a05432b1570c (patch)
tree6b7fb0bd5aa067abb1ef1fa261d1beee3f5a90a6
parent30685d03c99db147e8f65f4fac9a7fb365317f8e (diff)
downloadaur-a6a0c87a2745f8b66954dda06429a05432b1570c.tar.gz
passwordsafe: glibc2.30 patch; remove leftover passwordsafe-git conflict
-rw-r--r--.SRCINFO5
-rw-r--r--412458d281-glibc2.30-fix.patch27
-rw-r--r--PKGBUILD15
3 files changed, 41 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b71f86b55fe..55e29052741 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = passwordsafe
pkgdesc = Simple & Secure Password Management
pkgver = 1.08.2BETA
- pkgrel = 1
+ pkgrel = 2
url = https://pwsafe.org/
arch = i686
arch = x86_64
@@ -18,14 +18,15 @@ pkgbase = passwordsafe
depends = qrencode
optdepends = xvkbd: virtual-keyboard support
conflicts = passwordsafe-debian
- conflicts = passwordsafe-git
conflicts = pwsafe
conflicts = pwsafe-gui
source = https://github.com/pwsafe/pwsafe/archive/1.08.2BETA.tar.gz
source = https://github.com/pwsafe/pwsafe/releases/download/1.08.2BETA/1.08.2BETA.tar.gz.sig
+ source = 412458d281-glibc2.30-fix.patch
validpgpkeys = C8876BE69A8EC6414C8C8729B131423D7F2F1BB9
sha1sums = 0643f708517302a715a68241f90072dcb41a0c46
sha1sums = SKIP
+ sha1sums = 6d7c571d9f03f4f56fd60f8756d2db46e0e334b7
pkgname = passwordsafe
diff --git a/412458d281-glibc2.30-fix.patch b/412458d281-glibc2.30-fix.patch
new file mode 100644
index 00000000000..4f59f4886f0
--- /dev/null
+++ b/412458d281-glibc2.30-fix.patch
@@ -0,0 +1,27 @@
+From 412458d281f98ea7649d2957f88ebad701b6cd18 Mon Sep 17 00:00:00 2001
+From: ronys <ronys@pwsafe.org>
+Date: Wed, 6 Nov 2019 22:44:17 +0200
+Subject: [PATCH] Fix time64 type issue on newer glibc
+
+---
+ src/os/unix/pws_time.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/os/unix/pws_time.h b/src/os/unix/pws_time.h
+index 683cb48b9..3407fe702 100644
+--- a/src/os/unix/pws_time.h
++++ b/src/os/unix/pws_time.h
+@@ -14,8 +14,11 @@
+ #include <time.h>
+ #endif
+
+-#if !defined(__time64_t) && !defined(__TIME64_T_TYPE)
+-typedef uint64_t __time64_t;
++#ifndef __TIME64_T_TYPE
++#define __TIME64_T_TYPE uint64_t
++#endif
++#ifndef time64_t
++typedef __TIME64_T_TYPE __time64_t;
+ #endif
+
+ extern int localtime64_r(const __time64_t *timep, struct tm *result);
diff --git a/PKGBUILD b/PKGBUILD
index 6beeb0990dd..fa648912334 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=pwsafe
pkgname=passwordsafe
_pkgver=1.08.2
pkgver="$_pkgver"BETA
-pkgrel=1
+pkgrel=2
pkgdesc="Simple & Secure Password Management"
arch=('i686' 'x86_64')
url="https://pwsafe.org/"
@@ -12,12 +12,19 @@ license=('Artistic2.0')
depends=('libxtst' 'wxgtk2' 'yubikey-personalization' 'xerces-c' 'qrencode')
makedepends=('zip' 'libxt' 'cmake' 'gtest' 'git')
optdepends=('xvkbd: virtual-keyboard support')
-conflicts=('passwordsafe-debian' 'passwordsafe-git' 'pwsafe' 'pwsafe-gui')
+conflicts=('passwordsafe-debian' 'pwsafe' 'pwsafe-gui')
source=(https://github.com/pwsafe/pwsafe/archive/$pkgver.tar.gz
- https://github.com/pwsafe/pwsafe/releases/download/$pkgver/$pkgver.tar.gz.sig)
+ https://github.com/pwsafe/pwsafe/releases/download/$pkgver/$pkgver.tar.gz.sig
+ 412458d281-glibc2.30-fix.patch)
validpgpkeys=('C8876BE69A8EC6414C8C8729B131423D7F2F1BB9') # http://pgp.mit.edu/pks/lookup?op=vindex&search=0xB131423D7F2F1BB9
sha1sums=('0643f708517302a715a68241f90072dcb41a0c46'
- 'SKIP')
+ 'SKIP'
+ '6d7c571d9f03f4f56fd60f8756d2db46e0e334b7')
+
+prepare() {
+ cd $_pkgname-$pkgver
+ patch -p1 < ../412458d281-glibc2.30-fix.patch
+}
build() {
cd $_pkgname-$pkgver