File merge_from_0_9_8k.patch of Package libopenssl0_9_8

Index: openssl-0.9.8m/Configure
===================================================================
--- openssl-0.9.8m.orig/Configure
+++ openssl-0.9.8m/Configure
@@ -874,7 +874,7 @@ PROCESS_ARGS:
 			}
 		else
 			{
-			die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
+                        warn "target already defined - $target (offending arg: $_)\n" if ($target ne "");
 			$target=$_;
 			}
 
@@ -1123,7 +1123,7 @@ else				{ $lflags=$prelflags; undef $pre
 my $no_shared_warn=0;
 my $no_user_cflags=0;
 
-if ($flags ne "")	{ $cflags="$flags$cflags"; }
+if ($flags ne "")      { $cflags="$cflags $flags"; }
 else			{ $no_user_cflags=1;       }
 
 # Kerberos settings.  The flavor must be provided from outside, either through
Index: openssl-0.9.8m/config
===================================================================
--- openssl-0.9.8m.orig/config
+++ openssl-0.9.8m/config
@@ -526,7 +526,8 @@ case "$GUESSOS" in
   ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
   i386-apple-darwin*) OUT="darwin-i386-cc" ;;
   alpha-*-linux2)
-        ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
+       #ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
+       ISA=EV56
 	case ${ISA:-generic} in
 	*[678])	OUT="linux-alpha+bwx-$CC" ;;
 	*)	OUT="linux-alpha-$CC" ;;
@@ -546,7 +547,8 @@ case "$GUESSOS" in
 	    echo "         You have about 5 seconds to press Ctrl-C to abort."
 	    (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
 	fi
-	OUT="linux-ppc"
+       # we have the target and force it here
+       OUT="linux-ppc64"
 	;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   ia64-*-linux?) OUT="linux-ia64" ;;
@@ -562,10 +564,10 @@ case "$GUESSOS" in
   sparc-*-linux2)
 	KARCH=`awk '/^type/{print$3;exit(0);}' /proc/cpuinfo`
 	case ${KARCH:-sun4} in
-	sun4u*)	OUT="linux-sparcv9" ;;
-	sun4m)	OUT="linux-sparcv8" ;;
-	sun4d)	OUT="linux-sparcv8" ;;
-	*)	OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
+#	sun4u*)	OUT="linux-sparcv9" ;;
+#	sun4m)	OUT="linux-sparcv8" ;;
+#	sun4d)	OUT="linux-sparcv8" ;;
+        *)      OUT="linux-sparcv8" ;;
 	esac ;;
   parisc*-*-linux2)
 	# 64-bit builds under parisc64 linux are not supported and
@@ -584,7 +586,11 @@ case "$GUESSOS" in
 	#         PA8500   -> 8000   (2.0)
 	#         PA8600   -> 8000   (2.0)
 
-	CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8.00/8000/'`
+	# CPUSCHEDULE=`echo $CPUSCHEDULE|sed -e 's/7300LC/7100LC/' -e 's/8?00/8000/'`
+	# lets have CPUSCHEDULE for 1.1:
+	CPUSCHEDULE=7100LC
+	# we want to support 1.1 CPUs as well:
+	CPUARCH=1.1
 	# Finish Model transformations
 
 	options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH"
Index: openssl-0.9.8m/crypto/camellia/cmll_locl.h
===================================================================
--- openssl-0.9.8m.orig/crypto/camellia/cmll_locl.h
+++ openssl-0.9.8m/crypto/camellia/cmll_locl.h
@@ -97,7 +97,7 @@ extern "C" {
 	(ct)[2] = (u8)((st) >>  8); \
 	(ct)[3] = (u8)(st); }
 
-#if (defined (__GNUC__) && (defined(__x86_64__) || defined(__x86_64)))
+#if (defined (__GNUC__) && (defined(__x86_64__) || defined(__x86_64) || defined(i386)))
 #define CAMELLIA_SWAP4(x) \
   do{\
     asm("bswap %1" : "+r" (x));\
Index: openssl-0.9.8m/crypto/perlasm/x86unix.pl
===================================================================
--- openssl-0.9.8m.orig/crypto/perlasm/x86unix.pl
+++ openssl-0.9.8m/crypto/perlasm/x86unix.pl
@@ -547,8 +547,6 @@ sub main'file_end
 
 		push (@out,"\n.section\t.bss\n");
 		push (@out,".comm\t${under}OPENSSL_ia32cap_P,4,4\n");
-
-		return;
 	}
 
 	if ($const ne "")
@@ -557,6 +555,7 @@ sub main'file_end
 		push(@out,$const);
 		$const="";
 		}
+	push(@out, ".section    .note.GNU-stack,\"\",\@progbits");
 	}
 
 sub main'data_byte
Index: openssl-0.9.8m/engines/Makefile
===================================================================
--- openssl-0.9.8m.orig/engines/Makefile
+++ openssl-0.9.8m/engines/Makefile
@@ -92,7 +92,7 @@ install:
 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
 	@if [ -n "$(SHARED_LIBS)" ]; then \
 		set -e; \
-		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines; \
+		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
 		for l in $(LIBNAMES); do \
 			( echo installing $$l; \
 			  if [ "$(PLATFORM)" != "Cygwin" ]; then \