diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-04 09:24:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-04 09:24:36 +0000 |
| commit | 44ef6d97d5c4cb631e3cf70dfb854be5db1488d2 (patch) | |
| tree | 2fd7d8e5510e8a95c7a04960a3502667d42436b4 /main/gnupg | |
| parent | 3270015d234b245f95d9e9c60757043e7c10a7e8 (diff) | |
| download | aports-44ef6d97d5c4cb631e3cf70dfb854be5db1488d2.tar.bz2 aports-44ef6d97d5c4cb631e3cf70dfb854be5db1488d2.tar.xz | |
main/gnupg: upgrade to 2.1.0-beta751
Diffstat (limited to 'main/gnupg')
| -rw-r--r-- | main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch | 31 | ||||
| -rw-r--r-- | main/gnupg/APKBUILD | 38 |
2 files changed, 58 insertions, 11 deletions
diff --git a/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch b/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch new file mode 100644 index 0000000000..a835f39278 --- /dev/null +++ b/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch @@ -0,0 +1,31 @@ +From d2f3053e156a8dfc3e2e7f8fa814f671d851b26f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 4 Jul 2014 08:15:21 +0000 +Subject: [PATCH] Include sys/select.h for FD_SETSIZE + +This fixes the following compile error with musl libc: +watchgnupg.c:225:18: error: 'FD_SETSIZE' undeclared (first use in this +function) + else if (fd >= FD_SETSIZE) + ^ + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + tools/watchgnupg.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c +index 4f4d54d..7aede22 100644 +--- a/tools/watchgnupg.c ++++ b/tools/watchgnupg.c +@@ -28,6 +28,7 @@ + #include <stdarg.h> + #include <assert.h> + #include <unistd.h> ++#include <sys/select.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <netinet/in.h> +-- +2.0.1 + diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index 46dc350d30..90ea81f85a 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -1,20 +1,33 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnupg -pkgver=2.0.22 -pkgrel=1 +pkgver=2.1.0_beta751 +_ver=${pkgver/_beta/-beta} +pkgrel=0 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" url="http://www.gnupg.org/" arch="all" license="GPL" -options="!libc_musl" +options="" depends="pinentry" -makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev - pth-dev zlib-dev libiconv-dev libassuan-dev" +makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev + npth-dev zlib-dev libiconv-dev libassuan-dev" subpackages="$pkgname-doc" -source="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2" +source="ftp://ftp.gnupg.org/gcrypt/gnupg/unstable/gnupg-$_ver.tar.bz2 + 0001-Include-sys-select.h-for-FD_SETSIZE.patch + " +_builddir="$srcdir"/$pkgname-$_ver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + update_config_sub || return 1 +} build () { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,11 +38,14 @@ build () { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make DESTDIR="$pkgdir" install # compat symlink ln -s gpg2 "$pkgdir"/usr/bin/gpg } -md5sums="ee22e7b4fdbfcb50229c2e6db6db291e gnupg-2.0.22.tar.bz2" -sha256sums="437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251 gnupg-2.0.22.tar.bz2" -sha512sums="de534b2f4b8d3c320e97519fe0834bc403c96c6dbb2e24fc24eb68f4ff80374360ef66d83ddc3d6fa096c5199d3782abc5d06b866203378cba130b42802cc855 gnupg-2.0.22.tar.bz2" +md5sums="fc568463581bc1b9633886419bc9b0b9 gnupg-2.1.0-beta751.tar.bz2 +1d944009f039912d92e4f119bd6826e4 0001-Include-sys-select.h-for-FD_SETSIZE.patch" +sha256sums="5abd2bc02365ba3007ed484a256651341a87a1f2a03970bac4015809de09ade5 gnupg-2.1.0-beta751.tar.bz2 +6ce103e1bf68ba8e35b0e6d5805632deddded62b3224b185589f7bd9243ddb9e 0001-Include-sys-select.h-for-FD_SETSIZE.patch" +sha512sums="230a2e37eea401465017053e3c5e47187a5963f06dc5528c9a3ff6c76ee9e2ff857cb9e4ddf0b72d8d79eadb50834858f5340c02625279c403f30ed709da4869 gnupg-2.1.0-beta751.tar.bz2 +c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-select.h-for-FD_SETSIZE.patch" |