summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schnaidt2015-06-13 20:48:27 +0200
committerAlexander Schnaidt2015-06-13 20:48:27 +0200
commitd390fb8af16467300766a054e9e7f174c039a677 (patch)
tree62f65aff87c70d6e58be095dab6f13119e87b134
parent87b5a271ddb08c84478ac698cf000bae200bfa07 (diff)
downloadaur-d390fb8af16467300766a054e9e7f174c039a677.tar.gz
passwordsafe: update for 0.96BETA, remove gcc5-patch
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch26
-rw-r--r--PKGBUILD13
3 files changed, 10 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a1e22e08d5a..8dff98d20be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = passwordsafe
pkgdesc = Simple & Secure Password Management
- pkgver = 0.95.1BETA
- pkgrel = 3
+ pkgver = 0.96BETA
+ pkgrel = 1
url = http://sourceforge.net/projects/passwordsafe/
install = passwordsafe.install
arch = i686
@@ -19,12 +19,10 @@ pkgbase = passwordsafe
conflicts = passwordsafe-debian
conflicts = passwordsafe-git
conflicts = pwsafe
- source = http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.95.1/pwsafe-0.95.1BETA-src.tgz
- source = http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.95.1/pwsafe-0.95.1BETA-src.tgz.sig
- source = 0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch
- md5sums = e3e3429d08789b6bde6270d1e6a91608
+ source = http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.96/pwsafe-0.96BETA-src.tgz
+ source = http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.96/pwsafe-0.96BETA-src.tgz.sig
+ md5sums = 0da54dd106895e18dcff5ed370843884
md5sums = SKIP
- md5sums = 2f8e962b4437f72c88493ede8cf6fcf5
pkgname = passwordsafe
diff --git a/0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch b/0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch
deleted file mode 100644
index feaa3f7a075..00000000000
--- a/0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f158a3cf478b9adb18c07f3f2b322785ec3afb82 Mon Sep 17 00:00:00 2001
-From: ronys <ronys@users.sourceforge.net>
-Date: Sat, 14 Mar 2015 20:53:11 +0200
-Subject: [PATCH] Fix for Fedora 22, applicable to all Linux builds
-
-From Jan Henning
----
- src/os/linux/rand.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/os/linux/rand.cpp b/src/os/linux/rand.cpp
-index 068bf70..9fd726d 100644
---- a/src/os/linux/rand.cpp
-+++ b/src/os/linux/rand.cpp
-@@ -35,7 +35,7 @@ bool pws_os::GetRandomData(void *p, unsigned long len)
- ifstream is("/dev/urandom");
- if (!is)
- return false;
-- return is.read(static_cast<char *>(p), len);
-+ return is.read(static_cast<char *>(p), len).good();
- }
-
- static void get_failsafe_rnd(char * &p, unsigned &slen)
---
-2.4.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 0f485564ca6..71c735fa273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
_pkgname=pwsafe
pkgname=passwordsafe
-_pkgver=0.95.1
+_pkgver=0.96
pkgver="$_pkgver"BETA
-pkgrel=3
+pkgrel=1
pkgdesc="Simple & Secure Password Management"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/passwordsafe/"
@@ -14,18 +14,15 @@ depends=('libxtst' 'wxgtk' 'webkitgtk2' 'ykpers' 'xerces-c')
makedepends=('git' 'zip' 'libxt')
optdepends=('xvkbd: virtual-keyboard support')
conflicts=('passwordsafe-debian' 'passwordsafe-git' 'pwsafe')
-source=(http://downloads.sourceforge.net/project/$pkgname/Linux-BETA/$_pkgver/$_pkgname-$pkgver-src.tgz{,.sig}
- 0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch)
+source=(http://downloads.sourceforge.net/project/$pkgname/Linux-BETA/$_pkgver/$_pkgname-$pkgver-src.tgz{,.sig})
install='passwordsafe.install'
validpgpkeys=('A703C1328EABC7B201753BA3919464515CCF8BB3') #Rony Shapiro
-md5sums=('e3e3429d08789b6bde6270d1e6a91608'
- 'SKIP'
- '2f8e962b4437f72c88493ede8cf6fcf5')
+md5sums=('0da54dd106895e18dcff5ed370843884'
+ 'SKIP')
prepare() {
cd "$_pkgname-$pkgver"
- patch -p1 -i ../0001-Fix-for-Fedora-22-applicable-to-all-Linux-builds.patch
}
build() {