summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrés J. Díaz2017-07-04 14:21:02 +0200
committerAndrés J. Díaz2017-07-04 14:21:02 +0200
commitf289ec0399255256f55549c57802fcc74a218bc0 (patch)
tree29daf2a7eb68dd19815dccd2a94975fd7a47e3c7
parent9af8aa5674a48e86dfd1442f0006834e3502ccca (diff)
downloadaur-f289ec0399255256f55549c57802fcc74a218bc0.tar.gz
Fix cryptokit uint32 bogus type error
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD28
-rw-r--r--cryptokit-1.7-sks-uint32.patch14
3 files changed, 40 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8dcdc0f0c83..47f37810bce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sks
pkgdesc = Synchronizing OpenPGP Key Server
pkgver = 1.1.6
- pkgrel = 1
+ pkgrel = 2
url = https://bitbucket.org/skskeyserver/sks-keyserver/
install = sks.install
arch = i686
@@ -21,12 +21,14 @@ pkgbase = sks
source = 500_debian_fhs.patch
source = sks-db.service
source = sks-recon.service
+ source = cryptokit-1.7-sks-uint32.patch
validpgpkeys = C90EF1430B3AC0DFD00E6EA541259773973A612A
- md5sums = 43f0cc8b4b43d798d453fedad840f926
- md5sums = SKIP
- md5sums = 9cf5495b95e84ed91788c04c9ce1b8c1
- md5sums = e8c7dcbb7db3ad879d391a7c0127a068
- md5sums = f28a2d0b151996a99bb006b8e1d29408
+ sha512sums = f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
+ sha512sums = SKIP
+ sha512sums = 0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc
+ sha512sums = 5628e6a0065ec9bab4df84e77bed0af51379e70021543dfee4d4181f55b2779735fcea7848b51e2ab555f9f988da5aff8f0f15e522b801d7330e4bb2e53701fc
+ sha512sums = 41352e9862996170c70ed8e546ad89e26c94bf3c4ef7e91b64f330273b94c2666cf3f11f13a54e66b1a29b3ef46b75c8c6dfbe49fe12e2b11451e8311faf68a9
+ sha512sums = 6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171
pkgname = sks
diff --git a/PKGBUILD b/PKGBUILD
index e5bf4ef8d37..fca0d5b6376 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=sks
pkgver=1.1.6
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
pkgdesc='Synchronizing OpenPGP Key Server'
@@ -13,15 +13,20 @@ backup=('etc/sks/sksconf'
'etc/sks/mailsync'
'etc/sks/membership'
'etc/sks/procmail')
-source=(https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${pkgname}-${pkgver}.tgz{,.asc}
- '500_debian_fhs.patch'
- 'sks-db.service'
- 'sks-recon.service')
-md5sums=('43f0cc8b4b43d798d453fedad840f926'
- 'SKIP'
- '9cf5495b95e84ed91788c04c9ce1b8c1'
- 'e8c7dcbb7db3ad879d391a7c0127a068'
- 'f28a2d0b151996a99bb006b8e1d29408')
+source=(
+ https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${pkgname}-${pkgver}.tgz{,.asc}
+ '500_debian_fhs.patch'
+ 'sks-db.service'
+ 'sks-recon.service'
+ 'cryptokit-1.7-sks-uint32.patch')
+sha512sums=(
+ 'f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099'
+ SKIP
+ '0fd57ccd86f289cf51638995555988a572ee00d6f28f3797092ffda19a0f668ee950be1ef381e94c64301db2dd1ad308834a45b7eaec148e9d8c01ed0a1829bc'
+ '5628e6a0065ec9bab4df84e77bed0af51379e70021543dfee4d4181f55b2779735fcea7848b51e2ab555f9f988da5aff8f0f15e522b801d7330e4bb2e53701fc'
+ '41352e9862996170c70ed8e546ad89e26c94bf3c4ef7e91b64f330273b94c2666cf3f11f13a54e66b1a29b3ef46b75c8c6dfbe49fe12e2b11451e8311faf68a9'
+ '6ee333ce8aec0b103a36be376da43a569ed455f554fe853d007afc1d2e3a30d29735f515d22646832a8b4efa1ffdbfadb4a85ec22f2e5159180fc8373252c171'
+)
validpgpkeys=(C90EF1430B3AC0DFD00E6EA541259773973A612A) # SKS Keyserver Signing Key
@@ -50,6 +55,9 @@ build() {
cd "$pkgname-$pkgver"
unset MAKEFLAGS
make dep
+ make "cryptokit-1.7/README.txt"
+
+ patch -Np0 -i "$srcdir/cryptokit-1.7-sks-uint32.patch"
# XXX Parallel compiling not supporting for Bdb module, force -j1 always.
make CFLAGS="$CFLAGS -I`ocamlc -where` -I ." -j1 all
diff --git a/cryptokit-1.7-sks-uint32.patch b/cryptokit-1.7-sks-uint32.patch
new file mode 100644
index 00000000000..0f2e18a39ee
--- /dev/null
+++ b/cryptokit-1.7-sks-uint32.patch
@@ -0,0 +1,14 @@
+diff -urN cryptokit-1.7-orig/src/stubs-md5.c cryptokit-1.7/src/stubs-md5.c
+--- cryptokit-1.7-orig/src/stubs-md5.c 2010-08-30 05:53:00.000000000 -0500
++++ cryptokit-1.7/src/stubs-md5.c 2015-08-05 21:35:16.192104184 -0500
+@@ -18,8 +18,8 @@
+ #include <caml/alloc.h>
+
+ struct MD5Context {
+- uint32 buf[4];
+- uint32 bits[2];
++ uint32_t buf[4];
++ uint32_t bits[2];
+ unsigned char in[64];
+ };
+