webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 00:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated ClamAV to 0.92

Browse Source 
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
This commit is contained in:
arne_f
2008-02-11 22:33:41 +00:00
parent 5362088b3e
commit a092753f23
5 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/rootfiles/packages/clamav
View File

@@ -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

2
doc/packages-list.txt
View File

@@ -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

6
lfs/clamav
View File

@@ -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)

1
lfs/gcc
View File

@@ -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"

41
src/patches/gcc-pr28045.patch Normal file
View File

@@ -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;
}