diff options
| author | Michael Lyngbol <michael@lyngbol.dk> | 2022-08-07 06:26:12 +0000 |
|---|---|---|
| committer | alice <alice@ayaya.dev> | 2022-08-07 14:59:55 +0000 |
| commit | 0f3fa72739cf6c3c57e6302cbce398ca0600ca73 (patch) | |
| tree | 482c78523d51ec436d6f5a0a69fb555e471bba19 | |
| parent | e4ce640c2c7a4178ff493b8bf33909fb77cb304f (diff) | |
community/inetutils-telnet: upgrade to 2.3
| -rw-r--r-- | community/inetutils-telnet/0001-telnet-fix-infloop-for-malicious-server.patch | 25 | ||||
| -rw-r--r-- | community/inetutils-telnet/APKBUILD | 8 |
2 files changed, 3 insertions, 30 deletions
diff --git a/community/inetutils-telnet/0001-telnet-fix-infloop-for-malicious-server.patch b/community/inetutils-telnet/0001-telnet-fix-infloop-for-malicious-server.patch deleted file mode 100644 index 8aa82b329e3..00000000000 --- a/community/inetutils-telnet/0001-telnet-fix-infloop-for-malicious-server.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3fcebb9b38b8b01e528d158656af863f98a3c751 Mon Sep 17 00:00:00 2001 -From: Simon Josefsson <simon@josefsson.org> -Date: Fri, 3 Sep 2021 15:59:45 +0200 -Subject: [PATCH] telnet: Don't infloop for malicious server. - -See https://bugs.debian.org/945861 and the tiny patch used by NetBSD: -https://github.com/NetBSD/src/commit/36b8cfb2e28f691beae12da0c207086e1df0c8c4#diff-38b7213f9c6c21245fbeb4fad9520a27239d712a6dd0fea20dd6b77203b5737c - -* telnet/utilities.c (ExitString): Don't call SetForExit(). - -diff --git a/telnet/utilities.c b/telnet/utilities.c -index 85fd4762..08571cd4 100644 ---- a/telnet/utilities.c -+++ b/telnet/utilities.c -@@ -1063,7 +1063,6 @@ Exit (int returnCode) - void - ExitString (char *string, int returnCode) - { -- SetForExit (); - fwrite (string, 1, strlen (string), stderr); - exit (returnCode); - } --- -2.33.0 - diff --git a/community/inetutils-telnet/APKBUILD b/community/inetutils-telnet/APKBUILD index dc47ca06eca..4ecb4193ac5 100644 --- a/community/inetutils-telnet/APKBUILD +++ b/community/inetutils-telnet/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Michael Lyngbol <michael@lyngbol.dk> pkgname=inetutils-telnet _pkgname=inetutils -pkgver=2.2 -pkgrel=1 +pkgver=2.3 +pkgrel=0 pkgdesc="Telnet client from GNU network utilities" url="https://www.gnu.org/software/inetutils" arch="all" @@ -12,7 +12,6 @@ depends="ncurses" makedepends="ncurses-dev" subpackages="$pkgname-doc" source="https://ftp.gnu.org/gnu/inetutils/$_pkgname-$pkgver.tar.xz - 0001-telnet-fix-infloop-for-malicious-server.patch " builddir="$srcdir"/$_pkgname-$pkgver @@ -44,6 +43,5 @@ package() { } sha512sums=" -153bc02b2d497f927528f9aac04f16011ec5eb54a3acd98c100dfb6b0b01a63fd1cbc7d2e502b434e38d3ef70208d7a498141b930b1818181343627a525eaeef inetutils-2.2.tar.xz -844cac3437d8b1321e90dadbcbd2020a675740b4d3a051b17508a42196e5814e692dbee2cf41c30c1549746e497127261a5f76a86b914d83f83ea46dc15c9143 0001-telnet-fix-infloop-for-malicious-server.patch +bedaa347ad0e4e7ab43a0cb60a2bb693f84de7687a368e7a10d328306db6f508a0ef28ee80e6110a3e932a094d4b9355911935fd9f0700fe991b853a063adf60 inetutils-2.3.tar.xz " |