Date: Sunday, August 3, 2014 @ 19:06:11 Author: thestinger Revision: 116795
upgpkg: hardening-wrapper 5-2 Added: hardening-wrapper/trunk/common.sh Modified: hardening-wrapper/trunk/PKGBUILD hardening-wrapper/trunk/cc-wrapper.sh hardening-wrapper/trunk/ld-wrapper.sh ---------------+ PKGBUILD | 13 +++++++------ cc-wrapper.sh | 7 ++----- common.sh | 4 ++++ ld-wrapper.sh | 2 ++ 4 files changed, 15 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-03 15:58:57 UTC (rev 116794) +++ PKGBUILD 2014-08-03 17:06:11 UTC (rev 116795) @@ -1,7 +1,7 @@ # Maintainer: Daniel Micay <[email protected]> pkgname=hardening-wrapper pkgver=5 -pkgrel=1 +pkgrel=2 pkgdesc='Wrapper script for building hardened executables by default' arch=(i686 x86_64) url='https://archlinux.org/' @@ -8,10 +8,11 @@ license=('GPL') depends=(bash) backup=(etc/hardening-wrapper.conf) -source=(cc-wrapper.sh ld-wrapper.sh path.sh +source=(cc-wrapper.sh ld-wrapper.sh common.sh path.sh hardening-wrapper-i686.conf hardening-wrapper-x86_64.conf) -sha1sums=('996ceb802ace34ad0fbd253edc20bd1376cfe4bc' - 'cbccd615be70f9f287b0c8a17ad450462bb46eba' +sha1sums=('1443421d2c79351a1a2e89683d41b9621b8e7fa9' + '1091ff9c65a60fa785ecb5b825db1ab6dfd310ff' + '0c420f5323c0573d5c23c0ff8981025e2ba347ff' '1e5f6d9931f01b26bb4b6fbb839e21d34d534cdc' '4d7a8f4818c531ce7002e860e0654b42b6147037' '50db33c08439393b673c23d542e274beef44fbdd') @@ -21,7 +22,8 @@ install -Dm644 path.sh "$pkgdir/etc/profile.d/hardening-wrapper.sh" mkdir -p "$pkgdir/usr/lib/hardening-wrapper/bin" - install -m755 cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper" + install -m755 {cc,ld}-wrapper.sh common.sh "$pkgdir/usr/lib/hardening-wrapper" + ln -s ../cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/c89" ln -s ../cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/c99" ln -s ../cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/cc" @@ -31,7 +33,6 @@ ln -s ../cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/gcc" ln -s ../cc-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/g++" - install -m755 ld-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper" ln -s ../ld-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/ld" ln -s ../ld-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/ld.bfd" ln -s ../ld-wrapper.sh "$pkgdir/usr/lib/hardening-wrapper/bin/ld.gold" Modified: cc-wrapper.sh =================================================================== --- cc-wrapper.sh 2014-08-03 15:58:57 UTC (rev 116794) +++ cc-wrapper.sh 2014-08-03 17:06:11 UTC (rev 116795) @@ -1,5 +1,7 @@ #!/bin/bash +. /usr/lib/hardening-wrapper/common.sh + declare -A default while IFS== read key value; do default["$key"]="$value" @@ -11,11 +13,6 @@ force_stack_check="${HARDENING_STACK_CHECK:-"${default[HARDENING_STACK_CHECK]:-0}"}" force_stack_protector="${HARDENING_STACK_PROTECTOR:-${default[HARDENING_STACK_PROTECTOR]:-2}}" -error() { - printf "%s\n" "$1" >&2 - exit 1 -} - optimizing=0 for opt; do Added: common.sh =================================================================== --- common.sh (rev 0) +++ common.sh 2014-08-03 17:06:11 UTC (rev 116795) @@ -0,0 +1,4 @@ +error() { + printf "%s\n" "$1" >&2 + exit 1 +} Modified: ld-wrapper.sh =================================================================== --- ld-wrapper.sh 2014-08-03 15:58:57 UTC (rev 116794) +++ ld-wrapper.sh 2014-08-03 17:06:11 UTC (rev 116795) @@ -1,5 +1,7 @@ #!/bin/bash +. /usr/lib/hardening-wrapper/common.sh + declare -A default while IFS== read key value; do default["$key"]="$value"
