Prechádzať zdrojové kódy

modifying package: apache-1.3.31 20040920 -> 20040923

Ralf S. Engelschall 21 rokov pred
rodič
commit
197ccec5a1
2 zmenil súbory, kde vykonal 2 pridanie a 27 odobranie
  1. 0 23
      apache/apache.patch.modauthmysql
  2. 2 4
      apache/apache.spec

+ 0 - 23
apache/apache.patch.modauthmysql

@@ -1,23 +0,0 @@
-Index: mod_auth_mysql.c
---- mod_auth_mysql.c.orig	2004-09-10 20:46:16 +0200
-+++ mod_auth_mysql.c	2004-09-10 20:50:32 +0200
-@@ -127,9 +127,9 @@
- #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
- #include "ap_compat.h"
- #include "apr_strings.h"
--#include "util_md5.h"
- #include "crypt.h"
- #endif
-+#include "util_md5.h"
- #include <mysql.h>
- 
- /*
-@@ -412,7 +412,7 @@
-     (void*)XtOffsetOf(mysql_auth_config_rec, mysqlsocket),
-     OR_AUTHCFG, TAKE1, "mysql server socket path" },
- 
--  { "AuthMySQLPort", ap_set_int_slot,
-+  { "AuthMySQLPort", ap_set_flag_slot,
-     (void*)XtOffsetOf(mysql_auth_config_rec, mysqlport),
-     OR_AUTHCFG, TAKE1, "mysql server port number" },
- 

+ 2 - 4
apache/apache.spec

@@ -44,7 +44,7 @@
 %define       V_mod_auth_pam       1.1.1
 %define       V_mod_auth_ldap      2.4.2
 %define       V_mod_auth_radius    1.5.7
-%define       V_mod_auth_mysql     2.5.0
+%define       V_mod_auth_mysql     2.6.0
 %define       V_mod_gzip           1.3.19.1a
 %define       V_mod_fastcgi        2.4.2
 %define       V_mod_throttle       312
@@ -66,7 +66,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040920
+Release:      20040923
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -213,7 +213,6 @@ Patch0:       apache.patch
 Patch1:       apache.patch.modowa
 Patch2:       apache.patch.php
 Patch3:       http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
-Patch4:       apache.patch.modauthmysql
 
 #   build information
 Prefix:       %{l_prefix}
@@ -559,7 +558,6 @@ AutoReqProv:  no
 %endif
 %if "%{with_mod_auth_mysql}" == "yes"
     %setup -q -T -D -a 16
-    %{l_patch} -d mod_auth_mysql-%{V_mod_auth_mysql} -p0 <%{PATCH4}
 %endif
 %if "%{with_suphp}" == "yes"
     %setup -q -T -D -a 17