upg krb5 libnftnl jobbot add libverto

This commit is contained in:
joborun linux 2022-06-08 15:18:54 +03:00
parent 2e30a19598
commit 0adb64a998
16 changed files with 168 additions and 31 deletions

1
gssproxy/note Normal file
View file

@ -0,0 +1 @@
gssproxy is only used in nfsutils as a dependency, after 0.8 0.9 wouldn't build without systemd, so nfsutils is built without it instead. When 9.1 was introduced it would again build without systemd, so we built it, but still not used by nfsutils. If you are building your own make the choice yourself. Void does not use gssproxy on nfsutils, gssproxy does not exist in many systemd-less distros.

View file

@ -8,7 +8,7 @@
pkgname=jobbot
pkgdesc='Minimal set of packages to maintain the building chroot for JOBORun Linux'
pkgver=0.1
pkgrel=04
pkgrel=05
groups=( jobbot )
arch=(x86_64)
source=( README-jobbot.txt Qsq ckchroot)
@ -20,7 +20,7 @@ depends=( acl archlinux-keyring obarun-keyring joborun-keyring attr audit bash
kmod krb5 less libarchive libassuan libcap libcap-ng libelf libeudev libffi libgcrypt
libgpg-error libidn2 libisl libksba libldap libmnl libmpc libnetfilter_conntrack
libnfnetlink libnftnl libnghttp2 libnl libp11-kit libpcap libpsl libsasl libseccomp
libsecret libssh2 libtasn1 libtirpc libtool libunistring libxcrypt licenses linux-api-headers
libsecret libssh2 libtasn1 libtirpc libtool libunistring libverto libxcrypt licenses linux-api-headers
lz4 m4 make mpfr nano ncurses nettle npth numactl openssl opensysusers p11-kit package-query pacman
pacman-contrib pacman-mirrorlist pam pambase patch pciutils pcre pcre2 perl pinentry
pkgconf procps-ng psmisc readline sed shadow sqlite sudo tar texinfo tzdata util-linux
@ -41,5 +41,5 @@ package() {
license=('ISC')
sha256sums=(b8d35ce63241ebd38ba6fde17894bbb5b0c334b165789fd0454530c20b25ed75 # README-jobbot.txt
744909b154b344f6001d7e75c6c12a11b73158088a07982ee29c534358ce19c6 # Qsq
65b9591fd06623fef36cb41933a19f3571d730aac99fe3712c94429a1cd77c11 # Qsq
50febbb21bb779f43b93c7f8e65ba4cbff0c6b32cddd45ecb9118fc801581d99) # ckchroot

View file

@ -58,6 +58,7 @@ libcap
libcap-ng
libelf
libeudev
libevent
libffi
libgcrypt
libgpg-error
@ -83,6 +84,7 @@ libtasn1
libtirpc
libtool
libunistring
libverto
libxcrypt
licenses
linux-api-headers

View file

@ -0,0 +1,35 @@
From 0bfd22feb6493f34fdc894daaf680c3a2f2e7784 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 3 May 2022 01:56:05 -0400
Subject: [PATCH] Omit LDFLAGS from krb5-config --libs output
Linker options supplied at configure time (such as -Wl,--as-needed)
can be harmful when applied to downstream users of the libraries, and
in most cases should not be necessary.
ticket: 9057 (new)
---
src/build-tools/krb5-config.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
index dead0dddce7..8e6eb866018 100755
--- a/src/build-tools/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -33,7 +33,6 @@ includedir=@includedir@
libdir=@libdir@
CC_LINK='@CC_LINK@'
KDB5_DB_LIB=@KDB5_DB_LIB@
-LDFLAGS='@LDFLAGS@'
RPATH_FLAG='@RPATH_FLAG@'
PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@'
PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
@@ -220,7 +219,7 @@ if test -n "$do_libs"; then
-e 's#\$(PROG_RPATH)#'$libdir'#' \
-e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
-e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ -e 's#\$(LDFLAGS)##' \
-e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
-e 's#\$(CFLAGS)##'`

View file

@ -8,11 +8,12 @@
pkgname=krb5
_pkgvermajor=1.19
pkgver=1.19.3
pkgrel=01
pkgrel=03
pkgdesc='The Kerberos network authentication system w/o systemd'
url='https://web.mit.edu/kerberos/'
arch=(x86_64)
depends=(glibc e2fsprogs libss.so libcom_err.so libldap keyutils)
depends=(glibc e2fsprogs libldap keyutils libverto-module-base
libkeyutils.so libss.so libcom_err.so libverto.so)
makedepends=(perl bison gettext)
provides=(
libgssapi_krb5.so
@ -25,7 +26,6 @@ provides=(
libkrad.so
libkrb5.so
libkrb5support.so
libverto.so
)
backup=(
'etc/krb5.conf'
@ -33,16 +33,18 @@ backup=(
)
options=('!emptydirs')
source=(https://web.mit.edu/kerberos/dist/krb5/${_pkgvermajor}/${pkgname}-${pkgver}.tar.gz{,.asc}
krb5-config_LDFLAGS.patch)
0001-krb5-config_LDFLAGS.patch::https://github.com/krb5/krb5/commit/0bfd22feb6493f34fdc894daaf680c3a2f2e7784.patch)
prepare() {
cd ${pkgname}-${pkgver}
# cf https://bugs.gentoo.org/show_bug.cgi?id=448778
patch -Np1 < "${srcdir}"/krb5-config_LDFLAGS.patch
# https://github.com/krb5/krb5/commit/0bfd22feb6493f34fdc894daaf680c3a2f2e7784
# https://krbdev.mit.edu/rt/Ticket/Display.html?id=9057
patch -Np1 < "${srcdir}"/0001-krb5-config_LDFLAGS.patch
# FS#25384
sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
}
build() {
@ -60,7 +62,7 @@ build() {
--without-tcl \
--enable-dns-for-realm \
--with-ldap \
--without-system-verto
--with-system-verto
make
}
@ -85,10 +87,10 @@ package() {
license=(custom)
validpgpkeys=(2C732B1C0DBEF678AB3AF606A32F17FD0055C305 # Tom Yu <tlyu@mit.edu>
C4493CB739F4A89F9852CBC20CBA08575F8372DF) # Greg Hudson <ghudson@mit.edu>
validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305' # Tom Yu <tlyu@mit.edu>
'C4493CB739F4A89F9852CBC20CBA08575F8372DF') # Greg Hudson <ghudson@mit.edu>
sha256sums=(56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0 # krb5-1.19.3.tar.gz
65367b953d832f1a3d894a7b9b4062bc68fd7a455df3ab84c58dfa02227045c9 # krb5-1.19.3.tar.gz.asc
84007c7423f67db7a8b248b9643c49ef25f2d56ce15c2574eb41ecbf51bcd3f2) # krb5-config_LDFLAGS.patch
4ec41b4042d736a304ef230c81e9577ba20870ca5bd0e0af635c7b79f889eaf7) # 0001-krb5-config_LDFLAGS.patch

View file

@ -3,13 +3,13 @@
pkgname=krb5
_pkgvermajor=1.19
pkgver=1.19.3
pkgrel=1
pkgrel=3
pkgdesc='The Kerberos network authentication system'
url='https://web.mit.edu/kerberos/'
arch=('x86_64')
license=('custom')
depends=('glibc' 'e2fsprogs' 'libldap' 'keyutils'
libkeyutils.so libss.so libcom_err.so)
depends=('glibc' 'e2fsprogs' 'libldap' 'keyutils' 'libverto-module-base'
libkeyutils.so libss.so libcom_err.so libverto.so)
makedepends=('perl')
provides=(
libgssapi_krb5.so
@ -22,7 +22,6 @@ provides=(
libkrad.so
libkrb5.so
libkrb5support.so
libverto.so
)
backup=(
'etc/krb5.conf'
@ -30,7 +29,7 @@ backup=(
)
options=('!emptydirs')
source=(https://web.mit.edu/kerberos/dist/krb5/${_pkgvermajor}/${pkgname}-${pkgver}.tar.gz{,.asc}
krb5-config_LDFLAGS.patch
0001-krb5-config_LDFLAGS.patch::https://github.com/krb5/krb5/commit/0bfd22feb6493f34fdc894daaf680c3a2f2e7784.patch
krb5-kadmind.service
krb5-kdc.service
krb5-kpropd.service
@ -38,7 +37,7 @@ source=(https://web.mit.edu/kerberos/dist/krb5/${_pkgvermajor}/${pkgname}-${pkgv
krb5-kpropd.socket)
sha512sums=('18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351'
'SKIP'
'5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801'
'SKIP'
'ae1fa980e8e30a83dfef7fe233be70a9ec530ebaffc344a0e7eba61e7de4c800421b45cf203f1e526cc8351754038d6539184b30aa049a567e2a9e80f0d39841'
'b137ff0154f9af4891e9e78cec692af47ecfd92ca9ce6e00b40ef137d942ba04e8caf483fc5d464b9559ad4a5c4e75ec57b6eab7fc35181115ca1606c0b316c1'
'b57bbe55c19c92a04cd3e8ad569adcc5aedd4246075b2e6dbcc363e523853332a3e7650be85098b91e495799f8b728ea550495ab303f46ccd9298a2260120b2f'
@ -50,8 +49,9 @@ validpgpkeys=('2C732B1C0DBEF678AB3AF606A32F17FD0055C305' # Tom Yu <tlyu@mit.edu
prepare() {
cd ${pkgname}-${pkgver}
# cf https://bugs.gentoo.org/show_bug.cgi?id=448778
patch -Np1 < "${srcdir}"/krb5-config_LDFLAGS.patch
# https://github.com/krb5/krb5/commit/0bfd22feb6493f34fdc894daaf680c3a2f2e7784
# https://krbdev.mit.edu/rt/Ticket/Display.html?id=9057
patch -Np1 < "${srcdir}"/0001-krb5-config_LDFLAGS.patch
# FS#25384
sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4
@ -72,7 +72,7 @@ build() {
--without-tcl \
--enable-dns-for-realm \
--with-ldap \
--without-system-verto
--with-system-verto
make
}
@ -95,6 +95,7 @@ package() {
# systemd stuff
install -Dm 644 "${srcdir}"/krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
-t "${pkgdir}/usr/lib/systemd/system"
}
# vim: ts=2 sw=2 et:

View file

@ -1,3 +1,4 @@
bison
gettext

View file

@ -1,5 +1,5 @@
real 1m5.642s
user 2m23.215s
sys 0m15.775s
real 1m33.576s
user 2m50.972s
sys 0m16.190s

View file

@ -1,11 +1,12 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libnftnl
pkgver=1.2.1
pkgver=1.2.2
pkgrel=01
pkgdesc='Netfilter library providing interface to the nf_tables subsystem'
arch=('x86_64')
@ -48,5 +49,6 @@ license=('GPL2')
validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
sha256sums=(7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c # libnftnl-1.2.1.tar.bz2
1b1aec537976e77eceb4b0730ff10b300aec232eb0366ca580784a78278bf450) # libnftnl-1.2.1.tar.bz2.sig
sha256sums=(9efc004f9d15918d68f9e98e194d55e030168f33bb67c3e7a545b740c9ed6d0a # libnftnl-1.2.2.tar.bz2
893c75db6bd4a7a82024d50aff537d5d997136507c67252206f71c5de2a0f36e) # libnftnl-1.2.2.tar.bz2.sig

View file

@ -1,7 +1,7 @@
# Maintainer: Sébastien Luttringer
pkgname=libnftnl
pkgver=1.2.1
pkgver=1.2.2
pkgrel=1
pkgdesc='Netfilter library providing interface to the nf_tables subsystem'
arch=('x86_64')
@ -10,7 +10,7 @@ license=('GPL2')
depends=('libmnl')
validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
source=("https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2"{,.sig})
sha256sums=('7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c'
sha256sums=('9efc004f9d15918d68f9e98e194d55e030168f33bb67c3e7a545b740c9ed6d0a'
'SKIP')
prepare() {

View file

@ -1 +1,3 @@

47
libverto/PKGBUILD Normal file
View file

@ -0,0 +1,47 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libverto
pkgver=0.3.2
pkgrel=04
pkgdesc="Main event loop abstraction library"
arch=('x86_64')
url="https://github.com/latchset/libverto"
depends=('glibc' 'libevent')
provides=('libverto.so' 'libverto-libevent.so' 'libverto-module-base')
conflicts=("krb5<1.19.3-2" "libverto-libevent<0.3.2-4")
replaces=("libverto-libevent<0.3.2-4")
source=("https://github.com/latchset/libverto/releases/download/$pkgver/libverto-$pkgver.tar.gz")
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--disable-static \
--with-libevent \
--without-libev \
--without-glib
make
}
check() {
cd "$pkgname-$pkgver"
make check
}
package_libverto() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -Dm0644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
}
#---- license gpg-key sha256sums ----
license=(MIT)
sha256sums=(8d1756fd704f147549f606cd987050fb94b0b1ff621ea6aa4d6bf0b74450468a) # libverto-0.3.2.tar.gz

38
libverto/PKGBUILD-arch Normal file
View file

@ -0,0 +1,38 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Mantas Mikulėnas <grawity@gmail.com>
pkgname=libverto
pkgver=0.3.2
pkgrel=4
pkgdesc="Main event loop abstraction library"
arch=('x86_64')
url="https://github.com/latchset/libverto"
license=(MIT)
depends=('glibc' 'libevent')
provides=('libverto.so' 'libverto-libevent.so' 'libverto-module-base')
conflicts=("krb5<1.19.3-2" "libverto-libevent<0.3.2-4")
replaces=("libverto-libevent<0.3.2-4")
source=("https://github.com/latchset/libverto/releases/download/$pkgver/libverto-$pkgver.tar.gz")
sha256sums=('8d1756fd704f147549f606cd987050fb94b0b1ff621ea6aa4d6bf0b74450468a')
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--disable-static \
--with-libevent \
--without-libev \
--without-glib
make
}
check() {
cd "$pkgname-$pkgver"
make check
}
package_libverto() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -Dm0644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
}

1
libverto/clean Normal file
View file

@ -0,0 +1 @@
rm -rf {src,pkg,libverto*tar.gz}

1
libverto/deps Normal file
View file

@ -0,0 +1 @@
libevent

4
libverto/time Normal file
View file

@ -0,0 +1,4 @@
real 0m32.061s
user 0m6.257s
sys 0m1.005s