[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/, x11-misc/alock/files/
commit: fe668307e129013f764d655fb4c3416872970de4
Author: Sam James gentoo org>
AuthorDate: Mon May 16 23:13:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon May 16 23:13:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe668307
x11-misc/alock: avoid using which in configure
Closes: https://bugs.gentoo.org/844886
Signed-off-by: Sam James gentoo.org>
x11-misc/alock/alock-1.0.0-r1.ebuild | 3 ++-
x11-misc/alock/files/no-which.patch | 30 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild
b/x11-misc/alock/alock-1.0.0-r1.ebuild
index 33a86aadaf0a..476253fafdaa 100644
--- a/x11-misc/alock/alock-1.0.0-r1.ebuild
+++ b/x11-misc/alock/alock-1.0.0-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
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/tidy-printf.patch
"${FILESDIR}"/fix-aliasing.patch
"${FILESDIR}"/no-xf86misc.patch
+ "${FILESDIR}"/no-which.patch
)
src_configure() {
diff --git a/x11-misc/alock/files/no-which.patch
b/x11-misc/alock/files/no-which.patch
new file mode 100644
index ..1764be32c82d
--- /dev/null
+++ b/x11-misc/alock/files/no-which.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/844886
+--- a/configure
b/configure
+@@ -26,7 +26,7 @@ msg_chkfor() {
+ check_docs() {
+
+ msg_chkfor "asciidoc"
+-if which asciidoc 1> /dev/null 2>&3
++if command -v asciidoc 1> /dev/null 2>&3
+ then
+ echo "ok."
+ echo "#___" >&4
+@@ -40,7 +40,7 @@ check_docs() {
+ check_tools() {
+
+ msg_chkfor "compiler $CC"
+-if which "$CC" 1> /dev/null 2>&3
++if command -v "$CC" 1> /dev/null 2>&3
+ then
+ echo "ok."
+ echo "-" 1>&3
+@@ -56,7 +56,7 @@ check_tools() {
+ check_imlib2() {
+
+ msg_chkfor "imlib2-config"
+-if which imlib2-config 1> /dev/null 2>&3
++if command -v imlib2-config 1> /dev/null 2>&3
+ then
+ echo "ok."
+ cat << EOF > tmp.c
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 3893fe63b83524644a2cc0fc54ee6ebed30d2570 Author: Sam James gentoo org> AuthorDate: Fri Apr 16 08:15:56 2021 + Commit: Sam James gentoo org> CommitDate: Fri Apr 16 11:22:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3893fe63 x11-misc/alock: eutils-- Signed-off-by: Sam James gentoo.org> x11-misc/alock/alock-1.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0.ebuild index 8488326f950..e636eb5415e 100644 --- a/x11-misc/alock/alock-1.0.0.ebuild +++ b/x11-misc/alock/alock-1.0.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs # we need this since there are no tagged releases yet DESCRIPTION="locks the local X display until a password is entered"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 33053f9fc9dc82cf2a7b0a91dc5b3b688556047c
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Oct 12 18:09:15 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Oct 12 18:09:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33053f9f
x11-misc/alock: migrate to sys-libs/pam
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada gentoo.org>
x11-misc/alock/alock-1.0.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
index 92f0dc70f0e..8488326f950 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,7 +21,7 @@ DEPEND="x11-libs/libX11
x11-libs/libXrender
x11-libs/libXcursor
imlib? ( media-libs/imlib2[X] )
- pam? ( virtual/pam )
+ pam? ( sys-libs/pam )
doc? ( app-text/asciidoc )"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: e50d5d8aaabbebf28e5124c464d2964b562f6285
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun May 20 12:22:09 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sun May 20 23:25:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50d5d8a
x11-misc/alock: use HTTPS
x11-misc/alock/alock-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
index a0e77239d2d..92f0dc70f0e 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
# we need this since there are no tagged releases yet
DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="http://darkshed.net/projects/alock
+HOMEPAGE="https://darkshed.net/projects/alock
https://github.com/mgumz/alock;
SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 2cc029d9b4dca006df073864223f767b4a197841
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Apr 20 09:29:42 2018 +
Commit: David Seifert gentoo org>
CommitDate: Fri Apr 20 20:01:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc029d9
x11-misc/alock: epatch->PATCHES=()
Package-Manager: Portage-2.3.28, Repoman-2.3.9
x11-misc/alock/alock-1.0.0.ebuild | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
index cdbbba3dd5b..a0e77239d2d 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,14 +25,13 @@ DEPEND="x11-libs/libX11
doc? ( app-text/asciidoc )"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
- epatch "${FILESDIR}"/check-setuid.patch
- epatch "${FILESDIR}"/tidy-printf.patch
- epatch "${FILESDIR}"/fix-aliasing.patch
- epatch "${FILESDIR}"/no-xf86misc.patch
- eapply_user
-}
+PATCHES=(
+ "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+ "${FILESDIR}"/check-setuid.patch
+ "${FILESDIR}"/tidy-printf.patch
+ "${FILESDIR}"/fix-aliasing.patch
+ "${FILESDIR}"/no-xf86misc.patch
+)
src_configure() {
tc-export CC
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: e972a2bebd226dea8d1359630362eaaca1846150 Author: Daniel Campbell gentoo org> AuthorDate: Tue Dec 12 21:38:48 2017 + Commit: Daniel Campbell gentoo org> CommitDate: Tue Dec 12 21:46:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e972a2be x11-misc/alock: Remove self as maintainer Package-Manager: Portage-2.3.16, Repoman-2.3.6 x11-misc/alock/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml index f51dc2953b6..1a916c1e377 100644 --- a/x11-misc/alock/metadata.xml +++ b/x11-misc/alock/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - z...@gentoo.org - Daniel Campbell - + An extremely simple screen locking utility based on xtrlock. Supports multiple hash-types, shadow passwords, and PAM.
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: a27ed9ec221280d9b05695ef7deb622cb9b5ed51
Author: Daniel Campbell gentoo org>
AuthorDate: Mon Feb 13 07:45:38 2017 +
Commit: Daniel Campbell gentoo org>
CommitDate: Mon Feb 13 08:52:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27ed9ec
x11-misc/alock: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/alock/Manifest | 2 --
x11-misc/alock/alock-94-r1.ebuild | 69 ---
x11-misc/alock/alock-94-r2.ebuild | 76 ---
x11-misc/alock/alock-94.ebuild| 60 ---
4 files changed, 207 deletions(-)
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 36e419eb14..f17999c35e 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,3 +1 @@
DIST alock-1.0.0.tar.gz 71497 SHA256
011a75e612c12947b0428168386e0b4e71610e4c05330239a07ae8c74f6505aa SHA512
7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
WHIRLPOOL
f6931fdbf3b16fe50625dd4c95d6c056ab3b733d416c842ea7db9499ecef8ea39b1f4c6254be0f6d4ba594830bb1979ec5f107d43e7f076df3997d661752
-DIST alock-94.zip 93058 SHA256
7f283b775902b5b3bdebd498e3d295408a0e603c5e1ff4863806d3844e3c70ce SHA512
3f321ebbb5526f6d1f66c7e80d2e0126ca15cb614b8ffd2ebbb824bff8d87a1eb4d8db1b33edb294398c9919d99e9983a2db7555a1330e3cb5307be369ef0e50
WHIRLPOOL
555ee700dbe1b6c376344ee1fe72bfc75c3d135c501a91f42f46e3904fd52eebcdb0f6fc2705abc7e5ed9c748d4a9003d58b419a41ffd9e070965e47ef98109a
-DIST alock-svn-94.tar.bz2 68140 SHA256
37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26 SHA512
91166bf6ca4fa715754048b9ac39367f691dbaef7ac39cbe32a92541a00cb522de9070b35bb70646f53cb7f32f7a8028455a5c7bcb0729c6948a089304a26a64
WHIRLPOOL
5c28a8ca3da7b4d31c9fa4994f1ddda3a11a73ea7719d96238b41651bf80a4be99bd7b5f159264ed0495ebc63d20e220769ffe205afb523b49c2c7bcbfadd932
diff --git a/x11-misc/alock/alock-94-r1.ebuild
b/x11-misc/alock/alock-94-r1.ebuild
deleted file mode 100644
index ceaceb864a..00
--- a/x11-misc/alock/alock-94-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="https://code.google.com/p/alock/
- http://darkshed.net/projects/alock
- https://github.com/mgumz/alock;
-SRC_URI="https://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="imlib pam"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXcursor
- imlib? ( media-libs/imlib2[X] )
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-svn-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
- epatch "${FILESDIR}"/check-setuid.patch
- epatch "${FILESDIR}"/tidy-printf.patch
- epatch "${FILESDIR}"/fix-aliasing.patch
- epatch "${FILESDIR}"/no-xf86misc.patch
-}
-
-src_configure() {
- tc-export CC
-
- econf \
- --prefix=/usr \
- --with-all \
- $(use_with pam) \
- $(use_with imlib imlib2)
-}
-
-src_compile() {
- # xmlto isn't required, so set to 'true' as dummy program
- # alock.1 is suitable for a manpage
- emake XMLTO=true
-}
-
-src_install() {
- dobin src/alock
- doman alock.1
- dodoc {CHANGELOG,README,TODO}.txt
-
- insinto /usr/share/alock/xcursors
- doins contrib/xcursor-*
-
- insinto /usr/share/alock/bitmaps
- doins bitmaps/*
-
- if ! use pam; then
- # Sets suid so alock can correctly work with shadow
- fperms 4755 /usr/bin/alock
- fi
-}
diff --git a/x11-misc/alock/alock-94-r2.ebuild
b/x11-misc/alock/alock-94-r2.ebuild
deleted file mode 100644
index 79bab8367e..00
--- a/x11-misc/alock/alock-94-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-# we need this since there are no tagged releases yet
-COMMIT_ID="fd3ea42bda834a6b6f023291be23eb32f117f1b4"
-DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="http://darkshed.net/projects/alock
- https://github.com/mgumz/alock;
-SRC_URI="https://github.com/mgumz/${PN}/archive/${COMMIT_ID}.zip -> ${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc imlib pam"
-
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXcursor
- imlib? (
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 48399e3267f0bb3b64314c658d8ef7eb72521236
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 12 16:58:05 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 12 17:00:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48399e32
x11-misc/alock: ppc stable wrt bug #604626
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/alock/alock-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
index 8c32a78b34..30d523016d 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="doc imlib pam"
DEPEND="x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 57db4ed5f869730c3092314586e70c3e50f60f0a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Feb 4 15:18:53 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Feb 4 15:21:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57db4ed5
x11-misc/alock: amd64 stable wrt bug #604626
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/alock/alock-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
index b1d6201..817a743 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="doc imlib pam"
DEPEND="x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: 0e4f8f3d09b8bdc6aa10452eaff9d7d930a4767d
Author: Daniel Campbell gentoo org>
AuthorDate: Mon Jan 2 13:18:17 2017 +
Commit: Daniel Campbell gentoo org>
CommitDate: Mon Jan 2 14:06:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4f8f3d
x11-misc/alock: version "bump"
Google Code has shut down and upstream supplied a proper version to
target.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/alock/Manifest | 1 +
x11-misc/alock/alock-1.0.0.ebuild | 73 +++
2 files changed, 74 insertions(+)
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 873c2cd..36e419e 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,2 +1,3 @@
+DIST alock-1.0.0.tar.gz 71497 SHA256
011a75e612c12947b0428168386e0b4e71610e4c05330239a07ae8c74f6505aa SHA512
7f2515410919ef1324019cd8d218650f54537f9fddf1d74bebd255c7572eff9433ded92f2d1f4ee5f352151dd15f4a7f53f7b639f82d4e6f936f831262d508a5
WHIRLPOOL
f6931fdbf3b16fe50625dd4c95d6c056ab3b733d416c842ea7db9499ecef8ea39b1f4c6254be0f6d4ba594830bb1979ec5f107d43e7f076df3997d661752
DIST alock-94.zip 93058 SHA256
7f283b775902b5b3bdebd498e3d295408a0e603c5e1ff4863806d3844e3c70ce SHA512
3f321ebbb5526f6d1f66c7e80d2e0126ca15cb614b8ffd2ebbb824bff8d87a1eb4d8db1b33edb294398c9919d99e9983a2db7555a1330e3cb5307be369ef0e50
WHIRLPOOL
555ee700dbe1b6c376344ee1fe72bfc75c3d135c501a91f42f46e3904fd52eebcdb0f6fc2705abc7e5ed9c748d4a9003d58b419a41ffd9e070965e47ef98109a
DIST alock-svn-94.tar.bz2 68140 SHA256
37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26 SHA512
91166bf6ca4fa715754048b9ac39367f691dbaef7ac39cbe32a92541a00cb522de9070b35bb70646f53cb7f32f7a8028455a5c7bcb0729c6948a089304a26a64
WHIRLPOOL
5c28a8ca3da7b4d31c9fa4994f1ddda3a11a73ea7719d96238b41651bf80a4be99bd7b5f159264ed0495ebc63d20e220769ffe205afb523b49c2c7bcbfadd932
diff --git a/x11-misc/alock/alock-1.0.0.ebuild
b/x11-misc/alock/alock-1.0.0.ebuild
new file mode 100644
index ..b1d6201
--- /dev/null
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+# we need this since there are no tagged releases yet
+DESCRIPTION="locks the local X display until a password is entered"
+HOMEPAGE="http://darkshed.net/projects/alock
+ https://github.com/mgumz/alock;
+SRC_URI="https://github.com/mgumz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc imlib pam"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ x11-libs/libXrender
+ x11-libs/libXcursor
+ imlib? ( media-libs/imlib2[X] )
+ pam? ( virtual/pam )
+ doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+ epatch "${FILESDIR}"/check-setuid.patch
+ epatch "${FILESDIR}"/tidy-printf.patch
+ epatch "${FILESDIR}"/fix-aliasing.patch
+ epatch "${FILESDIR}"/no-xf86misc.patch
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ econf \
+ --prefix=/usr \
+ --with-all \
+ $(use_with pam) \
+ $(use_with imlib imlib2)
+}
+
+src_compile() {
+ # xmlto isn't required, so set to 'true' as dummy program
+ # alock.1 is suitable for a manpage
+ emake XMLTO=true
+}
+
+src_install() {
+ dobin src/alock
+ if use doc; then
+ # We need to generate the manpage...
+ a2x -d manpage -f manpage ./"${PN}".txt || die "a2x conversion
failed."
+ doman alock.1
+ dodoc {CHANGELOG,README,TODO}.txt
+ fi
+
+ insinto /usr/share/alock/xcursors
+ doins contrib/xcursor-*
+
+ insinto /usr/share/alock/bitmaps
+ doins bitmaps/*
+
+ if ! use pam; then
+ # Sets suid so alock can correctly work with shadow
+ fperms 4755 /usr/bin/alock
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: ad73e1df3b214ebb4514f83a44696088d95ba9e5
Author: Daniel Campbell gentoo org>
AuthorDate: Wed Nov 9 12:33:10 2016 +
Commit: Daniel Campbell gentoo org>
CommitDate: Wed Nov 9 13:21:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad73e1df
x11-misc/alock: Remove Google Code upstream
Removed Google Code upstream, added "doc" USE flag, which pulls in
app-text/asciidoc to generate the manpage.
Package-Manager: portage-2.3.2
x11-misc/alock/Manifest | 1 +
x11-misc/alock/alock-94-r2.ebuild | 76 +++
x11-misc/alock/metadata.xml | 4 ++-
3 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index b9775ab..873c2cd 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1 +1,2 @@
+DIST alock-94.zip 93058 SHA256
7f283b775902b5b3bdebd498e3d295408a0e603c5e1ff4863806d3844e3c70ce SHA512
3f321ebbb5526f6d1f66c7e80d2e0126ca15cb614b8ffd2ebbb824bff8d87a1eb4d8db1b33edb294398c9919d99e9983a2db7555a1330e3cb5307be369ef0e50
WHIRLPOOL
555ee700dbe1b6c376344ee1fe72bfc75c3d135c501a91f42f46e3904fd52eebcdb0f6fc2705abc7e5ed9c748d4a9003d58b419a41ffd9e070965e47ef98109a
DIST alock-svn-94.tar.bz2 68140 SHA256
37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26 SHA512
91166bf6ca4fa715754048b9ac39367f691dbaef7ac39cbe32a92541a00cb522de9070b35bb70646f53cb7f32f7a8028455a5c7bcb0729c6948a089304a26a64
WHIRLPOOL
5c28a8ca3da7b4d31c9fa4994f1ddda3a11a73ea7719d96238b41651bf80a4be99bd7b5f159264ed0495ebc63d20e220769ffe205afb523b49c2c7bcbfadd932
diff --git a/x11-misc/alock/alock-94-r2.ebuild
b/x11-misc/alock/alock-94-r2.ebuild
new file mode 100644
index ..79bab83
--- /dev/null
+++ b/x11-misc/alock/alock-94-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+# we need this since there are no tagged releases yet
+COMMIT_ID="fd3ea42bda834a6b6f023291be23eb32f117f1b4"
+DESCRIPTION="locks the local X display until a password is entered"
+HOMEPAGE="http://darkshed.net/projects/alock
+ https://github.com/mgumz/alock;
+SRC_URI="https://github.com/mgumz/${PN}/archive/${COMMIT_ID}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc imlib pam"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ x11-libs/libXrender
+ x11-libs/libXcursor
+ imlib? ( media-libs/imlib2[X] )
+ pam? ( virtual/pam )
+ doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+ epatch "${FILESDIR}"/check-setuid.patch
+ epatch "${FILESDIR}"/tidy-printf.patch
+ epatch "${FILESDIR}"/fix-aliasing.patch
+ epatch "${FILESDIR}"/no-xf86misc.patch
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ econf \
+ --prefix=/usr \
+ --with-all \
+ $(use_with pam) \
+ $(use_with imlib imlib2)
+}
+
+src_compile() {
+ # xmlto isn't required, so set to 'true' as dummy program
+ # alock.1 is suitable for a manpage
+ emake XMLTO=true
+}
+
+src_install() {
+ dobin src/alock
+ if use doc; then
+ # We need to generate the manpage...
+ a2x -d manpage -f manpage ./"${PN}".txt || die "a2x conversion
failed."
+ doman alock.1
+ dodoc {CHANGELOG,README,TODO}.txt
+ fi
+
+ insinto /usr/share/alock/xcursors
+ doins contrib/xcursor-*
+
+ insinto /usr/share/alock/bitmaps
+ doins bitmaps/*
+
+ if ! use pam; then
+ # Sets suid so alock can correctly work with shadow
+ fperms 4755 /usr/bin/alock
+ fi
+}
diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml
index 9488617..f51dc29 100644
--- a/x11-misc/alock/metadata.xml
+++ b/x11-misc/alock/metadata.xml
@@ -14,7 +14,9 @@
ak...@fluxbox.org
Mathias Gumz
- alock
mgumz/alock
+
+ Build and install manpage with
app-text/asciidoc.
+
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/, x11-misc/alock/files/
commit: c174fed67ba441d51f8375b4dbe9ed74e861c547
Author: Daniel Campbell gentoo org>
AuthorDate: Sun Jan 10 09:42:09 2016 +
Commit: Daniel Campbell gentoo org>
CommitDate: Sun Jan 10 09:42:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c174fed6
x11-misc/alock: revbump to 94-r1
* Fix printf issue on compiling
* Remove dependency on libXxf86misc; it's deprecated
* Correct strict-aliasing error
* Correct handling of setuid() return value
Patches will be presented to upstream for review
Package-Manager: portage-2.2.26
x11-misc/alock/alock-94-r1.ebuild | 69 +
x11-misc/alock/files/check-setuid.patch | 31
x11-misc/alock/files/fix-aliasing.patch | 23 ++
x11-misc/alock/files/no-xf86misc.patch | 129
x11-misc/alock/files/tidy-printf.patch | 23 ++
5 files changed, 275 insertions(+)
diff --git a/x11-misc/alock/alock-94-r1.ebuild
b/x11-misc/alock/alock-94-r1.ebuild
new file mode 100644
index 000..ceaceb8
--- /dev/null
+++ b/x11-misc/alock/alock-94-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="locks the local X display until a password is entered"
+HOMEPAGE="https://code.google.com/p/alock/
+ http://darkshed.net/projects/alock
+ https://github.com/mgumz/alock;
+SRC_URI="https://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="imlib pam"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXpm
+ x11-libs/libXrender
+ x11-libs/libXcursor
+ imlib? ( media-libs/imlib2[X] )
+ pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-svn-${PV}
+
+src_prepare() {
+ epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+ epatch "${FILESDIR}"/check-setuid.patch
+ epatch "${FILESDIR}"/tidy-printf.patch
+ epatch "${FILESDIR}"/fix-aliasing.patch
+ epatch "${FILESDIR}"/no-xf86misc.patch
+}
+
+src_configure() {
+ tc-export CC
+
+ econf \
+ --prefix=/usr \
+ --with-all \
+ $(use_with pam) \
+ $(use_with imlib imlib2)
+}
+
+src_compile() {
+ # xmlto isn't required, so set to 'true' as dummy program
+ # alock.1 is suitable for a manpage
+ emake XMLTO=true
+}
+
+src_install() {
+ dobin src/alock
+ doman alock.1
+ dodoc {CHANGELOG,README,TODO}.txt
+
+ insinto /usr/share/alock/xcursors
+ doins contrib/xcursor-*
+
+ insinto /usr/share/alock/bitmaps
+ doins bitmaps/*
+
+ if ! use pam; then
+ # Sets suid so alock can correctly work with shadow
+ fperms 4755 /usr/bin/alock
+ fi
+}
diff --git a/x11-misc/alock/files/check-setuid.patch
b/x11-misc/alock/files/check-setuid.patch
new file mode 100644
index 000..d29beb0
--- /dev/null
+++ b/x11-misc/alock/files/check-setuid.patch
@@ -0,0 +1,31 @@
+--- a/src/auth_pam.c
b/src/auth_pam.c
+@@ -138,7 +138,12 @@
+
+ /* we can be installed setuid root to support shadow passwords,
+and we don't need root privileges any longer. --marekm */
+-setuid(getuid());
++int retval;
++retval = setuid(getuid());
++/* if setuid's return value isn't checked, it's a security issue */
++if (retval != 0) {
++return 0;
++}
+
+ return 1;
+ }
+--- a/src/auth_passwd.c
a/src/auth_passwd.c
+@@ -68,7 +68,11 @@
+
+ /* we can be installed setuid root to support shadow passwords,
+and we don't need root privileges any longer. --marekm */
+-setuid(getuid());
++int retval;
++retval = setuid(getuid());
++if (retval != 0) {
++return 0;
++}
+
+ if (strlen(pwd_entry->pw_passwd) < 13) {
+ perror("password entry has no pwd\n");
diff --git a/x11-misc/alock/files/fix-aliasing.patch
b/x11-misc/alock/files/fix-aliasing.patch
new file mode 100644
index 000..a4462c2
--- /dev/null
+++ b/x11-misc/alock/files/fix-aliasing.patch
@@ -0,0 +1,23 @@
+--- a/src/auth_sha2.c
b/src/auth_sha2.c
+@@ -511,7 +517,8 @@
+ *context->buffer = 0x80;
+ }
+ /* Set the bit count: */
+-*(u_int64_t *)>buffer[SHA256_SHORT_BLOCK_LENGTH] =
context->bitcount;
++/* Use memcpy so we're not casting or aliasing */
++memcpy(>buffer[SHA256_SHORT_BLOCK_LENGTH],
>bitcount, sizeof (context->bitcount));
+
+ /* Final transform: */
+ sha256_transform(context, context->buffer);
+@@ -789,8 +796,8 @@
+ *context->buffer = 0x80;
+ }
+ /* Store the length of input data (in bits): */
+-*(u_int64_t *)>buffer[SHA512_SHORT_BLOCK_LENGTH] =
context->bitcount[1];
+-*(u_int64_t *)>buffer[SHA512_SHORT_BLOCK_LENGTH+8] =
context->bitcount[0];
++
[gentoo-commits] repo/gentoo:master commit in: x11-misc/alock/
commit: d31310c3f0cd8af9ddaa6dd02a6999e26a3caa7c Author: Daniel Campbell gentoo org> AuthorDate: Sun Jan 10 09:32:54 2016 + Commit: Daniel Campbell gentoo org> CommitDate: Sun Jan 10 09:42:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31310c3 x11-misc/alock: Take ownership of package Added better upstream information as well Package-Manager: portage-2.2.26 x11-misc/alock/metadata.xml | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml index 884db11..0f48bcd 100644 --- a/x11-misc/alock/metadata.xml +++ b/x11-misc/alock/metadata.xml @@ -1,8 +1,20 @@ http://www.gentoo.org/dtd/metadata.dtd;> - desktop-misc + + z...@gentoo.org + Daniel Campbell + + + An extremely simple screen locking utility based on xtrlock. Supports + multiple hash-types, shadow passwords, and PAM. + + + ak...@fluxbox.org + Mathias Gumz + alock + mgumz/alock
