wok-next rev 20593

Up gpm (1.20.7)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Apr 14 16:28:35 2018 +0300 (2018-04-14)
parents b9a5d02f5901
children 12d2d32d8ab5
files gpm/receipt gpm/stuff/patches/gpm-1.20.7.patch gpm/stuff/patches/series
line diff
     1.1 --- a/gpm/receipt	Sat Apr 14 15:59:55 2018 +0300
     1.2 +++ b/gpm/receipt	Sat Apr 14 16:28:35 2018 +0300
     1.3 @@ -1,19 +1,20 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="gpm"
     1.7 -VERSION="1.99.7"
     1.8 +VERSION="1.20.7"
     1.9  CATEGORY="misc"
    1.10 -SHORT_DESC="Mouse server for console."
    1.11 +SHORT_DESC="Mouse server for console"
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="http://www.nico.schottelius.org/software/gpm/"
    1.15  
    1.16 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.17 +TARBALL="$PACKAGE-$VERSION.tar.lzma"
    1.18  WGET_URL="${WEB_SITE}archives/$TARBALL"
    1.19  
    1.20  BUILD_DEPENDS_arm=" "
    1.21  BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo"
    1.22 -SPLIT="gpm gpm-dev gpm-extra"
    1.23 +SPLIT="gpm-extra gpm gpm-dev"
    1.24 +COOKOPTS="skip-log-errors"
    1.25  
    1.26  compile_rules() {
    1.27  	sed -i 's|-Werror||' Makefile.include.in
    1.28 @@ -23,8 +24,8 @@
    1.29  	./configure $CONFIGURE_ARGS &&
    1.30  	make && make install || return 1
    1.31  
    1.32 -#	chmod a+x $install/usr/lib/*
    1.33 -	cp -a $stuff/* $install
    1.34 +	chmod a+x $install/usr/lib/*
    1.35 +	install -Dm755 $stuff/etc/init.d/gpm $install/etc/init.d/gpm
    1.36  }
    1.37  
    1.38  genpkg_rules() {
    1.39 @@ -53,6 +54,6 @@
    1.40  }
    1.41  
    1.42  # Just to be sure when cross-compiling.
    1.43 -testsuite_gpm_extra() {
    1.44 +testsuite() {
    1.45  	readelf -h $install/usr/bin/gpm-root
    1.46  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gpm/stuff/patches/gpm-1.20.7.patch	Sat Apr 14 16:28:35 2018 +0300
     2.3 @@ -0,0 +1,30 @@
     2.4 +# from https://bugzilla.redhat.com/show_bug.cgi?id=1500092
     2.5 +# from https://src.fedoraproject.org/rpms/gpm/pull-request/1
     2.6 +--- a/src/prog/gpm-root.y
     2.7 ++++ b/src/prog/gpm-root.y
     2.8 +@@ -1196,11 +1196,7 @@
     2.9 +                                                         LOG_DAEMON : LOG_USER);
    2.10 +    /* reap your zombies */
    2.11 +    childaction.sa_handler=reap_children;
    2.12 +-#if defined(__GLIBC__)
    2.13 +-   __sigemptyset(&childaction.sa_mask);
    2.14 +-#else /* __GLIBC__ */
    2.15 +-   childaction.sa_mask=0;
    2.16 +-#endif /* __GLIBC__ */
    2.17 ++   sigemptyset(&childaction.sa_mask);
    2.18 +    childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
    2.19 +    sigaction(SIGCHLD,&childaction,NULL);
    2.20 + 
    2.21 +--- a/src/daemon/open_console.c
    2.22 ++++ b/src/daemon/open_console.c
    2.23 +@@ -23,6 +23,10 @@
    2.24 + #include <sys/stat.h>               /* stat()            */
    2.25 + #include <sys/ioctl.h>              /* ioctl             */
    2.26 + 
    2.27 ++#ifdef HAVE_SYS_SYSMACROS_H
    2.28 ++#include <sys/sysmacros.h>          /* major() w/newer glibc */
    2.29 ++#endif
    2.30 ++
    2.31 + /* Linux specific (to be outsourced in gpm2 */
    2.32 + #include <linux/serial.h>           /* for serial console check */
    2.33 + #include <asm/ioctls.h>            /* for serial console check */
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/gpm/stuff/patches/series	Sat Apr 14 16:28:35 2018 +0300
     3.3 @@ -0,0 +1,1 @@
     3.4 +gpm-1.20.7.patch