[arch-commits] Commit in gpm/trunk (0001-glibc-sigemptyset.patch PKGBUILD gpm.service)

[Christian Hesse]

    Date: Saturday, September 29, 2018 @ 20:02:38
  Author: eworm
Revision: 335555

upgpkg: gpm 1.20.7.r27.g1fd1941-1

* update to latest git master
* fix building with recent glibc
* add dependencies in systemd unit file

Added:
  gpm/trunk/0001-glibc-sigemptyset.patch
Modified:
  gpm/trunk/PKGBUILD
  gpm/trunk/gpm.service

------------------------------+
 0001-glibc-sigemptyset.patch |   29 ++++++++++++++++++++
 PKGBUILD                     |   59 +++++++++++++++++++++++++++++------------
 gpm.service                  |    3 ++
 3 files changed, 75 insertions(+), 16 deletions(-)

Added: 0001-glibc-sigemptyset.patch
===================================================================
--- 0001-glibc-sigemptyset.patch	                        (rev 0)
+++ 0001-glibc-sigemptyset.patch	2018-09-29 20:02:38 UTC (rev 335555)
@@ -0,0 +1,29 @@
+From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Sun, 25 Jun 2017 07:25:33 -0700
+Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
+
+__sigemptyset has been removed from glibc public
+API headers in upcoming (2.26) release onwards
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+---
+ src/prog/gpm-root.y | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 5126c65..76c896c 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
+                                                         LOG_DAEMON : LOG_USER);
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+-#if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
+-#else /* __GLIBC__ */
+    sigemptyset(&childaction.sa_mask);
+-#endif /* __GLIBC__ */
+    childaction.sa_flags=0;
+    sigaction(SIGCHLD,&childaction,NULL);
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-29 19:55:40 UTC (rev 335554)
+++ PKGBUILD	2018-09-29 20:02:38 UTC (rev 335555)
@@ -1,35 +1,62 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=gpm
-pkgver=1.20.7
-pkgrel=8
-pkgdesc="A mouse server for the console and xterm"
+pkgver=1.20.7.r27.g1fd1941
+_commit='1fd19417b8a4dd9945347e98dfa97e4cfd798d77'
+pkgrel=1
+pkgdesc='A mouse server for the console and xterm'
 arch=('x86_64')
-url="http://www.nico.schottelius.org/software/gpm/"
+url='https://www.nico.schottelius.org/software/gpm/'
 license=('GPL')
 depends=('bash' 'procps-ng')
+makedepends=('git')
 options=('!makeflags')
-source=(https://sources.archlinux.org/other/gpm/${pkgname}-${pkgver}.tar.lzma
-        gpm.sh gpm.service)
-sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369'
-          '94447c6f8bfadd062efa1a747a597426f339d13e'
-          'f9bde96eb9c78da9f225bcf40822647f6592cf23')
+source=("git+https://github.com/telmich/gpm.git#commit=${_commit}"
+        '0001-glibc-sigemptyset.patch'
+        'gpm.sh'
+        'gpm.service')
+sha256sums=('SKIP'
+            '61f901aae46ff79679a058758151dc93901dcd9ea938fabb0765554993b8cb09'
+            'f41e90dcf6c0c6c4b8eff1c69039a20eb6b38ea851ffd1fa47ba311bf83d6ed8'
+            'dc7d2463f6670ff2c1646a571ffad51f7c603793c25c6f685efad13cbb444034')
 
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+
+  GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"
+  printf '%s.r%s.g%s' \
+    "${GITTAG}" \
+    "$(git rev-list --count ${GITTAG}..)" \
+    "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "${srcdir}/${pkgname}"
+
+  patch -Np1 < ../0001-glibc-sigemptyset.patch
+
+  ./autogen.sh
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
+  cd "${srcdir}/${pkgname}"
+  
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
+
   make DESTDIR="${pkgdir}" install
-  install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
-  install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
+  install -D -m0755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
+  install -D -m0644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
 
 # library fixes
   cd "${pkgdir}/usr/lib/"
   ln -s libgpm.so.2.* libgpm.so
-  chmod 755 "${pkgdir}"/usr/lib/libgpm.so.*
+  chmod 0755 "${pkgdir}"/usr/lib/libgpm.so.*
 }

Modified: gpm.service
===================================================================
--- gpm.service	2018-09-29 19:55:40 UTC (rev 335554)
+++ gpm.service	2018-09-29 20:02:38 UTC (rev 335555)
@@ -1,5 +1,8 @@
 [Unit]
 Description=Virtual console mouse server
+Requires=systemd-udevd.service
+After=systemd-udevd.service
+ConditionPathExists=/dev/input/mice
 
 [Service]
 Type=forking