[arch-commits] Commit in dirmngr/repos (12 files)
Tobias Powalowski
tpowa at archlinux.org
Tue Sep 9 06:24:13 UTC 2014
Date: Tuesday, September 9, 2014 @ 08:24:12
Author: tpowa
Revision: 221230
db-move: moved dirmngr from [testing] to [core] (i686, x86_64)
Added:
dirmngr/repos/core-i686/PKGBUILD
(from rev 221229, dirmngr/repos/testing-i686/PKGBUILD)
dirmngr/repos/core-i686/dirmngr-pth-fix.patch
(from rev 221229, dirmngr/repos/testing-i686/dirmngr-pth-fix.patch)
dirmngr/repos/core-i686/dirmngr.install
(from rev 221229, dirmngr/repos/testing-i686/dirmngr.install)
dirmngr/repos/core-x86_64/PKGBUILD
(from rev 221229, dirmngr/repos/testing-x86_64/PKGBUILD)
dirmngr/repos/core-x86_64/dirmngr-pth-fix.patch
(from rev 221229, dirmngr/repos/testing-x86_64/dirmngr-pth-fix.patch)
dirmngr/repos/core-x86_64/dirmngr.install
(from rev 221229, dirmngr/repos/testing-x86_64/dirmngr.install)
Deleted:
dirmngr/repos/core-i686/PKGBUILD
dirmngr/repos/core-i686/dirmngr.install
dirmngr/repos/core-x86_64/PKGBUILD
dirmngr/repos/core-x86_64/dirmngr.install
dirmngr/repos/testing-i686/
dirmngr/repos/testing-x86_64/
-----------------------------------+
/PKGBUILD | 74 ++++++++++++++++++++++++++++++++++++
/dirmngr.install | 40 +++++++++++++++++++
core-i686/PKGBUILD | 30 --------------
core-i686/dirmngr-pth-fix.patch | 17 ++++++++
core-i686/dirmngr.install | 20 ---------
core-x86_64/PKGBUILD | 30 --------------
core-x86_64/dirmngr-pth-fix.patch | 17 ++++++++
core-x86_64/dirmngr.install | 20 ---------
8 files changed, 148 insertions(+), 100 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2014-09-09 06:23:29 UTC (rev 221229)
+++ core-i686/PKGBUILD 2014-09-09 06:24:12 UTC (rev 221230)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=dirmngr
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="A daemon to handle CRL and certificate requests"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
-depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-install=dirmngr.install
-md5sums=('f5a40e93bcf07a94522579bfd58a2c96')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- # FIX for https://bugzilla.redhat.com/565131
- # not sure how best to turn this into something more upstreamable
- # patch configure to try this combo first? -- Rex
- # https://bugs.archlinux.org/task/28606
- export LDAPLIBS="-lldap -llber"
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: dirmngr/repos/core-i686/PKGBUILD (from rev 221229, dirmngr/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=dirmngr
+pkgver=1.1.1
+pkgrel=3
+pkgdesc="A daemon to handle CRL and certificate requests"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
+depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
+ 'dirmngr-pth-fix.patch')
+install=dirmngr.install
+md5sums=('f5a40e93bcf07a94522579bfd58a2c96'
+ '3592d141e818c0fbc71018e9ffc71953')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i $srcdir/dirmngr-pth-fix.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # FIX for https://bugzilla.redhat.com/565131
+ # not sure how best to turn this into something more upstreamable
+ # patch configure to try this combo first? -- Rex
+ # https://bugs.archlinux.org/task/28606
+ export LDAPLIBS="-lldap -llber"
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Copied: dirmngr/repos/core-i686/dirmngr-pth-fix.patch (from rev 221229, dirmngr/repos/testing-i686/dirmngr-pth-fix.patch)
===================================================================
--- core-i686/dirmngr-pth-fix.patch (rev 0)
+++ core-i686/dirmngr-pth-fix.patch 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,17 @@
+Index: src/dirmngr.c
+===================================================================
+--- src/dirmngr.c (revision 348)
++++ src/dirmngr.c (working copy)
+@@ -665,8 +665,11 @@
+ the option parsing may need services of the libraries. */
+
+ /* Libgcrypt requires us to register the threading model first.
+- Note that this will also do the pth_init. */
++ Note that this will also do the pth_init for libgcrypt < 1.6 */
+
++#if GCRYPT_VERSION_NUMBER >= 0x010600
++ pth_init ();
++#endif
+ /* Init Libgcrypt. */
+ rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
+ if (rc)
Deleted: core-i686/dirmngr.install
===================================================================
--- core-i686/dirmngr.install 2014-09-09 06:23:29 UTC (rev 221229)
+++ core-i686/dirmngr.install 2014-09-09 06:24:12 UTC (rev 221230)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(dirmngr.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
Copied: dirmngr/repos/core-i686/dirmngr.install (from rev 221229, dirmngr/repos/testing-i686/dirmngr.install)
===================================================================
--- core-i686/dirmngr.install (rev 0)
+++ core-i686/dirmngr.install 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(dirmngr.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2014-09-09 06:23:29 UTC (rev 221229)
+++ core-x86_64/PKGBUILD 2014-09-09 06:24:12 UTC (rev 221230)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=dirmngr
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="A daemon to handle CRL and certificate requests"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
-depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-install=dirmngr.install
-md5sums=('f5a40e93bcf07a94522579bfd58a2c96')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- # FIX for https://bugzilla.redhat.com/565131
- # not sure how best to turn this into something more upstreamable
- # patch configure to try this combo first? -- Rex
- # https://bugs.archlinux.org/task/28606
- export LDAPLIBS="-lldap -llber"
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
Copied: dirmngr/repos/core-x86_64/PKGBUILD (from rev 221229, dirmngr/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=dirmngr
+pkgver=1.1.1
+pkgrel=3
+pkgdesc="A daemon to handle CRL and certificate requests"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="ftp://ftp.gnupg.org/gcrypt/dirmngr"
+depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth')
+source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
+ 'dirmngr-pth-fix.patch')
+install=dirmngr.install
+md5sums=('f5a40e93bcf07a94522579bfd58a2c96'
+ '3592d141e818c0fbc71018e9ffc71953')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i $srcdir/dirmngr-pth-fix.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ # FIX for https://bugzilla.redhat.com/565131
+ # not sure how best to turn this into something more upstreamable
+ # patch configure to try this combo first? -- Rex
+ # https://bugs.archlinux.org/task/28606
+ export LDAPLIBS="-lldap -llber"
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Copied: dirmngr/repos/core-x86_64/dirmngr-pth-fix.patch (from rev 221229, dirmngr/repos/testing-x86_64/dirmngr-pth-fix.patch)
===================================================================
--- core-x86_64/dirmngr-pth-fix.patch (rev 0)
+++ core-x86_64/dirmngr-pth-fix.patch 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,17 @@
+Index: src/dirmngr.c
+===================================================================
+--- src/dirmngr.c (revision 348)
++++ src/dirmngr.c (working copy)
+@@ -665,8 +665,11 @@
+ the option parsing may need services of the libraries. */
+
+ /* Libgcrypt requires us to register the threading model first.
+- Note that this will also do the pth_init. */
++ Note that this will also do the pth_init for libgcrypt < 1.6 */
+
++#if GCRYPT_VERSION_NUMBER >= 0x010600
++ pth_init ();
++#endif
+ /* Init Libgcrypt. */
+ rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
+ if (rc)
Deleted: core-x86_64/dirmngr.install
===================================================================
--- core-x86_64/dirmngr.install 2014-09-09 06:23:29 UTC (rev 221229)
+++ core-x86_64/dirmngr.install 2014-09-09 06:24:12 UTC (rev 221230)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(dirmngr.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
Copied: dirmngr/repos/core-x86_64/dirmngr.install (from rev 221229, dirmngr/repos/testing-x86_64/dirmngr.install)
===================================================================
--- core-x86_64/dirmngr.install (rev 0)
+++ core-x86_64/dirmngr.install 2014-09-09 06:24:12 UTC (rev 221230)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(dirmngr.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list