[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 131daa1420732d39ac871ae9025e4821257eb636
Author: Sam James gentoo org>
AuthorDate: Sat Jul 8 03:38:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 8 03:38:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131daa14
x11-misc/slock: Stabilize 1.5 arm64, #909805
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
index 48c224ba3286..4893525a9c52 100644
--- a/x11-misc/slock/slock-1.5.ebuild
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ppc64 x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 907ca7794d6b733447fbbb512b2aee3098246224
Author: Sam James gentoo org>
AuthorDate: Fri Jul 7 10:14:22 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 7 10:14:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907ca779
x11-misc/slock: Stabilize 1.5 x86, #909805
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
index b6f333bb946a..48c224ba3286 100644
--- a/x11-misc/slock/slock-1.5.ebuild
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc64 x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 900a8ee74941009ea073b2d9fdfc9baa576a
Author: Sam James gentoo org>
AuthorDate: Fri Jul 7 04:40:07 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 7 04:40:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900a8ee7
x11-misc/slock: Stabilize 1.5 ppc64, #909805
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
index 5e6ede234cef..b6f333bb946a 100644
--- a/x11-misc/slock/slock-1.5.ebuild
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc64 ~x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 3b5772bd9242f97fa4c556b1b013ecab30fe8474
Author: Sam James gentoo org>
AuthorDate: Fri Jul 7 04:40:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 7 04:40:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5772bd
x11-misc/slock: Stabilize 1.5 amd64, #909805
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
index 34bb4c6a6a2b..5e6ede234cef 100644
--- a/x11-misc/slock/slock-1.5.ebuild
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 ~x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 275536f33bafe228c28f5f872e740d9c7d1e87e8
Author: Georgy Yakovlev gentoo org>
AuthorDate: Fri Oct 7 18:57:03 2022 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Fri Oct 7 19:07:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275536f3
x11-misc/slock: add 1.5
Signed-off-by: Georgy Yakovlev gentoo.org>
x11-misc/slock/Manifest | 1 +
x11-misc/slock/slock-1.5.ebuild | 66 +
2 files changed, 67 insertions(+)
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index 9f3c59274d64..4de919f78f4b 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1 +1,2 @@
DIST slock-1.4.tar.gz 6889 BLAKE2B
67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f
SHA512
ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
+DIST slock-1.5.tar.gz 6898 BLAKE2B
f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41
SHA512
2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
new file mode 100644
index ..34bb4c6a6a2b
--- /dev/null
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X display locker"
+HOMEPAGE="https://tools.suckless.org/slock;
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+
+RDEPEND="
+ virtual/libcrypt:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/slock-1.4-fix-link-paths.patch
+)
+
+src_prepare() {
+ default
+
+ 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
+
+ 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_setgid,cap_setuid,cap_sys_resource \
+ /usr/bin/slock
+
+ savedconfig_pkg_postinst
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 00c8c27ef9ca50fae3713b97cfc69c17b4f7ae35
Author: David Seifert gentoo org>
AuthorDate: Sun Jan 2 17:49:10 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 2 17:49:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c8c27e
x11-misc/slock: remove freebsd-libc
Signed-off-by: David Seifert gentoo.org>
x11-misc/slock/slock-1.4-r1.ebuild | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild
b/x11-misc/slock/slock-1.4-r1.ebuild
index 2753a8449711..0f6f4a035658 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,10 +40,6 @@ src_prepare() {
-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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: c68d068caa8b22c1282b691d51421a41caa6dffb
Author: Sam James gentoo org>
AuthorDate: Sat Jul 17 23:17:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 17 23:17:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68d068c
x11-misc/slock: Stabilize 1.4-r1 ppc64, #800212
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild
b/x11-misc/slock/slock-1.4-r1.ebuild
index 5c0b10dd2b8..2753a844971 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ppc64 x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: d0605e1461533f953caa32e21b686efb162698e6
Author: Sam James gentoo org>
AuthorDate: Thu Jul 15 21:41:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 15 21:41:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0605e14
x11-misc/slock: Stabilize 1.4-r1 arm64, #800212
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild
b/x11-misc/slock/slock-1.4-r1.ebuild
index 615682671a0..5c0b10dd2b8 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc64 x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 337f8104a386f9e0b122d3d47a3fe38be3edc668
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sat Jul 3 20:51:22 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sat Jul 3 20:51:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337f8104
x11-misc/slock: keyword 1.4-r1 for ~ppc64
Signed-off-by: Georgy Yakovlev gentoo.org>
x11-misc/slock/slock-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.4-r1.ebuild
b/x11-misc/slock/slock-1.4-r1.ebuild
index 616eee7abe4..615682671a0 100644
--- a/x11-misc/slock/slock-1.4-r1.ebuild
+++ b/x11-misc/slock/slock-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc64 x86"
RDEPEND="
virtual/libcrypt:=
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: aa1a5b8b907101883a7b607c8ad0fe544c426286 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 3 21:48:52 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Nov 3 21:54:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1a5b8b x11-misc/slock: update metadata.xml Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> x11-misc/slock/metadata.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml index 814e8b81bc5..efcd58fe0b9 100644 --- a/x11-misc/slock/metadata.xml +++ b/x11-misc/slock/metadata.xml @@ -1,8 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - desktop-m...@gentoo.org - Gentoo Desktop Miscellaneous Project - + + gyakov...@gentoo.org + Georgy Yakovlev +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: c705dc3136535099bcda1d250b2a8ae3e5a4d86d
Author: Sam James gentoo org>
AuthorDate: Fri Jul 10 12:05:57 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 10 12:09:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c705dc31
x11-misc/slock: arm64 keyworded (bug #731290)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
x11-misc/slock/slock-1.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index a8d677de1b6..ac963b394c1 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~arm64 hppa x86"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 1aec95dc619cea8fb634be4081dd63ca9d6f1752
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Aug 31 10:24:33 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Aug 31 10:24:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aec95dc
x11-misc/slock: Whitespace.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
x11-misc/slock/slock-1.4.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 0fca667183c..b6a698a98bc 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -34,10 +34,13 @@ src_prepare() {
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
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 8dcf4462014e858aea7a521e5c52270900e81d60
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Aug 31 09:53:22 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Aug 31 09:53:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dcf4462
x11-misc/slock: Switch to HTTPS.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
x11-misc/slock/slock-1.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 452035f1777..0fca667183c 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -5,8 +5,8 @@ EAPI=6
inherit fcaps savedconfig toolchain-funcs
DESCRIPTION="simple X display locker"
-HOMEPAGE="http://tools.suckless.org/slock;
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
+HOMEPAGE="https://tools.suckless.org/slock;
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: c24a59350fa5db2636ae3051f0df47ecc0f1fcf6
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 14 13:19:20 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 14 13:19:20 2017 +
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..
--- 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..
--- 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..
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 68f4623ce22eccce39e8bc9eaa8309beca97d33d
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 14 13:16:40 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 14 13:16:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f4623c
x11-misc/slock: Stable for HPPA (bug #604336).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
x11-misc/slock/slock-1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 4baf6e6..f445eef 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: b5aa17daea7ead49bc6915af2a62b9c21db47ef7
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Jan 9 13:37:58 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Jan 9 13:38:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5aa17da
x11-misc/slock: Update DESCRIPTION, remove short .
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/slock/metadata.xml | 1 -
x11-misc/slock/slock-1.4.ebuild | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
index ab67c93..807835d 100644
--- a/x11-misc/slock/metadata.xml
+++ b/x11-misc/slock/metadata.xml
@@ -8,5 +8,4 @@
desktop-m...@gentoo.org
Gentoo Desktop Miscellaneous Project
-simple X screen locker
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 29f01fb..4baf6e6 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -5,7 +5,7 @@
EAPI=6
inherit fcaps savedconfig toolchain-funcs
-DESCRIPTION="simple X screen locker"
+DESCRIPTION="simple X display locker"
HOMEPAGE="http://tools.suckless.org/slock;
SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 7bc917eaa5037b66a4185021c80013da6a85937f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jan 4 17:07:21 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jan 4 17:07:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc917ea
x11-misc/slock: x86 stable wrt bug #604336
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/slock/slock-1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index f762b80..29f01fb 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 8aa7f334cc307503f7b647cef2da76035ac7b9fd
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jan 4 16:56:24 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jan 4 16:56:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa7f334
x11-misc/slock: amd64 stable wrt bug #604336
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/slock/slock-1.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 28d167e..f762b80 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: d79d6f3023024ab64f6d2e5548e2d2dfd3d8d880
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Nov 24 22:36:22 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Nov 24 22:36:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79d6f30
x11-misc/slock: Version bump.
Package-Manager: portage-2.3.2
x11-misc/slock/Manifest | 1 +
x11-misc/slock/slock-1.4.ebuild | 61 +
2 files changed, 62 insertions(+)
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
index ad2719c..01a0cb9 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1 +1,2 @@
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/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
new file mode 100644
index ..28d167e
--- /dev/null
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -0,0 +1,61 @@
+# 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() {
+ default
+
+ 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_setgid,cap_setuid,cap_sys_resource \
+ /usr/bin/slock
+
+ savedconfig_pkg_postinst
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: 0eee9ed77ba81cba3bdd28b5862b6557c6f5e65f
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 11 06:07:08 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 11 06:07:08 2016 +
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..
--- 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..
--- 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..
--- 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;
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: d691d6a67addad8c6a117f524667c85f8ce84a2c
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 11 06:06:04 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 11 06:06:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d691d6a6
x11-misc/slock: Stable for x86 (bug #591664).
Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches
x11-misc/slock/slock-1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.3-r3.ebuild
b/x11-misc/slock/slock-1.3-r3.ebuild
index 48c17e8..042db78 100644
--- a/x11-misc/slock/slock-1.3-r3.ebuild
+++ b/x11-misc/slock/slock-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 0acc04d4b532c50e59815922e826e7eab6f16e47
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Sep 10 12:47:21 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Sep 10 12:47:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acc04d4
x11-misc/slock: amd64 stable wrt bug #591664
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/slock/slock-1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.3-r3.ebuild
b/x11-misc/slock/slock-1.3-r3.ebuild
index a60e8b9..48c17e8 100644
--- a/x11-misc/slock/slock-1.3-r3.ebuild
+++ b/x11-misc/slock/slock-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ~x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 3217b3034ff39bdfed8826268d84f2c8bd9d5f1e
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Aug 28 08:51:47 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Aug 28 08:51:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3217b303
x11-misc/slock: Stable for HPPA (bug #591664).
Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches
x11-misc/slock/slock-1.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slock/slock-1.3-r3.ebuild
b/x11-misc/slock/slock-1.3-r3.ebuild
index 5a73ccd..a60e8b9 100644
--- a/x11-misc/slock/slock-1.3-r3.ebuild
+++ b/x11-misc/slock/slock-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: 6dfb6b69f2527547cd08559811ff921e4da4ea0d
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Aug 19 14:46:08 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Aug 19 14:46:36 2016 +
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 000..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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 0b05e42c92a83bb245ad8501f96698b2404e2d72
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Aug 13 08:23:53 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Aug 13 08:23:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b05e42c
x11-misc/slock: Stable for HPPA (bug #590350).
Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches
x11-misc/slock/slock-1.3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slock/slock-1.3-r2.ebuild
b/x11-misc/slock/slock-1.3-r2.ebuild
index de282af..c6a9b51 100644
--- a/x11-misc/slock/slock-1.3-r2.ebuild
+++ b/x11-misc/slock/slock-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: 8ef975064d0e5b18fa39812c0ccdd7f036ac520f
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Apr 16 12:25:50 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Apr 16 12:25:50 2016 +
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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 2017049447be1de395bf59e0154db52899208bdc
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Mar 3 17:21:51 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Mar 3 17:21:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20170494
x11-misc/slock: Depend on x11-libs/libXrandr (bug #576342 by Toralf Förster).
Package-Manager: portage-2.2.27
x11-misc/slock/slock-1.3-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/x11-misc/slock/slock-1.3-r1.ebuild
b/x11-misc/slock/slock-1.3-r1.ebuild
index 0cfb4d8..57c1466 100644
--- a/x11-misc/slock/slock-1.3-r1.ebuild
+++ b/x11-misc/slock/slock-1.3-r1.ebuild
@@ -16,9 +16,11 @@ KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
RDEPEND="
x11-libs/libX11
x11-libs/libXext
+ x11-libs/libXrandr
"
DEPEND="
${RDEPEND}
+ x11-proto/randrproto
x11-proto/xproto
"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: 493288e791574c69448063d5a93ba6c0bd6f5dfd
Author: Jeroen Roovers gentoo org>
AuthorDate: Mon Feb 15 04:44:09 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Mon Feb 15 04:44:40 2016 +
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
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 12971a1c32410e7946638ba6674d87dd4d8aaba7
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Feb 13 20:56:26 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Feb 13 20:57:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12971a1c
x11-misc/slock: Old.
Package-Manager: portage-2.2.27
x11-misc/slock/slock-1.2-r1.ebuild | 59 --
1 file changed, 59 deletions(-)
diff --git a/x11-misc/slock/slock-1.2-r1.ebuild
b/x11-misc/slock/slock-1.2-r1.ebuild
deleted file mode 100644
index 0ec1fc8..000
--- a/x11-misc/slock/slock-1.2-r1.ebuild
+++ /dev/null
@@ -1,59 +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
-
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/files/, x11-misc/slock/
commit: b14e1d9c1c668d2f138872daadfd4c885e277f05
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Feb 13 20:55:40 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Feb 13 20:57:17 2016 +
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 000..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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/slock/
commit: 3b10e2078c19c6cd9b6b1fb1def83a488397d2b1
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Nov 6 04:51:45 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Nov 6 04:51:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b10e207
x11-misc/slock: Add epatch_user (bug #564744 by aj xocite.com).
Package-Manager: portage-2.2.24
x11-misc/slock/slock-1.2-r1.ebuild | 59 ++
1 file changed, 59 insertions(+)
diff --git a/x11-misc/slock/slock-1.2-r1.ebuild
b/x11-misc/slock/slock-1.2-r1.ebuild
new file mode 100644
index 000..0ec1fc8
--- /dev/null
+++ b/x11-misc/slock/slock-1.2-r1.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}"/${P}-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
+}
