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: 17-Oct-2007 12:23:00
Branch: HEAD Handle: 2007101711230000
Modified files:
openpkg-src/openpkg openssl.patch
Log:
Grrr... third attempt in fixing the OpenSSL patch variant for the
bootstrap. Seems like someone finally has to teach RSE how correct
patches are made in the year 2007....
Summary:
Revision Changes Path
1.12 +50 -50 openpkg-src/openpkg/openssl.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openssl.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 openssl.patch
--- openpkg-src/openpkg/openssl.patch 17 Oct 2007 08:03:16 -0000 1.11
+++ openpkg-src/openpkg/openssl.patch 17 Oct 2007 10:23:00 -0000 1.12
@@ -1,38 +1,6 @@
-Index: crypto/objects/obj_dat.pl
---- crypto/objects/obj_dat.pl.orig 2005-08-29 01:20:47 +0200
-+++ crypto/objects/obj_dat.pl 2006-05-15 08:03:44 +0200
-@@ -1,9 +1,5 @@
- #!/usr/local/bin/perl
-
--# fixes bug in floating point emulation on sparc64 when
--# this script produces off-by-one output on sparc64
--use integer;
--
- sub obj_cmp
- {
- local(@a,@b,$_,$r);
-Index: util/mklink.pl
---- util/mklink.pl.orig 2006-05-15 20:46:35 +0200
-+++ util/mklink.pl 2006-05-15 20:48:07 +0200
-@@ -15,13 +15,12 @@
- # Apart from this, this script should be able to handle even the most
- # pathological cases.
-
--use Cwd;
--
- my $from = shift;
- my @files = @ARGV;
-
- my @from_path = split(/[\\\/]/, $from);
--my $pwd = getcwd();
-+my $pwd = `pwd`;
-+$pwd =~ s/\n$//s;
- chomp($pwd);
- my @pwd_path = split(/[\\\/]/, $pwd);
-
Index: Configure
---- Configure.orig 2007-10-11 22:43:07 +0200
-+++ Configure 2007-10-11 22:43:07 +0200
+--- Configure.orig 2007-09-16 14:24:17 +0200
++++ Configure 2007-10-17 12:14:14 +0200
@@ -6,7 +6,6 @@
##
@@ -41,7 +9,7 @@
# see INSTALL for instructions.
-@@ -33,6 +33,7 @@
+@@ -34,6 +33,7 @@
# (Default: KRB5_DIR/include)
# --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
# supported values are "MIT" and "Heimdal". A value is required.
@@ -49,7 +17,7 @@
#
# --test-sanity Make a number of sanity checks on the data in this file.
# This is a debugging tool for OpenSSL developers.
-@@ -112,6 +113,7 @@
+@@ -113,6 +113,7 @@
#$bits2="THIRTY_TWO_BIT ";
my $bits1="THIRTY_TWO_BIT ";
my $bits2="SIXTY_FOUR_BIT ";
@@ -57,18 +25,7 @@
my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o:dx86-elf.o
yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o
s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o:dx86-cof.o
yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o
s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
-@@ -696,6 +698,10 @@
- {
- exit(&test_sanity());
- }
-+ elsif (/^--with-cc=(.*)$/)
-+ {
-+ $ccarg=$1
-+ }
- elsif (/^reconfigure/ || /^reconf/)
- {
- if (open(IN,"<$Makefile"))
-@@ -402,8 +402,8 @@
+@@ -402,8 +403,8 @@
#### IBM's AIX.
"aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG
RC4_CHAR:::",
@@ -79,7 +36,18 @@
# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
# at build time. $OBJECT_MODE is respected at ./config stage!
"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro
-qroconst::-qthreaded:AIX::BN_LLONG
RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X
32",
-@@ -948,7 +954,7 @@
+@@ -697,6 +698,10 @@
+ {
+ exit(&test_sanity());
+ }
++ elsif (/^--with-cc=(.*)$/)
++ {
++ $ccarg=$1
++ }
+ elsif (/^reconfigure/ || /^reconf/)
+ {
+ if (open(IN,"<$Makefile"))
+@@ -949,7 +954,7 @@
print "IsMK1MF=$IsMK1MF\n";
my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
@@ -90,7 +58,7 @@
my $thread_cflag = $fields[$idx_thread_cflag];
Index: config
--- config.orig 2007-08-01 13:21:35 +0200
-+++ config 2007-10-11 22:45:07 +0200
++++ config 2007-10-17 12:13:48 +0200
@@ -401,9 +401,9 @@
# figure out if gcc is available and if so we use it otherwise
@@ -353,3 +321,35 @@
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
+Index: crypto/objects/obj_dat.pl
+--- crypto/objects/obj_dat.pl.orig 2005-08-29 01:20:47 +0200
++++ crypto/objects/obj_dat.pl 2007-10-17 12:13:48 +0200
+@@ -1,9 +1,5 @@
+ #!/usr/local/bin/perl
+
+-# fixes bug in floating point emulation on sparc64 when
+-# this script produces off-by-one output on sparc64
+-use integer;
+-
+ sub obj_cmp
+ {
+ local(@a,@b,$_,$r);
+Index: util/mklink.pl
+--- util/mklink.pl.orig 2006-02-09 13:28:30 +0100
++++ util/mklink.pl 2007-10-17 12:13:48 +0200
+@@ -15,13 +15,12 @@
+ # Apart from this, this script should be able to handle even the most
+ # pathological cases.
+
+-use Cwd;
+-
+ my $from = shift;
+ my @files = @ARGV;
+
+ my @from_path = split(/[\\\/]/, $from);
+-my $pwd = getcwd();
++my $pwd = `pwd`;
++$pwd =~ s/\n$//s;
+ chomp($pwd);
+ my @pwd_path = split(/[\\\/]/, $pwd);
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
