aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2019-04-08 12:09:11 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-04-08 12:09:43 +0000
commite29c5d734c6d64bd6709f1e9a9e3404ca37f2211 (patch)
treea47580464c406af71450ee7b11e8a7df29dd3de0 /main
parentd9e9e955df92cd033d2771455fa4409ea08562fe (diff)
downloadaports-e29c5d734c6d64bd6709f1e9a9e3404ca37f2211.tar.bz2
aports-e29c5d734c6d64bd6709f1e9a9e3404ca37f2211.tar.xz
main/putty: security upgrade to 0.71
CVE-2019-9894, CVE-2019-9895, CVE-2019-9897, CVE-2019-9898 Fixes #10193 Update license, disable check
Diffstat (limited to 'main')
-rw-r--r--main/putty/APKBUILD18
-rw-r--r--main/putty/fix-ppc64le-disable-werror.patch8
2 files changed, 18 insertions, 8 deletions
diff --git a/main/putty/APKBUILD b/main/putty/APKBUILD
index 6c883747e3..4fc1019b93 100644
--- a/main/putty/APKBUILD
+++ b/main/putty/APKBUILD
@@ -1,16 +1,24 @@
# Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org>
pkgname=putty
-pkgver=0.70
-pkgrel=1
+pkgver=0.71
+pkgrel=0
pkgdesc="SSH and telnet client"
url="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
arch="all"
-license="custom"
+license="MIT"
subpackages="$pkgname-doc"
source="http://the.earth.li/~sgtatham/putty/$pkgver/putty-$pkgver.tar.gz
fix-ppc64le-disable-werror.patch"
+options="!check" # no test suite
builddir="$srcdir"/putty-$pkgver
+# secfixes:
+# 0.71-r0:
+# - CVE-2019-9894
+# - CVE-2019-9895
+# - CVE-2019-9897
+# - CVE-2019-9898
+
build() {
cd "$builddir"
./configure \
@@ -25,5 +33,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2aaf4fa2b4ad2d82eb5cdc4419ade79e0c5d8bd3c093db92b3c048e6107f85a5f1647f9d8203cda0906ce2b926725a75319f981cb32e6f1ebf50b1f738564fed putty-0.70.tar.gz
-408f113f659bcb0df99d2941d243950b59159fb06a7c1640fdb92b79e1f4f9c7304c36910143797c448577282b17cd6297b98fefe83d9beeeab0ffc3657aebf7 fix-ppc64le-disable-werror.patch"
+sha512sums="f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07 putty-0.71.tar.gz
+b10b2332ca0592db5664311d1bba7549ded79f16f6eef13dab3caca21626d97657f31e8603766e00b1a06f42cf229107eb53929730fe48e97cfc9216093fcc4c fix-ppc64le-disable-werror.patch"
diff --git a/main/putty/fix-ppc64le-disable-werror.patch b/main/putty/fix-ppc64le-disable-werror.patch
index b42a99e962..2dba28bdb7 100644
--- a/main/putty/fix-ppc64le-disable-werror.patch
+++ b/main/putty/fix-ppc64le-disable-werror.patch
@@ -1,11 +1,13 @@
+diff --git a/configure b/configure
+index d68c382..5db360e 100755
--- a/configure
+++ b/configure
-@@ -5853,7 +5853,7 @@
+@@ -5995,7 +5995,7 @@ fi
if test "x$GCC" = "xyes"; then
:
-- WARNINGOPTS='-Wall -Werror'
-+ WARNINGOPTS='-Wall '
+- WARNINGOPTS='-Wall -Werror -Wpointer-arith -Wvla'
++ WARNINGOPTS='-Wall -Wpointer-arith -Wvla'
else
: