1 |
commit: 57806610d17ef4ddeb092bf207fef5938510a329 |
2 |
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 12:14:53 2011 +0000 |
4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 12:14:53 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=57806610 |
7 |
|
8 |
Added version bump. |
9 |
|
10 |
--- |
11 |
www-servers/uwsgi/Manifest | 11 +- |
12 |
www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch | 13 -- |
13 |
www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 + |
14 |
...wsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch | 51 -------- |
15 |
.../uwsgi/files/uwsgi-0.9.5-respect_flags.patch | 127 -------------------- |
16 |
.../uwsgi/files/uwsgi-0.9.8-no-werror.patch | 11 ++ |
17 |
www-servers/uwsgi/files/uwsgi.confd | 47 +++++++ |
18 |
www-servers/uwsgi/files/uwsgi.initd | 101 ++++++++++++++++ |
19 |
www-servers/uwsgi/uwsgi-0.9.6.5.ebuild | 46 ------- |
20 |
www-servers/uwsgi/uwsgi-0.9.8.3.ebuild | 72 +++++++++++ |
21 |
10 files changed, 244 insertions(+), 242 deletions(-) |
22 |
|
23 |
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest |
24 |
index 79e693c..e44697a 100644 |
25 |
--- a/www-servers/uwsgi/Manifest |
26 |
+++ b/www-servers/uwsgi/Manifest |
27 |
@@ -1,7 +1,8 @@ |
28 |
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9 |
29 |
-AUX 0.9.6.5-gentoo-gcc.patch 408 RMD160 d437d759d571724da35e0010c7e18282469e9bff SHA1 dd32829dc95ca77bb00aaa542b979ec7df917487 SHA256 a4b91449527946744c30974bd2dad75c34030da71ecdf15d3486a89eb2617f51 |
30 |
-AUX uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch 1202 RMD160 9c32ba693bd7bbdd6fae90c5b43118b8e0f882bc SHA1 cab74b61086c39e9f77e217b88361197c0069b98 SHA256 3903cf208ba14578aaf5cb95306191b97ed0b973047cad02321d4416d03a47f5 |
31 |
-AUX uwsgi-0.9.5-respect_flags.patch 3985 RMD160 1787075a4decad7376e1772231a65e0ef5737537 SHA1 456031bc53a80ca5423a149b7c8013c3bb9338fe SHA256 5af3f880b7104b5fb4c8612d92fab9074b1d5ecc556aeea0775a82a82c4be80e |
32 |
+AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 |
33 |
+AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 |
34 |
+AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f |
35 |
+AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4 |
36 |
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35 |
37 |
-EBUILD uwsgi-0.9.6.5.ebuild 1090 RMD160 4010f9f335772176930bd82297ffdcd8843368e9 SHA1 1c3fd2eadfcd1e0f14e2dd97c4cd0eb4020caaca SHA256 25598b27206aaef170e4adcdab1040493a93bb2f945fbe7a3d45cf5994afd1b2 |
38 |
-DIST uwsgi-0.9.6.5.tar.gz 152165 RMD160 0c33445aec79778bf663e3cead7c574956032c43 SHA1 ba05b3f6fa5019253ad4d09dae04654e8e36205d SHA256 8f4099be19c36ed484a4f1508e83e4170ce3ca1c32f3dd5591cd191223904bca |
39 |
+EBUILD uwsgi-0.9.8.3.ebuild 1870 RMD160 53ae8621ac13e000fc29e1ab6e37fcfab87f8434 SHA1 a1a3ad0e9cd8db43aae9f07ee2077b3c3e9cab56 SHA256 08a663229cd0510fa3eb4ccc16aa68343b7097f7436c7c37e4f6880b4b00c698 |
40 |
+DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f |
41 |
|
42 |
diff --git a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch b/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch |
43 |
deleted file mode 100644 |
44 |
index ae196b1..0000000 |
45 |
--- a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch |
46 |
+++ /dev/null |
47 |
@@ -1,13 +0,0 @@ |
48 |
-diff --git a/uwsgiconfig.py b/uwsgiconfig.py |
49 |
-index c06882c..2efc46c 100644 |
50 |
---- a/uwsgiconfig.py |
51 |
-+++ b/uwsgiconfig.py |
52 |
-@@ -84,7 +84,7 @@ def spcall2(cmd): |
53 |
- else: |
54 |
- return None |
55 |
- |
56 |
--gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[2] |
57 |
-+gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[4] |
58 |
- |
59 |
- gcc_major = int(gcc_version.split('.')[0]) |
60 |
- gcc_minor = int(gcc_version.split('.')[1]) |
61 |
|
62 |
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf |
63 |
new file mode 100644 |
64 |
index 0000000..a619bae |
65 |
--- /dev/null |
66 |
+++ b/www-servers/uwsgi/files/42_mod_uwsgi.conf |
67 |
@@ -0,0 +1,7 @@ |
68 |
+<IfDefine UWSGI> |
69 |
+ LoadModule uwsgi_module modules/mod_uwsgi.so |
70 |
+</IfDefine> |
71 |
+<IfDefine RUWSGI> |
72 |
+ LoadModule uwsgi_module modules/mod_Ruwsgi.so |
73 |
+</IfDefine> |
74 |
+ |
75 |
|
76 |
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch |
77 |
deleted file mode 100644 |
78 |
index e02f497..0000000 |
79 |
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch |
80 |
+++ /dev/null |
81 |
@@ -1,51 +0,0 @@ |
82 |
---- uwsgiconfig.py |
83 |
-+++ uwsgiconfig.py |
84 |
-@@ -68,9 +68,9 @@ |
85 |
- p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) |
86 |
- |
87 |
- if p.wait() == 0: |
88 |
-- return p.stdout.read().rstrip().decode() |
89 |
-+ return p.stdout.read().rstrip().decode() |
90 |
- else: |
91 |
-- return None |
92 |
-+ return None |
93 |
- |
94 |
- def add_o(x): |
95 |
- if x == 'uwsgi': |
96 |
-@@ -149,11 +149,11 @@ |
97 |
- kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly'] |
98 |
- |
99 |
- if uwsgi_os == 'SunOS': |
100 |
-- ldflags.append('-lsendfile') |
101 |
-+ ldflags.append('-lsendfile') |
102 |
- ldflags.remove('-rdynamic') |
103 |
- |
104 |
- if uwsgi_os in kvm_list: |
105 |
-- ldflags.append('-lkvm') |
106 |
-+ ldflags.append('-lkvm') |
107 |
- |
108 |
- if uwsgi_os == 'OpenBSD': |
109 |
- UGREEN = False |
110 |
-@@ -245,8 +245,8 @@ |
111 |
- gcc_list.append('erlang') |
112 |
- |
113 |
- if SCTP: |
114 |
-- ldflags.append("-lsctp") |
115 |
-- cflags.append("-DUWSGI_SCTP") |
116 |
-+ ldflags.append("-lsctp") |
117 |
-+ cflags.append("-DUWSGI_SCTP") |
118 |
- |
119 |
- if SPOOLER: |
120 |
- depends_on("SPOOLER", ['EMBEDDED']) |
121 |
-@@ -294,9 +294,9 @@ |
122 |
- sys.exit(1) |
123 |
- |
124 |
- if cmd == '--cflags': |
125 |
-- print(' '.join(cflags)) |
126 |
-+ print(' '.join(cflags)) |
127 |
- if cmd == '--ldflags': |
128 |
-- print(' '.join(ldflags)) |
129 |
-+ print(' '.join(ldflags)) |
130 |
- elif cmd == '--build': |
131 |
- parse_vars() |
132 |
- build_uwsgi(UWSGI_BIN_NAME) |
133 |
|
134 |
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch |
135 |
deleted file mode 100644 |
136 |
index c3f740d..0000000 |
137 |
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch |
138 |
+++ /dev/null |
139 |
@@ -1,127 +0,0 @@ |
140 |
---- uwsgiconfig.py |
141 |
-+++ uwsgiconfig.py |
142 |
-@@ -20,7 +20,6 @@ |
143 |
- PLUGINS = [] |
144 |
- UNBIT=False |
145 |
- UWSGI_BIN_NAME = 'uwsgi' |
146 |
--GCC='gcc' |
147 |
- |
148 |
- # specific compilation flags |
149 |
- # libxml2 or expat |
150 |
-@@ -46,17 +45,22 @@ |
151 |
- |
152 |
- from distutils import sysconfig |
153 |
- |
154 |
-+GCC = os.environ.get('CC', sysconfig.get_config_var('CC')) |
155 |
-+if not GCC: |
156 |
-+ GCC = 'gcc' |
157 |
-+ |
158 |
- gcc_list = ['utils', 'pyutils', 'protocol', 'socket', 'logging', 'wsgi_handlers', 'wsgi_headers', 'uwsgi_handlers', 'uwsgi'] |
159 |
- |
160 |
- # large file support |
161 |
- try: |
162 |
-- cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + sysconfig.get_config_var('CFLAGS').split() |
163 |
-+ cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() |
164 |
- except: |
165 |
- print("You need python headers to build uWSGI.") |
166 |
- sys.exit(1) |
167 |
- |
168 |
- cflags = cflags + ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ] |
169 |
--ldflags = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split() |
170 |
-+ldflags = os.environ.get("LDFLAGS", "").split() |
171 |
-+libs = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split() |
172 |
- |
173 |
- def depends_on(what, dep): |
174 |
- for d in dep: |
175 |
-@@ -97,7 +101,7 @@ |
176 |
- print(plugin) |
177 |
- |
178 |
- print("*** uWSGI linking ***") |
179 |
-- ldline = "%s -o %s %s %s" % (GCC, bin_name, ' '.join(map(add_o, gcc_list)), ' '.join(ldflags)) |
180 |
-+ ldline = "%s -o %s %s %s %s" % (GCC, bin_name, ' '.join(ldflags), ' '.join(map(add_o, gcc_list)), ' '.join(libs)) |
181 |
- print(ldline) |
182 |
- ret = os.system(ldline) |
183 |
- if ret != 0: |
184 |
-@@ -141,19 +145,19 @@ |
185 |
- version = sys.version_info |
186 |
- uver = "%d.%d" % (version[0], version[1]) |
187 |
- |
188 |
-- ldflags.append('-lpython' + uver) |
189 |
-+ libs.append('-lpython' + uver) |
190 |
- |
191 |
- if str(PYLIB_PATH) != '': |
192 |
-- ldflags.insert(0,'-L' + PYLIB_PATH) |
193 |
-+ libs.insert(0,'-L' + PYLIB_PATH) |
194 |
- |
195 |
- kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly'] |
196 |
- |
197 |
- if uwsgi_os == 'SunOS': |
198 |
-- ldflags.append('-lsendfile') |
199 |
-- ldflags.remove('-rdynamic') |
200 |
-+ libs.append('-lsendfile') |
201 |
-+ libs.remove('-rdynamic') |
202 |
- |
203 |
- if uwsgi_os in kvm_list: |
204 |
-- ldflags.append('-lkvm') |
205 |
-+ libs.append('-lkvm') |
206 |
- |
207 |
- if uwsgi_os == 'OpenBSD': |
208 |
- UGREEN = False |
209 |
-@@ -221,7 +225,7 @@ |
210 |
- print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML") |
211 |
- sys.exit(1) |
212 |
- else: |
213 |
-- ldflags.append(xmlconf) |
214 |
-+ libs.append(xmlconf) |
215 |
- xmlconf = spcall("xml2-config --cflags") |
216 |
- if xmlconf is None: |
217 |
- print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML") |
218 |
-@@ -232,20 +236,20 @@ |
219 |
- gcc_list.append('xmlconf') |
220 |
- elif XML_IMPLEMENTATION == 'expat': |
221 |
- cflags.append("-DUWSGI_XML -DUWSGI_XML_EXPAT") |
222 |
-- ldflags.append('-lexpat') |
223 |
-+ libs.append('-lexpat') |
224 |
- gcc_list.append('xmlconf') |
225 |
- |
226 |
- |
227 |
- if ERLANG: |
228 |
- depends_on("ERLANG", ['EMBEDDED']) |
229 |
- cflags.append("-DUWSGI_ERLANG") |
230 |
-- ldflags.append(ERLANG_LDFLAGS) |
231 |
-+ libs.append(ERLANG_LDFLAGS) |
232 |
- if str(ERLANG_CFLAGS) != '': |
233 |
- cflags.append(ERLANG_CFLAGS) |
234 |
- gcc_list.append('erlang') |
235 |
- |
236 |
- if SCTP: |
237 |
-- ldflags.append("-lsctp") |
238 |
-+ libs.append("-lsctp") |
239 |
- cflags.append("-DUWSGI_SCTP") |
240 |
- |
241 |
- if SPOOLER: |
242 |
-@@ -263,13 +267,13 @@ |
243 |
- import uwsgiplugin as up |
244 |
- |
245 |
- cflags.append(up.CFLAGS) |
246 |
-- ldflags.append(up.LDFLAGS) |
247 |
-+ libs.append(up.LDFLAGS) |
248 |
- |
249 |
- cflags.insert(0, '-I.') |
250 |
- |
251 |
- plugin_base = path + '/' + up.NAME + '_plugin' |
252 |
- |
253 |
-- gccline = "%s -fPIC -shared -o %s.so %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), plugin_base, ' '.join(ldflags)) |
254 |
-+ gccline = "%s -fPIC -shared -o %s.so %s %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), ' '.join(ldflags), plugin_base, ' '.join(libs)) |
255 |
- print(gccline) |
256 |
- |
257 |
- ret = os.system(gccline) |
258 |
-@@ -297,6 +301,8 @@ |
259 |
- print(' '.join(cflags)) |
260 |
- if cmd == '--ldflags': |
261 |
- print(' '.join(ldflags)) |
262 |
-+ if cmd == '--libs': |
263 |
-+ print(' '.join(libs)) |
264 |
- elif cmd == '--build': |
265 |
- parse_vars() |
266 |
- build_uwsgi(UWSGI_BIN_NAME) |
267 |
|
268 |
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch |
269 |
new file mode 100644 |
270 |
index 0000000..f55d6bb |
271 |
--- /dev/null |
272 |
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch |
273 |
@@ -0,0 +1,11 @@ |
274 |
+--- uwsgiconfig.py 2011-06-07 18:38:50.000000000 +0400 |
275 |
++++ uwsgiconfig.py 2011-06-05 10:28:03.000000000 +0400 |
276 |
+@@ -176,7 +176,7 @@ |
277 |
+ if uwsgi_os == 'Linux': |
278 |
+ self.gcc_list.append('lib/linux_ns') |
279 |
+ self.gcc_list.append('lib/netlink') |
280 |
+- self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() |
281 |
++ self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() |
282 |
+ try: |
283 |
+ gcc_version = str(spcall("%s -dumpversion" % GCC)) |
284 |
+ except: |
285 |
|
286 |
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd |
287 |
new file mode 100644 |
288 |
index 0000000..11152da |
289 |
--- /dev/null |
290 |
+++ b/www-servers/uwsgi/files/uwsgi.confd |
291 |
@@ -0,0 +1,47 @@ |
292 |
+# Distributed under the terms of the GNU General Public License v2 |
293 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $ |
294 |
+ |
295 |
+# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD! |
296 |
+ |
297 |
+# Path (or name) of UNIX/TCP socket to bind to |
298 |
+# |
299 |
+UWSGI_SOCKET=127.0.0.1:1234 |
300 |
+ |
301 |
+# Enable threads? |
302 |
+# |
303 |
+UWSGI_THREADS=1 |
304 |
+ |
305 |
+# The path to your uWSGI application. |
306 |
+# |
307 |
+UWSGI_PROGRAM= |
308 |
+ |
309 |
+# The path to your uWSGI xml config file. |
310 |
+# |
311 |
+UWSGI_XML_CONFIG= |
312 |
+ |
313 |
+# The number of child processes to spawn. The default is 1. |
314 |
+# |
315 |
+UWSGI_CHILDREN=1 |
316 |
+ |
317 |
+# The log file path. If empty logging is disabled |
318 |
+# |
319 |
+UWSGI_LOG_FILE= |
320 |
+ |
321 |
+# If you want to run your application inside a chroot then specify the |
322 |
+# directory here. Leave this blank otherwise. |
323 |
+# |
324 |
+UWSGI_CHROOT= |
325 |
+ |
326 |
+# If you want to run your application from a specific directiory specify |
327 |
+# it here. Leave this blank otherwise. |
328 |
+# |
329 |
+# UWSGI_DIR= |
330 |
+ |
331 |
+# The user and group to run your application as. If you do not specify these, |
332 |
+# the application will be run as root:root. |
333 |
+# |
334 |
+UWSGI_USER= |
335 |
+ |
336 |
+# Additional options you might want to pass to uWSGI |
337 |
+# |
338 |
+#UWSGI_EXTRA_OPTIONS= |
339 |
|
340 |
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd |
341 |
new file mode 100644 |
342 |
index 0000000..3fedecc |
343 |
--- /dev/null |
344 |
+++ b/www-servers/uwsgi/files/uwsgi.initd |
345 |
@@ -0,0 +1,101 @@ |
346 |
+#!/sbin/runscript |
347 |
+# Copyright 1999-2011 Gentoo Foundation |
348 |
+# Distributed under the terms of the GNU General Public License v2 |
349 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $ |
350 |
+ |
351 |
+PROGNAME=${SVCNAME#*.} |
352 |
+ |
353 |
+UWSGI_EXEC=/usr/bin/uwsgi |
354 |
+PIDPATH=/var/run/uwsgi |
355 |
+PIDFILE="${PIDPATH}/${PROGNAME}.pid" |
356 |
+ |
357 |
+depend() { |
358 |
+ need net |
359 |
+} |
360 |
+ |
361 |
+start() { |
362 |
+ local OPTIONS |
363 |
+ |
364 |
+ if [ "${SVCNAME}" = "uwsgi" ]; then |
365 |
+ eerror "You are not supposed to run this script directly. Create a symlink" |
366 |
+ eerror "for the FastCGI application you want to run as well as a copy of the" |
367 |
+ eerror "configuration file and modify it appropriately like so..." |
368 |
+ eerror |
369 |
+ eerror " ln -s uwsgi /etc/init.d/uwsgi.trac" |
370 |
+ eerror " cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac" |
371 |
+ eerror " `basename "${EDITOR}"` /etc/conf.d/uwsgi.trac" |
372 |
+ eerror |
373 |
+ return 1 |
374 |
+ fi |
375 |
+ |
376 |
+ if [ -z "${UWSGI_SOCKET}" ]; then |
377 |
+ eerror "You need to specify path (or name) of UNIX/TCP socket to bind to" |
378 |
+ eerror "in UWSGI_SOCKET" |
379 |
+ return 1 |
380 |
+ fi |
381 |
+ |
382 |
+ if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then |
383 |
+ eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG" |
384 |
+ eerror "you want to start." |
385 |
+ eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}" |
386 |
+ return 1 |
387 |
+ fi |
388 |
+ |
389 |
+ if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then |
390 |
+ eerror "Only one of the two may be defined:" |
391 |
+ eerror " UWSGI_PROGRAM=${UWSGI_PROGRAM}" |
392 |
+ eerror " UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}" |
393 |
+ return 1 |
394 |
+ fi |
395 |
+ |
396 |
+ |
397 |
+ OPTIONS="--master --daemonize" |
398 |
+ |
399 |
+ if [ -n "$UWSGI_LOG_FILE" ]; then |
400 |
+ OPTIONS="${OPTIONS} $UWSGI_LOG_FILE" |
401 |
+ else |
402 |
+ OPTIONS="${OPTIONS} /dev/null --disable-logging" |
403 |
+ fi |
404 |
+ |
405 |
+ if [ "${UWSGI_THREADS}" = "1" ]; then |
406 |
+ OPTIONS="${OPTIONS} --enable-threads" |
407 |
+ fi |
408 |
+ |
409 |
+ if [ -n "${UWSGI_SOCKET}" ]; then |
410 |
+ OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}" |
411 |
+ fi |
412 |
+ |
413 |
+ if [ -n "${UWSGI_CHILDREN}" ]; then |
414 |
+ OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}" |
415 |
+ fi |
416 |
+ |
417 |
+ if [ -n "${UWSGI_CHROOT}" ]; then |
418 |
+ OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}" |
419 |
+ fi |
420 |
+ |
421 |
+ [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/" |
422 |
+ [ -z "${UWSGI_USER}" ] && UWSGI_USER="root" |
423 |
+ |
424 |
+ if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then |
425 |
+ OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}" |
426 |
+ fi |
427 |
+ |
428 |
+ if [ -n "${UWSGI_PROGRAM}" ]; then |
429 |
+ OPTIONS="${OPTIONS} --wsgi-file ${UWSGI_PROGRAM}" |
430 |
+ fi |
431 |
+ |
432 |
+ if [ -n "${UWSGI_XML_CONFIG}" ]; then |
433 |
+ OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}" |
434 |
+ fi |
435 |
+ |
436 |
+ ebegin "Starting uWSGI application ${PROGNAME}" |
437 |
+ cd "${UWSGI_DIR}" && \ |
438 |
+ start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}" |
439 |
+ eend $? |
440 |
+} |
441 |
+ |
442 |
+stop() { |
443 |
+ ebegin "Stopping uWSGI application ${PROGNAME}" |
444 |
+ start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3 |
445 |
+ eend $? |
446 |
+} |
447 |
|
448 |
diff --git a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild b/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild |
449 |
deleted file mode 100644 |
450 |
index 951eb8a..0000000 |
451 |
--- a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild |
452 |
+++ /dev/null |
453 |
@@ -1,46 +0,0 @@ |
454 |
-# Copyright 1999-2010 Gentoo Foundation |
455 |
-# Distributed under the terms of the GNU General Public License v2 |
456 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.5.ebuild,v 1.1 2010/05/03 19:24:28 hollow Exp $ |
457 |
- |
458 |
-EAPI="3" |
459 |
-PYTHON_DEPEND="*" |
460 |
-SUPPORT_PYTHON_ABIS="1" |
461 |
- |
462 |
-inherit eutils python toolchain-funcs |
463 |
- |
464 |
-DESCRIPTION="uWSGI server for Python web applications" |
465 |
-HOMEPAGE="http://projects.unbit.it/uwsgi/" |
466 |
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz" |
467 |
- |
468 |
-LICENSE="GPL-2" |
469 |
-SLOT="0" |
470 |
-KEYWORDS="~amd64 ~x86" |
471 |
-IUSE="" |
472 |
- |
473 |
-RDEPEND="dev-libs/libxml2" |
474 |
-DEPEND="${RDEPEND}" |
475 |
- |
476 |
-src_prepare() { |
477 |
- # Python 3 requires constant indentation. |
478 |
-# epatch "${FILESDIR}/${PN}-0.9.5-fix_uwsgiconfig.py_indentation.patch" |
479 |
- |
480 |
- # Respect CC, CFLAGS and LDFLAGS. |
481 |
-# epatch "${FILESDIR}/${PN}-0.9.5-respect_flags.patch" |
482 |
- |
483 |
- epatch "${FILESDIR}/${PV}-gentoo-gcc.patch" |
484 |
- |
485 |
- python_copy_sources |
486 |
-} |
487 |
- |
488 |
-src_compile() { |
489 |
- python_src_compile CC="$(tc-getCC)" |
490 |
-} |
491 |
- |
492 |
-src_install() { |
493 |
- installation() { |
494 |
- newbin uwsgi uwsgi-${PYTHON_ABI} |
495 |
- } |
496 |
- python_execute_function -s installation |
497 |
- |
498 |
- python_generate_wrapper_scripts "${ED}usr/bin/uwsgi" |
499 |
-} |
500 |
|
501 |
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild |
502 |
new file mode 100644 |
503 |
index 0000000..10c82a8 |
504 |
--- /dev/null |
505 |
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild |
506 |
@@ -0,0 +1,72 @@ |
507 |
+# Copyright 1999-2011 Gentoo Foundation |
508 |
+# Distributed under the terms of the GNU General Public License v2 |
509 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $ |
510 |
+ |
511 |
+EAPI="3" |
512 |
+PYTHON_DEPEND="*" |
513 |
+SUPPORT_PYTHON_ABIS="1" |
514 |
+ |
515 |
+inherit eutils python toolchain-funcs apache-module |
516 |
+ |
517 |
+DESCRIPTION="uWSGI server for Python web applications" |
518 |
+HOMEPAGE="http://projects.unbit.it/uwsgi/" |
519 |
+SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz" |
520 |
+ |
521 |
+LICENSE="GPL-2" |
522 |
+SLOT="0" |
523 |
+KEYWORDS="~amd64 ~x86" |
524 |
+IUSE="" |
525 |
+ |
526 |
+RDEPEND="dev-libs/libxml2" |
527 |
+DEPEND="${RDEPEND}" |
528 |
+ |
529 |
+APXS2_S="${S}/apache2" |
530 |
+APACHE2_MOD_CONF="42_mod_${PN}" |
531 |
+want_apache2_2 |
532 |
+ |
533 |
+src_prepare() { |
534 |
+ epatch "${FILESDIR}"/${PN}-0.9.8-no-werror.patch |
535 |
+ python_copy_sources |
536 |
+} |
537 |
+ |
538 |
+src_compile() { |
539 |
+ python_src_compile CC="$(tc-getCC)" |
540 |
+ |
541 |
+ if use apache2 ; then |
542 |
+ for m in Ruwsgi uwsgi ; do |
543 |
+ APXS2_ARGS="-c mod_${m}.c" |
544 |
+ apache-module_src_compile |
545 |
+ done |
546 |
+ fi |
547 |
+} |
548 |
+ |
549 |
+src_install() { |
550 |
+ installation() { |
551 |
+ newbin uwsgi uwsgi-${PYTHON_ABI} |
552 |
+ } |
553 |
+ python_execute_function -s installation |
554 |
+ |
555 |
+ python_generate_wrapper_scripts "${ED}usr/bin/uwsgi" |
556 |
+ |
557 |
+ if use apache2; then |
558 |
+ for m in Ruwsgi uwsgi ; do |
559 |
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so" |
560 |
+ apache-module_src_install |
561 |
+ done |
562 |
+ fi |
563 |
+ |
564 |
+ newinitd "${FILESDIR}"/uwsgi.initd uwsgi |
565 |
+ newconfd "${FILESDIR}"/uwsgi.confd uwsgi |
566 |
+ mkdir "${ED}"/var/run/uwsgi |
567 |
+} |
568 |
+ |
569 |
+pkg_postinst() { |
570 |
+ if use apache2 ; then |
571 |
+ elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi." |
572 |
+ elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2." |
573 |
+ elog "Both have the same configuration interface and define the same symbols." |
574 |
+ elog "Therefore you can enable only one of them at a time." |
575 |
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky." |
576 |
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported." |
577 |
+ fi |
578 |
+} |