upg util-linux

This commit is contained in:
joborun linux 2024-03-27 20:05:21 +02:00
parent e925b8a579
commit 51f639a0e9
2 changed files with 13 additions and 19 deletions

View file

@ -7,9 +7,9 @@
pkgbase=util-linux
pkgname=(util-linux util-linux-libs)
_tag='2.40-rc2'
_tag='2.40'
pkgver="${_tag/-/}"
pkgrel=02
pkgrel=01
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
url='https://github.com/util-linux/util-linux'
#url='https://github.com/util-linux/util-linux'
@ -35,8 +35,8 @@ source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed"
'60-rfkill.rules')
_backports=(
# current stable/v2.40
"v${_tag}..175af5cb8e0434bbc6660f7ccbea3a188d8f2d72"
# # current stable/v2.40
# "v${_tag}..175af5cb8e0434bbc6660f7ccbea3a188d8f2d72"
)
_reverts=(
@ -57,8 +57,8 @@ prepare() {
git revert --mainline 1 --no-commit "${_c}"
done
# fast-forward to current master
#git merge master
# # fast-forward to current master
# git merge master
# do not mark dirty
sed -i '/dirty=/c dirty=' tools/git-version-gen
@ -101,7 +101,7 @@ package_util-linux() {
'pam'
'readline'
'shadow'
'libeudev'
'libeudev'
'util-linux-libs'
'zlib')
optdepends=('words: default dictionary for look')
@ -155,7 +155,6 @@ package_util-linux() {
install -vDm 644 $pkgbase/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/"
install -vDm 644 $pkgbase-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
}
package_util-linux-libs() {
@ -195,7 +194,7 @@ license=(
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
sha256sums=(f15b74b9927426ea71b0ecf2ffaf4d3c71220ae791c700a42497985dbd3f8b01 # util-linux
sha256sums=(153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d # util-linux
6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a # util-linux-BSD-2-Clause.txt
ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275 # pam-login
57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af # pam-common
@ -205,6 +204,6 @@ sha256sums=(f15b74b9927426ea71b0ecf2ffaf4d3c71220ae791c700a42497985dbd3f8b01 #
10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
## b5c4f2c7df9a63212fc6bb172a745213a1a091b6882932c325b8453012cd6aca util-linux-2.40rc2-02-x86_64.pkg.tar.lz
## 067c5bfa742de2c6916bb2c85e04635fb70eb08b08bc499b13faaf05231d006d util-linux-libs-2.40rc2-02-x86_64.pkg.tar.lz
## af17f4464466ac76c2cf368dd4b18c3856ba09867dc4b864addf621fae50076a util-linux-2.40-01-x86_64.pkg.tar.lz
## 011e1f6117c58b49546b152d0d5a3363e65c7e38c88fb50b6852c3cedb0b1a92 util-linux-libs-2.40-01-x86_64.pkg.tar.lz

View file

@ -4,9 +4,9 @@
pkgbase=util-linux
pkgname=(util-linux util-linux-libs)
_tag='2.40-rc2'
_tag='2.40'
pkgver="${_tag/-/}"
pkgrel=2
pkgrel=1
pkgdesc='Miscellaneous system utilities for Linux'
url='https://github.com/util-linux/util-linux'
arch=('x86_64')
@ -40,7 +40,7 @@ source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed"
'60-rfkill.rules'
'rfkill-unblock_.service'
'rfkill-block_.service')
sha256sums=('f15b74b9927426ea71b0ecf2ffaf4d3c71220ae791c700a42497985dbd3f8b01'
sha256sums=('153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d'
'6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275'
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
@ -53,8 +53,6 @@ sha256sums=('f15b74b9927426ea71b0ecf2ffaf4d3c71220ae791c700a42497985dbd3f8b01'
'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
_backports=(
# current stable/v2.40
"v${_tag}..175af5cb8e0434bbc6660f7ccbea3a188d8f2d72"
)
_reverts=(
@ -75,9 +73,6 @@ prepare() {
git revert --mainline 1 --no-commit "${_c}"
done
# fast-forward to current master
#git merge master
# do not mark dirty
sed -i '/dirty=/c dirty=' tools/git-version-gen
}