1 |
commit: fb97be03efd9702270e34c75b759282174c6fac1 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 2 16:23:42 2014 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 2 16:23:42 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=fb97be03 |
7 |
|
8 |
added net-mail/automx test version |
9 |
|
10 |
--- |
11 |
net-mail/automx/ChangeLog | 51 +++++++++++++++++ |
12 |
net-mail/automx/Manifest | 5 ++ |
13 |
net-mail/automx/automx-0.10.1_pre1.ebuild | 66 ++++++++++++++++++++++ |
14 |
.../automx/files/automx-memcache-optional.patch | 45 +++++++++++++++ |
15 |
net-mail/automx/metadata.xml | 13 +++++ |
16 |
5 files changed, 180 insertions(+) |
17 |
|
18 |
diff --git a/net-mail/automx/ChangeLog b/net-mail/automx/ChangeLog |
19 |
new file mode 100644 |
20 |
index 0000000..807c916 |
21 |
--- /dev/null |
22 |
+++ b/net-mail/automx/ChangeLog |
23 |
@@ -0,0 +1,51 @@ |
24 |
+# ChangeLog for net-mail/automx |
25 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
26 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/ChangeLog,v 1.9 2013/12/28 11:21:49 mschiff Exp $ |
27 |
+ |
28 |
+*automx-0.10.0 (28 Dec 2013) |
29 |
+ |
30 |
+ 28 Dec 2013; Marc Schiffbauer <mschiff@g.o> +automx-0.10.0.ebuild: |
31 |
+ Bump version. Closes #494652. Thanks to Andreis Vinogradovs. |
32 |
+ |
33 |
+*automx-0.9.2 (30 Mar 2013) |
34 |
+ |
35 |
+ 30 Mar 2013; Marc Schiffbauer <mschiff@g.o> +automx-0.9.2.ebuild, |
36 |
+ metadata.xml: |
37 |
+ Version bump. |
38 |
+ |
39 |
+ 24 Mar 2013; Vicente Olivert Riera <vincent@g.o> automx-0.8-r1.ebuild: |
40 |
+ amd64 and x86 stable wrt bug #462812 |
41 |
+ |
42 |
+*automx-0.8-r1 (02 Jan 2013) |
43 |
+ |
44 |
+ 02 Jan 2013; Marc Schiffbauer <mschiff@g.o> -automx-0.8.ebuild, |
45 |
+ +automx-0.8-r1.ebuild: |
46 |
+ Fix bug #449702 - thanks to Marcin Mirosław. Bump revision. Remove old |
47 |
+ ebuild. |
48 |
+ |
49 |
+*automx-0.8 (28 Mar 2012) |
50 |
+ |
51 |
+ 28 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_rc2.ebuild, |
52 |
+ +automx-0.8.ebuild: |
53 |
+ Bump version. Remove old version. |
54 |
+ |
55 |
+*automx-0.8_rc2 (23 Mar 2012) |
56 |
+ |
57 |
+ 23 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_rc1.ebuild, |
58 |
+ +automx-0.8_rc2.ebuild: |
59 |
+ Bump version. Remove old version. Added sql USE flag. |
60 |
+ |
61 |
+*automx-0.8_rc1 (15 Mar 2012) |
62 |
+ |
63 |
+ 15 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_beta1.ebuild, |
64 |
+ +automx-0.8_rc1.ebuild: |
65 |
+ Version bump. Drop old version. |
66 |
+ |
67 |
+ 28 Feb 2012; Marc Schiffbauer <mschiff@g.o> automx-0.8_beta1.ebuild: |
68 |
+ Always install INSTALL file. |
69 |
+ |
70 |
+*automx-0.8_beta1 (28 Feb 2012) |
71 |
+ |
72 |
+ 28 Feb 2012; Marc Schiffbauer <mschiff@g.o> +automx-0.8_beta1.ebuild, |
73 |
+ +metadata.xml: |
74 |
+ New ebuild for automx. |
75 |
|
76 |
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest |
77 |
new file mode 100644 |
78 |
index 0000000..268f3f5 |
79 |
--- /dev/null |
80 |
+++ b/net-mail/automx/Manifest |
81 |
@@ -0,0 +1,5 @@ |
82 |
+AUX automx-memcache-optional.patch 1290 SHA256 baef74496e5760a0d27f64f4d632b3ea31fb6ec091ec49ac14915abd1aa85ca6 SHA512 d1e09fd54a28165eef7e65e73264e07ffe21988e47a07588946fa358abb3aace6b328c2f872d027c2533c770272a4be68c5766392deb693c01c2988a2866d1d0 WHIRLPOOL 7285d3a80410c7da9ad4d9c73d17d94a3f6404b4d4b8794f10ba6ac5b45c9adcab0b1c6c53d4dd58826aed3784c1df750e1b72cab5245dbd94912219bacabc8f |
83 |
+DIST automx-0.10.0.tgz 410218 SHA256 4a367dc1d96ddc3dd01765854bbd76ac5cd4463e0abadb442d8c6c8155f325d7 SHA512 187540b4a2379968dcb5f2ef3d0f632add36f113a5ed04f6ff0d3785fec98f42af141875d45164b4a017637b2e4b1480fe2c602db2947fcb12aa85cc5787c990 WHIRLPOOL d005da5eb382bba5bece03f21d951b9025cf4015eb0a0f4920d1566ec266fd26a3cbd34aadf2c2761ce199e42afb84bb8c41690cd5c944643ee59de53b6591e8 |
84 |
+EBUILD automx-0.10.1_pre1.ebuild 1555 SHA256 a92864a675aec3cc8b8b19279206b622b0ffb6a9e7dd5fb012638a52c8e55ac8 SHA512 dd01f8f3dc6384182c2cf51649be49687c75528be68fc2a96ce664110e31d5d27fe8b2494df45cdc4092b6cffb0d892711cd9f145572fd92db402e8e674fee69 WHIRLPOOL 3e0c94380c94a64862063205f1ebec4e0750016038d17de2222de8e2f7ff6a47763cab564680dadb33cbbc9e593349513b01b178fa497c4c68c3c50baa195655 |
85 |
+MISC ChangeLog 1633 SHA256 cb990b2400cf1bd0870a8c3d2d077711f0d65b50fbea099fbe2cff5394a3150d SHA512 b4c0f99a99decb90dd8a988d672c7991ba10bba9aecd96d7796f80a133407c905fbfc55d585cb94949c38d1feba3c1345c7b32188c437a27944cccf6f119371d WHIRLPOOL b21c0174d29a54c5c9da3048350d2e5c237602da781f5624e428a7725f08e4f6504886a2508096f9f8de1f816045787b93b358e8c4ed19d771702482dfc6ce7a |
86 |
+MISC metadata.xml 430 SHA256 c4230b47da093af67c2a2b2b32d9bd62abcaab5bbf37605e4f50ffa675a9c802 SHA512 f285e73eb372cb504e57d648d506db0254cbfdca1ad0488e94defaff489ffdf9fa5618b2dd856944d2928d993870a6c0c8eb622185897fd2bd4592d53cf2d111 WHIRLPOOL efe246064245388ab1e81b7954631e771adaa30866ec98d997c5e8daacdf59111667578c8744eca727aaf4092c478bef8143ea3ddf160cda954eb91cbdd453c0 |
87 |
|
88 |
diff --git a/net-mail/automx/automx-0.10.1_pre1.ebuild b/net-mail/automx/automx-0.10.1_pre1.ebuild |
89 |
new file mode 100644 |
90 |
index 0000000..0463ec1 |
91 |
--- /dev/null |
92 |
+++ b/net-mail/automx/automx-0.10.1_pre1.ebuild |
93 |
@@ -0,0 +1,66 @@ |
94 |
+# Copyright 1999-2013 Gentoo Foundation |
95 |
+# Distributed under the terms of the GNU General Public License v2 |
96 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.10.0.ebuild,v 1.1 2013/12/28 11:21:49 mschiff Exp $ |
97 |
+ |
98 |
+EAPI=5 |
99 |
+ |
100 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
101 |
+ |
102 |
+inherit eutils distutils-r1 |
103 |
+ |
104 |
+DESCRIPTION="A mail user agent auto configuration service" |
105 |
+HOMEPAGE="http://www.automx.org" |
106 |
+SRC_URI="https://github.com/sys4/${PN}/archive/v0.10.0.tar.gz -> automx-0.10.0.tgz" |
107 |
+ |
108 |
+LICENSE="GPL-3" |
109 |
+SLOT="0" |
110 |
+KEYWORDS="~amd64 ~x86" |
111 |
+IUSE="ldap memcached sql +tools" |
112 |
+ |
113 |
+DEPEND="${PYTHON_DEPS}" |
114 |
+RDEPEND=" |
115 |
+ ${DEPEND} |
116 |
+ dev-python/ipaddr[${PYTHON_USEDEP}] |
117 |
+ dev-python/lxml[${PYTHON_USEDEP}] |
118 |
+ dev-python/python-dateutil[${PYTHON_USEDEP}] |
119 |
+ || ( www-apache/mod_wsgi www-servers/uwsgi ) |
120 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
121 |
+ memcached? ( dev-python/python-memcached ) |
122 |
+ sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] ) |
123 |
+ tools? ( net-dns/bind-tools net-misc/wget ) |
124 |
+ " |
125 |
+ |
126 |
+PATCHES=( "$FILESDIR/automx-memcache-optional.patch" ) |
127 |
+S="${WORKDIR}/${PN}-0.10.0" |
128 |
+ |
129 |
+#src_prepare() { |
130 |
+# epatch |
131 |
+# sed -i '/py_modules=/d' setup.py |
132 |
+#} |
133 |
+ |
134 |
+src_install() { |
135 |
+ distutils-r1_src_install |
136 |
+ |
137 |
+ dodoc INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README |
138 |
+ dohtml -r doc/html/* |
139 |
+ |
140 |
+ docinto examples |
141 |
+ dodoc src/conf/*example* |
142 |
+ |
143 |
+ doman doc/man/man5/* |
144 |
+ |
145 |
+ if use tools; then |
146 |
+ exeinto /usr/bin |
147 |
+ doexe src/automx-test |
148 |
+ doman doc/man/man1/automx-test.1 |
149 |
+ fi |
150 |
+ |
151 |
+ exeinto /usr/lib/${PN} |
152 |
+ doexe src/automx_wsgi.py |
153 |
+} |
154 |
+ |
155 |
+pkg_postinst() { |
156 |
+ einfo |
157 |
+ einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions" |
158 |
+ einfo |
159 |
+} |
160 |
|
161 |
diff --git a/net-mail/automx/files/automx-memcache-optional.patch b/net-mail/automx/files/automx-memcache-optional.patch |
162 |
new file mode 100644 |
163 |
index 0000000..a290030 |
164 |
--- /dev/null |
165 |
+++ b/net-mail/automx/files/automx-memcache-optional.patch |
166 |
@@ -0,0 +1,45 @@ |
167 |
+diff --git a/src/automx/config.py b/src/automx/config.py |
168 |
+index 48a8e16..a79fb34 100644 |
169 |
+--- a/src/automx/config.py |
170 |
++++ b/src/automx/config.py |
171 |
+@@ -27,9 +27,14 @@ import subprocess |
172 |
+ import shlex |
173 |
+ import StringIO |
174 |
+ import re |
175 |
+-import memcache |
176 |
+ import logging |
177 |
+ |
178 |
++try: |
179 |
++ import memcache |
180 |
++ use_memcache = True |
181 |
++except ImportError: |
182 |
++ use_memcache = False |
183 |
++ |
184 |
+ from ConfigParser import NoOptionError, NoSectionError |
185 |
+ from ipaddr import IPAddress, IPNetwork |
186 |
+ from dateutil import parser |
187 |
+@@ -849,7 +854,7 @@ class Memcache(object): |
188 |
+ return self.__current |
189 |
+ |
190 |
+ def set_client(self): |
191 |
+- if not self.__has_memcache: |
192 |
++ if not self.__has_memcache or use_memcache is False: |
193 |
+ return |
194 |
+ |
195 |
+ if self.__is_trusted_network(): |
196 |
+@@ -870,7 +875,7 @@ class Memcache(object): |
197 |
+ self.__mc.set(self.__client, self.__current, time=ttl) |
198 |
+ |
199 |
+ def allow_client(self): |
200 |
+- if not self.__has_memcache: |
201 |
++ if not self.__has_memcache or use_memcache is False: |
202 |
+ return True |
203 |
+ |
204 |
+ self.__client = self.__environ["REMOTE_ADDR"] |
205 |
+@@ -914,4 +919,4 @@ class Memcache(object): |
206 |
+ |
207 |
+ return False |
208 |
+ |
209 |
+-# vim: expandtab ts=4 sw=4 |
210 |
+\ No newline at end of file |
211 |
++# vim: expandtab ts=4 sw=4 |
212 |
|
213 |
diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml |
214 |
new file mode 100644 |
215 |
index 0000000..6b795b8 |
216 |
--- /dev/null |
217 |
+++ b/net-mail/automx/metadata.xml |
218 |
@@ -0,0 +1,13 @@ |
219 |
+<?xml version="1.0" encoding="UTF-8"?> |
220 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
221 |
+<pkgmetadata> |
222 |
+ <maintainer> |
223 |
+ <email>mschiff@g.o</email> |
224 |
+ <name>Marc Schiffbauer</name> |
225 |
+ </maintainer> |
226 |
+ <use> |
227 |
+ <flag name="memcached">Enable memcached support</flag> |
228 |
+ <flag name="sql">Enable support for SQL backends</flag> |
229 |
+ <flag name="tools">Install additional automx-test tool</flag> |
230 |
+ </use> |
231 |
+</pkgmetadata> |