From 7b72a025d3e0451083f716e0c217033c8f374269 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Tue, 5 Jan 2021 14:43:37 +0100
Subject: [PATCH] fix build rs

---
 fuzzers/libfuzzer_libpng/build.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fuzzers/libfuzzer_libpng/build.rs b/fuzzers/libfuzzer_libpng/build.rs
index f15c5f7bb9..f9f76f2578 100644
--- a/fuzzers/libfuzzer_libpng/build.rs
+++ b/fuzzers/libfuzzer_libpng/build.rs
@@ -4,7 +4,7 @@ use std::env;
 use std::path::Path;
 use std::process::Command;
 
-const LIBPNG_URL: &str = "http://prdownloads.sourceforge.net/libpng/libpng-1.6.37.tar.gz?download";
+const LIBPNG_URL: &str = "https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz";
 
 fn main() {
     let out_dir = env::var_os("OUT_DIR").unwrap();
@@ -15,15 +15,10 @@ fn main() {
     println!("cargo:rerun-if-changed=./runtime/rt.c",);
     println!("cargo:rerun-if-changed=harness.cc");
 
-    cc::Build::new()
-        .file("../libfuzzer_runtime/rt.c")
-        .file("./harness.cc")
-        .compile("libfuzzer-sys");
-
     let libpng = format!("{}/libpng-1.6.37", &out_dir);
     let libpng_path = Path::new(&libpng);
-    let libpng_tar = format!("{}/libpng-1.6.37.tar.gz", &cwd);
-
+    let libpng_tar = format!("{}/libpng-1.6.37.tar.xz", &cwd);
+    
     if !libpng_path.is_dir() {
         if !Path::new(&libpng_tar).is_file() {
             println!("cargo:warning=Libpng not found, downloading...");
@@ -38,7 +33,7 @@ fn main() {
         }
         Command::new("tar")
             .current_dir(&out_dir_path)
-            .arg("-xvzf")
+            .arg("-xvf")
             .arg(&libpng_tar)
             .status()
             .unwrap();
@@ -87,6 +82,12 @@ fn main() {
             .status()
             .unwrap();
     }
+    
+    cc::Build::new()
+        .include(&libpng_path)
+        .file("../libfuzzer_runtime/rt.c")
+        .file("./harness.cc")
+        .compile("libfuzzer-sys");
 
     println!("cargo:rustc-link-search=native={}", &out_dir);
     println!("cargo:rustc-link-search=native={}/.libs", &libpng);