summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2024-03-25 23:53:47 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2024-03-28 23:07:03 -0400
commit529f8d3a01c32b9b1dabed626982e7bdc794530b (patch)
treef160de2c1b2c079fc16046bb50e4746750ef936e
parent6e623293812d9744dacda9386c993cf720500865 (diff)
util-linux: upgrade to v2.40-rc2HEADmaster
-rw-r--r--nonsystemd/util-linux/0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch104
-rw-r--r--nonsystemd/util-linux/PKGBUILD225
-rw-r--r--nonsystemd/util-linux/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc52
-rw-r--r--nonsystemd/util-linux/pam-login1
-rw-r--r--nonsystemd/util-linux/pam-remote8
5 files changed, 217 insertions, 173 deletions
diff --git a/nonsystemd/util-linux/0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch b/nonsystemd/util-linux/0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch
deleted file mode 100644
index 4f317b034..000000000
--- a/nonsystemd/util-linux/0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 47831cc02ac0d71c335caecef1753f4c8861277c Mon Sep 17 00:00:00 2001
-From: tamz <totemz@protonmail.com>
-Date: Thu, 6 Jan 2022 11:56:58 +0100
-Subject: [PATCH 1/1] agetty: resolve tty name even if stdin is specified
-
-[kzak@redhat.com: - use "const" for options->tty (and friends)
- as expected by get_terminal_name()]
-
-Addresses: https://github.com/util-linux/util-linux/issues/1546
-Signed-off-by: tamz <totemz@protonmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/agetty.c | 26 ++++++++++++++++++--------
- 1 file changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/term-utils/agetty.c b/term-utils/agetty.c
-index 55d373461..22850786d 100644
---- a/term-utils/agetty.c
-+++ b/term-utils/agetty.c
-@@ -190,8 +190,8 @@ struct options {
- char *chroot; /* Chroot before the login */
- char *login; /* login program */
- char *logopt; /* options for login program */
-- char *tty; /* name of tty */
-- char *vcline; /* line of virtual console */
-+ const char *tty; /* name of tty */
-+ const char *vcline; /* line of virtual console */
- char *term; /* terminal type */
- char *initstring; /* modem init string */
- char *issue; /* alternative issue file or directory */
-@@ -203,6 +203,7 @@ struct options {
- int numspeed; /* number of baud rates to try */
- int clocal; /* CLOCAL_MODE_* */
- int kbmode; /* Keyboard mode if virtual console */
-+ int tty_is_stdin; /* is the tty the standard input stream */
- speed_t speeds[MAX_SPEED]; /* baud rates to be tried */
- };
-
-@@ -319,7 +320,7 @@ static void init_special_char(char* arg, struct options *op);
- static void parse_args(int argc, char **argv, struct options *op);
- static void parse_speeds(struct options *op, char *arg);
- static void update_utmp(struct options *op);
--static void open_tty(char *tty, struct termios *tp, struct options *op);
-+static void open_tty(const char *tty, struct termios *tp, struct options *op);
- static void termio_init(struct options *op, struct termios *tp);
- static void reset_vc(const struct options *op, struct termios *tp, int canon);
- static void auto_baud(struct termios *tp);
-@@ -922,6 +923,15 @@ static void parse_args(int argc, char **argv, struct options *op)
- }
- }
-
-+ /* resolve the tty path in case it was provided as stdin */
-+ if (strcmp(op->tty, "-") == 0) {
-+ op->tty_is_stdin = 1;
-+ int fd = get_terminal_name(NULL, &op->tty, NULL);
-+ if (fd < 0) {
-+ log_warn(_("could not get terminal name: %d"), fd);
-+ }
-+ }
-+
- /* On virtual console remember the line which is used for */
- if (strncmp(op->tty, "tty", 3) == 0 &&
- strspn(op->tty + 3, "0123456789") == strlen(op->tty+3))
-@@ -962,8 +972,8 @@ static void update_utmp(struct options *op)
- time_t t;
- pid_t pid = getpid();
- pid_t sid = getsid(0);
-- char *vcline = op->vcline;
-- char *line = op->tty;
-+ const char *vcline = op->vcline;
-+ const char *line = op->tty;
- struct utmpx *utp;
-
- /*
-@@ -1002,7 +1012,7 @@ static void update_utmp(struct options *op)
- str2memcpy(ut.ut_id, vcline, sizeof(ut.ut_id));
- else {
- size_t len = strlen(line);
-- char * ptr;
-+ const char * ptr;
- if (len >= sizeof(ut.ut_id))
- ptr = line + len - sizeof(ut.ut_id);
- else
-@@ -1030,7 +1040,7 @@ static void update_utmp(struct options *op)
- #endif /* SYSV_STYLE */
-
- /* Set up tty as stdin, stdout & stderr. */
--static void open_tty(char *tty, struct termios *tp, struct options *op)
-+static void open_tty(const char *tty, struct termios *tp, struct options *op)
- {
- const pid_t pid = getpid();
- int closed = 0;
-@@ -1040,7 +1050,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
-
- /* Set up new standard input, unless we are given an already opened port. */
-
-- if (strcmp(tty, "-") != 0) {
-+ if (!op->tty_is_stdin) {
- char buf[PATH_MAX+1];
- struct group *gr = NULL;
- struct stat st;
---
-2.34.1
-
diff --git a/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index 3c86cc828..0d5ea698e 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -1,122 +1,211 @@
# Maintainer: David P. <megver83@parabola.nu>
-# Maintainer (artix): Tom Gundersen <teg@jklm.no>
-# Maintainer (artix): Dave Reisner <dreisner@archlinux.org>
+# Maintainer (artix): Artoo <artoo@artixlinux.org>
+# Maintainer (arch): Tom Gundersen <teg@jklm.no>
+# Maintainer (arch): Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=util-linux
pkgname=(util-linux util-linux-libs)
-_pkgmajor=2.37
-_realver=${_pkgmajor}.2
-pkgver=${_realver/-/}
-pkgrel=5
+_tag='2.40-rc2'
+pkgver="${_tag/-/}"
+pkgrel=2
pkgrel+=.nonsystemd1
pkgdesc='Miscellaneous system utilities for Linux'
-url='https://github.com/karelzak/util-linux'
+url='https://github.com/util-linux/util-linux'
arch=('x86_64')
-arch+=('i686' 'armv7h')
-makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python' 'udev')
+arch+=('armv7h' 'i686')
+makedepends=('asciidoctor'
+ 'bash-completion'
+ 'git'
+ 'libcap-ng'
+ 'libutempter'
+ 'libxcrypt'
+ 'meson'
+ 'python'
+ 'sqlite'
+ 'systemd')
+makedepends=( ${makedepends[*]/systemd/udev} ) # DIFF: non-systemd
+license=(
+ 'BSD-2-Clause'
+ 'BSD-3-Clause'
+ 'BSD-4-Clause-UC'
+ 'GPL-2.0-only'
+ 'GPL-2.0-or-later'
+ 'GPL-3.0-or-later'
+ 'ISC'
+ 'LGPL-2.1-or-later'
+ 'LicenseRef-PublicDomain'
+) # TODO: SPDX
license=('GPL2')
options=('strip')
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
- '0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch'
- pam-{login,common,runuser,su}
+source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed"
+ $pkgbase-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
+ pam-{login,common,remote,runuser,su}
'util-linux.sysusers'
- '60-rfkill.rules')
-sha256sums=('6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9'
- 'SKIP'
- '53395b7e434b32e6fee25f1b6fa59330ab72c1a2f99a17c3d3fd92473379fd9a'
- '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
+ '60-rfkill.rules'
+ 'rfkill-unblock_.service'
+ 'rfkill-block_.service')
+source=( ${source[*]/rfkill-unblock_.service/} ) # DIFF: non-systemd
+source=( ${source[*]/rfkill-block_.service/} ) # DIFF: non-systemd
+# source+=('0001-uuid-tmpfiles.patch' ) # DIFF: non-systemd
+sha256sums=('SKIP'
+ '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
+ 'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275'
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
+ '8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931'
'48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
'b28f31fcafa401b0eb26bc0c710002acc4f7718f97af45b0d444e4af6dfb15a8'
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
- '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
+ '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
+ # DIFF: non-systemd
+ # DIFF: non-systemd
+)
+# sha256sums+=('7fccfdbc22c215104aa0b79afa7491c100623ecbc581ff12b7a44b7ca870096f')
+_backports=(
+ # current stable/v2.40
+ "v${_tag}..175af5cb8e0434bbc6660f7ccbea3a188d8f2d72"
+)
+
+_reverts=(
+)
prepare() {
- cd "${pkgbase}-${_realver}"
-
- patch -Np1 < ../0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch
+ 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
+
+ # fast-forward to current master
+ #git merge master
+
+# patch -Np 1 -i ../0001-uuid-tmpfiles.patch
+ # do not mark dirty
+ sed -i '/dirty=/c dirty=' tools/git-version-gen
}
build() {
- cd "${pkgbase}-${_realver}"
-
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib \
- --bindir=/usr/bin \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --enable-usrdir-path \
- --enable-fs-paths-default=/usr/bin:/usr/local/bin \
- --enable-raw \
- --enable-vipw \
- --enable-newgrp \
- --enable-chfn-chsh \
- --enable-write \
- --enable-mesg \
- --without-systemd \
- --with-python=3
-
- make
+ 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
+ )
+ _meson_options+=( -Dsystemd=disabled ) # DIFF: non-systemd
+
+ 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' 'libudev.so'
- 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
- 'libmagic.so' 'libncursesw.so' 'libreadline.so')
- optdepends=('python: python bindings to libmount'
- 'words: default dictionary for look')
+ depends=('coreutils'
+ 'file' 'libmagic.so'
+ 'glibc'
+ 'libcap-ng'
+ 'libutempter'
+ 'libxcrypt' 'libcrypt.so'
+ 'ncurses' 'libncursesw.so'
+ 'pam'
+ 'readline'
+ 'shadow'
+ 'systemd-libs' 'libsystemd.so' 'libudev.so'
+ 'util-linux-libs'
+ 'zlib')
+ depends=( ${depends[*]/systemd-libs/libudev} ) # DIFF: non-systemd
+ depends=( ${depends[*]/libsystemd.so/} ) # DIFF: non-systemd
+ optdepends=('words: default dictionary for look')
backup=(etc/pam.d/chfn
etc/pam.d/chsh
etc/pam.d/login
+ etc/pam.d/remote
etc/pam.d/runuser
etc/pam.d/runuser-l
etc/pam.d/su
etc/pam.d/su-l)
- cd "${pkgbase}-${_realver}"
+ _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
+
+ DESTDIR="${pkgdir}" meson install -C build
- make DESTDIR="${pkgdir}" install
+ # 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 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chfn"
- install -m0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chsh"
- install -m0644 "${srcdir}/pam-login" "${pkgdir}/etc/pam.d/login"
- install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser"
- install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser-l"
- install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su"
- install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su-l"
-
- # adjust for usrmove
- # TODO(dreisner): fix configure.ac upstream so that this isn't needed
- cd "${pkgdir}"
- mv usr/sbin/* usr/bin
- rmdir usr/sbin
-
- ### runtime libs are shipped as part of util-linux-libs
- rm "${pkgdir}"/usr/lib/lib*.{a,so}*
+ 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-remote "${pkgdir}/etc/pam.d/remote"
+ 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 sysusers
- install -Dm0644 "${srcdir}/util-linux.sysusers" \
+ install -Dm0644 util-linux.sysusers \
"${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
- install -Dm0644 "${srcdir}/60-rfkill.rules" \
+ install -Dm0644 60-rfkill.rules \
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
+
+ # DIFF: system only
+
+ 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() {
- pkgdesc="util-linux runtime libraries"
+ pkgdesc='util-linux runtime libraries'
+ depends=('glibc'
+ 'sqlite')
provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
conflicts=('libutil-linux')
+ conflicts=('glib2>=2.81.0' 'at-spi2-core>=2.53.0') # the sodep 'libmount.so' is too stable - many GUI things break without this (eg: LXDE)
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
- make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
+ 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/"
}
diff --git a/nonsystemd/util-linux/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc b/nonsystemd/util-linux/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc
new file mode 100644
index 000000000..306d645e0
--- /dev/null
+++ b/nonsystemd/util-linux/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Zh9rvA==
+=cevX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/nonsystemd/util-linux/pam-login b/nonsystemd/util-linux/pam-login
index 2dac6ab61..28f6fc5de 100644
--- a/nonsystemd/util-linux/pam-login
+++ b/nonsystemd/util-linux/pam-login
@@ -1,6 +1,5 @@
#%PAM-1.0
-auth required pam_securetty.so
auth requisite pam_nologin.so
auth include system-local-login
account include system-local-login
diff --git a/nonsystemd/util-linux/pam-remote b/nonsystemd/util-linux/pam-remote
new file mode 100644
index 000000000..7fce079c1
--- /dev/null
+++ b/nonsystemd/util-linux/pam-remote
@@ -0,0 +1,8 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-remote-login
+account include system-remote-login
+session include system-remote-login
+password include system-remote-login