diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
| commit | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (patch) | |
| tree | 227eed66652cffc0e872b75e7fe601cb23214cdb /community/pwsafe | |
| parent | 394988e4c3a3ab21e5d79481ac3f3295045af987 (diff) | |
| parent | 7ff5465d0386f06bea97ef956397c305d6f7e07f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/smalltalk/PKGBUILD
extra/crypto++/PKGBUILD
extra/libpciaccess/PKGBUILD
extra/postfix/PKGBUILD
extra/samba/PKGBUILD
extra/xorg-server/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
Diffstat (limited to 'community/pwsafe')
| -rw-r--r-- | community/pwsafe/PKGBUILD | 20 | ||||
| -rw-r--r-- | community/pwsafe/pwsafe-XChangeProperty.patch | 20 |
2 files changed, 36 insertions, 4 deletions
diff --git a/community/pwsafe/PKGBUILD b/community/pwsafe/PKGBUILD index 9ce2a6cf1..d95d4e563 100644 --- a/community/pwsafe/PKGBUILD +++ b/community/pwsafe/PKGBUILD @@ -1,23 +1,35 @@ -# $Id: PKGBUILD 66173 2012-02-23 02:29:46Z spupykin $ +# $Id: PKGBUILD 69267 2012-04-11 11:46:13Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=pwsafe pkgver=0.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="A commandline program for managing encrypted password databases" arch=('i686' 'x86_64' 'mips64el') url="http://nsd.dyndns.org/pwsafe/" license=('GPL') depends=('openssl' 'libxmu' 'readline') -source=($url/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('4bb36538a2772ecbf1a542bc7d4746c0') +source=(${url}/releases/${pkgname}-${pkgver}.tar.gz + pwsafe-XChangeProperty.patch) +md5sums=('4bb36538a2772ecbf1a542bc7d4746c0' + 'cff6aee2e43f5fbe82e8cd7ccfefb099') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Patch from fedora, fixes FS#28339 + patch -Np0 -i ../pwsafe-XChangeProperty.patch + ./configure --prefix=/usr --mandir=/usr/share/man make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # Make pwsafe suid root so it can seed rng as a user chmod +s ${pkgdir}/usr/bin/pwsafe } diff --git a/community/pwsafe/pwsafe-XChangeProperty.patch b/community/pwsafe/pwsafe-XChangeProperty.patch new file mode 100644 index 000000000..6758a573d --- /dev/null +++ b/community/pwsafe/pwsafe-XChangeProperty.patch @@ -0,0 +1,20 @@ +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) { |