upg gnupg and 66 modify install scripts for s6log
This commit is contained in:
parent
841cb83ff9
commit
ca380a3e80
5 changed files with 126 additions and 10 deletions
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=gnupg
|
||||
pkgver=2.2.32
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
pkgdesc='Complete and free implementation of the OpenPGP standard w/o systemd'
|
||||
url='https://www.gnupg.org/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -25,7 +25,7 @@ source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,
|
|||
'drop-import-clean.patch'
|
||||
'avoid-beta-warning.patch')
|
||||
|
||||
install=install
|
||||
# install=install ### this was for linking systemd sockets and such crap !!
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
@ -46,6 +46,7 @@ build() {
|
|||
--sbindir=/usr/bin \
|
||||
--libexecdir=/usr/lib/gnupg \
|
||||
--enable-maintainer-mode \
|
||||
--disable-systemd
|
||||
|
||||
make
|
||||
}
|
||||
|
|
@ -60,8 +61,6 @@ package() {
|
|||
make DESTDIR="${pkgdir}" install
|
||||
ln -s gpg "${pkgdir}"/usr/bin/gpg2
|
||||
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
|
||||
|
||||
install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
|
|
|||
76
gnupg/PKGBUILD-arch
Normal file
76
gnupg/PKGBUILD-arch
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
|
||||
# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
|
||||
# Contributor: Gaetan Bisson <bisson@archlinux.org>
|
||||
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Contributor: Andreas Radke <andyrtr@archlinux.org>
|
||||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
|
||||
pkgname=gnupg
|
||||
pkgver=2.2.32
|
||||
pkgrel=2
|
||||
pkgdesc='Complete and free implementation of the OpenPGP standard'
|
||||
url='https://www.gnupg.org/'
|
||||
license=('GPL')
|
||||
arch=('x86_64')
|
||||
checkdepends=('openssh')
|
||||
makedepends=('libldap' 'libusb-compat' 'pcsclite')
|
||||
depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
|
||||
'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite'
|
||||
'zlib' 'glibc')
|
||||
optdepends=('libldap: gpg2keys_ldap'
|
||||
'libusb-compat: scdaemon'
|
||||
'pcsclite: scdaemon')
|
||||
validpgpkeys=(
|
||||
'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
|
||||
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
|
||||
'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
|
||||
)
|
||||
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
|
||||
'drop-import-clean.patch'
|
||||
'avoid-beta-warning.patch')
|
||||
sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
|
||||
'SKIP'
|
||||
'02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
|
||||
'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
|
||||
|
||||
install=install
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../avoid-beta-warning.patch
|
||||
patch -p1 -i ../drop-import-clean.patch
|
||||
|
||||
# improve reproducibility
|
||||
rm doc/gnupg.info*
|
||||
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--sbindir=/usr/bin \
|
||||
--libexecdir=/usr/lib/gnupg \
|
||||
--enable-maintainer-mode \
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
ln -s gpg "${pkgdir}"/usr/bin/gpg2
|
||||
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
|
||||
|
||||
install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 noet:
|
||||
31
gnupg/install.4systemdonly
Normal file
31
gnupg/install.4systemdonly
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
_global_units() {
|
||||
_units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket)
|
||||
_dir=/etc/systemd/user/sockets.target.wants
|
||||
|
||||
case $1 in
|
||||
enable)
|
||||
mkdir -p $_dir
|
||||
for _u in "${_units[@]}"; do
|
||||
ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
|
||||
done
|
||||
;;
|
||||
disable)
|
||||
for _u in "${_units[@]}"; do
|
||||
rm -f $_dir/$_u
|
||||
done
|
||||
rmdir -p --ignore-fail-on-non-empty $_dir
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# See FS#42798 and FS#47371
|
||||
dirmngr </dev/null &>/dev/null
|
||||
|
||||
# Let systemd supervise daemons by default
|
||||
_global_units enable
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
_global_units disable
|
||||
}
|
||||
|
|
@ -4,7 +4,12 @@ post_install() {
|
|||
fi
|
||||
|
||||
if ! getent passwd s6log >/dev/null; then
|
||||
useradd -u 19 -g 19 -d / -c "S6 log user" -s /usr/bin/nologin s6log
|
||||
useradd -u 919 -g 19 -d / -c "S6 log user" -s /usr/bin/nologin s6log
|
||||
fi
|
||||
|
||||
if ! ls -l /var/log | grep 66 1>/dev/null; then
|
||||
mkdir -p /var/log/66
|
||||
chown -R s6log:log /var/log/66
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -13,3 +18,9 @@ post_upgrade() {
|
|||
post_install
|
||||
printf "%s\n" "==> WARNING: According to the skarnet recommendations about the s6-svscan and skalibs library changes, you need to reboot after your 66 package upgrade."
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
echo "/var/log/66 66's logging directory will now ne removed and s6log user removed"
|
||||
rm -rf /var/log/66
|
||||
userdel s6log
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
pkgname=66
|
||||
pkgver=0.6.2.0
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
# change in uid for s6log
|
||||
pkgdesc="Small tools built around s6 and s6-rc programs"
|
||||
url='https://framagit.org/Obarun/66.git'
|
||||
source=("${pkgname}::git+${url}#tag=v$pkgver"
|
||||
66.install )
|
||||
source=("${pkgname}::git+${url}#tag=v$pkgver")
|
||||
# direct: https://git.obarun.org/pkg/obcore/66/-/raw/master/trunk/66.install
|
||||
|
||||
makedepends=('git' 'skalibs>=2.11.2.0' 'execline>=2.8.3.0' 's6>=2.11.1.0' 's6-rc>=0.5.2.3' 'oblibs>=0.1.4.0' 'lowdown' 'linux-api-headers')
|
||||
|
|
@ -66,5 +66,4 @@ package() {
|
|||
|
||||
license=(ISC)
|
||||
|
||||
sha256sums=(SKIP
|
||||
a8ccf4276e7ccedbc32244e50e0df802c81cb8ef13b18a6e214e9ddae15dd2c3) # 66.install
|
||||
sha256sums=(SKIP)
|
||||
|
|
|
|||
Loading…
Reference in a new issue