[arch-commits] Commit in deheader/trunk (PKGBUILD deheader_use-system-python.patch)

2020-08-12 Thread Jonas Witschel via arch-commits 
Date: Wednesday, August 12, 2020 @ 16:58:18
  Author: diabonas
Revision: 676514

upgpkg: deheader 1.7-1: upstream release

Modified:
  deheader/trunk/PKGBUILD
  deheader/trunk/deheader_use-system-python.patch

--+
 PKGBUILD |   13 -
 deheader_use-system-python.patch |   20 ++--
 2 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-12 16:57:06 UTC (rev 676513)
+++ PKGBUILD2020-08-12 16:58:18 UTC (rev 676514)
@@ -1,7 +1,7 @@
 # Maintainer: Jonas Witschel 
 pkgname=deheader
-pkgver=1.6
-pkgrel=4
+pkgver=1.7
+pkgrel=1
 pkgdesc='Find and optionally remove unneeded includes in C or C++ source files'
 arch=('any')
 url='http://www.catb.org/~esr/deheader/'
@@ -8,15 +8,10 @@
 license=('BSD')
 depends=('python')
 source=("$url/$pkgname-$pkgver.tar.gz" 'deheader_use-system-python.patch')
-noextract=("$pkgname-$pkgver.tar.gz")
-sha512sums=('8278d845bf618aabe1fb1da77fb99f6de5efe76a8bd8ae12da0327c0e4df184b7c4d50b2ac2be4a3dd271b8b010818fef83cd80d81f2be2b04bd09e2fee1cea3'
-
'e864cd32dca820844c5d4a0ff4f15f18bf7be53231daba54111ea914cbd594f9d0244e4ec05cf806ef85a86662ce434acc41ace97106e846ddb7409be793a0d3')
+sha512sums=('611c7c71a2a5c79ca79fd0de26b53fdd10a7e4b090330c35c3f7d56737b0b3c6736a6b98ca568320a36452a157af4642912e78d02c77bd43c2ef32541f4a09ed'
+
'1f4d63ec337ed2f4672124abae2637605f88e3580205b744d82d505ab0d3cfe67988eb2f5c698d2a41b908c99ce66fe7da8b965073465b80ccadc1a9b0d2a72b')
 
 prepare() {
-   # Invalid hardlink in release tarball leads to bsdtar errors during 
extraction
-   # (https://gitlab.com/esr/deheader/issues/7)
-   bsdtar --extract -s '|deheader-1.6/deheader.1||R' --file 
"$pkgname-$pkgver.tar.gz"
-
cd "$pkgname-$pkgver"
patch --strip=1 --input="$srcdir/deheader_use-system-python.patch"
 }

Modified: deheader_use-system-python.patch
===
--- deheader_use-system-python.patch2020-08-12 16:57:06 UTC (rev 676513)
+++ deheader_use-system-python.patch2020-08-12 16:58:18 UTC (rev 676514)
@@ -1,4 +1,4 @@
-From df0b47a4543279191e1bfc88269438add4a8deb3 Mon Sep 17 00:00:00 2001
+From c14978acf7cc42d6fe9fa1c91adaf771610f43cf Mon Sep 17 00:00:00 2001
 From: Jonas Witschel 
 Date: Tue, 15 Oct 2019 17:51:25 +0200
 Subject: [PATCH] Force use of the system Python 3 interpreter
@@ -10,7 +10,7 @@
  2 files changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/deheader b/deheader
-index 5b7d06f..4ceb83b 100755
+index 6e8ed47..ba10088 100755
 --- a/deheader
 +++ b/deheader
 @@ -1,4 +1,4 @@
@@ -20,7 +20,7 @@
  deheader -- find (optionally remove) unneeded includes in C or C++ 
sourcefiles.
  
 diff --git a/test/Makefile b/test/Makefile
-index 6a70c0d..cf4dc8c 100644
+index 0ac42f9..f6fc9ef 100644
 --- a/test/Makefile
 +++ b/test/Makefile
 @@ -4,13 +4,8 @@ SOURCES = $(shell ls *.c)
@@ -27,16 +27,16 @@
  
  regress:
@echo "Testing deheader: no output is good news."
--  @setpython python2
-   @-deheader -v -v . >/tmp/regress
+-  @./setpython python2
+   @-../deheader -v -v . >/tmp/regress
@diff -u regress.chk /tmp/regress
--  @setpython python3
--  @-deheader -v -v . >/tmp/regress
+-  @./setpython python3
+-  @-../deheader -v -v . >/tmp/regress
 -  @diff -u regress.chk /tmp/regress
--  @setpython python
+-  @./setpython python
@rm /tmp/regress 
  makeregress:
-   @-deheader -v -v . >regress.chk
+   @-../deheader -v -v . >regress.chk
 -- 
-2.23.0
+2.28.0

[arch-commits] Commit in deheader/trunk (PKGBUILD deheader_use-system-python.patch)

2019-10-15 Thread Jonas Witschel via arch-commits 
Date: Tuesday, October 15, 2019 @ 16:00:36
  Author: diabonas
Revision: 516189

upgpkg: deheader 1.6-3

Use system Python binary (also fixes issues with the reproducible builds CI)

Added:
  deheader/trunk/deheader_use-system-python.patch
Modified:
  deheader/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++--
 deheader_use-system-python.patch |   42 +
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-15 15:23:28 UTC (rev 516188)
+++ PKGBUILD2019-10-15 16:00:36 UTC (rev 516189)
@@ -1,19 +1,24 @@
 # Maintainer: Jonas Witschel 
 pkgname=deheader
 pkgver=1.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Find and optionally remove unneeded includes in C or C++ source files'
 arch=('any')
 url='http://www.catb.org/~esr/deheader/'
 license=('BSD')
 depends=('python')
-source=("$url/$pkgname-$pkgver.tar.gz")
+source=("$url/$pkgname-$pkgver.tar.gz" 'deheader_use-system-python.patch')
 noextract=("$pkgname-$pkgver.tar.gz")
-sha512sums=('8278d845bf618aabe1fb1da77fb99f6de5efe76a8bd8ae12da0327c0e4df184b7c4d50b2ac2be4a3dd271b8b010818fef83cd80d81f2be2b04bd09e2fee1cea3')
+sha512sums=('8278d845bf618aabe1fb1da77fb99f6de5efe76a8bd8ae12da0327c0e4df184b7c4d50b2ac2be4a3dd271b8b010818fef83cd80d81f2be2b04bd09e2fee1cea3'
+
'e864cd32dca820844c5d4a0ff4f15f18bf7be53231daba54111ea914cbd594f9d0244e4ec05cf806ef85a86662ce434acc41ace97106e846ddb7409be793a0d3')
 
 prepare() {
# Invalid hardlink in release tarball leads to bsdtar errors during 
extraction
+   # (https://gitlab.com/esr/deheader/issues/7)
bsdtar --extract -s '|deheader-1.6/deheader.1||R' --file 
"$pkgname-$pkgver.tar.gz"
+
+   cd "$pkgname-$pkgver"
+   patch --strip=1 --input="$srcdir/deheader_use-system-python.patch"
 }
 
 check() {

Added: deheader_use-system-python.patch
===
--- deheader_use-system-python.patch(rev 0)
+++ deheader_use-system-python.patch2019-10-15 16:00:36 UTC (rev 516189)
@@ -0,0 +1,42 @@
+From df0b47a4543279191e1bfc88269438add4a8deb3 Mon Sep 17 00:00:00 2001
+From: Jonas Witschel 
+Date: Tue, 15 Oct 2019 17:51:25 +0200
+Subject: [PATCH] Force use of the system Python 3 interpreter
+
+This avoids PATH manipulation attacks and is encouraged by PEP 394.
+---
+ deheader  | 2 +-
+ test/Makefile | 5 -
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/deheader b/deheader
+index 5b7d06f..4ceb83b 100755
+--- a/deheader
 b/deheader
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ """\
+ deheader -- find (optionally remove) unneeded includes in C or C++ 
sourcefiles.
+ 
+diff --git a/test/Makefile b/test/Makefile
+index 6a70c0d..cf4dc8c 100644
+--- a/test/Makefile
 b/test/Makefile
+@@ -4,13 +4,8 @@ SOURCES = $(shell ls *.c)
+ 
+ regress:
+   @echo "Testing deheader: no output is good news."
+-  @setpython python2
+   @-deheader -v -v . >/tmp/regress
+   @diff -u regress.chk /tmp/regress
+-  @setpython python3
+-  @-deheader -v -v . >/tmp/regress
+-  @diff -u regress.chk /tmp/regress
+-  @setpython python
+   @rm /tmp/regress 
+ makeregress:
+   @-deheader -v -v . >regress.chk
+-- 
+2.23.0
+