kiss-stj

commit a01f92c0f68eaca09ff5ad1f80858f2b9cbf1e6a
parent f00b9269bdea858307aaa93b8095b9d3f03ebdd5
Author: St John Karp <contact@stjo.hn>
Date:   Sat,  2 Jul 2022 16:11:03 -0400

firejail: Remove build-time dependency on Python

I realised the date invocations in mkman.sh were literally just
to generate the date at the bottom of the manpage, which is a
ridiculous thing to require a whole dependency on Python. I've
updated the POSIX compliance patch so that we use the date utility
and just get the current month and year, ignoring the SOURCE_DATE_EPOCH
variable.

Diffstat:
M
extra/firejail/checksums
 | 
2
+-
D
extra/firejail/depends
 | 
1
-
M
extra/firejail/patches/posix-date-sed.patch
 | 
10
++++------

3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/extra/firejail/checksums b/extra/firejail/checksums
@@ -1,3 +1,3 @@
 b77b67a4db7c01d69cb033a50aa7b1132dfaeb2cd97ce6412285235265b71b17
 4f7bc56405b0588fdbd4a8fa220119191aa5090441dde40bf86078caad90ec85
-14e2e8e6e58653ab0584066d081e348310a966237e9dadb1daa8655c438735c2
+f128a6bfcfdcf6b8fd4f62a454ef45b86c4d657440e93cfa27f643b3bb86b83e
diff --git a/extra/firejail/depends b/extra/firejail/depends
@@ -1 +0,0 @@
-python make
diff --git a/extra/firejail/patches/posix-date-sed.patch b/extra/firejail/patches/posix-date-sed.patch
@@ -1,8 +1,8 @@
 diff --git a/mkman.sh b/mkman.sh
-index 79ad162..9ce10af 100755
+index 79ad162..3c4260b 100755
 --- a/mkman.sh
 +++ b/mkman.sh
-@@ -5,8 +5,9 @@
+@@ -5,8 +5,7 @@
  
  set -e
  
@@ -11,9 +11,7 @@ index 79ad162..9ce10af 100755
 -sed -i "s/MONTH/$MONTH/g" "$3"
 -YEAR="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)"
 -sed -i "s/YEAR/$YEAR/g" "$3"
-+MONTH="$(python -c "import datetime; print(datetime.datetime.utcfromtimestamp(${SOURCE_DATE_EPOCH:-$(date +%s)}).strftime('%b'))")"
-+YEAR="$(python -c "import datetime; print(datetime.datetime.utcfromtimestamp(${SOURCE_DATE_EPOCH:-$(date +%s)}).strftime('%Y'))")"
 +sed -e "s/VERSION/$1/g" \
-+	-e "s/MONTH/$MONTH/g" \
-+	-e "s/YEAR/$YEAR/g" \
++	-e "s/MONTH/$(date -u +%b)/g" \
++	-e "s/YEAR/$(date -u +%Y)/g" \
 +	"$2" > "$3"