upg kbd
This commit is contained in:
parent
4b77af2f21
commit
54eea19901
2 changed files with 167 additions and 1 deletions
|
|
@ -69,7 +69,7 @@ validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov
|
|||
|
||||
sha256sums=(4642d236cb377a8cbfd4157aac25e4b783c99b22ed1d7c0bcb3161d358deaa97 # kbd-2.6.0.tar.gz
|
||||
03d614155ce1238d7ffba29e4ae561831d5f106cc281b605d65a41d49d20e0f4 # kbd-2.6.0.tar.sign
|
||||
a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch
|
||||
a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch
|
||||
5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam
|
||||
|
||||
## 7df8c9f18e4c7fc68c6f44832776dea617790bcbd68f54faa2981f8f27801489 kbd-2.6.0-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
166
util-linux/PKGBUILD-arch.new
Normal file
166
util-linux/PKGBUILD-arch.new
Normal file
|
|
@ -0,0 +1,166 @@
|
|||
# Maintainer: Tom Gundersen <teg@jklm.no>
|
||||
# Maintainer: Dave Reisner <dreisner@archlinux.org>
|
||||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
|
||||
pkgbase=util-linux
|
||||
pkgname=(util-linux util-linux-libs)
|
||||
_tag='8d7cca1a88bb347d7a0b5c32d2d2b1e8d71cafcc' # git rev-parse v${_tag_name}
|
||||
_tag_name=2.39
|
||||
pkgver=${_tag_name/-/}
|
||||
pkgrel=9
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'meson' 'asciidoctor' 'bash-completion' 'libcap-ng'
|
||||
'libutempter' 'libxcrypt' 'python' 'systemd')
|
||||
license=('GPL2')
|
||||
options=('strip')
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
source=("git+https://github.com/karelzak/util-linux#tag=${_tag}?signed"
|
||||
pam-{login,common,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
'60-rfkill.rules'
|
||||
'rfkill-unblock_.service'
|
||||
'rfkill-block_.service')
|
||||
sha256sums=('SKIP'
|
||||
'99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
|
||||
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
|
||||
'48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
|
||||
'3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b'
|
||||
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
|
||||
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
|
||||
'8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
|
||||
'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
|
||||
|
||||
_backports=(
|
||||
# current stable/v2.39
|
||||
"${_tag}..8c85b08057a4664efe856de49b798b87a4e091af"
|
||||
|
||||
# libmount: introduce LIBMOUNT_FORCE_MOUNT2={always,never,auto}
|
||||
'fd6b4d94ff013dc7ed680d4e864610da5b9751f1'
|
||||
|
||||
# meson: install setuid/setgid
|
||||
'60d457f52991e6f6472171035974ce7a3ae621f3~1..cee78467bea45f7a4f890f0c65bd59441bd42697'
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${pkgbase}"
|
||||
|
||||
local _c
|
||||
for _c in "${_backports[@]}"; do
|
||||
if [[ $_c == *..* ]]; then
|
||||
git log --oneline --reverse "${_c}"
|
||||
else
|
||||
git log --oneline -1 "${_c}"
|
||||
fi
|
||||
git cherry-pick -n -m1 "${_c}"
|
||||
done
|
||||
for _c in "${_reverts[@]}"; do
|
||||
git log --oneline -1 "${_c}"
|
||||
git revert -n "${_c}"
|
||||
done
|
||||
|
||||
# a dirty hack for now...
|
||||
# https://github.com/util-linux/util-linux/issues/2310
|
||||
sed -i 's|HAVE_PTY|HAVE_PTY_H|' login-utils/su-common.c
|
||||
}
|
||||
|
||||
build() {
|
||||
local _meson_options=(
|
||||
-Dfs-search-path=/usr/bin:/usr/local/bin
|
||||
|
||||
-Dlibuser=disabled
|
||||
-Dncurses=disabled
|
||||
-Dncursesw=enabled
|
||||
-Deconf=disabled
|
||||
|
||||
-Dbuild-chfn-chsh=enabled
|
||||
-Dbuild-line=disabled
|
||||
-Dbuild-mesg=enabled
|
||||
-Dbuild-newgrp=enabled
|
||||
-Dbuild-vipw=enabled
|
||||
-Dbuild-write=enabled
|
||||
)
|
||||
|
||||
arch-meson "${pkgbase}" build "${_meson_options[@]}"
|
||||
|
||||
meson compile -C build
|
||||
}
|
||||
|
||||
package_util-linux() {
|
||||
conflicts=('rfkill' 'hardlink')
|
||||
provides=('rfkill' 'hardlink')
|
||||
replaces=('rfkill' 'hardlink')
|
||||
depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
|
||||
'libudev.so' 'libcap-ng' 'libutempter' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
'libmagic.so' 'libncursesw.so')
|
||||
optdepends=('words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
etc/pam.d/login
|
||||
etc/pam.d/runuser
|
||||
etc/pam.d/runuser-l
|
||||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
_python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
|
||||
|
||||
DESTDIR="${pkgdir}" meson install -C build
|
||||
|
||||
# remove static libraries
|
||||
rm "${pkgdir}"/usr/lib/lib*.a*
|
||||
|
||||
# setuid chfn and chsh
|
||||
chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
|
||||
|
||||
# install PAM files for login-utils
|
||||
install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
|
||||
|
||||
# TODO(dreisner): offer this upstream?
|
||||
sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
|
||||
|
||||
# runtime libs are shipped as part of util-linux-libs
|
||||
install -d -m0755 util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/include util-linux-libs/include
|
||||
mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/"${_python_stdlib}"
|
||||
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
|
||||
|
||||
# install systemd-sysusers
|
||||
install -Dm0644 util-linux.sysusers \
|
||||
"${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
|
||||
|
||||
install -Dm0644 60-rfkill.rules \
|
||||
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
|
||||
|
||||
install -Dm0644 rfkill-unblock_.service \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
|
||||
install -Dm0644 rfkill-block_.service \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
depends=('glibc')
|
||||
provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
|
||||
conflicts=('libutil-linux')
|
||||
replaces=('libutil-linux')
|
||||
optdepends=('python: python bindings to libmount')
|
||||
|
||||
install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
|
||||
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
|
||||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
}
|
||||
Loading…
Reference in a new issue