From 997cd15453d9aa06430d6b520a48fc2e2945a16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Fri, 23 Sep 2022 22:03:32 +0100
Subject: [PATCH] Add sed 4.8

---
 parts.rst                     |  7 ++++
 sysa/SHA256SUMS.pkgs          |  1 +
 sysc.py                       |  4 +++
 sysc/SHA256SUMS.sources       |  1 +
 sysc/run2.sh                  |  2 ++
 sysc/sed-4.8/import-gnulib.sh | 66 +++++++++++++++++++++++++++++++++++
 sysc/sed-4.8/sed-4.8.sh       | 23 ++++++++++++
 7 files changed, 104 insertions(+)
 create mode 100755 sysc/sed-4.8/import-gnulib.sh
 create mode 100755 sysc/sed-4.8/sed-4.8.sh

diff --git a/parts.rst b/parts.rst
index 56e86bc..1a24f9c 100644
--- a/parts.rst
+++ b/parts.rst
@@ -848,3 +848,10 @@ grep 3.7
 ========
 
 Newer ``grep`` will be needed to bootstrap ``autogen``.
+
+sed 4.8
+=======
+
+Earlier ``sed`` was built with manual makefile with most features compiled out.
+Build a newer ``sed`` using GNU Autotools build system. In particular this will let
+sed keep executable bit on after in place editing.
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index b01cdd0..5e1072d 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -91,6 +91,7 @@ df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6  openssl-1.1.1l
 041aed738c039a8c437c6d29530fe44f55bd5fc9ac2bb54f793f6fe3a9df16fd  perl5.005-03_0.tar.bz2
 c69e0197ebc1bf9f9fc68a06d4c649c934784077058c24a484da59a153132816  pkg-config-0.29.2_0.tar.bz2
 8a0248fbf8fe1764580698415cc3628585d4dd054ddf63040f400e18cbaef7a4  sed-4.0.9_0.tar.bz2
+af951f34f57d5920ee3b408f64bc8594d88d26cfd9a71ea465a0dba7b10600e8  sed-4.8_0.x86.xbps
 1245905d8942a10cccf21850a521db19c9a65ab35cef4c6bbb72672773851048  tar-1.34_0.tar.bz2
 42b8eabbd299737541b57b3aa362eeeb20499449901fc2a4895302ce0117080c  tcc-0.9.27_0.tar.bz2
 db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef  tcc-0.9.27_1.tar.bz2
diff --git a/sysc.py b/sysc.py
index 9082637..0ab2d23 100755
--- a/sysc.py
+++ b/sysc.py
@@ -219,3 +219,7 @@ class SysC(SysGeneral):
         # grep 3.7
         self.get_file(["https://mirrors.kernel.org/gnu/grep/grep-3.7.tar.xz",
                        "https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-8f4538a5.tar.gz"])
+
+        # sed 4.8
+        self.get_file(["https://mirrors.kernel.org/gnu/sed/sed-4.8.tar.xz",
+                       "http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d279bc.tar.gz"])
diff --git a/sysc/SHA256SUMS.sources b/sysc/SHA256SUMS.sources
index 3a8e6fa..a7423f8 100644
--- a/sysc/SHA256SUMS.sources
+++ b/sysc/SHA256SUMS.sources
@@ -48,6 +48,7 @@ ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd  patch-2.7.6.ta
 1d179b41283f12ad83f9758430f6ddc49bdf20db5c396aeae7e51ebb4e4afd29  perl_5.32.1.orig-regen-configure.tar.gz
 57cc47c735c8300a8ce2fa0643507b44c4ae59012bfdad0121313db639e02309  perl-5.32.1.tar.xz
 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591  pkg-config-0.29.2.tar.gz
+f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633  sed-4.8.tar.xz
 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28  tar-1.34.tar.xz
 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa  texinfo-6.7.tar.xz
 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad  which-2.21.tar.gz
diff --git a/sysc/run2.sh b/sysc/run2.sh
index 1d630df..a549a14 100755
--- a/sysc/run2.sh
+++ b/sysc/run2.sh
@@ -102,6 +102,8 @@ build which-2.21
 
 build grep-3.7
 
+build sed-4.8
+
 if [ "$FORCE_TIMESTAMPS" = True ] ; then
     echo 'Forcing all files timestamps to be 0 unix time.'
     canonicalise_all_files_timestamp
diff --git a/sysc/sed-4.8/import-gnulib.sh b/sysc/sed-4.8/import-gnulib.sh
new file mode 100755
index 0000000..ddc79be
--- /dev/null
+++ b/sysc/sed-4.8/import-gnulib.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+../gnulib-d279bc/gnulib-tool --import --local-dir=gl \
+  --lib=libsed \
+  --source-base=lib \
+  --m4-base=m4 \
+  --doc-base=doc \
+  --tests-base=gnulib-tests \
+  --aux-dir=build-aux \
+  --with-tests \
+  --makefile-name=gnulib.mk \
+  --no-conditional-dependencies \
+  --no-libtool \
+  --macro-prefix=gl \
+  --avoid=lock-tests \
+  acl \
+  alloca \
+  binary-io \
+  btowc \
+  c-ctype \
+  closeout \
+  dfa \
+  extensions \
+  fdl \
+  fwriting \
+  getdelim \
+  getopt \
+  gettext-h \
+  git-version-gen \
+  gitlog-to-changelog \
+  ignore-value \
+  localcharset \
+  manywarnings \
+  mbrlen \
+  mbrtowc \
+  mbsinit \
+  memchr \
+  memrchr \
+  mkostemp \
+  non-recursive-gnulib-prefix-hack \
+  obstack \
+  perl \
+  progname \
+  readme-release \
+  regex \
+  rename \
+  selinux-h \
+  ssize_t \
+  stat-macros \
+  stdalign \
+  stdbool \
+  strerror \
+  strverscmp \
+  unlocked-io \
+  update-copyright \
+  verify \
+  version-etc-fsf \
+  wcrtomb \
+  wctob \
+  xalloc
+
+./build-aux/prefix-gnulib-mk --lib-name=libsed lib/gnulib.mk
diff --git a/sysc/sed-4.8/sed-4.8.sh b/sysc/sed-4.8/sed-4.8.sh
new file mode 100755
index 0000000..1653e62
--- /dev/null
+++ b/sysc/sed-4.8/sed-4.8.sh
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+urls="https://mirrors.kernel.org/gnu/sed/sed-4.8.tar.xz
+ http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-d279bc.tar.gz"
+
+src_prepare() {
+    rm configure
+    find . -name 'Makefile.in' -delete
+
+    ../../import-gnulib.sh
+
+    autoreconf-2.69 -fi
+}
+
+src_configure() {
+    GL_GENERATE_ALLOCA_H_TRUE=0 LDFLAGS="-static" ./configure --prefix="${PREFIX}"
+}
+
+src_install() {
+    default
+}