diff --git a/B/bsdiff_classic/build_tarballs.jl b/B/bsdiff_classic/build_tarballs.jl index 3aadecad107..07ba935d64a 100644 --- a/B/bsdiff_classic/build_tarballs.jl +++ b/B/bsdiff_classic/build_tarballs.jl @@ -3,20 +3,23 @@ using BinaryBuilder, Pkg name = "bsdiff_classic" -version = v"4.3.0" +version = v"4.3.17" # Collection of sources required to complete build sources = [ - ArchiveSource("https://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz", "18821588b2dc5bf159aa37d3bcb7b885d85ffd1e19f23a0c57a58723fea85f48"), + GitSource("https://salsa.debian.org/debian/bsdiff.git", "24b5474a87e495678d71cac7ba02493fb4fa483f") ] # Bash recipe for building across all platforms script = raw""" -cd $WORKSPACE/srcdir/bsdiff-4.3 +cd bsdiff +atomic_patch -p1 $PWD/debian/patches/10-no-bsd-make.patch +atomic_patch -p1 $PWD/debian/patches/20-CVE-2014-9862.patch perl -i -ple '$_ = "#include \n" . $_ if $. == 31' bspatch.c -cc -O3 -lbz2 -I"${prefix}/include" bsdiff.c -o bsdiff -cc -O3 -lbz2 -I"${prefix}/include" bspatch.c -o bspatch +cc -O3 -lbz2 bsdiff.c -o bsdiff +cc -O3 -lbz2 bspatch.c -o bspatch install bsdiff bspatch "${bindir}" +install_license debian/copyright """ # Disable Windows for now, as there are many BSD-isms in the source code @@ -31,10 +34,9 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - # Future versions of bzip2 should allow a more relaxed compat because the - # soname of the macOS library shouldn't change at every patch release. - Dependency("Bzip2_jll", v"1.0.6"; compat="=1.0.6"), + Dependency("Bzip2_jll"; compat="1.0.8"), ] # Build the tarballs, and possibly a `build.jl` as well. -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies) +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; + julia_compat="1.6")