Hi,
On 08.05.2014 21:57, Sebastian Andrzej Siewior wrote:
On 2014-05-08 20:58:50 [+0200], Andreas Cadhalpun wrote:
I merged it now and added a changelog entry closing #669287.
Okay. So my testing is done. I would say very very good.
In freshclam I noticed that after the update the only option that was
missing was:
|NotifyClamd
in freshclam.conf. After re-running "dpkg-configure clamav-freshclam" it
got back. Not sure how important that is.
Thanks for your thorough testing!
NotifyClamd needs special casing, because instead of the debconf value
("true" or "false"), "/etc/clamav/clamd.conf" is written to the
configuration file, if the debconf value is "true" and the option is
omitted, if the debconf value is "false".
I fixed this problem now.
I added a # next to the bug in the changelog. In thing we are good to go
on the template front :)
Thanks.
Regarding the removal of llvm directory, I think the attached patch
should do, but I couldn't test, as split-target.sh fails:
configure.ac:130: required file `clamscan/Makefile.in' not found
configure.ac:130: required file `database/Makefile.in' not found
configure.ac:130: required file `docs/Makefile.in' not found
configure.ac:130: required file `clamd/Makefile.in' not found
configure.ac:130: required file `clamdscan/Makefile.in' not found
configure.ac:130: required file `clamsubmit/Makefile.in' not found
configure.ac:130: required file `clamav-milter/Makefile.in' not found
configure.ac:130: required file `freshclam/Makefile.in' not found
configure.ac:130: required file `sigtool/Makefile.in' not found
configure.ac:130: required file `clamconf/Makefile.in' not found
configure.ac:130: required file `etc/Makefile.in' not found
configure.ac:130: required file `test/Makefile.in' not found
configure.ac:130: required file `unit_tests/Makefile.in' not found
configure.ac:130: required file `clamdtop/Makefile.in' not found
configure.ac:130: required file `clambc/Makefile.in' not found
configure.ac:130: required file `clamav-config.in' not found
configure.ac:130: required file `libclamav.pc.in' not found
configure.ac:130: required file `docs/man/clamav-milter.8.in' not found
configure.ac:130: required file `docs/man/clamav-milter.conf.5.in' not found
configure.ac:130: required file `docs/man/clambc.1.in' not found
configure.ac:130: required file `docs/man/clamconf.1.in' not found
configure.ac:130: required file `docs/man/clamd.8.in' not found
configure.ac:130: required file `docs/man/clamd.conf.5.in' not found
configure.ac:130: required file `docs/man/clamdscan.1.in' not found
configure.ac:130: required file `docs/man/clamscan.1.in' not found
configure.ac:130: required file `docs/man/freshclam.1.in' not found
configure.ac:130: required file `docs/man/freshclam.conf.5.in' not found
configure.ac:130: required file `docs/man/sigtool.1.in' not found
configure.ac:130: required file `docs/man/clamdtop.1.in' not found
configure.ac:130: required file `docs/man/clamsubmit.1.in' not found
autoreconf: automake-1.11 failed with exit status: 1
What do you think?
Best regards,
Andreas
diff --git a/debian/split-tarball.sh b/debian/split-tarball.sh
index 9c53a9f..c1f92db 100755
--- a/debian/split-tarball.sh
+++ b/debian/split-tarball.sh
@@ -35,11 +35,13 @@ rm -r win32
sed -i 's/ win32//' Makefile.am Makefile.in
find shared -name '*.la' -o -name '*.lo' -o -name Makefile -exec rm {} \;
# cleanup llvm
-set -- libclamav/c++/llvm/utils/lit/lit/*.pyc
-if [ -f "$1" ] ; then
- echo "Pre-compiled python files found!"
- exit 1
-fi
+#set -- libclamav/c++/llvm/utils/lit/lit/*.pyc
+#if [ -f "$1" ] ; then
+# echo "Pre-compiled python files found!"
+# exit 1
+#fi
+# remove llvm, we build with the system version
+rm -r libclamav/c++/llvm
cp -R libclamunrar_iface $UNRARDIR
mv libclamunrar $UNRARDIR
cp -R m4/ $UNRARDIR
_______________________________________________
Pkg-clamav-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-clamav-devel
