cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build with clang

Browse Source
This commit is contained in:
espie 2017-05-02 21:14:22 +00:00
parent bab6db12b8
commit 7fb72ac006
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editors/xemacs21/stable/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.37 2017/03/05 15:11:52 landry Exp $
# $OpenBSD: Makefile,v 1.38 2017/05/02 21:14:22 espie Exp $
BRANCH= 21.4
VERSION= 22
REVISION= 15
REVISION= 16
WANTLIB= c m ncurses util
CFLAGS += -fno-pie
CFLAGS += -fno-pie -fgnu89-inline
CONFIGURE_ENV = LDFLAGS="-nopie"
CONFIGURE_ARGS+=--infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
--infopath='${LOCALBASE}/info/${DISTNAME}:${LOCALBASE}/info:/usr/share/info' \

34
editors/xemacs21/stable/patches/patch-src_lisp_h
View File

@ -1,12 +1,36 @@
$OpenBSD: patch-src_lisp_h,v 1.1 2009/12/15 10:05:55 jasper Exp $
$OpenBSD: patch-src_lisp_h,v 1.2 2017/05/02 21:14:22 espie Exp $
Security fix for CVE-2009-2688, xemacs: multiple integer overflow flaws.
* Security fix for CVE-2009-2688, xemacs: multiple integer overflow flaws.
Patch from gentoo.
--- src/lisp.h.orig Tue Dec 15 10:57:22 2009
+++ src/lisp.h Tue Dec 15 10:57:44 2009
@@ -265,6 +265,11 @@ void assert_failed (const char *, int, const char *);
* steal max_align_t declaration from unistd.h to avoid redef.
--- src/lisp.h.orig
+++ src/lisp.h
@@ -193,15 +193,13 @@ void xfree (void *);
# endif /* GNUC */
#endif
-/* No type has a greater alignment requirement than max_align_t.
- (except perhaps for types we don't use, like long double) */
-typedef union
-{
- struct { long l; } l;
- struct { void *p; } p;
- struct { void (*f)(void); } f;
- struct { double d; } d;
+#ifndef __CLANG_MAX_ALIGN_T_DEFINED
+#define __CLANG_MAX_ALIGN_T_DEFINED
+typedef struct {
+ long long __max_align_ll __aligned(__alignof__(long long));
+ long double __max_align_ld __aligned(__alignof__(long double));
} max_align_t;
+#endif
#ifndef ALIGNOF
# if defined (__GNUC__) && (__GNUC__ >= 2)
@@ -265,6 +263,11 @@ void assert_failed (const char *, int, const char *);
/*#define REGISTER register*/
/*#endif*/