Merge branch '3.1' into 3.2
This commit is contained in:
commit
fec496cff8
@ -1 +1 @@
|
||||
891635e76c661611bfb7e963bde38856 ed-1.11.tar.lz
|
||||
67c96fc79c29e86fb8002759c4a20e16 ed-1.12.tar.lz
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=ed
|
||||
version=1.11
|
||||
version=1.12
|
||||
release=1
|
||||
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.lz)
|
||||
|
||||
@ -18,6 +18,5 @@ build() {
|
||||
CFLAGS="$CFLAGS"
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
rm -r $PKG/usr/share
|
||||
make DESTDIR=$PKG install-bin install-man
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
61db35209ce71a6d576392ce6e1d2f80 file-5.23.tar.gz
|
||||
ec161b5a0d2aef147fb046e5630b1408 file-5.24.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib
|
||||
|
||||
name=file
|
||||
version=5.23
|
||||
version=5.24
|
||||
release=1
|
||||
source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz)
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@ drwxr-xr-x root/root usr/include/
|
||||
-rw-r--r-- root/root usr/include/gettext-po.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/gettext/
|
||||
-rwxr-xr-x root/root usr/lib/gettext/cldr-plurals
|
||||
-rwxr-xr-x root/root usr/lib/gettext/hostname
|
||||
-rwxr-xr-x root/root usr/lib/gettext/project-id
|
||||
-rwxr-xr-x root/root usr/lib/gettext/urlget
|
||||
@ -36,17 +37,17 @@ drwxr-xr-x root/root usr/lib/gettext/
|
||||
lrwxrwxrwx root/root usr/lib/libasprintf.so -> libasprintf.so.0.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libasprintf.so.0 -> libasprintf.so.0.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libasprintf.so.0.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libgettextlib-0.19.4.so
|
||||
-rwxr-xr-x root/root usr/lib/libgettextlib-0.19.5.so
|
||||
-rwxr-xr-x root/root usr/lib/libgettextlib.la
|
||||
lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.4.so
|
||||
lrwxrwxrwx root/root usr/lib/libgettextlib.so -> libgettextlib-0.19.5.so
|
||||
-rw-r--r-- root/root usr/lib/libgettextpo.a
|
||||
-rwxr-xr-x root/root usr/lib/libgettextpo.la
|
||||
lrwxrwxrwx root/root usr/lib/libgettextpo.so -> libgettextpo.so.0.5.3
|
||||
lrwxrwxrwx root/root usr/lib/libgettextpo.so.0 -> libgettextpo.so.0.5.3
|
||||
-rwxr-xr-x root/root usr/lib/libgettextpo.so.0.5.3
|
||||
-rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.4.so
|
||||
-rwxr-xr-x root/root usr/lib/libgettextsrc-0.19.5.so
|
||||
-rwxr-xr-x root/root usr/lib/libgettextsrc.la
|
||||
lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.4.so
|
||||
lrwxrwxrwx root/root usr/lib/libgettextsrc.so -> libgettextsrc-0.19.5.so
|
||||
-rw-r--r-- root/root usr/lib/preloadable_libintl.so
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
|
||||
@ -1 +1 @@
|
||||
d3511af1e604a3478900d2c2b4a4a48e gettext-0.19.4.tar.gz
|
||||
0f3c108d64e8dcd9e6fbdff4ca722feb gettext-0.19.5.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: ncurses acl
|
||||
|
||||
name=gettext
|
||||
version=0.19.4
|
||||
version=0.19.5
|
||||
release=1
|
||||
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
|
||||
|
||||
|
||||
72
libpcre/libpcre-8.37-CVE-2015-5073.patch
Normal file
72
libpcre/libpcre-8.37-CVE-2015-5073.patch
Normal file
@ -0,0 +1,72 @@
|
||||
https://bugs.exim.org/show_bug.cgi?id=1651
|
||||
https://bugs.gentoo.org/553300
|
||||
https://bugzilla.redhat.com/1237224
|
||||
|
||||
From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
|
||||
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
||||
Date: Tue, 23 Jun 2015 16:34:53 +0000
|
||||
Subject: [PATCH] Fix buffer overflow for forward reference within backward
|
||||
assertion with excess closing parenthesis. Bugzilla 1651.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is upstream commit ported to 8.37:
|
||||
|
||||
commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
|
||||
Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
||||
Date: Tue Jun 23 16:34:53 2015 +0000
|
||||
|
||||
Fix buffer overflow for forward reference within backward assertion with excess
|
||||
closing parenthesis. Bugzilla 1651.
|
||||
|
||||
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
||||
|
||||
It fixes CVE-2015-5073.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
pcre_compile.c | 2 +-
|
||||
testdata/testinput2 | 2 ++
|
||||
testdata/testoutput2 | 3 +++
|
||||
3 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pcre_compile.c b/pcre_compile.c
|
||||
index 6f06912..b66b1f6 100644
|
||||
--- a/pcre_compile.c
|
||||
+++ b/pcre_compile.c
|
||||
@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
|
||||
exceptional ones forgo this. We scan the pattern to check that they are fixed
|
||||
length, and set their lengths. */
|
||||
|
||||
-if (cd->check_lookbehind)
|
||||
+if (errorcode == 0 && cd->check_lookbehind)
|
||||
{
|
||||
pcre_uchar *cc = (pcre_uchar *)codestart;
|
||||
|
||||
diff --git a/testdata/testinput2 b/testdata/testinput2
|
||||
index 83bb471..5cc9ce6 100644
|
||||
--- a/testdata/testinput2
|
||||
+++ b/testdata/testinput2
|
||||
@@ -4154,4 +4154,6 @@ backtracking verbs. --/
|
||||
|
||||
"(?J)(?'d'(?'d'\g{d}))"
|
||||
|
||||
+/(?=di(?<=(?1))|(?=(.))))/
|
||||
+
|
||||
/-- End of testinput2 --/
|
||||
diff --git a/testdata/testoutput2 b/testdata/testoutput2
|
||||
index 7dff52a..4decb8d 100644
|
||||
--- a/testdata/testoutput2
|
||||
+++ b/testdata/testoutput2
|
||||
@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
|
||||
|
||||
"(?J)(?'d'(?'d'\g{d}))"
|
||||
|
||||
+/(?=di(?<=(?1))|(?=(.))))/
|
||||
+Failed: unmatched parentheses at offset 23
|
||||
+
|
||||
/-- End of testinput2 --/
|
||||
--
|
||||
2.4.3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user