From 94c9da4df2a0c23357548c0c0ac1479dc7617ef1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Thu, 18 Nov 2004 14:46:33 +0000
Subject: [PATCH] - updated for 4.1.0

Changed files:
    beecrypt-lib64_fix.patch -> 1.4
    beecrypt-opt.patch -> 1.4
---
 beecrypt-lib64_fix.patch |  9 +++---
 beecrypt-opt.patch       | 59 +++++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/beecrypt-lib64_fix.patch b/beecrypt-lib64_fix.patch
index 7a398f9..c468c5d 100644
--- a/beecrypt-lib64_fix.patch
+++ b/beecrypt-lib64_fix.patch
@@ -1,10 +1,11 @@
---- beecrypt-4.0.0/configure.ac.orig	2004-08-01 00:35:37.613627784 +0200
-+++ beecrypt-4.0.0/configure.ac	2004-08-01 00:44:57.718478904 +0200
-@@ -596,7 +596,7 @@
+diff -urN beecrypt-4.1.0.org/configure.ac beecrypt-4.1.0/configure.ac
+--- beecrypt-4.1.0.org/configure.ac	2004-11-17 20:05:37.000000000 +0100
++++ beecrypt-4.1.0/configure.ac	2004-11-18 15:20:28.433531355 +0100
+@@ -601,7 +601,7 @@
  case $target_os in
  linux*)
    case $bc_target_arch in
--  alpha* | powerpc64 | s390x | x86_64)
+-  powerpc64 | s390x | x86_64)
 +  sparc64 | powerpc64 | s390x | x86_64)
      bc_libalt="64"
      ;;
diff --git a/beecrypt-opt.patch b/beecrypt-opt.patch
index fbadf37..ed64ac2 100644
--- a/beecrypt-opt.patch
+++ b/beecrypt-opt.patch
@@ -1,35 +1,32 @@
---- beecrypt-3.0.0pre/configure.ac.wiget	2003-06-10 23:32:46.000000000 +0200
-+++ beecrypt-3.0.0pre/configure.ac	2003-06-11 00:34:19.000000000 +0200
-@@ -649,7 +649,7 @@
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
-     ;;
-   athlon*)
--    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
-+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
-     ;;
-   i386)
-     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
---- beecrypt-4.0.0/acinclude.m4.orig	2004-07-26 07:47:08.000000000 +0200
-+++ beecrypt-4.0.0/acinclude.m4	2004-08-01 00:35:07.223247824 +0200
-@@ -442,7 +442,7 @@
-     if test "$bc_cv_c_aggressive_opt" = yes; then
-       case $bc_target_cpu in
+diff -urN beecrypt-4.1.0.org/acinclude.m4 beecrypt-4.1.0/acinclude.m4
+--- beecrypt-4.1.0.org/acinclude.m4	2004-11-18 13:31:16.000000000 +0100
++++ beecrypt-4.1.0/acinclude.m4	2004-11-18 15:18:11.817798072 +0100
+@@ -495,19 +495,19 @@
+         # -march=athlon64 degrades performance
+         ;;
        athlon*)
--        CFLAGS="$CFLAGS -mcpu=pentiumpro";
-+        CFLAGS="$CFLAGS -mcpu=$bc_target_cpu";
+-        CFLAGS="$CFLAGS -march=$bc_target_arch"
++        CFLAGS="$CFLAGS -march=$bc_target_cpu"
          ;;
        i586)
-         CFLAGS="$CFLAGS -mcpu=pentium"
-@@ -454,7 +454,7 @@
-         # no -mcpu=... option on ia64
+-        CFLAGS="$CFLAGS -march=pentium"
++        CFLAGS="$CFLAGS -march=$bc_target_cpu"
+         ;;
+       i686)
+-        CFLAGS="$CFLAGS -march=pentiumpro"
++        CFLAGS="$CFLAGS -march=$bc_target_cpu"
          ;;
        pentium*)
+-        CFLAGS="$CFLAGS -march=$bc_target_arch"
++        CFLAGS="$CFLAGS -march=$bc_target_cpu"
+         ;;
+       powerpc | powerpc64)
 -        CFLAGS="$CFLAGS -mcpu=$bc_target_arch"
 +        CFLAGS="$CFLAGS -mcpu=$bc_target_cpu"
          ;;
-       esac
-       # Architecture-specific optimizations
-@@ -534,7 +534,7 @@
+       sparcv8)
+         CFLAGS="$CFLAGS -mv8"
+@@ -570,7 +570,7 @@
      if test "$bc_cv_c_aggressive_opt" = yes; then
        case $bc_target_cpu in
        athlon*)
@@ -38,7 +35,7 @@
          ;;
        i586)
          CXXFLAGS="$CXXFLAGS -mcpu=pentium"
-@@ -546,7 +546,7 @@
+@@ -582,7 +582,7 @@
          # no -mcpu=... option on ia64
          ;;
        pentium*)
@@ -47,3 +44,15 @@
          ;;
        esac
        # Architecture-specific optimizations
+diff -urN beecrypt-4.1.0.org/configure.ac beecrypt-4.1.0/configure.ac
+--- beecrypt-4.1.0.org/configure.ac	2004-11-17 20:05:37.000000000 +0100
++++ beecrypt-4.1.0/configure.ac	2004-11-18 15:19:07.577852788 +0100
+@@ -489,7 +489,7 @@
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
+     ;;
+   athlon*)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
+     CFLAGS="$CFLAGS -mmmx"
+     ;;
+   i386)
-- 
2.43.0