diff options
author | André Klitzing <aklitzing@gmail.com> | 2017-02-22 13:07:06 +0100 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2017-02-26 19:48:05 +0000 |
commit | 9124e66482aa2f1b21ef217785771108a755b3c9 (patch) | |
tree | 34ae6c82816016c09814c968f6d8c7eb7acaf20a /main/putty | |
parent | f4b3ad86ec6069729c2545d8004deecf29101094 (diff) | |
download | aports-9124e66482aa2f1b21ef217785771108a755b3c9.tar.bz2 aports-9124e66482aa2f1b21ef217785771108a755b3c9.tar.xz |
main/putty: upgrade to 0.68
* Modernize abuild
* Remove merged patches
Diffstat (limited to 'main/putty')
-rw-r--r-- | main/putty/APKBUILD | 37 | ||||
-rw-r--r-- | main/putty/fix-big-int-type.patch | 14 | ||||
-rw-r--r-- | main/putty/fix-include.patch | 12 |
3 files changed, 6 insertions, 57 deletions
diff --git a/main/putty/APKBUILD b/main/putty/APKBUILD index 7c397de0dd..a3b3695ef5 100644 --- a/main/putty/APKBUILD +++ b/main/putty/APKBUILD @@ -1,34 +1,17 @@ # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org> pkgname=putty -pkgver=0.67 +pkgver=0.68 pkgrel=0 pkgdesc="SSH and telnet client" url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" arch="all" license="custom" -depends= -depends_dev= -makedepends="$depends_dev" -install="" subpackages="$pkgname-doc" -source="http://the.earth.li/~sgtatham/putty/latest/putty-$pkgver.tar.gz -fix-big-int-type.patch -fix-include.patch -" - -_builddir="$srcdir"/putty-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +source="http://the.earth.li/~sgtatham/putty/latest/putty-$pkgver.tar.gz" +builddir="$srcdir"/putty-$pkgver build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,16 +21,8 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="8d5d450e8f9a011e2e411e3f30827e9b putty-0.67.tar.gz -a9a76a4b889eaa3c25bce60c2c3d1211 fix-big-int-type.patch -c376fb348650e28b88cbf06c07cd35d4 fix-include.patch" -sha256sums="80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 putty-0.67.tar.gz -77cf14b0c1b793c79c3f80a6e11b57ca281a155a3b01c96ec052ec1cd37d849b fix-big-int-type.patch -c10f453b2b8f4df670e192234ab14aa81d28f5b917a38c75d8936e351478c738 fix-include.patch" -sha512sums="c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca putty-0.67.tar.gz -7dae793a7f9c5248f10ebf456087c01459c99bc8ab931b06a9aa09d70ef010a06bf7b248c38b03ddd0b76d1a35d3b32a095ac99a22d08aa170ce0d100f5dffb7 fix-big-int-type.patch -1ac1d9c803e0bc180b4c9a2dde357d06b0af37d182e8037fccc5c42f03f5e796fca0a1a2e6fa2db5ae27fbbdfb2579938a70ccf5028fee20c828a853607f330b fix-include.patch" +sha512sums="e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 putty-0.68.tar.gz" diff --git a/main/putty/fix-big-int-type.patch b/main/putty/fix-big-int-type.patch deleted file mode 100644 index 77c17284b2..0000000000 --- a/main/putty/fix-big-int-type.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sshbn.h.orig b/sshbn.h -index a043241..f2a3217 100644 ---- a/sshbn.h.orig -+++ b/sshbn.h -@@ -26,7 +26,8 @@ - * using the same 'two machine registers' kind of code generation that - * 32-bit targets use for 64-bit ints. If we have one of these, we can - * use a 64-bit BignumInt and a 128-bit BignumDblInt. */ --typedef __uint64_t BignumInt; -+#include <stdint.h> -+typedef uint64_t BignumInt; - typedef __uint128_t BignumDblInt; - #define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL - #define BIGNUM_TOP_BIT 0x8000000000000000ULL diff --git a/main/putty/fix-include.patch b/main/putty/fix-include.patch deleted file mode 100644 index f024a5eb80..0000000000 --- a/main/putty/fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/unix/uxcons.c b/unix/uxcons.c -index fa1c43f..8c8da0c 100644 ---- a/unix/uxcons.c -+++ b/unix/uxcons.c -@@ -8,6 +8,7 @@ - #include <stdarg.h> - #include <assert.h> - #include <errno.h> -+#include <sys/select.h> - - #include <termios.h> - #include <unistd.h> |