* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2016-02-13 20:57 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-02-13 20:57 UTC (permalink / raw
To: gentoo-commits
commit: b14e1d9c1c668d2f138872daadfd4c885e277f05
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 20:55:40 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:57:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14e1d9c
x11-misc/slock: Version bump.
Package-Manager: portage-2.2.27
x11-misc/slock/Manifest | 1 +
x11-misc/slock/files/slock-1.3-dontdieonme.patch | 10 ++++
x11-misc/slock/slock-1.3.ebuild | 59 ++++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 3d81cb7..077a64b 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1 +1,2 @@
DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
+DIST slock-1.3.tar.gz 5943 SHA256 bab4a3aea4046aa0fd0361c3649b79b90ca531bc5dfae3c4a6c0fe436152bd18 SHA512 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f WHIRLPOOL 0f5d89117ad6a51f4d409f0e00b6cc114bf19e36265d8a476420fee688b224c0e9fe688d961537fbd7794c8f13df51629f7396a7e2fbc16e7b85b877b151959c
diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
new file mode 100644
index 0000000..dd08ba7
--- /dev/null
+++ b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
@@ -0,0 +1,10 @@
+--- a/slock.c
++++ b/slock.c
+@@ -55,7 +55,6 @@
+ va_start(ap, errstr);
+ vfprintf(stderr, errstr, ap);
+ va_end(ap);
+- exit(1);
+ }
+
+ #ifdef __linux__
diff --git a/x11-misc/slock/slock-1.3.ebuild b/x11-misc/slock/slock-1.3.ebuild
new file mode 100644
index 0000000..0cfb4d8
--- /dev/null
+++ b/x11-misc/slock/slock-1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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
+"
+DEPEND="
+ ${RDEPEND}
+ x11-proto/xproto
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.3-dontdieonme.patch
+
+ epatch_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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2016-02-15 4:44 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-02-15 4:44 UTC (permalink / raw
To: gentoo-commits
commit: 493288e791574c69448063d5a93ba6c0bd6f5dfd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 04:44:09 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 04:44:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493288e7
x11-misc/slock: Turn the correct die() into a warning.
Package-Manager: portage-2.2.27
x11-misc/slock/files/slock-1.3-dontdieonme.patch | 13 +++++++------
x11-misc/slock/{slock-1.3.ebuild => slock-1.3-r1.ebuild} | 0
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
index dd08ba7..bda110a 100644
--- a/x11-misc/slock/files/slock-1.3-dontdieonme.patch
+++ b/x11-misc/slock/files/slock-1.3-dontdieonme.patch
@@ -1,10 +1,11 @@
--- a/slock.c
+++ b/slock.c
-@@ -55,7 +55,6 @@
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
-- exit(1);
+@@ -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 (make sure to suid or sgid slock)\n");
}
+ #endif
- #ifdef __linux__
diff --git a/x11-misc/slock/slock-1.3.ebuild b/x11-misc/slock/slock-1.3-r1.ebuild
similarity index 100%
rename from x11-misc/slock/slock-1.3.ebuild
rename to x11-misc/slock/slock-1.3-r1.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2016-04-16 12:26 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-04-16 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 8ef975064d0e5b18fa39812c0ccdd7f036ac520f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 12:25:50 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 12:25:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef97506
x11-misc/slock: Remove suid/sgid advice by Markus Teich
.../files/{slock-1.3-dontdieonme.patch => slock-1.3-warning.patch} | 3 +--
x11-misc/slock/{slock-1.3-r1.ebuild => slock-1.3-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/x11-misc/slock/files/slock-1.3-dontdieonme.patch b/x11-misc/slock/files/slock-1.3-warning.patch
similarity index 85%
rename from x11-misc/slock/files/slock-1.3-dontdieonme.patch
rename to x11-misc/slock/files/slock-1.3-warning.patch
index bda110a..df2ce5a 100644
--- a/x11-misc/slock/files/slock-1.3-dontdieonme.patch
+++ b/x11-misc/slock/files/slock-1.3-warning.patch
@@ -5,7 +5,6 @@
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 (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-r1.ebuild b/x11-misc/slock/slock-1.3-r2.ebuild
similarity index 95%
rename from x11-misc/slock/slock-1.3-r1.ebuild
rename to x11-misc/slock/slock-1.3-r2.ebuild
index 57c1466..de282af 100644
--- a/x11-misc/slock/slock-1.3-r1.ebuild
+++ b/x11-misc/slock/slock-1.3-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3-dontdieonme.patch
+ epatch "${FILESDIR}"/${PN}-1.3-warning.patch
epatch_user
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2016-08-19 14:46 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-08-19 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 6dfb6b69f2527547cd08559811ff921e4da4ea0d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 14:46:08 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 14:46:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfb6b69
x11-misc/slock: Apply patch for CVE-2016-6866 (bug #591664).
Package-Manager: portage-2.3.0
x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch | 11 ++++
x11-misc/slock/slock-1.3-r3.ebuild | 63 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
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
new file mode 100644
index 0000000..a5043b9
--- /dev/null
+++ b/x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch
@@ -0,0 +1,11 @@
+--- 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/slock-1.3-r3.ebuild b/x11-misc/slock/slock-1.3-r3.ebuild
new file mode 100644
index 0000000..5a73ccd
--- /dev/null
+++ b/x11-misc/slock/slock-1.3-r3.ebuild
@@ -0,0 +1,63 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2016-09-11 6:07 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-09-11 6:07 UTC (permalink / raw
To: gentoo-commits
commit: 0eee9ed77ba81cba3bdd28b5862b6557c6f5e65f
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 06:07:08 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 06:07:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eee9ed7
x11-misc/slock: Old.
Package-Manager: portage-2.3.0
x11-misc/slock/Manifest | 1 -
x11-misc/slock/files/slock-1.2-dontdieonme.patch | 11 -----
x11-misc/slock/slock-1.2.ebuild | 57 ----------------------
x11-misc/slock/slock-1.3-r2.ebuild | 61 ------------------------
4 files changed, 130 deletions(-)
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 077a64b..ad2719c 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1,2 +1 @@
-DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
DIST slock-1.3.tar.gz 5943 SHA256 bab4a3aea4046aa0fd0361c3649b79b90ca531bc5dfae3c4a6c0fe436152bd18 SHA512 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f WHIRLPOOL 0f5d89117ad6a51f4d409f0e00b6cc114bf19e36265d8a476420fee688b224c0e9fe688d961537fbd7794c8f13df51629f7396a7e2fbc16e7b85b877b151959c
diff --git a/x11-misc/slock/files/slock-1.2-dontdieonme.patch b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
deleted file mode 100644
index e4d1b46..00000000
--- a/x11-misc/slock/files/slock-1.2-dontdieonme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/slock.c
-+++ b/slock.c
-@@ -57,7 +57,7 @@
- if (fd < 0 && errno == ENOENT)
- return;
- if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
-- die("cannot disable the out-of-memory killer for this process\n");
-+ fprintf(stderr, "cannot disable the out-of-memory killer for this process\n");
- }
- #endif
-
diff --git a/x11-misc/slock/slock-1.2.ebuild b/x11-misc/slock/slock-1.2.ebuild
deleted file mode 100644
index ae04a40..00000000
--- a/x11-misc/slock/slock-1.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils 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
-"
-DEPEND="
- ${RDEPEND}
- x11-proto/xproto
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-dontdieonme.patch
-
- 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
-}
diff --git a/x11-misc/slock/slock-1.3-r2.ebuild b/x11-misc/slock/slock-1.3-r2.ebuild
deleted file mode 100644
index c6a9b51..00000000
--- a/x11-misc/slock/slock-1.3-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils 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() {
- epatch "${FILESDIR}"/${PN}-1.3-warning.patch
-
- epatch_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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
@ 2017-01-14 13:19 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2017-01-14 13:19 UTC (permalink / raw
To: gentoo-commits
commit: c24a59350fa5db2636ae3051f0df47ecc0f1fcf6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 13:19:20 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 13:19:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24a5935
x11-misc/slock: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/slock/Manifest | 1 -
x11-misc/slock/files/slock-1.3-CVE-2016-6866.patch | 11 ----
x11-misc/slock/files/slock-1.3-warning.patch | 10 ----
x11-misc/slock/slock-1.3-r3.ebuild | 63 ----------------------
4 files changed, 85 deletions(-)
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 01a0cb9..8f595b2 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 a5043b9..00000000
--- 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 df2ce5a..00000000
--- 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 042db78..00000000
--- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-14 13:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-19 14:46 [gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-01-14 13:19 Jeroen Roovers
2016-09-11 6:07 Jeroen Roovers
2016-04-16 12:26 Jeroen Roovers
2016-02-15 4:44 Jeroen Roovers
2016-02-13 20:57 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox