From 2e64d809347d20fc37c5779105d5ec1d7719e75b Mon Sep 17 00:00:00 2001 From: Mingye Wang Date: Tue, 25 Aug 2015 00:30:37 -0400 Subject: [PATCH] v0.1.4.2: Hardening and quirks. More control for hardening flags in `AB_FLAGS_*`: * PIC: Position-independent code. Makes ASLR work. * PIE: Position-independent executables. * SSP: Strong Stack Protector. * RRO: LD RELRO. * NOW: LD NOW. * FTF: Cpp FORTIFY_SOURCE. Quirks System: See previous commit. --- autobuild/defines | 2 +- proc/40-patch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild/defines b/autobuild/defines index ab6cd490..b47e8816 100644 --- a/autobuild/defines +++ b/autobuild/defines @@ -22,7 +22,7 @@ timestamp_convert(){ PKGNAME=autobuild3$( ((_GIT)) && echo "-git-$(git branch 2>/dev/null | grep '*' | sed 's/*\ //g')") PKGEPOCH=1 -PKGVER=0.1.4$( ((_GIT)) && echo "+$(timestamp_convert $(git log -1 --date=raw --pretty=format:%cd))") +PKGVER=0.1.4.2$( ((_GIT)) && echo "+$(timestamp_convert $(git log -1 --date=raw --pretty=format:%cd))") PKGDES="Automatic package building tool." PKGRECOM="distcc ccache" PKGDEP="dpkg bash rpm apt coreutils autoconf automake autogen spdx-licenses" diff --git a/proc/40-patch.sh b/proc/40-patch.sh index 868af3aa..83a86506 100644 --- a/proc/40-patch.sh +++ b/proc/40-patch.sh @@ -7,7 +7,7 @@ then touch .patch elif [ -f autobuild/patches/series ] then - for i in $(grep -v '#' autobuild/patches/series); do + for i in $(grep -v '^#' autobuild/patches/series); do patch -Np1 -i autobuild/patches/$i done touch .patch