upg util-linux
This commit is contained in:
parent
3200a66c1b
commit
b3dbe7eaba
3 changed files with 349 additions and 3 deletions
3
util-linux/.gitignore
vendored
3
util-linux/.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
|||
/PKGBUILD
|
||||
/PKGBUILD-arch
|
||||
/PKGBUILD-oba
|
||||
194
util-linux/PKGBUILD
Normal file
194
util-linux/PKGBUILD
Normal file
|
|
@ -0,0 +1,194 @@
|
|||
#!/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 |---------------------------------------
|
||||
|
||||
pkgbase=util-linux
|
||||
pkgname=(util-linux util-linux-libs)
|
||||
_tag='722ea47989cef5d892711614c4a2767213b177d8' # git rev-parse v${_tag_name}
|
||||
_tag_name=2.39.1
|
||||
pkgver=${_tag_name/-/}
|
||||
#_pkgmajor=2.39
|
||||
#_realver=${_pkgmajor}
|
||||
#pkgver=${_realver/-/}
|
||||
pkgrel=01
|
||||
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
#url='https://github.com/util-linux/util-linux'
|
||||
makedepends=('git' 'meson' 'asciidoctor' 'libcap-ng' 'libudev.so'
|
||||
'libxcrypt' 'cryptsetup' 'python' 'libutempter' 'bash-completion'
|
||||
'libcrypt.so')
|
||||
#options=('debug' 'strip')
|
||||
options=('strip')
|
||||
# source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
|
||||
# source=("git+https://github.com/karelzak/util-linux#tag=${_tag}?signed"
|
||||
# yet again in a month three sources for the same software ... lead by a man with a redhat account.
|
||||
# need we say more for the puppets in kernel.org?
|
||||
source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
|
||||
# '0001-meson-install-setuid.patch'
|
||||
pam-{login,common,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
'60-rfkill.rules')
|
||||
|
||||
# 8d7cca1a88bb347d7a0b5c32d2d2b1e8d71cafcc refs/tags/v2.39
|
||||
# ^2dccaae42bfdd0f1e34da11f2023480655308e1b
|
||||
# 48a08dabcb7c8eb86616b95625f0d08675337d1b refs/tags/v2.39-rc1
|
||||
# ^0116b114ad98bb696a20b4653d20fd8140c564dc
|
||||
# 4739964818a4193c16d7dac4ba48cfc4382a9836 refs/tags/v2.39-rc2
|
||||
# ^6df1a6c45549eb8683f0152e0202e2c46ed656da
|
||||
# 055f7161aeec7acd33ddfbcdc4c3a6da66860181 refs/tags/v2.39-rc3
|
||||
# ^c00d9e002bc53534895ade9dc9d1cdd9b71ac9a3
|
||||
|
||||
_backports=(
|
||||
# current stable/v2.39
|
||||
# "${_tag}..205e88e51c11d039cd80c9f1104bee5555a4ddaa" # arch -9
|
||||
# "${_tag}..8c85b08057a4664efe856de49b798b87a4e091af" # oba
|
||||
# "${_tag}..868f7f10ce533a8d4b0fc4055749b97ba6fb670d" # arch -10
|
||||
# "${_tag}..d9fca2b62e0322ff5a3dbc90605ac47d3d8b284f"
|
||||
# # libmount: introduce LIBMOUNT_FORCE_MOUNT2={always,never,auto}
|
||||
# 'fd6b4d94ff013dc7ed680d4e864610da5b9751f1'
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${pkgbase}"
|
||||
|
||||
# patch -Np1 < ../0001-libmount-don-t-call-hooks-after-mount-type-helper.patch
|
||||
# patch -Np1 < ../0002-libmount-check-for-availability-of-mount-setattr.patch
|
||||
|
||||
local _c _l
|
||||
for _c in "${_backports[@]}"; do
|
||||
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
|
||||
git log --oneline "${_l}" "${_c}"
|
||||
git cherry-pick --mainline 1 --no-commit "${_c}"
|
||||
done
|
||||
|
||||
|
||||
for _c in "${_reverts[@]}"; do
|
||||
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
|
||||
git log --oneline "${_l}" "${_c}"
|
||||
git revert --mainline 1 --no-commit "${_c}"
|
||||
done
|
||||
|
||||
# do not mark dirty
|
||||
sed -i '/dirty=/c dirty=' tools/git-version-gen
|
||||
|
||||
# patch -Np1 < ../0001-meson-install-setuid.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
# cd "${pkgbase}-${_realver}"
|
||||
|
||||
local _meson_options=(
|
||||
-Dfs-search-path=/usr/bin:/usr/local/bin
|
||||
|
||||
-Dlibuser=disabled
|
||||
-Dncurses=disabled
|
||||
-Dncursesw=enabled
|
||||
-Deconf=disabled
|
||||
-Dsystemd=disabled
|
||||
-Dbuild-chfn-chsh=enabled
|
||||
-Dbuild-line=disabled
|
||||
-Dbuild-mesg=enabled
|
||||
-Dbuild-newgrp=enabled
|
||||
-Dbuild-vipw=enabled
|
||||
-Dbuild-write=enabled
|
||||
-Dbuild-plymouth-support=disabled
|
||||
|
||||
)
|
||||
|
||||
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' 'libudev.so'
|
||||
'libeudev' 'libcap-ng' 'libutempter' 'libcrypt.so'
|
||||
'libxcrypt' '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"
|
||||
|
||||
# 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 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"
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
|
||||
sha256sums=(SKIP # util-linux
|
||||
99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f # pam-login
|
||||
57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af # pam-common
|
||||
48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1 # pam-runuser
|
||||
3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b # pam-su
|
||||
10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
|
||||
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
|
||||
|
||||
## 6c90a554a83f3481f332f9e4b0f7a13782e1039b10aaec9c4fde47c5a0cea540 util-linux-2.39.1-01-x86_64.pkg.tar.lz
|
||||
## 64c7b1dab0ffb19852e9a1857aa3ba7a706f8796fd8fe4d30442abf94ccfc34a util-linux-libs-2.39.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
155
util-linux/PKGBUILD-arch
Normal file
155
util-linux/PKGBUILD-arch
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
# 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='722ea47989cef5d892711614c4a2767213b177d8' # git rev-parse v${_tag_name}
|
||||
_tag_name=2.39.1
|
||||
pkgver=${_tag_name/-/}
|
||||
pkgrel=1
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/util-linux/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/util-linux/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=(
|
||||
)
|
||||
|
||||
_reverts=(
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${pkgbase}"
|
||||
|
||||
local _c _l
|
||||
for _c in "${_backports[@]}"; do
|
||||
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
|
||||
git log --oneline "${_l}" "${_c}"
|
||||
git cherry-pick --mainline 1 --no-commit "${_c}"
|
||||
done
|
||||
for _c in "${_reverts[@]}"; do
|
||||
if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi
|
||||
git log --oneline "${_l}" "${_c}"
|
||||
git revert --mainline 1 --no-commit "${_c}"
|
||||
done
|
||||
|
||||
# do not mark dirty
|
||||
sed -i '/dirty=/c dirty=' tools/git-version-gen
|
||||
}
|
||||
|
||||
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