From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MAC7d-0004Ru-0S for garchives@archives.gentoo.org; Sat, 30 May 2009 00:08:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E16BE02A8; Sat, 30 May 2009 00:08:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 20A47E02A8 for ; Sat, 30 May 2009 00:08:23 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BACC266DE8 for ; Sat, 30 May 2009 00:08:22 +0000 (UTC) Received: from arfrever by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MAC7a-0007T6-DT for gentoo-commits@lists.gentoo.org; Sat, 30 May 2009 00:08:22 +0000 From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-apache/mod_gnutls/files: mod_gnutls-0.5.4-apache-2.4.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: mod_gnutls-0.5.4-apache-2.4.patch X-VCS-Directories: www-apache/mod_gnutls/files X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: Sender: Arfrever Frehtes Taifersar Arahesis Date: Sat, 30 May 2009 00:08:22 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d0e85b8e-2ed1-4aa9-8d11-59ba44dfe4fa X-Archives-Hash: 6562899677352e1ac777a0a00c8ced4b arfrever 09/05/30 00:08:22 Added: mod_gnutls-0.5.4-apache-2.4.patch Log: Version bump (bug #254438). Fix building with >=3Dnet-libs/gnutls-2.7.1= (bug #253714). (Portage version: 13625-svn/cvs/Linux x86_64) Revision Changes Path 1.1 www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-= 2.4.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_gnu= tls/files/mod_gnutls-0.5.4-apache-2.4.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_gnu= tls/files/mod_gnutls-0.5.4-apache-2.4.patch?rev=3D1.1&content-type=3Dtext= /plain Index: mod_gnutls-0.5.4-apache-2.4.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- include/mod_gnutls.h.in +++ include/mod_gnutls.h.in @@ -52,10 +52,8 @@ =20 /* Recent Versions of 2.1 renamed several hooks. This allows us to=20 compile on 2.0.xx */ -#if AP_SERVER_MINORVERSION_NUMBER >=3D 1 -#if AP_SERVER_PATCHLEVEL_NUMBER >=3D 3 +#if (AP_SERVER_MINORVERSION_NUMBER =3D=3D 1 && AP_SERVER_PATCHLEVEL_NUMB= ER >=3D 3) || AP_SERVER_MINORVERSION_NUMBER >=3D 2 #define USING_2_1_RECENT 1 -#endif #endif=20 =20 #ifndef USING_2_1_RECENT --- src/gnutls_cache.c +++ src/gnutls_cache.c @@ -38,6 +38,10 @@ #define MC_TAG_LEN sizeof(MC_TAG) #define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN) =20 +#if MODULE_MAGIC_NUMBER_MAJOR < 20081201 +#define ap_unixd_config unixd_config +#endif + char *mgs_session_id2sz(unsigned char *id, int idlen, char *str, int strsize) { @@ -544,9 +548,9 @@ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWA= RE) /* Running as Root */ if (geteuid() =3D=3D 0) { - chown(path1, unixd_config.user_id, -1); + chown(path1, ap_unixd_config.user_id, -1); if (path2 !=3D NULL) {=20 - chown(path2, unixd_config.user_id, -1); + chown(path2, ap_unixd_config.user_id, -1); } } #endif