From 2e3526ac5a45e9318944c69d844cdf376ed7f255 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Mar 2018 16:09:20 +0000
Subject: vi: update to 070224
---
abs/core/vi/PKGBUILD | 67 +++++++++---------
abs/core/vi/exrc.sample | 5 --
abs/core/vi/fix-tubesize-short-overflow.patch | 12 ++++
abs/core/vi/increase-tube.patch | 13 ----
abs/core/vi/preserve-dir.patch | 99 +++++++++++++++++++++++++++
abs/core/vi/preserve_dir.patch | 81 ----------------------
6 files changed, 147 insertions(+), 130 deletions(-)
delete mode 100644 abs/core/vi/exrc.sample
create mode 100644 abs/core/vi/fix-tubesize-short-overflow.patch
delete mode 100644 abs/core/vi/increase-tube.patch
create mode 100644 abs/core/vi/preserve-dir.patch
delete mode 100644 abs/core/vi/preserve_dir.patch
diff --git a/abs/core/vi/PKGBUILD b/abs/core/vi/PKGBUILD
index 0a5c7f8..9fa8028 100644
--- a/abs/core/vi/PKGBUILD
+++ b/abs/core/vi/PKGBUILD
@@ -1,47 +1,52 @@
-# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $
-# Maintainer: tobias [ tobias at archlinux org ]
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=vi
-pkgver=050325
+pkgver=070224
pkgrel=2
epoch=1
-pkgdesc='The original ex/vi text editor.'
-arch=('i686' 'x86_64')
-url='http://ex-vi.sourceforge.net/'
+pkgdesc="The original ex/vi text editor"
+arch=('x86_64')
+url="http://ex-vi.sourceforge.net/"
license=('custom:ex')
-depends=('ncurses')
-optdepends=('mailx: used by the preserve command for notification')
groups=('base')
-options=(strip !libtool emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
- exrc.sample
+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
- increase-tube.patch
- preserve_dir.patch)
-md5sums=('e668595254233e4d96811083a3e4e2f3'
- 'd3b483c994d859232ce369b82a4b5668'
- 'aac133930047eafa4f28736cfaf976b3'
- 'e596e05a00a24187b576e389fa1de45d'
- '419a8755e0dd16e95542bc107e6d2b24')
+ preserve-dir.patch)
+sha256sums=('c3e52dd44edd1f6bf0b52207f717c56149dc50aac0d131fff3851d589727f52f'
+ 'SKIP'
+ '42167fabebe30a13d594346b1d254db82090ba41742a9f35b8895d37092053f0'
+ '0e9e2d381f1d8cb86daae68462b3849825b003c08007725c0db9939d3d5bf58d'
+ 'f0ef9ed2ccea98bf47b08dd3faa2abb911b4e6c0579f5294e9d0e8742282ff65')
+validpgpkeys=('86CFFCA918CF3AF47147588051E8B148A9999C34')
-build() {
- cd "${srcdir}/ex-${pkgver}"
+prepare() {
+ cd ex-$pkgver
+
+ patch -Np1 -i ../fix-tubesize-short-overflow.patch
+ patch -Np1 -i ../navkeys.patch
+
+ # https://bugs.archlinux.org/task/20653
+ patch -Np1 -i ../preserve-dir.patch
+}
- # apply patches
- patch -Np1 -i ../navkeys.patch
- patch -Np0 -i ../increase-tube.patch
- # FS#20653
- patch -Np1 -i ../preserve_dir.patch
+build() {
+ cd ex-$pkgver
make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
- 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses
+ TERMLIB=ncurses FEATURES="-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8"
}
package() {
- cd "${srcdir}/ex-${pkgver}"
-
- make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/usr/bin/install \
- DESTDIR="$pkgdir" install
+ cd ex-$pkgver
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \
+ INSTALL=/usr/bin/install DESTDIR="$pkgdir" install
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/vi/exrc.sample b/abs/core/vi/exrc.sample
deleted file mode 100644
index 44b3045..0000000
--- a/abs/core/vi/exrc.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work.
-set showmode
-set noflash
-set autoindent
-set shiftwidth=2
diff --git a/abs/core/vi/fix-tubesize-short-overflow.patch b/abs/core/vi/fix-tubesize-short-overflow.patch
new file mode 100644
index 0000000..46cc2af
--- /dev/null
+++ b/abs/core/vi/fix-tubesize-short-overflow.patch
@@ -0,0 +1,12 @@
+diff -upr ex-070224.orig/ex_vis.h ex-070224/ex_vis.h
+--- ex-070224.orig/ex_vis.h 2005-08-06 14:41:15.000000000 +0300
++++ ex-070224/ex_vis.h 2015-05-02 20:41:13.938665281 +0300
+@@ -104,7 +104,7 @@ var enum {
+ */
+ var short TUBELINES;
+ var short TUBECOLS;
+-var short TUBESIZE;
++var int TUBESIZE;
+
+ /*
+ * The screen in visual and crtopen is of varying size; the basic
diff --git a/abs/core/vi/increase-tube.patch b/abs/core/vi/increase-tube.patch
deleted file mode 100644
index 5010798..0000000
--- a/abs/core/vi/increase-tube.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- config.h 2005-02-19 05:25:39.000000000 -0500
-+++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
-@@ -95,8 +95,8 @@
- #define TUBESIZE 6000 /* Maximum screen size for visual */
- #else /* VMUNIX */
- #define TUBELINES 100
--#define TUBECOLS 160
--#define TUBESIZE 16000
-+#define TUBECOLS 320
-+#define TUBESIZE 32000
- #endif /* VMUNIX */
-
- /*
diff --git a/abs/core/vi/preserve-dir.patch b/abs/core/vi/preserve-dir.patch
new file mode 100644
index 0000000..ddfe878
--- /dev/null
+++ b/abs/core/vi/preserve-dir.patch
@@ -0,0 +1,99 @@
+diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
+--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
+@@ -1950,7 +1950,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH DOCUMENTATION
+ The document
+diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
+--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
+@@ -272,7 +272,7 @@
+ #ifdef notdef
+ char pattern[] = "/usr/preserve/Exaa`XXXXX";
+ #else
+-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
+ #endif
+
+ /*
+@@ -296,7 +296,7 @@
+ timestamp = ctime(&time);
+ timestamp[16] = 0; /* blast from seconds on */
+ putenv("MAILRC=/dev/null");
+- sprintf(cmd, "/bin/mail %s", pp->pw_name);
++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
+ setuid(getuid());
+ mf = popen(cmd, "w");
+ if (mf == NULL)
+diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
+--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
+@@ -167,7 +167,7 @@
+ #ifdef notdef
+ char mydir[] = "/usr/preserve";
+ #else
+-char mydir[] = "/var/preserve";
++char mydir[] = "/var/lib/ex";
+ #endif
+
+ /*
+diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
+--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
+@@ -83,7 +83,7 @@
+ BINDIR = $(PREFIX)/bin
+ LIBEXECDIR = $(PREFIX)/libexec
+ MANDIR = $(PREFIX)/share/man
+-PRESERVEDIR = /var/preserve
++PRESERVEDIR = /var/lib/ex
+
+ #
+ # DESTDIR is prepended to the installation paths. It is mostly useful
+diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
+--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
+@@ -979,7 +979,7 @@
+ .B /var/tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+-.B /var/preserve
++.B /var/lib/ex
+ preservation directory
+ .SH SEE ALSO
+ ex(1),
+--- ex-050325.original/ex.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/ex.1 2012-01-27 20:47:24.535436516 +0100
+@@ -1932,10 +1932,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
+--- ex-050325.original/vi.1 2012-01-27 20:43:00.602119283 +0100
++++ ex-050325/vi.1 2012-01-27 20:46:33.815439611 +0100
+@@ -961,10 +961,10 @@
+ Determines the terminal type.
+ .SH FILES
+ .TP
+-.B /usr/libexec/expreserve
++.B /usr/lib/ex/expreserve
+ preserve command
+ .TP
+-.B /usr/libexec/exrecover
++.B /usr/lib/ex/exrecover
+ recover command
+ .TP
+ .B /etc/termcap
diff --git a/abs/core/vi/preserve_dir.patch b/abs/core/vi/preserve_dir.patch
deleted file mode 100644
index 5209f7b..0000000
--- a/abs/core/vi/preserve_dir.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1
---- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500
-@@ -1950,7 +1950,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH DOCUMENTATION
- The document
-diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c
---- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500
-@@ -272,7 +272,7 @@
- #ifdef notdef
- char pattern[] = "/usr/preserve/Exaa`XXXXX";
- #else
--char pattern[] = "/var/preserve/Exa`XXXXXXXXXX";
-+char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX";
- #endif
-
- /*
-@@ -296,7 +296,7 @@
- timestamp = ctime(&time);
- timestamp[16] = 0; /* blast from seconds on */
- putenv("MAILRC=/dev/null");
-- sprintf(cmd, "/bin/mail %s", pp->pw_name);
-+ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name);
- setuid(getuid());
- mf = popen(cmd, "w");
- if (mf == NULL)
-diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c
---- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500
-+++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500
-@@ -167,7 +167,7 @@
- #ifdef notdef
- char mydir[] = "/usr/preserve";
- #else
--char mydir[] = "/var/preserve";
-+char mydir[] = "/var/lib/ex";
- #endif
-
- /*
-diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec
---- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500
-@@ -20,7 +20,7 @@
- %define libexecdir %{prefix}/5lib
- %define mandir %{prefix}/share/man/5man
-
--%define preservedir /var/preserve
-+%define preservedir /var/lib/ex
-
- # install command
- %define ucbinstall install
-diff -Naur ex-050325.ori/Makefile ex-050325/Makefile
---- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500
-+++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500
-@@ -83,7 +83,7 @@
- BINDIR = $(PREFIX)/bin
- LIBEXECDIR = $(PREFIX)/libexec
- MANDIR = $(PREFIX)/share/man
--PRESERVEDIR = /var/preserve
-+PRESERVEDIR = /var/lib/ex
-
- #
- # DESTDIR is prepended to the installation paths. It is mostly useful
-diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1
---- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500
-+++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500
-@@ -979,7 +979,7 @@
- .B /var/tmp/Rx\fInnnnnnnnnn\fP
- named buffer temporary
- .TP
--.B /var/preserve
-+.B /var/lib/ex
- preservation directory
- .SH SEE ALSO
- ex(1),
--
cgit v0.12