[arch-commits] Commit in kbd/repos/testing-x86_64 (8 files)

Tobias Powalowski tpowa at archlinux.org
Wed Feb 10 06:49:26 UTC 2021


    Date: Wednesday, February 10, 2021 @ 06:49:26
  Author: tpowa
Revision: 407777

archrelease: copy trunk to testing-x86_64

Added:
  kbd/repos/testing-x86_64/PKGBUILD
    (from rev 407776, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-euro2.patch
    (from rev 407776, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/kbd-fix-loadkmap-compat.patch
    (from rev 407776, kbd/trunk/kbd-fix-loadkmap-compat.patch)
  kbd/repos/testing-x86_64/vlock.pam
    (from rev 407776, kbd/trunk/vlock.pam)
Deleted:
  kbd/repos/testing-x86_64/PKGBUILD
  kbd/repos/testing-x86_64/fix-euro2.patch
  kbd/repos/testing-x86_64/kbd-fix-loadkmap-compat.patch
  kbd/repos/testing-x86_64/vlock.pam

-------------------------------+
 PKGBUILD                      |  125 ++++++++++++++++++++--------------------
 fix-euro2.patch               |   18 ++---
 kbd-fix-loadkmap-compat.patch |   44 +++++++-------
 vlock.pam                     |   10 +--
 4 files changed, 99 insertions(+), 98 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-10 06:49:17 UTC (rev 407776)
+++ PKGBUILD	2021-02-10 06:49:26 UTC (rev 407777)
@@ -1,62 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kbd
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="Keytable files and keyboard utilities"
-arch=('x86_64')
-url="http://www.kbd-project.org"
-license=('GPL')
-depends=('glibc' 'pam')
-makedepends=('check' 'git')
-#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
-#        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
-source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-        'fix-euro2.patch'
-	'vlock.pam')
-provides=('vlock')
-conflicts=('vlock')
-replaces=('vlock')
-sha256sums=('SKIP'
-            'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8'
-            '5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4')
-validpgpkeys=(
-              '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
-             )
-
-prepare() {
-  cd ${pkgname}
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-  # fix euro2 #28213
-  patch -Np1 -i ../fix-euro2.patch
-  autoreconf -if
-}
-
-build() {
-  cd ${pkgname}
-  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-check() {
-  cd ${pkgname}
-
-# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
-  sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
-
-  make check
-}
-
-package() {
-  cd ${pkgname}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
-  install -Dm644 ../vlock.pam "${pkgdir}"/etc/pam.d/vlock
-}

Copied: kbd/repos/testing-x86_64/PKGBUILD (from rev 407776, kbd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-10 06:49:26 UTC (rev 407777)
@@ -0,0 +1,63 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kbd
+pkgver=2.4.0
+pkgrel=2
+pkgdesc="Keytable files and keyboard utilities"
+arch=('x86_64')
+url="http://www.kbd-project.org"
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check' 'git')
+#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
+#        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
+source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
+        'fix-euro2.patch'
+	'vlock.pam')
+backup=('etc/pam.d/vlock')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+sha256sums=('SKIP'
+            'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8'
+            '5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4')
+validpgpkeys=(
+              '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
+             )
+
+prepare() {
+  cd ${pkgname}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+  autoreconf -if
+}
+
+build() {
+  cd ${pkgname}
+  ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+check() {
+  cd ${pkgname}
+
+# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
+  sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
+
+  make check
+}
+
+package() {
+  cd ${pkgname}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
+  install -Dm644 ../vlock.pam "${pkgdir}"/etc/pam.d/vlock
+}

Deleted: fix-euro2.patch
===================================================================
--- fix-euro2.patch	2021-02-10 06:49:17 UTC (rev 407776)
+++ fix-euro2.patch	2021-02-10 06:49:26 UTC (rev 407777)
@@ -1,9 +0,0 @@
---- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
-+++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
-@@ -2,5 +2,5 @@
- # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
- #  on the positions where many keyboards have E and C.
- #  To get it displayed, use a latin0 (i.e., latin9) font.]
--altgr keycode  18 = currency
-+altgr keycode  18 = euro
- altgr keycode  46 = cent

Copied: kbd/repos/testing-x86_64/fix-euro2.patch (from rev 407776, kbd/trunk/fix-euro2.patch)
===================================================================
--- fix-euro2.patch	                        (rev 0)
+++ fix-euro2.patch	2021-02-10 06:49:26 UTC (rev 407777)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr keycode  18 = euro
+ altgr keycode  46 = cent

Deleted: kbd-fix-loadkmap-compat.patch
===================================================================
--- kbd-fix-loadkmap-compat.patch	2021-02-10 06:49:17 UTC (rev 407776)
+++ kbd-fix-loadkmap-compat.patch	2021-02-10 06:49:26 UTC (rev 407777)
@@ -1,22 +0,0 @@
-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 83ac351..8531b5a 100644
---- a/src/libkeymap/dump.c
-+++ b/src/libkeymap/dump.c
-@@ -72,9 +72,14 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
- 			continue;
- 
- 		for (j = 0; j < NR_KEYS / 2; j++) {
--			int v = lk_get_key(ctx, i, j);
-+			int value = lk_get_key(ctx, i, j);
- 
--			if (fwrite(&v, sizeof(v), 1, fd) != 1)
-+			if (value < 0 || value > USHRT_MAX) {
-+				ERR(ctx, _("can not bind key %d to value %d because it is too large"), j, value);
-+				goto fail;
-+			}
-+
-+			if (fwrite(&value, sizeof(unsigned short), 1, fd) != 1)
- 				goto fail;
- 		}
- 	}
-

Copied: kbd/repos/testing-x86_64/kbd-fix-loadkmap-compat.patch (from rev 407776, kbd/trunk/kbd-fix-loadkmap-compat.patch)
===================================================================
--- kbd-fix-loadkmap-compat.patch	                        (rev 0)
+++ kbd-fix-loadkmap-compat.patch	2021-02-10 06:49:26 UTC (rev 407777)
@@ -0,0 +1,22 @@
+diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
+index 83ac351..8531b5a 100644
+--- a/src/libkeymap/dump.c
++++ b/src/libkeymap/dump.c
+@@ -72,9 +72,14 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
+ 			continue;
+ 
+ 		for (j = 0; j < NR_KEYS / 2; j++) {
+-			int v = lk_get_key(ctx, i, j);
++			int value = lk_get_key(ctx, i, j);
+ 
+-			if (fwrite(&v, sizeof(v), 1, fd) != 1)
++			if (value < 0 || value > USHRT_MAX) {
++				ERR(ctx, _("can not bind key %d to value %d because it is too large"), j, value);
++				goto fail;
++			}
++
++			if (fwrite(&value, sizeof(unsigned short), 1, fd) != 1)
+ 				goto fail;
+ 		}
+ 	}
+

Deleted: vlock.pam
===================================================================
--- vlock.pam	2021-02-10 06:49:17 UTC (rev 407776)
+++ vlock.pam	2021-02-10 06:49:26 UTC (rev 407777)
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so

Copied: kbd/repos/testing-x86_64/vlock.pam (from rev 407776, kbd/trunk/vlock.pam)
===================================================================
--- vlock.pam	                        (rev 0)
+++ vlock.pam	2021-02-10 06:49:26 UTC (rev 407777)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so


More information about the arch-commits mailing list