diff options
author | graysky | 2020-09-06 06:24:33 -0400 |
---|---|---|
committer | graysky | 2020-09-06 06:24:33 -0400 |
commit | 3e23fa2b39117bbe80c9ceb696244efd80efb8e1 (patch) | |
tree | 3c699ab5f770c7a4ae3299ab5407f815118335ff | |
parent | c2d6b885623f73c5bd1c6e73aef3d5c88d777f23 (diff) | |
download | aur-3e23fa2b39117bbe80c9ceb696244efd80efb8e1.tar.gz |
Update to 20200906-1
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | pwsafe-XChangeProperty.patch | 20 |
3 files changed, 9 insertions, 35 deletions
@@ -1,17 +1,15 @@ pkgbase = pwsafe pkgdesc = A commandline program for managing encrypted password databases - pkgver = 20181220 - pkgrel = 2 + pkgver = 20200906 + pkgrel = 1 url = https://github.com/nsd20463/pwsafe arch = x86_64 license = GPL makedepends = git depends = openssl depends = libxmu - source = git://github.com/nsd20463/pwsafe.git#commit=1dbcfd01a502d1579a80c208662add64b4090818 - source = pwsafe-XChangeProperty.patch + source = git://github.com/nsd20463/pwsafe.git#commit=cc9e08da251a91915470f60c38da1efec57e5854 md5sums = SKIP - md5sums = cff6aee2e43f5fbe82e8cd7ccfefb099 pkgname = pwsafe @@ -3,24 +3,20 @@ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=pwsafe -pkgver=20181220 -_commit=1dbcfd01a502d1579a80c208662add64b4090818 -pkgrel=2 +pkgver=20200906 +_commit=cc9e08da251a91915470f60c38da1efec57e5854 +pkgrel=1 pkgdesc="A commandline program for managing encrypted password databases" arch=('x86_64') url="https://github.com/nsd20463/pwsafe" license=('GPL') depends=('openssl' 'libxmu') makedepends=('git') -source=("git://github.com/nsd20463/pwsafe.git#commit=${_commit}" - pwsafe-XChangeProperty.patch) -md5sums=('SKIP' - 'cff6aee2e43f5fbe82e8cd7ccfefb099') +source=("git://github.com/nsd20463/pwsafe.git#commit=${_commit}") +md5sums=('SKIP') prepare() { cd "$srcdir"/${pkgname} - # Patch from fedora, fixes FS#28339 - patch -Np0 -i ../pwsafe-XChangeProperty.patch } build() { @@ -37,5 +33,5 @@ package() { cd "$srcdir"/${pkgname} make DESTDIR="$pkgdir" install # Make pwsafe suid root so it can seed rng as a user - #chmod +s "$pkgdir"/usr/bin/pwsafe + chmod +s "$pkgdir"/usr/bin/pwsafe } diff --git a/pwsafe-XChangeProperty.patch b/pwsafe-XChangeProperty.patch deleted file mode 100644 index 6758a573dc62..000000000000 --- a/pwsafe-XChangeProperty.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: pwsafe.cpp -=================================================================== -RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v -retrieving revision 1.57 -diff -u -r1.57 pwsafe.cpp ---- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57 -+++ pwsafe.cpp 5 Jan 2011 22:16:43 -0000 -@@ -1820,10 +1820,10 @@ - if (xev.xselectionrequest.target == XA_TARGETS(xdisplay)) { - // tell them what we can supply - const Atom targets[] = { XA_TARGETS(xdisplay), XA_TIMESTAMP(xdisplay), XA_TEXT(xdisplay), XA_STRING }; -- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TARGETS(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0])); -+ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_ATOM, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0])); - } - else if (xev.xselectionrequest.target == XA_TIMESTAMP(xdisplay)) { -- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TIMESTAMP(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1); -+ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1); - } - else if (xev.xselectionrequest.target == XA_TEXT(xdisplay) || - xev.xselectionrequest.target == XA_STRING) { |