author | Sven-Hendrik Haase
<svenstaro@archlinux.org> 2019-12-15 18:50:53 UTC |
committer | Sven-Hendrik Haase
<svenstaro@archlinux.org> 2019-12-15 18:50:53 UTC |
parent | 96c222e61d6bbed36fdca5bd7947cc86afc0f15b |
PKGBUILD | +3 | -6 |
namcap-fix-full-relro.patch | +0 | -38 |
diff --git a/PKGBUILD b/PKGBUILD index 536fdcd..6abf0c9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=namcap -pkgver=3.2.8 -pkgrel=5 +pkgver=3.2.10 +pkgrel=1 pkgdesc="A Pacman package analyzer" arch=('any') url="https://projects.archlinux.org/namcap.git/" @@ -12,18 +12,15 @@ depends=('python' 'pyalpm>=0.5' 'licenses' 'binutils' 'elfutils' 'python-pyelftools') makedepends=('python-setuptools') source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz - namcap-fix-full-relro.patch namcap-ignore-so-no-pie.patch missing-desktop-file-utils.patch) -sha512sums=('504b8294a86fdcc15946098fa57a4b6ca3bea0daf9ec51e7eab62078225b2102f527e123a9aeee33b8c4151adb8a59c5a682e25fd0330bd576d3da737f2a7d81' - '2ca2bebef6c2307b73081b424c1a6cc34f0087726c48bac7808b35d88ddab6d8668b09ebf964a46f48fde4ce2c2ab8b5fdcc5120864d412d24d66d623bd47b6c' +sha512sums=('bdcca39cff873cc1ac7138bc2f218e808019424c1ff414b98f183400c08879a94fe7318049b1912dd094c1fced14b095a467465b04cd78cb9d1725cdbe2be821' 'df8a8c389aa9d619650d6e472409e4480095e09d5ea60b232a865e1a654dd9440e2228f1f098302b529d6db89f9cd0d8d066881da2bc3ca9ec07b17368efd2cf' '74efb1939053f41129cd811cf84abef8ff84ca4673cb62c3115b9d56830a57a48fed021b9807a74299c4c4cf3ec1880733f91dd5d06f4b9ac294fc78a9b5498e') prepare() { cd ${pkgname}-${pkgver} patch -Np1 -i "${srcdir}/missing-desktop-file-utils.patch" - patch -Np1 -i "${srcdir}/namcap-fix-full-relro.patch" patch -Np1 -i "${srcdir}/namcap-ignore-so-no-pie.patch" } diff --git a/namcap-fix-full-relro.patch b/namcap-fix-full-relro.patch deleted file mode 100644 index a11b63f..0000000 --- a/namcap-fix-full-relro.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4bf61fa3c5ecb928b2aaa526f8f56f3b5284d25f Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen <yan12125@gmail.com> -Date: Tue, 11 Sep 2018 22:28:37 +0800 -Subject: elffiles: also check DF_BIND_NOW when checking FULL RELRO - -Looks like DF_BIND_NOW has the same function as DT_BIND_NOW. - -Signed-off-by: Kyle Keen <keenerd@gmail.com> ---- - Namcap/rules/elffiles.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Namcap/rules/elffiles.py b/Namcap/rules/elffiles.py -index d707a58..6cef680 100644 ---- a/Namcap/rules/elffiles.py -+++ b/Namcap/rules/elffiles.py -@@ -140,11 +140,16 @@ class ELFGnuRelroRule(TarballRule): - description = "Check for FULL RELRO in ELF files." - - def has_bind_now(self, elffile): -+ DF_BIND_NOW = 0x08 -+ - for section in elffile.iter_sections(): - if not isinstance(section, DynamicSection): - continue -- if any(tag.entry.d_tag == 'DT_BIND_NOW' for tag in section.iter_tags()): -- return True -+ for tag in section.iter_tags(): -+ if tag.entry.d_tag == 'DT_BIND_NOW': -+ return True -+ if tag.entry.d_tag == 'DT_FLAGS' and tag.entry.d_val & DF_BIND_NOW: -+ return True - return False - - def analyze(self, pkginfo, tar): --- -cgit v1.2.1-1-g437b -