ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/www/mod_wsgi/mod_wsgi.2009-04-16T043025Z.diff
Revision: 35
Committed: 2008-08-22T16:07:56-07:00 (16 years, 10 months ago) by douglas
Original Path: freebsd/www/mod_wsgi.patch
File size: 2417 byte(s)
Log Message:
Upgrade mod_wsgi to 2.2!

File Contents

# Content
1 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile
2 --- /usr/ports/www/mod_wsgi/Makefile 2008-07-16 16:23:54.000000000 -0700
3 +++ mod_wsgi/Makefile 2008-08-22 16:05:40.374980883 -0700
4 @@ -6,7 +6,7 @@
5 #
6
7 PORTNAME= mod_wsgi
8 -PORTVERSION= 2.1
9 +PORTVERSION= 2.2
10 CATEGORIES= www python
11 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12
13 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/distinfo mod_wsgi/distinfo
14 --- /usr/ports/www/mod_wsgi/distinfo 2008-07-16 16:23:54.000000000 -0700
15 +++ mod_wsgi/distinfo 2008-08-22 14:26:12.755749948 -0700
16 @@ -1,3 +1,3 @@
17 -MD5 (mod_wsgi-2.1.tar.gz) = 4e0e8b5a13e0be2fc5b038f1e3e826a2
18 -SHA256 (mod_wsgi-2.1.tar.gz) = 7f1c28f1fbc585de2a15770c990e45b46d184245183775dd31e3a63bd30fc3a0
19 -SIZE (mod_wsgi-2.1.tar.gz) = 96635
20 +MD5 (mod_wsgi-2.2.tar.gz) = bff5bcf38cceb53c70e6bb4bad5f71d8
21 +SHA256 (mod_wsgi-2.2.tar.gz) = 297ece749140101f7fc159ffabda84b2e23c9616de8be0dbf83979a521033818
22 +SIZE (mod_wsgi-2.2.tar.gz) = 96836
23 diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c mod_wsgi/files/patch-mod_wsgi.c
24 --- /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c 2008-07-19 10:50:05.000000000 -0700
25 +++ mod_wsgi/files/patch-mod_wsgi.c 2008-08-22 15:15:59.347259483 -0700
26 @@ -1,20 +1,25 @@
27 ---- mod_wsgi.c.orig 2008-06-18 16:35:40.000000000 +0200
28 -+++ mod_wsgi.c 2008-07-19 19:41:18.000000000 +0200
29 -@@ -7771,6 +7771,9 @@
30 - * is restricted, need to truncate display name if too long.
31 - */
32 +--- mod_wsgi.c.orig 2008-08-21 22:31:15.000000000 -0700
33 ++++ mod_wsgi.c 2008-08-22 15:15:46.620906832 -0700
34 +@@ -7725,10 +7725,13 @@
35 + {
36 + const char *display_name = NULL;
37
38 -+#ifdef __FreeBSD__
39 -+ setproctitle(display_name);
40 ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
41 +#else
42 - argv0 = (char*)wsgi_server->process->argv[0];
43 + int slen = 0;
44 + int dlen = 0;
45
46 - dlen = strlen(argv0);
47 -@@ -7782,6 +7785,7 @@
48 - memcpy(argv0, display_name, slen);
49 - else
50 - memcpy(argv0, display_name, dlen);
51 + char *argv0 = NULL;
52 +#endif
53 - }
54
55 - static void wsgi_setup_access(WSGIDaemonProcess *daemon)
56 + display_name = daemon->group->display_name;
57 +
58 +@@ -7748,7 +7751,7 @@
59 + */
60 +
61 + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
62 +- setproctitle(display_name);
63 ++ setproctitle("%s", display_name);
64 + #else
65 + argv0 = (char*)wsgi_server->process->argv[0];
66 +