1 |
commit: 08f4cce70ead34aa28d28ce72ab4e2daacb26c4f |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 09:26:35 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 09:26:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f4cce7 |
7 |
|
8 |
sys-auth/passwdqc: Drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
sys-auth/passwdqc/Manifest | 1 - |
14 |
sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch | 58 ------------------ |
15 |
sys-auth/passwdqc/metadata.xml | 3 - |
16 |
sys-auth/passwdqc/passwdqc-1.3.0.ebuild | 69 ---------------------- |
17 |
4 files changed, 131 deletions(-) |
18 |
|
19 |
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest |
20 |
index 01a58c4f18a..dba9939c1f2 100644 |
21 |
--- a/sys-auth/passwdqc/Manifest |
22 |
+++ b/sys-auth/passwdqc/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece |
25 |
DIST passwdqc-1.4.0.tar.gz 55219 BLAKE2B 3f96a2d219ee23f11db2ad8ba433eaa56b97a263ad1a49159e0356b779cb4486ec9aa74cd7002fdd6d273e5a7bae4fe1b94e02f60256d331e5afc30d63e81360 SHA512 b9be6632688a1d7d929ec546679a366a67d44e7841e106c7f739a8e0656842866125160c87b04c8e0b3189a3e85eb182aa789196f68925b2f8ec71cd6a479800 |
26 |
|
27 |
diff --git a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch b/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch |
28 |
deleted file mode 100644 |
29 |
index c8adeb89b4a..00000000000 |
30 |
--- a/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch |
31 |
+++ /dev/null |
32 |
@@ -1,58 +0,0 @@ |
33 |
---- a/Makefile |
34 |
-+++ b/Makefile |
35 |
-@@ -20,10 +20,11 @@ |
36 |
- BINMODE = 755 |
37 |
- CONFDIR = /etc |
38 |
- CONFMODE = 644 |
39 |
--SHARED_LIBDIR = /lib |
40 |
-+LIBDIR = lib |
41 |
-+SHARED_LIBDIR = /$(LIBDIR) |
42 |
- SHARED_LIBDIR_SUN = /usr/lib |
43 |
- SHARED_LIBDIR_REL = ../..$(SHARED_LIBDIR) |
44 |
--DEVEL_LIBDIR = /usr/lib |
45 |
-+DEVEL_LIBDIR = /usr/$(LIBDIR) |
46 |
--SECUREDIR = /lib/security |
47 |
-+SECUREDIR = /$(LIBDIR)/security |
48 |
- SECUREDIR_SUN = /usr/lib/security |
49 |
- SECUREDIR_DARWIN = /usr/lib/pam |
50 |
-@@ -48,7 +49,7 @@ |
51 |
- INSTALL_SUN = /usr/ucb/install -c |
52 |
- CFLAGS = -Wall -W -O2 |
53 |
- CFLAGS_lib = $(CFLAGS) -fPIC |
54 |
--CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer |
55 |
-+CFLAGS_bin = $(CFLAGS) |
56 |
- |
57 |
- LDFLAGS = |
58 |
- LDFLAGS_shared = --shared |
59 |
-@@ -93,7 +94,7 @@ |
60 |
- |
61 |
- default: all |
62 |
- |
63 |
--all pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils: |
64 |
-+all lib pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils: |
65 |
- case "`uname -s`" in \ |
66 |
- Linux) $(MAKE) CFLAGS_lib="$(CFLAGS_lib) -DHAVE_SHADOW" \ |
67 |
- LDFLAGS_lib="$(LDFLAGS_lib_LINUX)" \ |
68 |
-@@ -126,18 +127,20 @@ |
69 |
- |
70 |
- all_wrapped: pam_wrapped utils_wrapped |
71 |
- |
72 |
-+lib_wrapped: $(SHARED_LIB) $(DEVEL_LIB) |
73 |
-+ |
74 |
- pam_wrapped: $(SHARED_PAM) |
75 |
- |
76 |
- utils_wrapped: $(BINS) |
77 |
- |
78 |
- $(SHARED_LIB): $(OBJS_LIB) $(MAP_LIB) |
79 |
-- $(LD_lib) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB) |
80 |
-+ $(LD_lib) $(LDFLAGS) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB) |
81 |
- |
82 |
- $(DEVEL_LIB): $(SHARED_LIB) |
83 |
- $(LN_s) $(SHARED_LIB) $(DEVEL_LIB) |
84 |
- |
85 |
- $(SHARED_PAM): $(OBJS_PAM) $(MAP_PAM) $(DEVEL_LIB) |
86 |
-- $(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM) |
87 |
-+ $(LD_lib) $(LDFLAGS) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM) |
88 |
- |
89 |
- pwqgen: $(OBJS_GEN) $(DEVEL_LIB) |
90 |
- $(LD) $(LDFLAGS) $(OBJS_GEN) -L. -lpasswdqc -o $@ |
91 |
|
92 |
diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml |
93 |
index dec6162a1b7..203fa55c746 100644 |
94 |
--- a/sys-auth/passwdqc/metadata.xml |
95 |
+++ b/sys-auth/passwdqc/metadata.xml |
96 |
@@ -5,7 +5,4 @@ |
97 |
<email>zlogene@g.o</email> |
98 |
<name>Mikle Kolyada</name> |
99 |
</maintainer> |
100 |
-<use> |
101 |
- <flag name="utils">Install pwqcheck and pwqgen helper utilities</flag> |
102 |
-</use> |
103 |
</pkgmetadata> |
104 |
|
105 |
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild |
106 |
deleted file mode 100644 |
107 |
index 61f8e548190..00000000000 |
108 |
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild |
109 |
+++ /dev/null |
110 |
@@ -1,69 +0,0 @@ |
111 |
-# Copyright 1999-2020 Gentoo Authors |
112 |
-# Distributed under the terms of the GNU General Public License v2 |
113 |
- |
114 |
-EAPI="5" |
115 |
- |
116 |
-inherit pam eutils toolchain-funcs multilib |
117 |
- |
118 |
-DESCRIPTION="Password strength checking library (and PAM module)" |
119 |
-HOMEPAGE="http://www.openwall.com/passwdqc/" |
120 |
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz" |
121 |
- |
122 |
-LICENSE="Openwall BSD public-domain" |
123 |
-SLOT="0" |
124 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
125 |
-IUSE="pam utils" |
126 |
- |
127 |
-RDEPEND=" |
128 |
- pam? ( |
129 |
- sys-libs/pam |
130 |
- !<sys-auth/pam_passwdqc-1.3.0 |
131 |
- )" |
132 |
-DEPEND="${RDEPEND}" |
133 |
- |
134 |
-src_prepare() { |
135 |
- epatch "${FILESDIR}"/${PN}-1.3.0-build.patch |
136 |
- sed -i \ |
137 |
- -e 's:`uname -s`:Linux:' \ |
138 |
- Makefile || die |
139 |
- # See if the system has a shadow.h. #554504 |
140 |
- echo '#include <shadow.h>' > "${T}"/test.c |
141 |
- if ! $(tc-getCPP) ${CPPFLAGS} "${T}"/test.c >& /dev/null ; then |
142 |
- sed -i -e 's:-DHAVE_SHADOW::' Makefile || die |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
-_emake() { |
147 |
- emake \ |
148 |
- LIBDIR="$(get_libdir)" \ |
149 |
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \ |
150 |
- LDFLAGS="${LDFLAGS}" \ |
151 |
- CC="$(tc-getCC)" \ |
152 |
- LD="$(tc-getCC)" \ |
153 |
- "$@" |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- # The use of wrapped targets defeats the Makefile dep tracking. |
158 |
- # Build all the targets explicitly after the library. |
159 |
- _emake lib |
160 |
- if use pam || use utils ; then |
161 |
- _emake $(usev pam) $(usev utils) |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-src_install() { |
166 |
- _emake \ |
167 |
- DESTDIR="${ED}" \ |
168 |
- install_lib $(usex pam install_pam '') $(usex utils install_utils '') |
169 |
- dodoc README PLATFORMS INTERNALS |
170 |
-} |
171 |
- |
172 |
-pkg_postinst() { |
173 |
- if use pam ; then |
174 |
- elog "To activate pam_passwdqc use pam_passwdqc.so instead" |
175 |
- elog "of pam_cracklib.so in /etc/pam.d/system-auth." |
176 |
- elog "Also, if you want to change the parameters, read up" |
177 |
- elog "on the pam_passwdqc(8) man page." |
178 |
- fi |
179 |
-} |