[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 63c94c5185e52dddb756cf7b0d46abd3ee72e012 - IPFire-SCM

19 May 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  63c94c5185e52dddb756cf7b0d46abd3ee72e012 (commit)
       via  56170c2ac313954020856526a64f9746b2dcad80 (commit)
       via  12999d325b9590de8ba485fab25975923dc6099d (commit)
      from  ca3c9e426fb3328d273cede3b84972c5b9449c2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63c94c5185e52dddb756cf7b0d46abd3ee72e012
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri May 19 20:25:30 2017 +0100
clamav: Import patch to fix build issues with GCC 6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 56170c2ac313954020856526a64f9746b2dcad80
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Apr 30 12:59:09 2017 +0200
make.sh: Build lcms2 before ghostscript
Ghostscript depends on it
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 12999d325b9590de8ba485fab25975923dc6099d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri May 19 17:44:13 2017 +0100
reiserfsprogs: Update to 3.6.25
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/reiserfsprogs | 19 ++++++++
 lfs/clamav                            |  1 +
 lfs/reiserfsprogs                     |  8 ++--
 make.sh                               |  2 +-
 src/patches/clamav-0.99.2-gcc-6.patch | 84 +++++++++++++++++++++++++++++++++++
 5 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 src/patches/clamav-0.99.2-gcc-6.patch
Difference in files:

diff --git a/config/rootfiles/common/reiserfsprogs b/config/rootfiles/common/reiserfsprogs
index f5cfca2..ac375e9 100644
--- a/config/rootfiles/common/reiserfsprogs
+++ b/config/rootfiles/common/reiserfsprogs
@@ -1,3 +1,4 @@
+#sbin/debugfs.reiserfs
 #sbin/debugreiserfs
 sbin/fsck.reiserfs
 sbin/mkfs.reiserfs
@@ -5,8 +6,26 @@ sbin/mkreiserfs
 sbin/reiserfsck
 sbin/reiserfstune
 sbin/resize_reiserfs
+sbin/tunefs.reiserfs
+#usr/include/reiserfs
+#usr/include/reiserfs/io.h
+#usr/include/reiserfs/misc.h
+#usr/include/reiserfs/reiserfs_err.h
+#usr/include/reiserfs/reiserfs_fs.h
+#usr/include/reiserfs/reiserfs_lib.h
+#usr/include/reiserfs/swab.h
+#usr/lib/libreiserfscore.a
+#usr/lib/libreiserfscore.la
+#usr/lib/libreiserfscore.so
+usr/lib/libreiserfscore.so.0
+usr/lib/libreiserfscore.so.0.0.0
+#usr/lib/pkgconfig/reiserfscore.pc
+#usr/share/man/man8/debugfs.reiserfs.8
 #usr/share/man/man8/debugreiserfs.8
+#usr/share/man/man8/fsck.reiserfs.8
+#usr/share/man/man8/mkfs.reiserfs.8
 #usr/share/man/man8/mkreiserfs.8
 #usr/share/man/man8/reiserfsck.8
 #usr/share/man/man8/reiserfstune.8
 #usr/share/man/man8/resize_reiserfs.8
+#usr/share/man/man8/tunefs.reiserfs.8
diff --git a/lfs/clamav b/lfs/clamav
index a20922e..06ba0fc 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -82,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav-0.99.2-gcc-6.patch
    cd $(DIR_APP) && ./configure \
    	--prefix=/usr \
    	--disable-zlib-vcheck \
diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs
index 402753e..3018aa1 100644
--- a/lfs/reiserfsprogs
+++ b/lfs/reiserfsprogs
@@ -24,10 +24,10 @@
include Config
-VER        = 3.6.21
+VER        = 3.6.25
THISAPP    = reiserfsprogs-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0639cefac8f8150536cfa7531c2aa2d2
+$(DL_FILE)_MD5 = 027a598b055dccb8da3aea1378a19f3c
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index 34fd15f..3ebf0b8 100755
--- a/make.sh
+++ b/make.sh
@@ -652,8 +652,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
diff --git a/src/patches/clamav-0.99.2-gcc-6.patch b/src/patches/clamav-0.99.2-gcc-6.patch
new file mode 100644
index 0000000..2031edb
--- /dev/null
+++ b/src/patches/clamav-0.99.2-gcc-6.patch
@@ -0,0 +1,84 @@
+diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+index 59ff6aa..1325394 100644
+--- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
++++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+@@ -169,3 +169,3 @@ public:
+       KeyLength+1;
+-    unsigned Alignment = alignof<StringMapEntry>();
++    unsigned Alignment = alignOf<StringMapEntry>();
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+index 88044c7..86b0f40 100644
+--- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
++++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+@@ -417,3 +417,3 @@ namespace llvm {
+           ileAllocator.Allocate(sizeof(IndexListEntry),
+-          alignof<IndexListEntry>()));
++          alignOf<IndexListEntry>()));
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+index 6a7a1a6..979e597 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
++++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+@@ -51,8 +51,8 @@ struct AlignOf {
+ 
+-/// alignof - A templated function that returns the mininum alignment of
++/// alignOf - A templated function that returns the mininum alignment of
+ ///  of a type.  This provides no extra functionality beyond the AlignOf
+ ///  class besides some cosmetic cleanliness.  Example usage:
+-///  alignof<int>() returns the alignment of an int.
++///  alignOf<int>() returns the alignment of an int.
+ template <typename T>
+-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
++static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+index 4a7251f..17caf5e 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
++++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+@@ -203,3 +203,3 @@ public:
+       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
+-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
++        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
+         if (Ptr + sizeof(T) <= End)
+diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+index b892d85..dc72346 100644
+--- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
++++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
+   if (isAlignOf(AllocTy)) {
+-    OS << "alignof(" << *AllocTy << ")";
++    OS << "alignOf(" << *AllocTy << ")";
+     return;
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+index 824021c..757ca50 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+index 9564fe0..b2b7986 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/mpool.c b/libclamav/mpool.c
+index cd38e15..b5e537d 100644
+--- a/libclamav/mpool.c
++++ b/libclamav/mpool.c
+@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
+ 
+-static inline unsigned int alignof(size_t size)
++static inline unsigned int alignOf(size_t size)
+ {
+@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
+ void *mpool_malloc(struct MP *mp, size_t size) {
+-  size_t align = alignof(size);
++  size_t align = alignOf(size);
+   size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
hooks/post-receive
--
IPFire 2.x development tree

    