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: 04-Apr-2006 21:19:00
Branch: HEAD Handle: 2006040420185900
Modified files:
openpkg-src/apache2 apache2.patch apache2.spec
Log:
remove obsolete patching and apply my latest UUID generation patch set
Summary:
Revision Changes Path
1.10 +56 -0 openpkg-src/apache2/apache2.patch
1.70 +1 -4 openpkg-src/apache2/apache2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 apache2.patch
--- openpkg-src/apache2/apache2.patch 16 Feb 2006 18:52:59 -0000 1.9
+++ openpkg-src/apache2/apache2.patch 4 Apr 2006 19:18:59 -0000 1.10
@@ -131,3 +131,59 @@
return APR_SUCCESS;
}
+Index: srclib/apr-util/crypto/getuuid.c
+--- srclib/apr-util/crypto/getuuid.c.orig 2005-02-04 21:45:35 +0100
++++ srclib/apr-util/crypto/getuuid.c 2006-04-04 21:06:48 +0200
+@@ -131,7 +131,7 @@
+
+ /* crap. this isn't crypto quality, but it will be Good Enough */
+
+- get_system_time(&time_now);
++ time_now = apr_time_now();
+ srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
+
+ return rand() & 0x0FFFF;
+@@ -151,7 +151,7 @@
+ static apr_interval_time_t time_last = 0;
+ static apr_interval_time_t fudge = 0;
+
+- time_now = apr_time_now();
++ get_system_time(&time_now);
+
+ /* if clock reading changed since last UUID generated... */
+ if (time_last != time_now) {
+@@ -188,17 +188,26 @@
+
+ get_current_time(×tamp);
+
+- d[0] = (unsigned char)timestamp;
+- d[1] = (unsigned char)(timestamp >> 8);
+- d[2] = (unsigned char)(timestamp >> 16);
+- d[3] = (unsigned char)(timestamp >> 24);
+- d[4] = (unsigned char)(timestamp >> 32);
+- d[5] = (unsigned char)(timestamp >> 40);
+- d[6] = (unsigned char)(timestamp >> 48);
+- d[7] = (unsigned char)(((timestamp >> 56) & 0x0F) | 0x10);
++ /* UUID field: time_low */
++ d[0] = (unsigned char)(timestamp >> (8*3));
++ d[1] = (unsigned char)(timestamp >> (8*2));
++ d[2] = (unsigned char)(timestamp >> (8*1));
++ d[3] = (unsigned char)(timestamp);
++
++ /* UUID field: time_mid */
++ d[4] = (unsigned char)(timestamp >> (8*5));
++ d[5] = (unsigned char)(timestamp >> (8*4));
++
++ /* UUID field: time_hi_and_version */
++ d[6] = (unsigned char)(((timestamp >> (8*7)) & 0x0F) | 0x10);
++ d[7] = (unsigned char)(timestamp >> (8*6));
+
++ /* UUID field: clk_seq_hi_res */
+ d[8] = (unsigned char)(((uuid_state_seqnum >> 8) & 0x3F) | 0x80);
++
++ /* UUID field: clk_seq_low */
+ d[9] = (unsigned char)uuid_state_seqnum;
+
++ /* UUID field: node */
+ memcpy(&d[10], uuid_state_node, NODE_LENGTH);
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 apache2.spec
--- openpkg-src/apache2/apache2.spec 16 Feb 2006 18:52:59 -0000 1.69
+++ openpkg-src/apache2/apache2.spec 4 Apr 2006 19:18:59 -0000 1.70
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060216
+Release: 20060404
# package options (suexec related)
%option with_suexec yes
@@ -123,9 +123,6 @@
%if "%{with_mod_perl}" == "yes"
%setup -q -T -D -a 1
%endif
- # incompatible API change in OpenSSL 0.9.8
- %{l_shtool} subst -e 's,PEM_F_DEF_CALLBACK,PEM_F_PEM_DEF_CALLBACK,g' \
- `find . -type f | xargs grep -l PEM_F_DEF_CALLBACK`
%build
# optionally prepare mod_perl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
