OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Apr-2007 17:08:33
Branch: HEAD Handle: 2007040216083200
Modified files:
openpkg-src/apache-php4 apache-php4.patch apache-php4.spec
Log:
fix SHA1 function under AMD64 (where "sizeof(unsigned long) == 8") by
using "unsigned int" in the same brain-dead and still partly broken
way (as "sizeof(unsigned int) == 4" cannot be assumed in general) as
the MD5 function in the Apache source. KEEP IN MIND THAT THIS IS STILL
UGLY, BUT AT LEAST SLIGHTLY BETTER AND AT LEAST AS BRAIN-DEAD AS THE
EXISTING MD5 CODE.
Summary:
Revision Changes Path
1.2 +12 -0 openpkg-src/apache-php4/apache-php4.patch
1.15 +1 -1 openpkg-src/apache-php4/apache-php4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php4/apache-php4.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 apache-php4.patch
--- openpkg-src/apache-php4/apache-php4.patch 7 Feb 2007 22:17:59 -0000
1.1
+++ openpkg-src/apache-php4/apache-php4.patch 2 Apr 2007 15:08:32 -0000
1.2
@@ -114,3 +114,15 @@
if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
env_path = DEFAULT_PATH;
}
+Index: apache_1.3.37/src/include/ap_sha1.h
+--- apache_1.3.37/src/include/ap_sha1.h.orig 2007-04-02 16:48:10 +0200
++++ apache_1.3.37/src/include/ap_sha1.h 2007-04-02 16:56:23 +0200
+@@ -38,7 +38,7 @@
+ #define AP_SHA1PW_ID "{SHA}"
+ #define AP_SHA1PW_IDLEN 5
+
+-typedef unsigned long AP_LONG; /* a 32-bit quantity */
++typedef unsigned int AP_LONG; /* a 32-bit quantity */
+
+ typedef struct {
+ AP_LONG digest[5]; /* message digest */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php4/apache-php4.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 apache-php4.spec
--- openpkg-src/apache-php4/apache-php4.spec 30 Mar 2007 17:06:53 -0000
1.14
+++ openpkg-src/apache-php4/apache-php4.spec 2 Apr 2007 15:08:32 -0000
1.15
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070330
+Release: 20070402
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
