diff --git a/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch b/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch deleted file mode 100644 index 2ad6cdcc809..00000000000 --- a/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Adam Lackorzynski -# Date 1440364600 -7200 -# Node ID 4eff7b4cde33a56d9caf64e44722186c89e26922 -# Parent 3cb4335d5819099c85a30dae714f0a213fa4a44c -Add ARRAY_SIZE macro - -diff -r 3cb4335d5819 -r 4eff7b4cde33 src/minicom.h ---- a/src/minicom.h Mon Jun 29 21:16:14 2015 +0200 -+++ b/src/minicom.h Sun Aug 23 23:16:40 2015 +0200 -@@ -302,6 +302,7 @@ - int lockfile_create(int no_msgs); - void lockfile_remove(void); - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - - - /* We want the ANSI offsetof macro to do some dirty stuff. */ - diff --git a/srcpkgs/minicom/patches/CVE-2017-7467.patch b/srcpkgs/minicom/patches/CVE-2017-7467.patch deleted file mode 100644 index 0b704e7d1d2..00000000000 --- a/srcpkgs/minicom/patches/CVE-2017-7467.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Adam Lackorzynski -# Date 1492510834 -7200 -# Node ID c33d24938f3ed3dc2b7d328fe255794468a814eb -# Parent c72edf0e43bca463239ea15594d128ecbc0d2574 -Fix CVE-2017-7467, a remote exploitalbe out of bound access - -This fixes an out of bounds data access that can lead to a -remotely exploitable code execution. - -This issue was found by Solar Designer of Openwall during a -security audit of the Virtuozzo 7 product, which contains -derived downstream code in its prl-vzvncserver component. -The corresponding Virtuozzo 7 fix is: - -https://src.openvz.org/projects/OVZ/repos/prl-vzvncserver/commits/6d95404e75b98f36b1cc85ee23df99dcf06ca13f - -Openwall would like to thank the Virtuozzo company for -funding the effort. - -diff -r c72edf0e43bc -r c33d24938f3e src/vt100.c ---- a/src/vt100.c Sat Sep 17 02:17:37 2016 +0200 -+++ b/src/vt100.c Tue Apr 18 12:20:34 2017 +0200 -@@ -427,7 +427,7 @@ - } - /* Separation between numbers ? */ - if (c == ';') { -- if (ptr < 7) -+ if (ptr < (int)ARRAY_SIZE(escparms) - 1) - ptr++; - return; - } - diff --git a/srcpkgs/minicom/patches/musl-sys_param_h.patch b/srcpkgs/minicom/patches/musl-sys_param_h.patch deleted file mode 100644 index be395faa80d..00000000000 --- a/srcpkgs/minicom/patches/musl-sys_param_h.patch +++ /dev/null @@ -1,12 +0,0 @@ -MAXNAMLEN is defined in sys/param.h - ---- a/src/getsdir.c 2011-02-14 11:07:00.000000000 +0100 -+++ b/src/getsdir.c 2015-06-22 02:47:36.263541750 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/minicom/patches/musl-vc_music.patch b/srcpkgs/minicom/patches/musl-vc_music.patch deleted file mode 100644 index 59bc022bb15..00000000000 --- a/srcpkgs/minicom/patches/musl-vc_music.patch +++ /dev/null @@ -1,21 +0,0 @@ -In musl libc __GLIBC__ is not defined, while it has the -same required header files for VC_MUSIC to work. -Just disable the additional __GLIBC__ shield. - ---- a/src/dial.c 2013-05-09 20:32:02.000000000 +0200 -+++ b/src/dial.c 2015-06-22 02:44:34.768551564 +0200 -@@ -39,11 +39,9 @@ - #include "intl.h" - - #ifdef VC_MUSIC --# if defined(__GLIBC__) --# include --# include --# include --# endif -+#include -+#include -+#include - #endif - - enum { CURRENT_VERSION = 6 }; diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template index 073ccb2f5ea..39825eff43d 100644 --- a/srcpkgs/minicom/template +++ b/srcpkgs/minicom/template @@ -1,14 +1,14 @@ # Template file for 'minicom' pkgname=minicom -version=2.7.1 -revision=2 +version=2.9 +revision=1 build_style=gnu-configure makedepends="ncurses-devel" short_desc="Menu driven communications program" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/minicom" -distfiles="${DEBIAN_SITE}/main/m/minicom/minicom_${version}.orig.tar.gz" -checksum=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 +distfiles="${DEBIAN_SITE}/main/m/minicom/minicom_${version}.orig.tar.bz2" +checksum=9efbb6458140e5a0de445613f0e76bcf12cbf7a9892b2f53e075c2e7beaba86c CFLAGS="-fcommon"