mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
ba4217f718
a/elvis-2.2_0-x86_64-5.txz: Rebuilt.
Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz: Upgraded.
a/nvi-1.81.6-x86_64-1.txz: Added.
This is an implementation of the classic ex/vi text editor written by Keith
Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
take over the ex/vi symlinks if they aren't already pointing to a different
choice. Note that the removal of vi/ex symlinks from the elvis and vim
packages might cause your ex/vi symlinks to point to this after all the ex/vi
packages have been upgraded. You can set them to your preferences using
pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz: Rebuilt.
Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz: Upgraded.
Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz: Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.11-noarch-1.txz: Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz: Upgraded.
n/ethtool-5.4-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 14private_regex_fixes.dpatch by <hesso@pool.math.tu-berlin.de>
|
|
##
|
|
## DP: Fixes to the private regex library; includes fix for #523934.
|
|
|
|
@DPATCH@
|
|
diff -Naur regex.orig/regcomp.c regex/regcomp.c
|
|
--- nvi-1.81.6.orig/regex/regcomp.c 2007-11-18 17:41:42.000000000 +0100
|
|
+++ nvi-1.81.6/regex/regcomp.c 2008-05-01 18:37:57.000000000 +0200
|
|
@@ -606,7 +606,8 @@
|
|
REQUIRE(starordinary, REG_BADRPT);
|
|
/* FALLTHROUGH */
|
|
default:
|
|
- ordinary(p, c &~ BACKSL);
|
|
+ /* ordinary(p, c &~ BACKSL); -- Fix potential overflow */
|
|
+ ordinary(p, c & 0xff);
|
|
break;
|
|
}
|
|
|
|
diff -Naur regex.orig/regexec.c regex/regexec.c
|
|
--- nvi-1.81.6.orig/regex/regexec.c 2007-11-18 17:41:42.000000000 +0100
|
|
+++ nvi-1.81.6/regex/regexec.c 2008-05-01 18:38:00.000000000 +0200
|
|
@@ -63,7 +63,7 @@
|
|
|
|
/* macros for manipulating states, small version */
|
|
#define states int
|
|
-#define states1 states /* for later use in regexec() decision */
|
|
+typedef states states1; /* for later use in regexec() decision */
|
|
#define CLEAR(v) ((v) = 0)
|
|
#define SET0(v, n) ((v) &= ~(1 << (n)))
|
|
#define SET1(v, n) ((v) |= 1 << (n))
|