1 |
commit: aa72164a2295449bbe4728884441a79d21aa975d |
2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 30 15:16:32 2020 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 15:21:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa72164a |
7 |
|
8 |
app-admin/apg: version bump |
9 |
|
10 |
- switch to new upstream |
11 |
- update to the latest git head |
12 |
- port cracklib support to the new build system |
13 |
|
14 |
Closes: https://bugs.gentoo.org/629272 |
15 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
16 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
17 |
|
18 |
app-admin/apg/Manifest | 1 + |
19 |
app-admin/apg/apg-2.3.0b_p20150129.ebuild | 43 ++++++++++++++++++++ |
20 |
.../apg/files/apg-2.3.0b_p20150129-cracklib.patch | 47 ++++++++++++++++++++++ |
21 |
app-admin/apg/metadata.xml | 10 ++++- |
22 |
4 files changed, 99 insertions(+), 2 deletions(-) |
23 |
|
24 |
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest |
25 |
index ea6ed5bf852..64074f5c0ab 100644 |
26 |
--- a/app-admin/apg/Manifest |
27 |
+++ b/app-admin/apg/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a |
30 |
+DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8 |
31 |
|
32 |
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..0d351d723be |
35 |
--- /dev/null |
36 |
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild |
37 |
@@ -0,0 +1,43 @@ |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+ |
43 |
+inherit autotools |
44 |
+ |
45 |
+BASEVER=$(ver_cut 1-4) |
46 |
+ |
47 |
+DESCRIPTION="Another Password Generator" |
48 |
+HOMEPAGE="https://github.com/wilx/apg" |
49 |
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz" |
50 |
+ |
51 |
+LICENSE="BSD" |
52 |
+SLOT="0" |
53 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
54 |
+IUSE="cracklib" |
55 |
+ |
56 |
+DEPEND="cracklib? ( sys-libs/cracklib )" |
57 |
+RDEPEND="${DEPEND}" |
58 |
+ |
59 |
+PATCHES=( |
60 |
+ "${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch" |
61 |
+ "${FILESDIR}/${P}-cracklib.patch" |
62 |
+) |
63 |
+ |
64 |
+DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt ) |
65 |
+ |
66 |
+S="${WORKDIR}/${PN}" |
67 |
+ |
68 |
+src_prepare() { |
69 |
+ default |
70 |
+ eautoreconf |
71 |
+} |
72 |
+ |
73 |
+src_configure() { |
74 |
+ econf $(use_with cracklib) |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ default |
79 |
+ doman doc/man/apg* |
80 |
+} |
81 |
|
82 |
diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch |
83 |
new file mode 100644 |
84 |
index 00000000000..b019f565e15 |
85 |
--- /dev/null |
86 |
+++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch |
87 |
@@ -0,0 +1,47 @@ |
88 |
+commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92 |
89 |
+Author: Andrew Savchenko <bircoph@g.o> |
90 |
+Date: Wed Sep 30 17:12:18 2020 +0300 |
91 |
+ |
92 |
+ add cracklib support to the new build system |
93 |
+ |
94 |
+diff --git a/Makefile.am b/Makefile.am |
95 |
+index 42068bf..3871295 100644 |
96 |
+--- a/Makefile.am |
97 |
++++ b/Makefile.am |
98 |
+@@ -19,9 +19,15 @@ common_apg_sources = \ |
99 |
+ convert.c |
100 |
+ |
101 |
+ apg_SOURCES = $(common_apg_sources) |
102 |
++if HAVE_CRACKLIB |
103 |
++apg_LDFLAGS = -lcrack |
104 |
++apg_CPPFLAGS = -DAPG_USE_CRACKLIB -DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\" |
105 |
++endif |
106 |
+ |
107 |
+ apgd_SOURCES = $(common_apg_sources) |
108 |
+ apgd_CPPFLAGS = -DCLISERV |
109 |
++apgd_CPPFLAGS += $(apg_CPPFLAGS) |
110 |
++apgd_LDFLAGS = $(apg_LDFLAGS) |
111 |
+ |
112 |
+ apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c |
113 |
+ apgbfm_CPPFLAGS = -DAPGBFM |
114 |
+diff --git a/configure.ac b/configure.ac |
115 |
+index d8fd056..75483d1 100644 |
116 |
+--- a/configure.ac |
117 |
++++ b/configure.ac |
118 |
+@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix]) |
119 |
+ AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror]) |
120 |
+ AC_CHECK_FUNCS([crypt]) |
121 |
+ |
122 |
++AC_ARG_WITH([cracklib], |
123 |
++ AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password checking [default=no]])) |
124 |
++AS_IF([test "x$with_cracklib" = "xyes"],[ |
125 |
++ AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1], |
126 |
++ AC_MSG_ERROR([cracklib requested but not found])) |
127 |
++]) |
128 |
++ |
129 |
+ LT_PREREQ([2.4.2]) |
130 |
+ LT_INIT([win32-dll disable-static pic-only]) |
131 |
+ |
132 |
++AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"]) |
133 |
+ AC_CONFIG_FILES([Makefile]) |
134 |
+ AC_OUTPUT |
135 |
|
136 |
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml |
137 |
index 585b0dc75dd..039bfee611a 100644 |
138 |
--- a/app-admin/apg/metadata.xml |
139 |
+++ b/app-admin/apg/metadata.xml |
140 |
@@ -1,5 +1,11 @@ |
141 |
<?xml version="1.0" encoding="UTF-8"?> |
142 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
143 |
<pkgmetadata> |
144 |
- <!-- maintainer-needed --> |
145 |
- </pkgmetadata> |
146 |
+ <maintainer type="person"> |
147 |
+ <email>bircoph@g.o</email> |
148 |
+ <name>Andrew Savchenko</name> |
149 |
+ </maintainer> |
150 |
+ <upstream> |
151 |
+ <remote-id type="github">wilx/apg</remote-id> |
152 |
+ </upstream> |
153 |
+</pkgmetadata> |