| 1 |
arfrever 09/05/30 00:08:22 |
| 2 |
|
| 3 |
Added: mod_gnutls-0.5.4-apache-2.4.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #254438). Fix building with >=net-libs/gnutls-2.7.1 (bug #253714). |
| 6 |
(Portage version: 13625-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mod_gnutls-0.5.4-apache-2.4.patch |
| 15 |
=================================================================== |
| 16 |
--- include/mod_gnutls.h.in |
| 17 |
+++ include/mod_gnutls.h.in |
| 18 |
@@ -52,10 +52,8 @@ |
| 19 |
|
| 20 |
/* Recent Versions of 2.1 renamed several hooks. This allows us to |
| 21 |
compile on 2.0.xx */ |
| 22 |
-#if AP_SERVER_MINORVERSION_NUMBER >= 1 |
| 23 |
-#if AP_SERVER_PATCHLEVEL_NUMBER >= 3 |
| 24 |
+#if (AP_SERVER_MINORVERSION_NUMBER == 1 && AP_SERVER_PATCHLEVEL_NUMBER >= 3) || AP_SERVER_MINORVERSION_NUMBER >= 2 |
| 25 |
#define USING_2_1_RECENT 1 |
| 26 |
-#endif |
| 27 |
#endif |
| 28 |
|
| 29 |
#ifndef USING_2_1_RECENT |
| 30 |
--- src/gnutls_cache.c |
| 31 |
+++ src/gnutls_cache.c |
| 32 |
@@ -38,6 +38,10 @@ |
| 33 |
#define MC_TAG_LEN sizeof(MC_TAG) |
| 34 |
#define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN) |
| 35 |
|
| 36 |
+#if MODULE_MAGIC_NUMBER_MAJOR < 20081201 |
| 37 |
+#define ap_unixd_config unixd_config |
| 38 |
+#endif |
| 39 |
+ |
| 40 |
char *mgs_session_id2sz(unsigned char *id, int idlen, |
| 41 |
char *str, int strsize) |
| 42 |
{ |
| 43 |
@@ -544,9 +548,9 @@ |
| 44 |
#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) |
| 45 |
/* Running as Root */ |
| 46 |
if (geteuid() == 0) { |
| 47 |
- chown(path1, unixd_config.user_id, -1); |
| 48 |
+ chown(path1, ap_unixd_config.user_id, -1); |
| 49 |
if (path2 != NULL) { |
| 50 |
- chown(path2, unixd_config.user_id, -1); |
| 51 |
+ chown(path2, ap_unixd_config.user_id, -1); |
| 52 |
} |
| 53 |
} |
| 54 |
#endif |
Archives