kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge patches for CVE-2009-2688 and C11 compliance, unbreaking the

Browse source 
build.
This commit is contained in:
hauke 2016-03-29 19:32:53 +00:00
parent 6b1ea1f14c
commit dfe2e174e4
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/xemacs/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.22 2016/03/26 23:26:14 joerg Exp $ $NetBSD: distinfo,v 1.23 2016/03/29 19:32:53 hauke Exp $
SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6 SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6
RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c
@ -20,6 +20,6 @@ SHA1 (patch-src_Makefile.in.in) = 28098f18870c34165b37fe11e84cbd6f5584bc63
SHA1 (patch-src_config.h.in) = 9a031ace4ca6f89dacbf599484d9fcd410d7841f SHA1 (patch-src_config.h.in) = 9a031ace4ca6f89dacbf599484d9fcd410d7841f
SHA1 (patch-src_dired.c) = 98f1c076c29385e3d5052cdb84d067f6cec8bc22 SHA1 (patch-src_dired.c) = 98f1c076c29385e3d5052cdb84d067f6cec8bc22
SHA1 (patch-src_glyphs-eimage.c) = ea561758dd454003eb3274508087fd302d9d9fd4 SHA1 (patch-src_glyphs-eimage.c) = ea561758dd454003eb3274508087fd302d9d9fd4
SHA1 (patch-src_lisp.h) = eb3247faef98f889cd6c95584395f97b1d29e2f7 SHA1 (patch-src_lisp.h) = 60a0a77ffb67500e078e2cf53512350386741316
SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9 SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9
SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd

17
editors/xemacs/patches/patch-src_lisp.h
View file

@ -1,6 +1,10 @@
$NetBSD: patch-src_lisp.h,v 1.3 2016/03/26 23:26:14 joerg Exp $ $NetBSD: patch-src_lisp.h,v 1.4 2016/03/29 19:32:53 hauke Exp $
--- src/lisp.h.orig 2016-03-26 15:03:47.482901440 +0000 Don't try to define max_align_t in C11 or C++11 mode.
Fix CVE-2009-2688, via <https://bugzilla.redhat.com/show_bug.cgi?id=511994>
--- src/lisp.h.orig 2015-01-29 15:04:29.000000000 +0000
+++ src/lisp.h +++ src/lisp.h
@@ -195,6 +195,7 @@ void xfree (void *); @@ -195,6 +195,7 @@ void xfree (void *);
@ -18,3 +22,12 @@ $NetBSD: patch-src_lisp.h,v 1.3 2016/03/26 23:26:14 joerg Exp $
#ifndef ALIGNOF #ifndef ALIGNOF
# if defined (__GNUC__) && (__GNUC__ >= 2) # if defined (__GNUC__) && (__GNUC__ >= 2)
@@ -265,6 +267,8 @@ void assert_failed (const char *, int, c
/*#define REGISTER register*/
/*#endif*/
+/* Mitigating CVE-2009-2688, see glyphs-eimage.c */
+#define UINT_64_BIT uint64_t
/* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
In particular, it must be large enough to contain a pointer.