From a092753f23abb3f0a731d65f6e28fd96742e79f1 Mon Sep 17 00:00:00 2001
From: arne_f <arne_f@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 11 Feb 2008 22:33:41 +0000
Subject: [PATCH] Updated ClamAV to 0.92 Added patch for gcc bug pr28045

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1202 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 config/rootfiles/packages/clamav | 10 ++++++--
 doc/packages-list.txt            |  2 +-
 lfs/clamav                       |  6 ++---
 lfs/gcc                          |  1 +
 src/patches/gcc-pr28045.patch    | 41 ++++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 src/patches/gcc-pr28045.patch

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 5b9673cef3..a5cb64abc5 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -8,8 +8,14 @@ usr/bin/sigtool
 #usr/lib/libclamav.a
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
-usr/lib/libclamav.so.2
-usr/lib/libclamav.so.2.0.8
+usr/lib/libclamav.so.3
+usr/lib/libclamav.so.3.0.3
+usr/lib/libclamunrar.so
+usr/lib/libclamunrar.so.3
+usr/lib/libclamunrar.so.3.0.3
+usr/lib/libclamunrar_iface.so
+usr/lib/libclamunrar_iface.so.3
+usr/lib/libclamunrar_iface.so.3.0.3
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 99a83adbc9..b83ef544df 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -52,7 +52,7 @@
 * ccache-2.4
 * cdrtools-2.01
 * centerim-4.22.1
-* clamav-0.91.2
+* clamav-0.92
 * collectd-4.2.3
 * coreutils-5.96
 * cpio-2.6
diff --git a/lfs/clamav b/lfs/clamav
index 17b428e8d5..859170a3e9 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.91.2
+VER        = 0.92
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2a7265d17cfa80c32858978f16a3f47b
+$(DL_FILE)_MD5 = e500651858a9187a87025c8a5c23969c
 
 install : $(TARGET)
 
diff --git a/lfs/gcc b/lfs/gcc
index 2ddaa7f5e4..2e8f2725c4 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -148,6 +148,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-pr28045.patch
 	@mkdir $(DIR_SRC)/gcc-build
 ifeq "$(ROOT)" ""
 ifeq "$(INST)" "1"
diff --git a/src/patches/gcc-pr28045.patch b/src/patches/gcc-pr28045.patch
new file mode 100644
index 0000000000..b38ff9e5e4
--- /dev/null
+++ b/src/patches/gcc-pr28045.patch
@@ -0,0 +1,41 @@
+Index: fold-const.c
+===================================================================
+*** gcc4.0.3/gcc/fold-const.c	(revision 114755)
+--- gcc4.0.3/fold-const.c	(working copy)
+*************** operand_equal_p (tree arg0, tree arg1, u
+*** 2497,2502 ****
+--- 2497,2507 ----
+    if (TYPE_UNSIGNED (TREE_TYPE (arg0)) != TYPE_UNSIGNED (TREE_TYPE (arg1)))
+      return 0;
+  
++   /* If both types don't have the same precision, then it is not safe
++      to strip NOPs.  */
++   if (TYPE_PRECISION (TREE_TYPE (arg0)) != TYPE_PRECISION (TREE_TYPE (arg1)))
++     return 0;
++ 
+    STRIP_NOPS (arg0);
+    STRIP_NOPS (arg1);
+  
+
+
+/* { dg-do run } */
+
+extern void abort(void);
+struct a
+{
+   unsigned int bits : 1;
+   signed long val : ((sizeof(long) * 8) - 1);
+};
+int Fnegate (struct a b)
+{
+  if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
+      && (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
+     return 0 ;
+  abort ();
+}
+int main ()
+{
+  struct a b = {1, 1};
+  Fnegate (b);
+  return 0;
+}
-- 
2.39.5