aboutsummaryrefslogtreecommitdiffstats
path: root/arch-system
diff options
context:
space:
mode:
authorTharre <tharre3@gmail.com>2024-03-03 05:05:22 +0100
committerTharre <tharre3@gmail.com>2024-03-03 05:11:49 +0100
commit89d65bd88f5aafb055de31f767bc62ad4ba2e7a0 (patch)
treea6a3aa81e0a758920ecb874a36103de31f87c35f /arch-system
parentfc19846e74eed98c205c132fdfdd18baaff980e8 (diff)
downloadpkgbuilds-89d65bd88f5aafb055de31f767bc62ad4ba2e7a0.tar.gz
pkgbuilds-89d65bd88f5aafb055de31f767bc62ad4ba2e7a0.tar.xz
pkgbuilds-89d65bd88f5aafb055de31f767bc62ad4ba2e7a0.zip
arch-system: remove yubikey udev rules
This seems to now be done by gpg since version 2.2.6[0], so remove this hack. [0] https://dev.gnupg.org/T3825
Diffstat (limited to 'arch-system')
-rw-r--r--arch-system/.SRCINFO4
-rw-r--r--arch-system/PKGBUILD4
-rw-r--r--arch-system/etc-yubikey.rules13
3 files changed, 2 insertions, 19 deletions
diff --git a/arch-system/.SRCINFO b/arch-system/.SRCINFO
index a1a2a77..f6c33e2 100644
--- a/arch-system/.SRCINFO
+++ b/arch-system/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = arch-system
pkgdesc = Arch Linux system configuration
- pkgver = 2023.07.01
+ pkgver = 2024.03.03
pkgrel = 1
arch = any
license = custom
@@ -11,7 +11,6 @@ pkgbase = arch-system
source = sudoers-wheel
source = etc-nsswitch.conf
source = 90-modprobe-d.hook
- source = etc-yubikey.rules
source = sudoers-borgbackup
source = backup-sudo
source = borg-backup.service
@@ -27,7 +26,6 @@ pkgbase = arch-system
sha256sums = 62c1a085f7a9d1c5d57b40516fea5d7e8dfb3593d5c0a713cd571c8e5bae2584
sha256sums = 9c1648e1e9219efbe1e4098952f7595f1ebb0eca629d2c8957079186c56d1822
sha256sums = 7467bb40e7d404ed249b34a0e410b8d452ebc4b90588d7e210bfa47011b5981d
- sha256sums = dd84877b7f6f4330da489fa33f843c9a7c862562a3d78dc2feea5116ac846a79
sha256sums = 483a7d9350653c2cf22f36f67f1a83cc5c95232dfc10642a20d76e3c32c9e2e3
sha256sums = d39732bec90036020ad94d52cb34b6215801a82595f7fb30f8c5e0a7f1eb9b1e
sha256sums = 94c06cbf7304996b0503cace9394c2dbc0150bc045fd30cc402e3d943a8c8abd
diff --git a/arch-system/PKGBUILD b/arch-system/PKGBUILD
index 8c04c44..2f47c08 100644
--- a/arch-system/PKGBUILD
+++ b/arch-system/PKGBUILD
@@ -10,7 +10,7 @@ url=""
license=('custom')
source=('etc-pacman.conf' 'etc-locale.gen' 'etc-vconsole.conf'
'mirrorupgrade.hook' 'sudoers-wheel' 'etc-nsswitch.conf'
- '90-modprobe-d.hook' 'etc-yubikey.rules'
+ '90-modprobe-d.hook'
'sudoers-borgbackup' 'backup-sudo' 'borg-backup.service'
'borg-backup.timer' 'borgbackup'
@@ -23,7 +23,6 @@ sha256sums=('8ccecac2fe69515ab18cabc36539d639df87ff22259f8d7c50fd2cc1368cadc3'
'62c1a085f7a9d1c5d57b40516fea5d7e8dfb3593d5c0a713cd571c8e5bae2584'
'9c1648e1e9219efbe1e4098952f7595f1ebb0eca629d2c8957079186c56d1822'
'7467bb40e7d404ed249b34a0e410b8d452ebc4b90588d7e210bfa47011b5981d'
- 'dd84877b7f6f4330da489fa33f843c9a7c862562a3d78dc2feea5116ac846a79'
'483a7d9350653c2cf22f36f67f1a83cc5c95232dfc10642a20d76e3c32c9e2e3'
'd39732bec90036020ad94d52cb34b6215801a82595f7fb30f8c5e0a7f1eb9b1e'
'94c06cbf7304996b0503cace9394c2dbc0150bc045fd30cc402e3d943a8c8abd'
@@ -54,7 +53,6 @@ EOF
kernel.sysrq = 1
EOF
install -Dm0644 90-modprobe-d.hook -t "$pkgdir"/usr/share/libalpm/hooks/
- install -Dm0644 etc-yubikey.rules -t "$pkgdir"/usr/lib/udev/rules.d
ln -s /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/etc/localtime
}
diff --git a/arch-system/etc-yubikey.rules b/arch-system/etc-yubikey.rules
deleted file mode 100644
index 6d8238b..0000000
--- a/arch-system/etc-yubikey.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yubico Yubikey
-#
-# This is a ugly hack to prevent scdaemon from locking up after suspend.
-# Note that more civil methods, like gpgconf --kill scdaemon or just sending a
-# normal TERM doesn't work.
-# see https://wiki.gnupg.org/SmartCard#Known_problem_of_Yubikey
-ATTRS{idVendor}=="1050", \
-ATTRS{idProduct}=="0010|0405|0110|0111|0116", \
-ENV{ID_SECURITY_TOKEN}="1", \
-RUN+="/usr/bin/killall -9 scdaemon", \
-TAG+="uaccess"
-
-LABEL="yubico_end"