summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2017-01-14 14:19:20 +0100
committerJeroen Roovers <jer@gentoo.org>2017-01-14 14:19:20 +0100
commitc24a59350fa5db2636ae3051f0df47ecc0f1fcf6 (patch)
tree7dae22aa60d1b7d254837b3dfebddcc083855feb
parentx11-misc/xlockmore: Stable for HPPA (bug #604370). (diff)
downloadgentoo-c24a59350fa5db2636ae3051f0df47ecc0f1fcf6.tar.gz
gentoo-c24a59350fa5db2636ae3051f0df47ecc0f1fcf6.tar.bz2
gentoo-c24a59350fa5db2636ae3051f0df47ecc0f1fcf6.zip
x11-misc/slock: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--x11-misc/slock/Manifest1
-rw-r--r--x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch11
-rw-r--r--x11-misc/slock/files/slock-1.3-warning.patch10
-rw-r--r--x11-misc/slock/slock-1.3-r3.ebuild63
4 files changed, 0 insertions, 85 deletions
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 01a0cb9c4e3d..8f595b2cd873 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,2 +1 @@
-DIST slock-1.3.tar.gz 5943 SHA256 bab4a3aea4046aa0fd0361c3649b79b90ca531bc5dfae3c4a6c0fe436152bd18 SHA512 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f WHIRLPOOL 0f5d89117ad6a51f4d409f0e00b6cc114bf19e36265d8a476420fee688b224c0e9fe688d961537fbd7794c8f13df51629f7396a7e2fbc16e7b85b877b151959c
DIST slock-1.4.tar.gz 6889 SHA256 b53849dbc60109a987d7a49b8da197305c29307fd74c12dc18af0d3044392e6a SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f WHIRLPOOL cc8527da479dd4703634877619fd2a8e6c30ef087bb0e70f94f97635152592ac011dfda8d82199701c9fe3f1c757de384101e27f45b9109142b5c1d591fc9e13
diff --git a/x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch b/x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch
deleted file mode 100644
index a5043b90978b..000000000000
--- a/x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/slock.c
-+++ b/slock.c
-@@ -310,6 +310,8 @@
-
- #ifndef HAVE_BSD_AUTH
- pws = getpw();
-+ if(strlen(pws) < 2)
-+ die("This user has no password set.\n");
- #endif
-
- if (!(dpy = XOpenDisplay(0)))
diff --git a/x11-misc/slock/files/slock-1.3-warning.patch b/x11-misc/slock/files/slock-1.3-warning.patch
deleted file mode 100644
index df2ce5a38514..000000000000
--- a/x11-misc/slock/files/slock-1.3-warning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/slock.c
-+++ b/slock.c
-@@ -81,7 +81,7 @@
- die("buffer too small\n");
-
- if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)
-- die("cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)\n");
-+ fprintf(stderr, "cannot disable the out-of-memory killer for this process.\n");
- }
- #endif
diff --git a/x11-misc/slock/slock-1.3-r3.ebuild b/x11-misc/slock/slock-1.3-r3.ebuild
deleted file mode 100644
index 042db78df54d..000000000000
--- a/x11-misc/slock/slock-1.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit fcaps savedconfig toolchain-funcs
-
-DESCRIPTION="simple X screen locker"
-HOMEPAGE="http://tools.suckless.org/slock"
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86 ~x86-fbsd"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
-"
-DEPEND="
- ${RDEPEND}
- x11-proto/randrproto
- x11-proto/xproto
-"
-
-src_prepare() {
- eapply \
- "${FILESDIR}"/${PN}-1.3-warning.patch \
- "${FILESDIR}"/${PN}-1.3-CVE-2016-6866.patch
-
- eapply_user
-
- sed -i \
- -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
- -e '/^CC/d' \
- -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
- config.mk || die
- sed -i \
- -e 's|@${CC}|$(CC)|g' \
- Makefile || die
- if use elibc_FreeBSD; then
- sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
- fi
- restore_config config.h
- tc-export CC
-}
-
-src_compile() { emake slock; }
-
-src_install() {
- dobin slock
- save_config config.h
-}
-
-pkg_postinst() {
- # cap_dac_read_search used to be enough for shadow access
- # but now slock wants to write to /proc/self/oom_score_adj
- # and for that it needs:
- fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
-
- savedconfig_pkg_postinst
-}