mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 20:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/fortify-headers: upgrade to 0.8

Browse Source 
ref #5899
This commit is contained in:
Natanael Copa 2016-07-15 09:03:46 +00:00
parent 3fc415d092
commit 465fd501c7
2 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
main/fortify-headers/0001-Only-include-limits.h-when-actually-used.patch
View File

@ -1,43 +0,0 @@
From a1445561442c19f2354b31ea4ac0084d2bd3b34f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 14 Jul 2016 16:33:29 +0200
Subject: [PATCH] Only include limits.h when actually used
The __extension__ seems to trigger a bug in gcc when there are no
identifier specified afterwards.
Testcase:
echo "#include <stdlib.h>" > try.c && cc -O0 -c try.c
try.c:2:0: error: expected identifier or '(' at end of input
With -O2 it does not happen.
We work around this by only pulling in limits.h when we actually need the
PATH_MAX.
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
include/stdlib.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/stdlib.h b/include/stdlib.h
index 26c7e44..0717e81 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -19,12 +19,12 @@
__extension__
#include_next <stdlib.h>
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
__extension__
#include_next <limits.h>
#endif
-#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
#include "fortify-headers.h"
#ifdef __cplusplus
--
2.9.0

14
main/fortify-headers/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=fortify-headers
pkgver=0.7
pkgrel=1
pkgver=0.8
pkgrel=0
pkgdesc="standalone fortify source implementation"
url="http://git.2f30.org/fortify-headers/"
arch="noarch"
@ -13,7 +13,6 @@ makedepends="$depends_dev"
install=""
subpackages=""
source="http://dl.2f30.org/releases/$pkgname-$pkgver.tar.gz
0001-Only-include-limits.h-when-actually-used.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@ -36,9 +35,6 @@ package() {
make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
}
md5sums="3f7c36daa0be000987e8ad8c0a202b42 fortify-headers-0.7.tar.gz
b5a474834aa5ef8797155bd60ac604c1 0001-Only-include-limits.h-when-actually-used.patch"
sha256sums="683ac9ae7bddb2975a2a76c9b09f432097928c8dfe8561c0aabf69f90f30920d fortify-headers-0.7.tar.gz
c076159979d3c2b2dcab6964d9a88fe7a0acd4a566d08daa6c1359b694fa0701 0001-Only-include-limits.h-when-actually-used.patch"
sha512sums="9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53 fortify-headers-0.7.tar.gz
cd9aa8dbf570d169ef1d2efbdd680bbc4eec61444268c6fe8405961f4da95ce5cedb1eca79959e59d2d950259b07d6d6c1e4a3d4f6c536de9ec9ff45d4510099 0001-Only-include-limits.h-when-actually-used.patch"
md5sums="678ebdac0c3278b934c6524cd1e3dc4c fortify-headers-0.8.tar.gz"
sha256sums="afcd073d6d8d175eede2a28a7dd71b7150cb03290f99102261892c793f6b4cb1 fortify-headers-0.8.tar.gz"
sha512sums="14cb6da17ed53272b1439a126a402246395f59e54b339ebf4e6ed8b1ed896702afc15f3084ec0e618b93dbf103cb4e9bc3735f4cab886a0d2ba57081bdcbf9dc fortify-headers-0.8.tar.gz"