summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-07-28 00:38:51 -0500
committerIván Ávalos <avalos@disroot.org>2022-07-28 00:38:51 -0500
commit3c5694e2fc30a846f438b05579ba827725e04c11 (patch)
tree30f5e5c14fee09d77dc2c54e1c87bcbe40002232 /pcr
parente4e3858e06dcaf7bf037aa0840a2db43133f5c52 (diff)
parent2187e3ffefad9f0133cede7f90cdda88c955b44d (diff)
downloadabslibre-wip-linux-libre-64.tar.gz
abslibre-wip-linux-libre-64.tar.bz2
abslibre-wip-linux-libre-64.zip
Merge branch 'wip-linux-libre-64' of git://git.parabola.nu/abslibre/abslibre into wip-linux-libre-64wip-linux-libre-64
Diffstat (limited to 'pcr')
-rw-r--r--pcr/gmid/PKGBUILD18
-rw-r--r--pcr/gophernicus/PKGBUILD65
-rw-r--r--pcr/gophernicus/fix-make-log-typo.patch13
-rw-r--r--pcr/gophernicus/gophernicus.install11
-rw-r--r--pcr/gophernicus/preserve-existing-gophermap.patch15
-rw-r--r--pcr/gophernicus/remove-DESTDIR-from-initscripts.patch32
-rw-r--r--pcr/gophernicus/xinetd-respect-custom-server-root.patch34
-rw-r--r--pcr/libreboot-utils/PKGBUILD20
8 files changed, 190 insertions, 18 deletions
diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD
index 073881ea1..cd743cd3a 100644
--- a/pcr/gmid/PKGBUILD
+++ b/pcr/gmid/PKGBUILD
@@ -9,8 +9,8 @@
pkgname=gmid
-pkgver=1.8.3
-pkgrel=3
+pkgver=1.8.4
+pkgrel=1
pkgdesc='Fast Gemini server written with security in mind.'
arch=('x86_64')
arch+=('i686' 'armv7h')
@@ -30,26 +30,28 @@ source=(
"gmid.conf"
"index.gmi"
)
-mksha256sums=('f7b6cc1deaea6c5242301fa7440c0f5caaf282fea780ba1edcef480f7fa67fe1')
+mksha256sums=('abecdec3bfc2f2deac9d57b84e43334484fc537e5086a3c061f07f6311c89d2f')
sha256sums=(
- '5a7ad3ef93434b8a42f18bffe93444de9d30360e4c799dcadac844374e2046ca'
+ '0'
'SKIP'
'946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94'
'4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6'
+# '6f3814be535099857b579126e5fb5ff9a9a6520d4ea9116c8a0c6a8589ab9ef6'
'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3'
'f396c7db961c45ddb8e48acf42708b3faf9df2a3eaa56f30d9e64d4de0971e88'
'7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6'
+# 'db240698dfb804d203299b3c89015a493c4fe97bec5cb3b3f920e566045191ce'
+# 'fac76dfe3da74d9dce4ed3acbb6bd0023904140bd71219a7cac06236e2e93d29'
'361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139'
)
validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
-
mksource() {
cd "$srcdir/$pkgname-$pkgver"
- # Remove unlicensed files.
- rm -r contrib
- rm -r site
+ # Remove unlicensed files
+ rm -rf contrib
+ rm -rf site
}
build() {
diff --git a/pcr/gophernicus/PKGBUILD b/pcr/gophernicus/PKGBUILD
new file mode 100644
index 000000000..d01c74125
--- /dev/null
+++ b/pcr/gophernicus/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: botplus <oneofvalts@sdf.org>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+pkgname=gophernicus
+pkgver=3.1.1
+pkgrel=2
+pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon"
+arch=('armv7h' 'i686' 'x86_64')
+url="https://github.com/gophernicus/gophernicus"
+license=('BSD2')
+
+backup=(etc/xinetd.d/gophernicus
+ srv/gopher/gophermap)
+install=${pkgname}.install
+
+depends=('libwrap' 'xinetd')
+optdepends=("xinetd-openrc: openrc init-script")
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz
+ xinetd-respect-custom-server-root.patch
+ remove-DESTDIR-from-initscripts.patch
+ fix-make-log-typo.patch
+ preserve-existing-gophermap.patch)
+
+b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb'
+ 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280'
+ '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468'
+ '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c'
+ 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4')
+
+
+prepare()
+{
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # allow server root under /srv/ with xinetd
+ patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch
+
+ # remove DESTDIR path from installed init scripts
+ patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch
+
+ # fix typo in make log (does not affect the binary package)
+ patch -Np1 < "${srcdir}"/fix-make-log-typo.patch
+
+ # fix think-o in ./configure (does not affect the binary package)
+ patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch
+}
+
+build()
+{
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --listener=xinetd \
+ --gopherroot=/srv/gopher
+ make
+}
+
+package()
+{
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/gophernicus/fix-make-log-typo.patch b/pcr/gophernicus/fix-make-log-typo.patch
new file mode 100644
index 000000000..4cf75dd40
--- /dev/null
+++ b/pcr/gophernicus/fix-make-log-typo.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3ab1bd1..5468d92 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -109,7 +109,7 @@ install-msg-xinetd:
+ echo "accessed."
+ echo "On systemd distributions:"
+ echo " systemctl restart xinetd"
+- echo "You can configure arguments, including the hostname, in $(INETD)."
++ echo "You can configure arguments, including the hostname, in $(XINETD)."
+ echo
+
+ install-msg-systemd:
diff --git a/pcr/gophernicus/gophernicus.install b/pcr/gophernicus/gophernicus.install
new file mode 100644
index 000000000..ad4be4589
--- /dev/null
+++ b/pcr/gophernicus/gophernicus.install
@@ -0,0 +1,11 @@
+post_install() {
+ echo "==> to start the gophernicus service:"
+ echo " systemd:"
+ echo " # systemctl start xinetd.service"
+ echo " openrc:"
+ echo " # rc-service xinetd start"
+ echo "==> configuration is:"
+ echo " /etc/xinetd.d/gophernicus"
+ echo "==> server root is:"
+ echo " /srv/gopher"
+}
diff --git a/pcr/gophernicus/preserve-existing-gophermap.patch b/pcr/gophernicus/preserve-existing-gophermap.patch
new file mode 100644
index 000000000..544339113
--- /dev/null
+++ b/pcr/gophernicus/preserve-existing-gophermap.patch
@@ -0,0 +1,15 @@
+diff --git a/configure b/configure
+index d54dc29..067affe 100755
+--- a/configure
++++ b/configure
+@@ -280,9 +280,9 @@ printf "\\n"
+ # Don't replace an existing root
+ printf "checking for existing gopher root... "
+ if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then
+- INSTALL_ROOT="install-root"
+ printf "yes"
+ else
++ INSTALL_ROOT="install-root"
+ printf "no"
+ fi
+ printf "\\n"
diff --git a/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch
new file mode 100644
index 000000000..96eec6d12
--- /dev/null
+++ b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile.in b/Makefile.in
+index 5468d92..d047c7a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -145,15 +145,15 @@ install-root:
+ $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap
+
+ install-inetd-update: install-root
+- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)"
++ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)"
+ update-inetd --enable gopher
+
+ install-inetd-manual: install-root
+- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD)
++ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD)
+
+ install-xinetd: install-root
+ $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d
+- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd
++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd
+ $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD)
+
+ install-osx: install-root
+@@ -172,7 +172,7 @@ install-systemd: install-root
+ $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD)
+ $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket
+- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service
++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service
+ $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service
+
+ uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@
diff --git a/pcr/gophernicus/xinetd-respect-custom-server-root.patch b/pcr/gophernicus/xinetd-respect-custom-server-root.patch
new file mode 100644
index 000000000..b0106639b
--- /dev/null
+++ b/pcr/gophernicus/xinetd-respect-custom-server-root.patch
@@ -0,0 +1,34 @@
+diff --git a/configure b/configure
+index 067affe..c78a9f6 100755
+--- a/configure
++++ b/configure
+@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile
+
+ printf "done\\n"
+
+-# Also sub in $HOSTNAME to the various init systems (whether or not we really
+-# use them, its just easier)
++# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems
++# (whether or not we really use them, its just easier)
+ for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \
+ gophernicus.xinetd; do
+ printf "creating init/${f}... "
+- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}"
++ cp init/${f}{.in,}
++ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f}
++ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f}
+ printf "done\\n"
+ done
+
+diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in
+index 4f2c921..a052375 100644
+--- a/init/gophernicus.xinetd.in
++++ b/init/gophernicus.xinetd.in
+@@ -6,6 +6,6 @@ service gopher
+ wait = no
+ user = nobody
+ server = @BINARY@
+- server_args = -r/var/gopher -h@HOSTNAME@
++ server_args = -r@GOPHERROOT@ -h@HOSTNAME@
+ disable = no
+ }
diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD
index 9c9865fe0..1a27c1182 100644
--- a/pcr/libreboot-utils/PKGBUILD
+++ b/pcr/libreboot-utils/PKGBUILD
@@ -1,26 +1,26 @@
+# SPDX-License-Identifier: CC0-1.0
# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
# Copyright (C) 2022 Wael Karram <wael@waelk.tech>
-# SPDX-License-Identifier: CC0-1.0
-# Maintainers: Parabola hackers <dev@lists.parabola.nu>
+# Maintainer: Parabola Hackers <dev@lists.parabola.nu>
pkgname=libreboot-utils
-pkgrel=14
-_upstream_ver=20211122
+pkgrel=15
+_upstream_ver=20220710
pkgver=4.15.libreboot${_upstream_ver}
pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)"
url="https://libreboot.org/"
arch=('x86_64' 'i686' 'armv7h')
license=('GPL2')
-makedepends=('pciutils' 'python' 'python-setuptools')
+makedepends=('pciutils' 'python' 'python-setuptools' 'flex')
_mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request
-source=("${_mirror}/testing/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig}
+source=("${_mirror}/stable/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig}
"0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch")
-sha256sums=('e8a610e51e668c34627a6d9c048c554592fd2c2ab4dbcad83c85c06d132e5ad1'
- '4442fc225383e1edf8f45e1aecba81868ae43db19978f15c17828389364c0434'
+sha256sums=('92439034828aa66d52507c97d8260a7d0335abbeedb1a70e5e1466b92a903645'
+ 'e8afb35e6d9328baa5cee5325c60cb40467559596e93a7ae218883ece3484b8f'
'SKIP')
-sha512sums=('3eac75b33bc6d2874c3ca1ad2392db7287992cf91d37879bb3244dbd6716bc7ffa3f8d31e15d821899e91a55b6fe665d918bea4e9da92e5e98345e9bcbe1bb95'
- '3a532ecef550ef27b723845544e91ff6b13ed6f2f1188d40fdeb7b3c416be619ff58103c3b01cd52ff88c28df6d419d2113b92d0b8ba36d1a74cfc16f70e0e63'
+sha512sums=('73fe77983d30997295747e365a363f6fc4897f469d9b24640fc6a7105f0ddb623890e797723077222212695dbbe9abb5186b04d75dad39f99cb62733f4b0de60'
+ 'aa4f35df0da8e93dda169034e906576db291ac2e6fe27b5c9693827ff99ecaa8c45b80892f0792505fb1d9c6d5190517a59309304f93c3e1f504ddacf95684c1'
'SKIP')
validpgpkeys=('98CCDDF8E56047F475C044BDD0C62464FA8B4856') # Leah Rowe