initial transfer

master
artoo 4 years ago
parent 7eb74d29e5
commit 0af135b88e
  1. 23
      repos/core-x86_64/0001-agetty-fix-output-of-escaped-characters.patch
  2. 1
      repos/core-x86_64/60-rfkill.rules
  3. 110
      repos/core-x86_64/PKGBUILD
  4. 6
      repos/core-x86_64/pam-common
  5. 7
      repos/core-x86_64/pam-login
  6. 9
      repos/core-x86_64/pam-su
  7. 2
      repos/core-x86_64/util-linux.sysusers
  8. 23
      trunk/0001-agetty-fix-output-of-escaped-characters.patch
  9. 1
      trunk/60-rfkill.rules
  10. 110
      trunk/PKGBUILD
  11. 6
      trunk/pam-common
  12. 7
      trunk/pam-login
  13. 9
      trunk/pam-su
  14. 2
      trunk/util-linux.sysusers

@ -0,0 +1,23 @@
From ecf19dcb2d623f9c5847b6d3b3a4b85751323aee Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 Nov 2018 13:54:32 +0100
Subject: [PATCH 1/1] agetty: fix output of escaped characters
Signed-off-by: Christian Hesse <mail@eworm.de>
---
term-utils/agetty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 05a269abb..b9f08728e 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
break;
}
default:
- putchar(c);
+ putc(c, ie->output);
break;
}
}

@ -0,0 +1 @@
KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

@ -0,0 +1,110 @@
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=util-linux
pkgname=(util-linux libutil-linux)
_pkgmajor=2.33
pkgver=${_pkgmajor}
pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="https://www.kernel.org/pub/linux/utils/util-linux/"
arch=('x86_64')
makedepends=('eudev' 'python' 'libcap-ng')
license=('GPL2')
options=('strip' 'debug')
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
'0001-agetty-fix-output-of-escaped-characters.patch'
pam-{login,common,su}
'util-linux.sysusers'
'60-rfkill.rules')
sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
'SKIP'
'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
'993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
'51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
prepare() {
cd "$pkgbase-$pkgver"
# agetty: fix output of escaped characters
patch -Np1 < ../0001-agetty-fix-output-of-escaped-characters.patch
}
build() {
cd "$pkgbase-$pkgver"
./configure \
--prefix=/usr \
--libdir=/usr/lib \
--bindir=/usr/bin \
--localstatedir=/var \
--enable-fs-paths-extra=/usr/bin \
--enable-raw \
--enable-vipw \
--enable-newgrp \
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
--with-python=3 \
--with-systemd=no \
--with-systemdsystemunitdir=no
make
}
package_util-linux() {
conflicts=('eject' 'zramctl' 'rfkill')
provides=('eject' 'zramctl' 'rfkill')
replaces=('zramctl' 'rfkill')
depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux')
optdepends=('python: python bindings to libmount'
'words: default dictionary for look')
groups=('base' 'base-devel')
backup=(etc/pam.d/chfn
etc/pam.d/chsh
etc/pam.d/login
etc/pam.d/su
etc/pam.d/su-l)
cd "$pkgbase-$pkgver"
make DESTDIR="$pkgdir" install
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
# install PAM files for login-utils
install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
install -m644 "$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 sbin usr/sbin
### runtime libs are shipped as part of libutil-linux
rm "$pkgdir"/usr/lib/lib*.{a,so}*
### install opensysusers
install -Dm644 "$srcdir/util-linux.sysusers" \
"$pkgdir/usr/lib/sysusers.d/util-linux.conf"
install -Dm644 "$srcdir/60-rfkill.rules" \
"$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
}
package_libutil-linux() {
pkgdesc="util-linux runtime libraries"
provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
}

@ -0,0 +1,6 @@
#%PAM-1.0
auth sufficient pam_rootok.so
auth required pam_unix.so
account required pam_unix.so
session required pam_unix.so
password required pam_permit.so

@ -0,0 +1,7 @@
#%PAM-1.0
auth required pam_securetty.so
auth requisite pam_nologin.so
auth include system-local-login
account include system-local-login
session include system-local-login

@ -0,0 +1,9 @@
#%PAM-1.0
auth sufficient pam_rootok.so
# Uncomment the following line to implicitly trust users in the "wheel" group.
#auth sufficient pam_wheel.so trust use_uid
# Uncomment the following line to require a user to be in the "wheel" group.
#auth required pam_wheel.so use_uid
auth required pam_unix.so
account required pam_unix.so
session required pam_unix.so

@ -0,0 +1,2 @@
u uuidd 68
g rfkill - - -

@ -0,0 +1,23 @@
From ecf19dcb2d623f9c5847b6d3b3a4b85751323aee Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 Nov 2018 13:54:32 +0100
Subject: [PATCH 1/1] agetty: fix output of escaped characters
Signed-off-by: Christian Hesse <mail@eworm.de>
---
term-utils/agetty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 05a269abb..b9f08728e 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
break;
}
default:
- putchar(c);
+ putc(c, ie->output);
break;
}
}

@ -0,0 +1 @@
KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

@ -0,0 +1,110 @@
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=util-linux
pkgname=(util-linux libutil-linux)
_pkgmajor=2.33
pkgver=${_pkgmajor}
pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="https://www.kernel.org/pub/linux/utils/util-linux/"
arch=('x86_64')
makedepends=('eudev' 'python' 'libcap-ng')
license=('GPL2')
options=('strip' 'debug')
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
'0001-agetty-fix-output-of-escaped-characters.patch'
pam-{login,common,su}
'util-linux.sysusers'
'60-rfkill.rules')
sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
'SKIP'
'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
'993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
'51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
prepare() {
cd "$pkgbase-$pkgver"
# agetty: fix output of escaped characters
patch -Np1 < ../0001-agetty-fix-output-of-escaped-characters.patch
}
build() {
cd "$pkgbase-$pkgver"
./configure \
--prefix=/usr \
--libdir=/usr/lib \
--bindir=/usr/bin \
--localstatedir=/var \
--enable-fs-paths-extra=/usr/bin \
--enable-raw \
--enable-vipw \
--enable-newgrp \
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
--with-python=3 \
--with-systemd=no \
--with-systemdsystemunitdir=no
make
}
package_util-linux() {
conflicts=('eject' 'zramctl' 'rfkill')
provides=('eject' 'zramctl' 'rfkill')
replaces=('zramctl' 'rfkill')
depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libutil-linux')
optdepends=('python: python bindings to libmount'
'words: default dictionary for look')
groups=('base' 'base-devel')
backup=(etc/pam.d/chfn
etc/pam.d/chsh
etc/pam.d/login
etc/pam.d/su
etc/pam.d/su-l)
cd "$pkgbase-$pkgver"
make DESTDIR="$pkgdir" install
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
# install PAM files for login-utils
install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
install -m644 "$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 sbin usr/sbin
### runtime libs are shipped as part of libutil-linux
rm "$pkgdir"/usr/lib/lib*.{a,so}*
### install opensysusers
install -Dm644 "$srcdir/util-linux.sysusers" \
"$pkgdir/usr/lib/sysusers.d/util-linux.conf"
install -Dm644 "$srcdir/60-rfkill.rules" \
"$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
}
package_libutil-linux() {
pkgdesc="util-linux runtime libraries"
provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
}

@ -0,0 +1,6 @@
#%PAM-1.0
auth sufficient pam_rootok.so
auth required pam_unix.so
account required pam_unix.so
session required pam_unix.so
password required pam_permit.so

@ -0,0 +1,7 @@
#%PAM-1.0
auth required pam_securetty.so
auth requisite pam_nologin.so
auth include system-local-login
account include system-local-login
session include system-local-login

@ -0,0 +1,9 @@
#%PAM-1.0
auth sufficient pam_rootok.so
# Uncomment the following line to implicitly trust users in the "wheel" group.
#auth sufficient pam_wheel.so trust use_uid
# Uncomment the following line to require a user to be in the "wheel" group.
#auth required pam_wheel.so use_uid
auth required pam_unix.so
account required pam_unix.so
session required pam_unix.so

@ -0,0 +1,2 @@
u uuidd 68
g rfkill - - -
Loading…
Cancel
Save