Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/lavabit/magma.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev/scripts/builders/build.lib.params.sh4
-rwxr-xr-xdev/scripts/builders/build.lib.sh64
-rw-r--r--lib/archives/clamav-0.98.4.tar.gzbin0 -> 15537593 bytes
-rw-r--r--lib/archives/clamav-0.98.7.tar.gzbin0 -> 15118851 bytes
-rw-r--r--lib/archives/clamav-0.99.3.tar.gzbin0 -> 38795146 bytes
-rw-r--r--lib/archives/zlib-1.2.10.tar.gzbin0 -> 607647 bytes
-rw-r--r--lib/archives/zlib-1.2.8.tar.gzbin0 -> 571091 bytes
-rw-r--r--lib/archives/zlib-1.2.9.tar.gzbin0 -> 607350 bytes
8 files changed, 42 insertions, 26 deletions
diff --git a/dev/scripts/builders/build.lib.params.sh b/dev/scripts/builders/build.lib.params.sh
index 5e24760d..e6ba616a 100644
--- a/dev/scripts/builders/build.lib.params.sh
+++ b/dev/scripts/builders/build.lib.params.sh
@@ -7,13 +7,13 @@ CURL="curl-7.23.1"
SPF2="libspf2-1.2.10"
XML2="libxml2-2.9.3"
DKIM="opendkim-2.10.3"
-ZLIB="zlib-1.2.11"
+ZLIB="zlib-1.2.8"
JPEG="jpeg-9b"
BZIP2="bzip2-1.0.6"
DSPAM="dspam-3.10.2"
MYSQL="mysql-5.1.73"
GEOIP="GeoIP-1.4.8"
-CLAMAV="clamav-0.99.2"
+CLAMAV="clamav-0.98.7"
CHECKER="check-0.11.0"
OPENSSL="openssl-1.0.2l"
GOOGTAP="gtest-tap-listener-0.5"
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh
index 01a82942..a94cbfc0 100755
--- a/dev/scripts/builders/build.lib.sh
+++ b/dev/scripts/builders/build.lib.sh
@@ -1131,32 +1131,41 @@ clamav() {
export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE -I$M_LOCAL/include"
export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -DGNU_SOURCE -I$M_LOCAL/include"
export LDFLAGS="-L$M_LOCAL/lib -Wl,-rpath,$M_LOCAL/lib"
+#
+# export CFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
+# export CXXFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
+# export CPPFLAGS="-fPIC -g3 -rdynamic -D_FORTIFY_SOURCE=2 -O2 -DGNU_SOURCE"
+# export CPPFLAGS="$CPPFLAGS \
+# -I$M_SOURCES/curl/include \
+# -I$M_SOURCES/openssl/include \
+# -I$M_SOURCES/zlib"
+# export LDFLAGS="\
+# -L$M_SOURCES/curl/lib -Wl,-rpath,$M_SOURCES/curl/lib\
+# -L$M_SOURCES/openssl -Wl,-rpath,$M_SOURCES/openssl\
+# -L$M_SOURCES/zlib -Wl,-rpath,$M_SOURCES/zlib"
+
# Note that at least in version 0.97 and 0.98, --disable-llvm breaks the unit tests. And with ClamAV 0.98.4
- # Zlib 1.2.11 is mistaken for Zlib 1.2.1 and thus triggers an invalid security complaint.
-# if [[ $CLAMAV =~ "clamav-0.99."[0-9] ]]; then #
-# ./configure \
-# --enable-check --enable-static --disable-yara --disable-mempool --disable-llvm --disable-zlib-vcheck \
-# --with-openssl="$M_LOCAL" --with-zlib="$M_LOCAL" --with-xml="$M_LOCAL" --with-libcurl="$M_LOCAL" \
-# --with-libbz2-prefix="$M_LOCAL" --with-libcheck-prefix="$M_LOCAL" \
-# --prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
-# &>> "$M_LOGS/clamav.txt"; error
-# --with-libcheck-prefix="$M_LOCAL"
+################################################################################################################################
+################################################################################################################################
+################################################################################################################################
+ # Updated to work with 0.99.2 but doesn't work with Zlib 1.2.11, yet.
./configure \
- --enable-static --enable-shared --disable-check --disable-mempool --disable-llvm --disable-silent-rules \
+ --enable-check --enable-static --enable-shared --disable-mempool --disable-llvm --disable-silent-rules \
--with-openssl="$M_LOCAL" --with-zlib="$M_LOCAL" --with-xml="$M_LOCAL" --with-libcurl="$M_LOCAL" \
- --with-libbz2-prefix="$M_LOCAL" \
+ --with-libbz2-prefix="$M_LOCAL" --with-libcheck-prefix="$M_LOCAL" \
--prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
&>> "$M_LOGS/clamav.txt"; error
-# else
-# ./configure \
-# --disable-llvm --with--disable-xml --enable-check --enable-static --disable-silent-rules --disable-libcurl \
-# --with-openssl="$M_SOURCES/openssl" --with-zlib="$M_SOURCES/zlib" --with-libcheck-prefix="$M_LOCAL" \
-# --with-libbz2-prefix="$M_SOURCES/bzip2" --prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
-# &>> "$M_LOGS/clamav.txt"; error
-#
-# fi
+################################################################################################################################
+################################################################################################################################
+################################################################################################################################
+# ./configure \
+# --disable-llvm --disable-jit --with-disable-xml --enable-check --enable-static --disable-silent-rules --disable-libcurl \
+# --with-openssl="$M_SOURCES/openssl" --with-zlib="$M_SOURCES/zlib" --with-libcheck-prefix="$M_LOCAL" \
+# --with-libbz2-prefix="$M_SOURCES/bzip2" --prefix="$M_LOCAL" --exec-prefix="$M_LOCAL" --libdir="$M_LOCAL/lib" \
+# &>> "$M_LOGS/clamav.txt"; error
+
unset CFLAGS; unset CXXFLAGS; unset CPPFLAGS
if [[ $CLAMAV =~ "clamav-0.9"[7-9]"."[1-9] ]]; then
@@ -1168,7 +1177,7 @@ clamav() {
printf "\x23\x21/bin/bash\nexit 77\n" > "$M_SOURCES/clamav/unit_tests/check4_clamd.sh"; error
fi
- make &>> "$M_LOGS/clamav.txt"; error
+ make --jobs=4 &>> "$M_LOGS/clamav.txt"; error
make install &>> "$M_LOGS/clamav.txt"; error
;;
clamav-check)
@@ -1336,12 +1345,19 @@ openssl() {
if [ $? == 0 ]; then
export CONFIGOPTS='-fno-merge-debug-strings '
fi
- ./config \
+# ./config \
+# -d shared zlib no-asm --openssldir="$M_LOCAL" --libdir="lib" \
+# -I"$M_SOURCES/zlib" -O $CONFIGOPTS -g3 -rdynamic -fPIC -DPURIFY -D_FORTIFY_SOURCE=2 \
+# -L"$M_SOURCES/openssl" -Wl,-rpath,"$M_SOURCES/openssl" \
+# -L"$M_SOURCES/zlib" -Wl,-rpath,"$M_SOURCES/zlib" \
+# &>> "$M_LOGS/openssl.txt"; error
+#
+ ./config \
-d shared zlib no-asm --openssldir="$M_LOCAL" --libdir="lib" \
- -I"$M_SOURCES/zlib" -O $CONFIGOPTS -g3 -rdynamic -fPIC -DPURIFY -D_FORTIFY_SOURCE=2 \
- -L"$M_SOURCES/openssl" -Wl,-rpath,"$M_SOURCES/openssl" \
- -L"$M_SOURCES/zlib" -Wl,-rpath,"$M_SOURCES/zlib" \
+ -I"$M_SOURCES/include/" -O $CONFIGOPTS -g3 -rdynamic -fPIC -DPURIFY -D_FORTIFY_SOURCE=2 \
+ -L"$M_SOURCES/lib/" -Wl,-rpath,"$M_SOURCES/lib/" \
&>> "$M_LOGS/openssl.txt"; error
+
make depend &>> "$M_LOGS/openssl.txt"; error
make &>> "$M_LOGS/openssl.txt"; error
diff --git a/lib/archives/clamav-0.98.4.tar.gz b/lib/archives/clamav-0.98.4.tar.gz
new file mode 100644
index 00000000..5bdbb103
--- /dev/null
+++ b/lib/archives/clamav-0.98.4.tar.gz
Binary files differ
diff --git a/lib/archives/clamav-0.98.7.tar.gz b/lib/archives/clamav-0.98.7.tar.gz
new file mode 100644
index 00000000..5720e9da
--- /dev/null
+++ b/lib/archives/clamav-0.98.7.tar.gz
Binary files differ
diff --git a/lib/archives/clamav-0.99.3.tar.gz b/lib/archives/clamav-0.99.3.tar.gz
new file mode 100644
index 00000000..3980e111
--- /dev/null
+++ b/lib/archives/clamav-0.99.3.tar.gz
Binary files differ
diff --git a/lib/archives/zlib-1.2.10.tar.gz b/lib/archives/zlib-1.2.10.tar.gz
new file mode 100644
index 00000000..e83fd64d
--- /dev/null
+++ b/lib/archives/zlib-1.2.10.tar.gz
Binary files differ
diff --git a/lib/archives/zlib-1.2.8.tar.gz b/lib/archives/zlib-1.2.8.tar.gz
new file mode 100644
index 00000000..ed88885b
--- /dev/null
+++ b/lib/archives/zlib-1.2.8.tar.gz
Binary files differ
diff --git a/lib/archives/zlib-1.2.9.tar.gz b/lib/archives/zlib-1.2.9.tar.gz
new file mode 100644
index 00000000..11ecc85c
--- /dev/null
+++ b/lib/archives/zlib-1.2.9.tar.gz
Binary files differ