From ec7d1f1b1affebb68368f367e10a59d6eb7db2ab Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Tue, 27 Dec 2022 23:10:04 +0200 Subject: [PATCH] upg cpio ethtool gperf lirc lua nftables ntp correct postfix deps --- cpio/PKGBUILD | 7 +++- cpio/PKGBUILD-arch | 6 ++-- cpio/deps | 1 + ethtool/PKGBUILD | 6 +++- ethtool/PKGBUILD-arch | 6 ++-- ethtool/deps | 1 - gperf/PKGBUILD | 9 +++-- gperf/PKGBUILD-arch | 6 ++-- gperf/deps | 2 ++ lirc/PKGBUILD | 5 ++- lirc/PKGBUILD-arch | 8 ++--- lirc/deps | 1 + lua/PKGBUILD | 5 ++- lua/PKGBUILD-arch | 10 +++--- meson/sums | 14 +++----- nftables/PKGBUILD | 71 +++++++++++++++++++++++++++++++++++++++ nftables/PKGBUILD-arch | 62 ++++++++++++++++++++++++++++++++++ nftables/clean | 1 + nftables/deps | 7 ++++ nftables/nftables.conf | 27 +++++++++++++++ nftables/nftables.install | 10 ++++++ nftables/nftables.service | 12 +++++++ nftables/time | 6 ++++ ntp/PKGBUILD | 8 +++-- ntp/PKGBUILD-arch | 2 +- ntp/time | 8 +++++ postfix/deps | 1 - 27 files changed, 263 insertions(+), 39 deletions(-) create mode 100644 nftables/PKGBUILD create mode 100644 nftables/PKGBUILD-arch create mode 100644 nftables/clean create mode 100644 nftables/deps create mode 100644 nftables/nftables.conf create mode 100644 nftables/nftables.install create mode 100644 nftables/nftables.service create mode 100644 nftables/time create mode 100644 ntp/time diff --git a/cpio/PKGBUILD b/cpio/PKGBUILD index e87e275..27d58e1 100644 --- a/cpio/PKGBUILD +++ b/cpio/PKGBUILD @@ -7,7 +7,7 @@ pkgname=cpio pkgver=2.13 -pkgrel=02 +pkgrel=03 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(x86_64) url="https://www.gnu.org/software/cpio" @@ -44,3 +44,8 @@ validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff pkgname=cpio pkgver=2.13 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(x86_64) license=('GPL') url="https://www.gnu.org/software/cpio" depends=('glibc') source=(https://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz{,.sig}) -md5sums=('389c5452d667c23b5eceb206f5000810' - 'SKIP') +sha256sums=('e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88' + 'SKIP') validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff build() { diff --git a/cpio/deps b/cpio/deps index 8d1c8b6..8cb7cb9 100644 --- a/cpio/deps +++ b/cpio/deps @@ -1 +1,2 @@ + diff --git a/ethtool/PKGBUILD b/ethtool/PKGBUILD index 0078ea9..eb9f862 100644 --- a/ethtool/PKGBUILD +++ b/ethtool/PKGBUILD @@ -7,7 +7,7 @@ pkgname=ethtool pkgver=6.0 -pkgrel=01 +pkgrel=02 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" arch=('x86_64') @@ -40,3 +40,7 @@ validpgpkeys=(CE4A4D080F0D304F23B9EBDD972D5BF4DC613806 # John W. Linville D2CB120AB45957B721CD9596F4554567B91DE934) # Michal Kubecek diff --git a/ethtool/deps b/ethtool/deps index 41112a0..d99bfa2 100644 --- a/ethtool/deps +++ b/ethtool/deps @@ -1,3 +1,2 @@ - diff --git a/gperf/PKGBUILD b/gperf/PKGBUILD index f306ea3..9dea931 100644 --- a/gperf/PKGBUILD +++ b/gperf/PKGBUILD @@ -1,12 +1,13 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gperf pkgver=3.1 -pkgrel=03 +pkgrel=04 pkgdesc="Perfect hash function generator" arch=('x86_64') url="https://www.gnu.org/software/gperf/" @@ -42,3 +43,7 @@ sha1sums=('e3c0618c2d2e5586eda9498c867d5e4858a3b0e2' sha256sums=(588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 # gperf-3.1.tar.gz 0554c9102d257d266bb4d9fb4bf76737abcecfc84a06884de84f8f8ff21c23e0) # gperf-3.1.tar.gz.sig + +## 683c54f5a560cc80f677070c40ccd7a4a648c377ab6691d459cf96b445884ce6 gperf-3.1-04-x86_64.pkg.tar.xz + + diff --git a/gperf/PKGBUILD-arch b/gperf/PKGBUILD-arch index 944baf2..6aa855d 100644 --- a/gperf/PKGBUILD-arch +++ b/gperf/PKGBUILD-arch @@ -3,15 +3,15 @@ pkgname=gperf pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Perfect hash function generator" arch=('x86_64') url="https://www.gnu.org/software/gperf/" license=('GPL3') depends=('gcc-libs' 'texinfo') source=("https://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz"{,.sig}) -sha1sums=('e3c0618c2d2e5586eda9498c867d5e4858a3b0e2' - 'SKIP') +sha256sums=('588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2' + 'SKIP') options=('!makeflags') validpgpkeys=('EDEB87A500CC0A211677FBFD93C08C88471097CD') # Marcel Schaible diff --git a/gperf/deps b/gperf/deps index 8b13789..b28b04f 100644 --- a/gperf/deps +++ b/gperf/deps @@ -1 +1,3 @@ + + diff --git a/lirc/PKGBUILD b/lirc/PKGBUILD index 17d9572..f0bcd7c 100644 --- a/lirc/PKGBUILD +++ b/lirc/PKGBUILD @@ -8,7 +8,7 @@ pkgname=lirc _pkgver=0.10.2 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" -pkgrel=01 +pkgrel=02 epoch=1 pkgdesc="Linux Infrared Remote Control utilities" arch=('x86_64') @@ -61,4 +61,7 @@ sha256sums=(3d44ec8274881cf262f160805641f0827ffcc20ade0d85e7e6f3b90e0d3d222a # bd13ca00e30d85ff9166c03b8f7a20195ef89794e66d7e54f04ba1d014a73e7d # lirc.logrotate b8eb6ff2a542a9a3b20fe259fe36aece941db8d309598d2eeb1815b779e2f838) # lirc.tmpfiles +# a3dc63cd90223ada593548b7b22dcaf2872799944d98fec0660928e4e1b0e955 lirc-1:0.10.2-02-x86_64.pkg.tar.xz + + diff --git a/lirc/PKGBUILD-arch b/lirc/PKGBUILD-arch index ce4ce89..23b5c2c 100644 --- a/lirc/PKGBUILD-arch +++ b/lirc/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=lirc _pkgver=0.10.2 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Linux Infrared Remote Control utilities" arch=('x86_64') @@ -23,9 +23,9 @@ backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf source=("https://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2" lirc.logrotate lirc.tmpfiles) -sha1sums=('02092890205891b6de5a699294485a1eedba46c5' - '4342b004eb53d51fcbb9af2cf136bb4990874608' - '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129') +sha256sums=('3d44ec8274881cf262f160805641f0827ffcc20ade0d85e7e6f3b90e0d3d222a' + 'bd13ca00e30d85ff9166c03b8f7a20195ef89794e66d7e54f04ba1d014a73e7d' + 'b8eb6ff2a542a9a3b20fe259fe36aece941db8d309598d2eeb1815b779e2f838') build() { cd lirc-${_pkgver} diff --git a/lirc/deps b/lirc/deps index c86df0d..d0de85c 100644 --- a/lirc/deps +++ b/lirc/deps @@ -10,3 +10,4 @@ python python-setuptools python-yaml + diff --git a/lua/PKGBUILD b/lua/PKGBUILD index 94d8d35..79759b6 100644 --- a/lua/PKGBUILD +++ b/lua/PKGBUILD @@ -8,7 +8,7 @@ pkgname=lua pkgver=5.4.4 _majorver=${pkgver%.*} -pkgrel=02 +pkgrel=03 pkgdesc='Powerful lightweight programming language designed for extending applications' arch=('x86_64') url='https://www.lua.org/' @@ -70,3 +70,6 @@ sha256sums=(164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 # l ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78 # lua.pc 142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4) # LICENSE + # 24215f2fe961b53509d65d25942e560c7bc8c83bbb8a5dc14235a291902fe867 lua-5.4.4-03-x86_64.pkg.tar.xz + + diff --git a/lua/PKGBUILD-arch b/lua/PKGBUILD-arch index ccc61dc..b88d353 100644 --- a/lua/PKGBUILD-arch +++ b/lua/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=lua pkgver=5.4.4 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=3 pkgdesc='Powerful lightweight programming language designed for extending applications' arch=('x86_64') url='https://www.lua.org/' @@ -16,10 +16,10 @@ source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz liblua.so.patch lua.pc LICENSE) -sha1sums=('03c27684b9d5d9783fb79a7c836ba1cdc5f309cd' - 'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0' - '1aee8d1a219639d0efc534e483ffa1ee236fb393' - '05f5f3b7bef0258bd617c505b8992de639af4551') +sha256sums=('164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61' + 'a8a7f89ab0c03b4bc1d58a935c54df792ad628edb4d1788c5ac66e4fc2d9f800' + 'ca9252633e782b8f85d6a94ea4f6babd4fe30bd759085b373160b1878e36ff78' + '142fb08b41a807b192b4b2c166696a1830a1c97967e5099ad0e579bf500e1da4') prepare() { cd lua-$pkgver diff --git a/meson/sums b/meson/sums index 9154570..1094e45 100644 --- a/meson/sums +++ b/meson/sums @@ -1,11 +1,7 @@ -meson-0.61.0.tar.gz -meson-0.61.0.tar.gz.asc -81fbcd1df48f669b6b23b9dd0752d6d366cc9bf2.patch -bcfb4d0f46608db46cd8881e2a02ba6c33ff066e.patch -704e9802c9f424a57c32d9e63ececfece807529a.patch -63593a55288ee5b89fc9c298dbc300f9c6adaba9.patch -bda11fe25d1efe688d251148cb7cf7939cd50433.patch -9952446a2a28ea2b009f4b8b2a14ad50f0878bdd.patch -skip-test.diff +meson-1.0.0.tar.gz +meson-1.0.0.tar.gz.asc +meson-reference-1.0.0.3 +meson-reference-1.0.0.json +0001-Skip-broken-tests.patch arch-meson jobo-meson diff --git a/nftables/PKGBUILD b/nftables/PKGBUILD new file mode 100644 index 0000000..eddde37 --- /dev/null +++ b/nftables/PKGBUILD @@ -0,0 +1,71 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +pkgname=nftables +epoch=1 +pkgver=1.0.6 +pkgrel=01 +pkgdesc='Netfilter tables userspace tools w/o systemd' +arch=('x86_64') +url='https://netfilter.org/projects/nftables/' +depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson') +optdepends=('python: Python bindings') +makedepends=('asciidoc' 'python') +backup=('etc/nftables.conf') +validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team +source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{,.sig} + 'nftables.conf') +# 'nftables.service') + +install=nftables.install + +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" + done + : +} + +build() { + cd $pkgname-$pkgver + autoreconf -fi #FIXME: To remove with 01.patch + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/usr/share \ + --with-json \ + --with-cli=readline \ + --disable-debug + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + popd + # basic safe firewall config + install -Dm644 nftables.conf "$pkgdir/etc/nftables.conf" +# # systemd +# install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service" +} + +#---- license gpg-key sha256sums ---- + +license=('GPL2') + +sha256sums=(2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c # nftables-1.0.6.tar.xz + 8bfb46d049eed2b7c52ad180dcb4649afea60fd3b24ead331a5abf4b84eaf197 # nftables-1.0.6.tar.xz.sig + 2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8) # nftables.conf + + diff --git a/nftables/PKGBUILD-arch b/nftables/PKGBUILD-arch new file mode 100644 index 0000000..2fc37e4 --- /dev/null +++ b/nftables/PKGBUILD-arch @@ -0,0 +1,62 @@ +# Maintainer: Sébastien "Seblu" Luttringer + +pkgname=nftables +epoch=1 +pkgver=1.0.6 +pkgrel=1 +pkgdesc='Netfilter tables userspace tools' +arch=('x86_64') +url='https://netfilter.org/projects/nftables/' +license=('GPL2') +depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson') +optdepends=('python: Python bindings') +makedepends=('asciidoc' 'python') +backup=('etc/nftables.conf') +validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team +source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{,.sig} + 'nftables.conf' + 'nftables.service') +install=nftables.install +sha256sums=('2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c' + 'SKIP' + '2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8' + 'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea') + +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" + done + : +} + +build() { + cd $pkgname-$pkgver + autoreconf -fi #FIXME: To remove with 01.patch + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/usr/share \ + --with-json \ + --with-cli=readline \ + --disable-debug + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + popd + # basic safe firewall config + install -Dm644 nftables.conf "$pkgdir/etc/nftables.conf" + # systemd + install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service" +} + +# vim:set ts=2 sw=2 et: diff --git a/nftables/clean b/nftables/clean new file mode 100644 index 0000000..50389cb --- /dev/null +++ b/nftables/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,nft*tar.xz*} diff --git a/nftables/deps b/nftables/deps new file mode 100644 index 0000000..7d8bce8 --- /dev/null +++ b/nftables/deps @@ -0,0 +1,7 @@ + +asciidoc +python + + +autoconf +automake diff --git a/nftables/nftables.conf b/nftables/nftables.conf new file mode 100644 index 0000000..fe835b3 --- /dev/null +++ b/nftables/nftables.conf @@ -0,0 +1,27 @@ +#!/usr/bin/nft -f +# vim:set ts=2 sw=2 et: + +# IPv4/IPv6 Simple & Safe firewall ruleset. +# More examples in /usr/share/nftables/ and /usr/share/doc/nftables/examples/. + +table inet filter +delete table inet filter +table inet filter { + chain input { + type filter hook input priority filter + policy drop + + ct state invalid drop comment "early drop of invalid connections" + ct state {established, related} accept comment "allow tracked connections" + iifname lo accept comment "allow from loopback" + ip protocol icmp accept comment "allow icmp" + meta l4proto ipv6-icmp accept comment "allow icmp v6" + tcp dport ssh accept comment "allow sshd" + pkttype host limit rate 5/second counter reject with icmpx type admin-prohibited + counter + } + chain forward { + type filter hook forward priority filter + policy drop + } +} diff --git a/nftables/nftables.install b/nftables/nftables.install new file mode 100644 index 0000000..455245d --- /dev/null +++ b/nftables/nftables.install @@ -0,0 +1,10 @@ +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + (( $(vercmp "$2" '1:0.9.9-1') > 0 )) || cat < Stopping/restarting the nftables service does NOT flush the ruleset anymore. +==> The nftables.conf file requires a delete/flush directive to be restarted. +==> See examples in /usr/share/nftables/ and /usr/share/doc/nftables/examples. +==> The nftables service reload has been removed as it is now equivalent to a restart. +EOF +} diff --git a/nftables/nftables.service b/nftables/nftables.service new file mode 100644 index 0000000..464d8df --- /dev/null +++ b/nftables/nftables.service @@ -0,0 +1,12 @@ +[Unit] +Description=Netfilter Tables +Documentation=man:nft(8) +Wants=network-pre.target +Before=network-pre.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/nft -f /etc/nftables.conf + +[Install] +WantedBy=multi-user.target diff --git a/nftables/time b/nftables/time new file mode 100644 index 0000000..c13190c --- /dev/null +++ b/nftables/time @@ -0,0 +1,6 @@ + + +real 0m29.555s +user 0m27.712s +sys 0m1.761s + diff --git a/ntp/PKGBUILD b/ntp/PKGBUILD index c38e39c..3bf1f14 100644 --- a/ntp/PKGBUILD +++ b/ntp/PKGBUILD @@ -9,7 +9,7 @@ pkgname=ntp _pkgname=ntp #-dev _pkgver=4.2.8p15 pkgver=${_pkgver/p/.p} -pkgrel=02 +pkgrel=03 pkgdesc='Network Time Protocol reference implementation w/o ipv6 & systemd' url='http://www.ntp.org/' arch=('x86_64') @@ -68,5 +68,7 @@ sha256sums=(f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 # 1809cd2be7ce7d16a3321f84cc469024624db70806c7229071cfa7951e8b4770 # ntp-4.2.8_p15-glibc-2.34.patch abccefe0b3a65cd375d5071ce780be8d2d205439aa6d34bcd3c56de6e80ba821 # ntp.conf f839a3b6d8e64fcd9332274131b4d5aa0b2c272db072dc310af1735ef286746a) # ntp.sysusers - - + +# 298457dc5bf038026950ff8f80f021958bfcbae976fb9bd6e70f20718ca5ea71 ntp-4.2.8.p15-03-x86_64.pkg.tar.xz + + diff --git a/ntp/PKGBUILD-arch b/ntp/PKGBUILD-arch index b4815c8..25af0bd 100644 --- a/ntp/PKGBUILD-arch +++ b/ntp/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=ntp _pkgname=ntp #-dev _pkgver=4.2.8p15 pkgver=${_pkgver/p/.p} -pkgrel=2 +pkgrel=3 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') diff --git a/ntp/time b/ntp/time new file mode 100644 index 0000000..8a85f3a --- /dev/null +++ b/ntp/time @@ -0,0 +1,8 @@ + + +real 1m24.934s +user 1m7.167s +sys 0m8.337s + + + diff --git a/postfix/deps b/postfix/deps index 8cf3967..20da6b3 100644 --- a/postfix/deps +++ b/postfix/deps @@ -5,4 +5,3 @@ lmdb mariadb-libs -db