rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xtrlock: unbreak build and update to version 2.12 

The previous xtrlock version could no longer be created because the
source package is no longer offered on the upstream master site.

This commit brings the xtrlock version to 2.12 with the following
noteworthy changes:

* Fixed CVE-2016-10894: Attempt to grab multitouch devices which are
  not intercepted via XGrabPointer.

* add a -b option [blank screen before locking]

* add a -f option [fork, and return success from parent once lock
  acquired]

Full changelog:
https://metadata.ftp-master.debian.org/changelogs//main/x/xtrlock/xtrlock_2.12_changelog
This commit is contained in:
Matthias Petermann 2020-01-26 06:30:56 +01:00
parent 59d3e10dcf
commit 0aa315c559
4 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xtrlock/Makefile
View File

@ -1,19 +1,19 @@
# $NetBSD: Makefile,v 1.3 2012/10/07 19:57:17 asau Exp $ # $NetBSD: Makefile,v 1.3 2012/10/07 19:57:17 asau Exp $
# #
DISTNAME= xtrlock_2.0-12 DISTNAME= xtrlock-2.12
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/x/xtrlock/} MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/x/xtrlock/}
EXTRACT_SUFX= .tar.xz
DISTFILES= xtrlock_2.12.tar.xz
MAINTAINER= uli@habel.name MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${MASTER_SITE_DEBIAN:=pool/main/x/xtrlock/}
COMMENT= Simple X11 screen lock tool COMMENT= Simple X11 screen lock tool
LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= destdir
USE_IMAKE= yes USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xtrlock-2.0 WRKSRC= ${WRKDIR}/xtrlock-2.12
MAN_PAGE= ${WRKSRC}/xtrlock.man MAN_PAGE= ${WRKSRC}/xtrlock.man
do-build: do-build:

11
xtrlock/TODO
View File

@ -4,12 +4,7 @@ it is completely idle while the display is locked and you don't
type at it, and it doesn't do funny things to the X access control type at it, and it doesn't do funny things to the X access control
lists. lists.
I needed this package for a monitoring workstation at my work * The package is tested on NetBSD i386 and amd64. Testing on Linux
and patched the Debian xtrlock for it. I haven't tested this or other systems needs still be done.
on Linux or other systems, just made it working on NetBSD i386
more testing is needed.
Is there a workaround for the setuid bit to lock the screen? * Is there a workaround for the setuid bit to lock the screen?
This package has known vulnerabilities, please investigate and fix if possible:
CVE-2016-10894

11
xtrlock/distinfo
View File

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.1.1.1 2007/03/28 07:19:42 uhabel Exp $ $NetBSD$
SHA1 (xtrlock_2.0-12.tar.gz) = fa405cf2da351c83d7b86cd1843a71d2b0afe0f2 SHA1 (xtrlock_2.12.tar.xz) = 90fde89622bd85ad2454de1308b10499b66f00e3
RMD160 (xtrlock_2.0-12.tar.gz) = d4fb80b24f3be974673501b3e60c5e9a9a3ddee4 RMD160 (xtrlock_2.12.tar.xz) = ba451bf74036bcf2f1be654d741638e154eda474
Size (xtrlock_2.0-12.tar.gz) = 7642 bytes SHA512 (xtrlock_2.12.tar.xz) = 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36
SHA1 (patch-aa) = e6e5938367c4db54b7d593870007d06af64fe927 Size (xtrlock_2.12.tar.xz) = 20620 bytes
SHA1 (patch-aa) = b8b3393cdb17253ec285def7ade91461bbd632ad

3
xtrlock/patches/patch-aa
View File

@ -1,4 +1,7 @@
$NetBSD: patch-aa,v 1.1.1.1 2007/03/28 07:19:42 uhabel Exp $ $NetBSD: patch-aa,v 1.1.1.1 2007/03/28 07:19:42 uhabel Exp $
Adjust includes matching BSD systems
--- xtrlock.c.orig 2007-03-28 07:24:00.000000000 +0200 --- xtrlock.c.orig 2007-03-28 07:24:00.000000000 +0200
+++ xtrlock.c 2007-03-28 07:27:32.000000000 +0200 +++ xtrlock.c 2007-03-28 07:27:32.000000000 +0200
@@ -31,11 +31,17 @@ @@ -31,11 +31,17 @@