upg vi libgpg-error

libgpg-error/PKGBUILD

@@ -6,8 +6,8 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=libgpg-error
-pkgver=1.45
-pkgrel=02
+pkgver=1.46
+pkgrel=01
 pkgdesc="Support library for libgcrypt"
 arch=(x86_64)
 url="https://www.gnupg.org"
@@ -53,7 +53,8 @@ validpgpkeys=(6DAA6E64A76D2840571B4902528897B826403ADA # Werner Koch (dist signi
 # indicates they are building disregarding signature errors.  And I thought it was only Obarun being negligent!
 ## with 1.45-2 they corrected the error.
 
-sha256sums=(570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 # libgpg-error-1.45.tar.bz2
-	51736fef75ae3c020512f6987b046698bd418d960eb0e2fe1a0860749da21444) # libgpg-error-1.45.tar.bz2.sig
+sha256sums=(b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d  # libgpg-error-1.46.tar.bz2
+	5a7baa9a56eb103277c06ee3bde4523d77ba796f65fe4119a3d03139c93f20aa) # libgpg-error-1.46.tar.bz2.sig
+
 
 

libgpg-error/PKGBUILD-arch

@@ -2,8 +2,8 @@
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libgpg-error
-pkgver=1.45
-pkgrel=2
+pkgver=1.46
+pkgrel=1
 pkgdesc="Support library for libgcrypt"
 arch=(x86_64)
 url="https://www.gnupg.org"
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('glibc' 'sh')
 source=(https://www.gnupg.org/ftp/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig})
 # https://www.gnupg.org/download/integrity_check.html
-sha1sums=('fe724ed37b4935964059a47b7c64d5f8246659d8'
+sha1sums=('a6e5efdd72e848aab4064e5ef4c6835ba344bcf1'
           'SKIP')
 validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
 validpgpkeys+=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key)

libgpg-error/deps

@@ -3,4 +3,3 @@ gettext
 automake
 
 
-

vi/PKGBUILD

@@ -6,15 +6,16 @@
 
 pkgname=vi
 pkgver=070224
-pkgrel=05
+pkgrel=06
 epoch=1
 pkgdesc="The original ex/vi text editor"
 arch=('x86_64')
-url="http://ex-vi.sourceforge.net/"
+url="https://ex-vi.sourceforge.net/"
 depends=('ncurses')
 optdepends=('s-nail: used by the preserve command for notification')
 source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
         fix-tubesize-short-overflow.patch
+        format-security.patch
         linenum.patch
         navkeys.patch
         preserve-dir.patch)
@@ -26,11 +27,15 @@ CFLAGS=${CFLAGS/-Werror=format-security/}  #  https://bugs.archlinux.org/task/70
 CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
 
   patch -Np1 -i ../fix-tubesize-short-overflow.patch
-  patch -Np1 -i ../navkeys.patch
+
+  # https://bugs.archlinux.org/task/76121
+  patch -Np1 -i ../format-security.patch
 
   # https://bugs.archlinux.org/task/70770
   patch -Np1 -i ../linenum.patch
 
+  patch -Np1 -i ../navkeys.patch
+
   # https://bugs.archlinux.org/task/20653
   patch -Np1 -i ../preserve-dir.patch
 }
@@ -59,6 +64,9 @@ validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
 sha256sums=(c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f # ex-070224.tar.xz
 	f45f9b452e065a7f8c271197fa5194b0e9389adf0a8955518dd9a213cef43f8b # ex-070224.tar.xz.sig
 	42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0 # fix-tubesize-short-overflow.patch
+	ec50373ab48a9b327c5d02b10406bc3d04310d692de6c17098a59b1afeb08e03 # format-security.patch
 	4539f46cd839475c168a9c463f041354463e90e810b973a10c499c2727b008e7 # linenum.patch
 	0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d # navkeys.patch
 	f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65) #  preserve-dir.patch
+
+

vi/PKGBUILD-arch

@@ -3,23 +3,25 @@
 
 pkgname=vi
 pkgver=070224
-pkgrel=5
+pkgrel=6
 epoch=1
 pkgdesc="The original ex/vi text editor"
 arch=('x86_64')
-url="http://ex-vi.sourceforge.net/"
+url="https://ex-vi.sourceforge.net/"
 license=('custom:ex')
 depends=('ncurses')
 optdepends=('s-nail: used by the preserve command for notification')
 source=(https://sources.archlinux.org/other/$pkgname/ex-$pkgver.tar.xz{,.sig}
         fix-tubesize-short-overflow.patch
         navkeys.patch
+        format-security.patch
         linenum.patch
         preserve-dir.patch)
 sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
             'SKIP'
             '42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
             '0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+            'ec50373ab48a9b327c5d02b10406bc3d04310d692de6c17098a59b1afeb08e03'
             '4539f46cd839475c168a9c463f041354463e90e810b973a10c499c2727b008e7'
             'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
 validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
@@ -30,6 +32,9 @@ prepare() {
   patch -Np1 -i ../fix-tubesize-short-overflow.patch
   patch -Np1 -i ../navkeys.patch
 
+  # https://bugs.archlinux.org/task/76121
+  patch -Np1 -i ../format-security.patch
+
   # https://bugs.archlinux.org/task/70770
   patch -Np1 -i ../linenum.patch
 

vi/deps

@@ -0,0 +1,2 @@
+
+

vi/format-security.patch

@@ -0,0 +1,26 @@
+diff --git a/ex_unix.c b/ex_unix.c
+index 4ad17f9..80815d1 100644
+--- a/ex_unix.c
++++ b/ex_unix.c
+@@ -179,7 +179,7 @@ uexp:
+ 	if (warn && hush == 0 && chng && xchng != chng && value(WARN) && dol > zero) {
+ 		xchng = chng;
+ 		vnfl();
+-		printf(mesg(catgets(catd, 1, 197,
++		printf("%s", mesg(catgets(catd, 1, 197,
+ 				"[No write]|[No write since last change]")));
+ 		noonl();
+ 		flush();
+diff --git a/ex_vops2.c b/ex_vops2.c
+index 48050ff..e59727a 100644
+--- a/ex_vops2.c
++++ b/ex_vops2.c
+@@ -211,7 +211,7 @@ showmode(int mode)
+ 	if (value(TERSE))
+ 		putchar(str[0]);
+ 	else
+-		printf(&str[1]);
++		printf("%s", &str[1]);
+ 	vgoto(sdl, sdc);
+ 	cursor = ocurs;
+ 	splitw = 0;