From 8f74c919dbaae9d13d7a86c7996bc2c710a69e97 Mon Sep 17 00:00:00 2001 From: Hal Emmerich Date: Wed, 27 May 2020 20:42:21 -0500 Subject: [PATCH] Actually include the debian folder --- .../filesystem/x11/xsecurelock/.gitignore | 9 ++-- .../x11/xsecurelock/src/debian/changelog | 21 +++++++++ .../x11/xsecurelock/src/debian/compat | 1 + .../x11/xsecurelock/src/debian/control | 40 +++++++++++++++++ .../x11/xsecurelock/src/debian/copyright | 29 ++++++++++++ .../x11/xsecurelock/src/debian/docs | 1 + .../x11/xsecurelock/src/debian/rules | 44 +++++++++++++++++++ .../x11/xsecurelock/src/debian/source/format | 1 + .../x11/xsecurelock/src/debian/watch | 3 ++ 9 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/changelog create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/compat create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/control create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/copyright create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/docs create mode 100755 packages/filesystem/x11/xsecurelock/src/debian/rules create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/source/format create mode 100644 packages/filesystem/x11/xsecurelock/src/debian/watch diff --git a/packages/filesystem/x11/xsecurelock/.gitignore b/packages/filesystem/x11/xsecurelock/.gitignore index f56a19a..cce6d9c 100644 --- a/packages/filesystem/x11/xsecurelock/.gitignore +++ b/packages/filesystem/x11/xsecurelock/.gitignore @@ -1,3 +1,7 @@ +#since we have not changed upstream, and this is packaged don't keep the source files +src/* +!src/debian + #only include specific /debian files src/debian/* !src/debian/compat @@ -7,12 +11,9 @@ src/debian/* !src/debian/copyright !src/debian/docs !src/debian/watch +!src/debian/source !src/debian/source/format -#since we have not changed upstream, and this is packaged don't keep the source files -src/* - - #generic packaging artifacts debhelper-build-stamp .debhelper diff --git a/packages/filesystem/x11/xsecurelock/src/debian/changelog b/packages/filesystem/x11/xsecurelock/src/debian/changelog new file mode 100644 index 0000000..6174f99 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/changelog @@ -0,0 +1,21 @@ +xsecurelock (1.5.1-1) stable; urgency=medium + + * Upstream version 1.5.1 + * Bump Standards-Version from 4.1.4 to 4.3.0 + * Changes from upstream version 1.5.1 + * XSECURELOCK_FORCE_GRAB no longer sometimes fails to re-map the unmapped + windows in case locking fails despite the forcing. Previously, a missing + XSync call led to the re-mapping sometimes not taking effect. + * Changes from upstream version 1.5.0 + * Always wake up from mouse motion events. + * Set PAM_RHOST to "localhost" as recommended by the Linux-PAM manual; add + a feature to disable setting this field entirely as a workaround for + pam_fprintd. + * Remove some stderr spam. + * Detect VNC and Chrome Remote Desktop servers and refuse to lock them, as + locking them would not make much sense (can be overridden). + * Allow the helpers directory to be recreated while xsecurelock is + running. Fixes issues like "cannot unlock after unattended package + upgrade". + + -- Hal Emmerich Sun, 24 May 2020 15:12:07 -0500 diff --git a/packages/filesystem/x11/xsecurelock/src/debian/compat b/packages/filesystem/x11/xsecurelock/src/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/compat @@ -0,0 +1 @@ +10 diff --git a/packages/filesystem/x11/xsecurelock/src/debian/control b/packages/filesystem/x11/xsecurelock/src/debian/control new file mode 100644 index 0000000..a62478e --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/control @@ -0,0 +1,40 @@ +Source: xsecurelock +Section: x11 +Priority: optional +Maintainer: Markus Teich +Uploaders: Hal Emmerich +Build-Depends: debhelper (>= 10), + libc6, + libpam-dev, + libx11-dev, + libxcomposite-dev, + libxext-dev, + libxfixes-dev, + libxft-dev, + libxmuu-dev, + libxrandr-dev, + libxss-dev, + pandoc, + x11proto-core-dev +Standards-Version: 4.3.0 +Homepage: https://github.com/google/xsecurelock +Vcs-Browser: https://github.com/google/xsecurelock/tree/debian +Vcs-Git: https://github.com/google/xsecurelock.git -b debian + +Package: xsecurelock +Architecture: any +Depends: dash, x11-xserver-utils, ${misc:Depends}, ${shlibs:Depends} +Suggests: mplayer, + mpv, + xscreensaver-data, + xscreensaver-data-extra, + xscreensaver-gl, + xscreensaver-gl-extra +Description: X11 screen lock utility with the primary goal of security + Screen lock utilities are widespread. However, in the past they often had + security issues regarding authentication bypass (a crashing screen locker + would unlock the screen), information disclosure (notifications may appear on + top of the screen saver), or sometimes even worse. + . + In XSecureLock, security is achieved using a modular design to avoid the usual + pitfalls of screen locking utility design on X11. diff --git a/packages/filesystem/x11/xsecurelock/src/debian/copyright b/packages/filesystem/x11/xsecurelock/src/debian/copyright new file mode 100644 index 0000000..2e421c5 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/copyright @@ -0,0 +1,29 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xsecurelock +Source: https://github.com/google/xsecurelock + +Files: * +Copyright: 2014-2019 Rudolf Polzer , + 2017-2019 Markus Teich + 2014-2019 Google Inc. All rights reserved. +License: Apache-2.0 + +Files: debian/* +Copyright: 2017-2019 Markus Teich +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + https://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/packages/filesystem/x11/xsecurelock/src/debian/docs b/packages/filesystem/x11/xsecurelock/src/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/packages/filesystem/x11/xsecurelock/src/debian/rules b/packages/filesystem/x11/xsecurelock/src/debian/rules new file mode 100755 index 0000000..22fa5c7 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Use already defined upstream version as DEB_VERSION_UPSTREAM. +include /usr/share/dpkg/pkg-info.mk + +export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + dh_auto_configure -- \ + --with-htpasswd=no \ + --with-mplayer=/usr/bin/mplayer \ + --with-mpv=/usr/bin/mpv \ + --with-pam \ + --with-pam-service-name=common-auth \ + --with-pamtester=no \ + --with-xcomposite \ + --with-xf86misc=no \ + --with-xfixes \ + --with-xft \ + --with-xkb \ + --with-xrandr \ + --with-xscreensaver=/usr/lib/xscreensaver \ + --with-xss \ + --with-xsync + +override_dh_auto_build: + GIT_VERSION="$(DEB_VERSION_UPSTREAM)" dh_auto_build + +override_dh_autoreconf: + dh_autoreconf ./autogen.sh + +override_dh_auto_install: + dh_auto_install + find ./debian -type f -name "LICENSE" -delete + +override_dh_auto_clean: + dh_auto_clean + -rm version.c diff --git a/packages/filesystem/x11/xsecurelock/src/debian/source/format b/packages/filesystem/x11/xsecurelock/src/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/packages/filesystem/x11/xsecurelock/src/debian/watch b/packages/filesystem/x11/xsecurelock/src/debian/watch new file mode 100644 index 0000000..37fb9bb --- /dev/null +++ b/packages/filesystem/x11/xsecurelock/src/debian/watch @@ -0,0 +1,3 @@ +version=4 + https://github.com/google/xsecurelock/releases \ + (?:.*?/)xsecurelock-(\d[\d.]*)\.tar\.gz