diff --git a/checksec-1.11.1-shebang.patch b/checksec-1.11.1-shebang.patch deleted file mode 100644 index be8b215..0000000 --- a/checksec-1.11.1-shebang.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: checksec.sh-1.11.1/checksec -=================================================================== ---- checksec.sh-1.11.1.orig/checksec -+++ checksec.sh-1.11.1/checksec -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/bash - # - # The BSD License (http://www.opensource.org/licenses/bsd-license.php) - # specifies the terms and conditions of use for checksec.sh: diff --git a/checksec.spec b/checksec.spec index 3f54d90..86bf697 100644 --- a/checksec.spec +++ b/checksec.spec @@ -1,32 +1,30 @@ # Testsuite needs root-privileges. -%bcond_with testsuite - -%global giturl https://github.com/slimm609/%{name}.sh +%bcond_with testsuite Name: checksec -Version: 2.1.0 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Tool to check system for binary-hardening License: BSD -URL: %{giturl} -Source0: %{giturl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -# Fix shebang. -Patch9998: %{name}-1.11.1-shebang.patch +URL: https://github.com/slimm609/%{name}.sh +Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch + %if %{with testsuite} BuildRequires: binutils BuildRequires: file BuildRequires: findutils BuildRequires: gawk BuildRequires: libxml2 +BuildRequires: openssl +BuildRequires: procps-ng %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: %{_bindir}/jsonlint -%endif # 0#{?fedora} || 0#{?rhel} >= 6 -%endif # with testsuite +%endif +%endif Requires: binutils Requires: file @@ -51,14 +49,22 @@ protection mechanisms. %prep %autosetup -n %{name}.sh-%{version} -p 1 + +# Fix shebang. +sed -i 's~^#!/usr/bin/env bash~#!/bin/bash~' checksec + # Disable --update command. sed -i 's/pkg_release=false/pkg_release=true/' checksec +%build +# noop + + %install -%{__mkdir} -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 -%{__install} -pm 0755 %{name} %{buildroot}%{_bindir} -%{__install} -pm 0644 extras/man/%{name}.1 %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 +install -pm 0755 %{name} %{buildroot}%{_bindir} +install -pm 0644 extras/man/%{name}.1 %{buildroot}%{_mandir}/man1 %if %{with testsuite} @@ -67,9 +73,9 @@ pushd tests ./xml-checks.sh || exit 2 %if 0%{?fedora} || 0%{?rhel} >= 6 ./json-checks.sh || exit 2 -%endif # 0#{?fedora} || 0#{?rhel} >= 6 +%endif popd -%endif # with testsuite +%endif %files @@ -80,6 +86,9 @@ popd %changelog +* Fri May 29 2020 Björn Esser - 2.2.2-1 +- Release 2.2.2 (BZ#1840807) + * Tue Jan 28 2020 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index a38612a..8ebb3b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (checksec-2.1.0.tar.gz) = 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74 +SHA512 (checksec-2.2.2.tar.gz) = d975a9cea60869ddda445515396b67b6ea3c9b33770e711071e1cff684f89b4718b135a3a3c1a88b11b96ccde0df72d6b7924cade0619d24e38db428251d22b0