Hi,
On 09.05.2014 00:09, Sebastian Andrzej Siewior wrote:
On 2014-05-08 23:14:49 [+0200], Andreas Cadhalpun wrote:
I just fixed the split-script. In testing mode of the result.
Thanks.
Bah. So the split scripts creates a tarball. I was doing the git-dpm
thingy and now I am grumpy.
I removed the libclamav/c++/llvm directory and then followed your
instructions below with minor modifications.
I did "git-dpm import-new-upstream --rebase-patched
../clamav_0.98.3+dfsg.orig.tar.xz"
I also ran:
pristine-tar commit ../clamav_0.98.3+dfsg.orig.tar.xz upstream-unstable
and then I tried to to "git rebase --skip" on the following three
patches
0002-Sebastian-Andrzej-Siewior.patch
0003-configure-use-pkg-config-for-check-so-test-is-detect.patch
0004-Stop-using-a-cargo-culted-syscall-table-and-trust-th.patch
We can also drop (This has been fixed independently upstream.):
0010-Add-missing-libxml2-include-to-fix-compiler-warning-.patch
And for
0005-configure.ac-patches-to-got-with-autoreconf-and-auto.patch
we can take the AM_INIT_AUTOMAKE lines from upstream and just add
AM_PROG_AR.
I have also changed 0009-Fix-FTBFS-with-LLVM-3.1-3.4.patch:
Remove AC_CONFIG_SRCDIR([llvm/configure]), otherwise this gives:
configure: error: cannot find sources (llvm/configure) in .
as I think upstream wanted to do something about it. Anyway the --skip
part did not work so I used "git add" and continued. After it was done,
I did a "git rebase" and dropped those three commits. Is there an easier
workflow?
For me the --skip worked the first time, but not the second time (0003
pkg-config for check so test is detected and tests will run). After that
it worked again. Is there a bug in git?
We gained new options:
|Unhandled option(clamd.conf): DisableCache
|Unhandled option(clamd.conf): PartitionIntersection
|Unhandled option(clamd.conf): MaxPartitions
|Unhandled option(clamd.conf): MaxIconsPE
|Unhandled option(clamd.conf): StatsEnabled
|Unhandled option(clamd.conf): StatsPEDisabled
|Unhandled option(clamd.conf): StatsHostID
|Unhandled option(clamd.conf): StatsTimeout
I'll create templates next.
and need to build-depen on libssl-dev
Yes. We shouldn't forget to update debian/copyright for the openssl
exception.
|configure: WARNING: libcurl not found. Please use the web interface for
|submitting FPs/FNs.
not sure what we should about this. But it looks an extra tool.
I don't know what FPs/FNs is supposed to mean, but this seems to be
related to the new tool clamsubmit. I'm not sure we need it.
With this changes it built (and failed due to missing .rar files
followed by new symbols).
The problem is, that upstream wanted to do us (users of --disable-unrar)
a favor and added to test/Makefile.am this check:
if ENABLE_UNRAR
FILES += clam-v2.rar clam-v3.rar
endif
So we can't ship the rar files anymore. I modified
clamav-testfiles.install accordingly.
There are not only new, but also missing symbols:
SHA1Final@CLAMAV_PRIVATE 0.98.1
SHA1Init@CLAMAV_PRIVATE 0.98.1
SHA1Update@CLAMAV_PRIVATE 0.98.1
sha256_final@CLAMAV_PRIVATE 0.98.1
sha256_init@CLAMAV_PRIVATE 0.98.1
sha256_update@CLAMAV_PRIVATE 0.98.1
So we have to check if all reverse-dependencies build correctly with the
new library.
What do you think?
Hard to say without testing :) The Makefile.am in c++ is referecing the
files in llvm subdirectory. I would assume that they need to be changed
but I could be wrong. Anyway, once the split script is wokring, I am in
my bed…
I think it should just work, because we are in the 'BUILD_EXTERNAL_LLVM'
codepath. Let's see.
I haven't pushed my hacks yet. If you want to remove llvm directory be
my guest. The rebase then should be easy.
I pushed my version to Alioth.
Remaining things TODO:
* create new templates (I'm going to work on this next.)
* update lintian overrides
* update debian/copyright
* update debian/changelog
* update libclamunrar
* check if we want to build clamsubmit
* check if reverse-build-dependencies still build
* check installation/upgrade
* check if bugs are possibly fixed with this version
Best regards,
Andreas
_______________________________________________
Pkg-clamav-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-clamav-devel
