1 |
commit: f7acc146761f5447aa4655a8a485cc74d1ec6fa4 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 9 17:12:39 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 9 17:12:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7acc146 |
7 |
|
8 |
net-libs/cvm: Fix tests and ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/624384 |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
net-libs/cvm/cvm-0.96-r1.ebuild | 67 +++++++++++++--------- |
15 |
net-libs/cvm/files/cvm-0.96-fix-test-padding.patch | 25 ++++++++ |
16 |
2 files changed, 65 insertions(+), 27 deletions(-) |
17 |
|
18 |
diff --git a/net-libs/cvm/cvm-0.96-r1.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild |
19 |
index c31bc931cc8..e3493f50322 100644 |
20 |
--- a/net-libs/cvm/cvm-0.96-r1.ebuild |
21 |
+++ b/net-libs/cvm/cvm-0.96-r1.ebuild |
22 |
@@ -7,23 +7,31 @@ inherit toolchain-funcs |
23 |
|
24 |
DESCRIPTION="Credential Validation Modules by Bruce Guenter" |
25 |
HOMEPAGE="http://untroubled.org/cvm/" |
26 |
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz" |
27 |
+SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz" |
28 |
|
29 |
LICENSE="GPL-2" |
30 |
SLOT="0" |
31 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
32 |
IUSE="mysql postgres test vpopmail" |
33 |
+RESTRICT="!test? ( test )" |
34 |
|
35 |
-RDEPEND="dev-db/cdb" |
36 |
+RDEPEND=" |
37 |
+ dev-db/cdb:= |
38 |
+ >=dev-libs/bglibs-1.041:=" |
39 |
DEPEND="${RDEPEND} |
40 |
- >=dev-libs/bglibs-1.041 |
41 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
42 |
- postgres? ( dev-db/postgresql[server] ) |
43 |
- vpopmail? ( net-mail/vpopmail ) |
44 |
- test? ( app-editors/vim dev-db/cdb )" |
45 |
-# some of the testcases use ex/vi/xxd and cdbmake |
46 |
- |
47 |
-MAKEOPTS="${MAKEOPTS} -j1" #310843 |
48 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
49 |
+ postgres? ( dev-db/postgresql[server] ) |
50 |
+ vpopmail? ( net-mail/vpopmail ) |
51 |
+ test? ( |
52 |
+ app-editors/vim |
53 |
+ dev-db/sqlite |
54 |
+ )" |
55 |
+# some of the testcases use |
56 |
+# - ex/vi/xxd |
57 |
+# - cdbmake |
58 |
+# - sqlite |
59 |
+ |
60 |
+PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch ) |
61 |
|
62 |
src_prepare() { |
63 |
default |
64 |
@@ -48,45 +56,54 @@ src_prepare() { |
65 |
} |
66 |
|
67 |
src_configure() { |
68 |
- echo "/usr/include/bglibs" > conf-bgincs |
69 |
- echo "/usr/$(get_libdir)/bglibs" > conf-bglibs |
70 |
- echo "/usr/include" > conf-include |
71 |
- echo "/usr/$(get_libdir)" > conf-lib |
72 |
- echo "/usr/bin" > conf-bin |
73 |
- echo "$(tc-getCC) ${CFLAGS}" > conf-cc |
74 |
- echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld |
75 |
+ echo "/usr/include/bglibs" > conf-bgincs || die |
76 |
+ echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die |
77 |
+ echo "/usr/include" > conf-include || die |
78 |
+ echo "/usr/$(get_libdir)" > conf-lib || die |
79 |
+ echo "/usr/bin" > conf-bin || die |
80 |
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die |
81 |
+ echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld || die |
82 |
} |
83 |
|
84 |
src_compile() { |
85 |
- emake |
86 |
+ emake -j1 |
87 |
|
88 |
if use mysql; then |
89 |
einfo "Building MySQL support" |
90 |
- emake mysql |
91 |
+ emake -j1 mysql |
92 |
fi |
93 |
|
94 |
if use postgres; then |
95 |
einfo "Building Postgresql support" |
96 |
- emake pgsql |
97 |
+ emake -j1 pgsql |
98 |
fi |
99 |
|
100 |
if use vpopmail; then |
101 |
einfo "Building vpopmail support" |
102 |
- emake cvm-vchkpw |
103 |
+ emake -j1 cvm-vchkpw |
104 |
fi |
105 |
} |
106 |
|
107 |
+src_test() { |
108 |
+ # bug 624384 |
109 |
+ # the test suite tests stuff that isn't potentially enabled |
110 |
+ emake -j1 sqlite |
111 |
+ sh tests.sh || die "Testing Failed" |
112 |
+} |
113 |
+ |
114 |
src_install() { |
115 |
# Upstreams installer is incredibly broken |
116 |
dolib.a .libs/*.a |
117 |
dolib.so .libs/*.so.* |
118 |
- for i in a so ; do |
119 |
+ |
120 |
+ local i |
121 |
+ for i in a so; do |
122 |
dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i} |
123 |
done |
124 |
|
125 |
for i in {bench,test}client chain checkpassword pwfile qmail unix \ |
126 |
vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \ |
127 |
- ; do |
128 |
+ ; do |
129 |
dobin .libs/cvm-${i} |
130 |
done |
131 |
use mysql && dobin .libs/cvm-mysql{,-local,-udp} |
132 |
@@ -104,7 +121,3 @@ src_install() { |
133 |
docinto html |
134 |
dodoc *.html |
135 |
} |
136 |
- |
137 |
-src_test() { |
138 |
- sh tests.sh || die "Testing Failed" |
139 |
-} |
140 |
|
141 |
diff --git a/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch |
142 |
new file mode 100644 |
143 |
index 00000000000..0db28d59553 |
144 |
--- /dev/null |
145 |
+++ b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch |
146 |
@@ -0,0 +1,25 @@ |
147 |
+The Debian packaging of cvm is maintained using dgit. For the sake |
148 |
+of an efficient workflow, Debian modifications to the upstream |
149 |
+source are squashed into a single diff, rather than a series of |
150 |
+quilt patches. To obtain a patch queue for package version |
151 |
+0.97-0.1: |
152 |
+ |
153 |
+ # apt-get install dgit |
154 |
+ % dgit clone cvm |
155 |
+ % cd foo |
156 |
+ % git log --oneline 0.97-0.1..debian/0.97 -- . ':!debian' |
157 |
+--- a/tests.sh |
158 |
++++ b/tests.sh |
159 |
+@@ -674,9 +674,9 @@ system directory: @TMPDIR@/home |
160 |
+ domain: test.tld |
161 |
+ mailbox path: @TMPDIR@/home/virt |
162 |
+ |
163 |
+-0000000: 020a 0108 0100 2430 2470 6173 7300 2e2f ......\$0\$pass../ |
164 |
+-0000010: 7669 7274 0000 002d 002d 002d 002d 0031 virt...-.-.-.-.1 |
165 |
+-0000020: 3031 3637 3331 3335 3800 2d00 016731358.-. |
166 |
++00000000: 020a 0108 0100 2430 2470 6173 7300 2e2f ......\$0\$pass../ |
167 |
++00000010: 7669 7274 0000 002d 002d 002d 002d 0031 virt...-.-.-.-.1 |
168 |
++00000020: 3031 3637 3331 3335 3800 2d00 016731358.-. |
169 |
+ END_OF_TEST_RESULTS |
170 |
+ |
171 |
+ |