Clean up build scripts

Author: Kraemii

rust/Cargo.lock

@@ -2,24 +2,24 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later WITH x11vnc-openssl-exception
 
+use std::env;
 use std::fs::canonicalize;
 
 fn main() {
-    println!(
-        "cargo:rustc-link-search={}",
-        canonicalize("./lib").unwrap().to_string_lossy()
-    );
-    println!("cargo:rustc-link-lib=static=gcrypt");
-    println!("cargo:rustc-link-lib=static=gpg-error");
     println!("cargo:rerun-if-changed=c/cryptographic/gcrypt_mac.c");
     println!("cargo:rerun-if-changed=c/cryptographic/gcrypt_error.c");
-    println!("cargo:rerun-if-changed=lib/libgcrypt.a");
-    println!("cargo:rerun-if-changed=lib/libgpg-error.a");
+
+    let include_dir = env::var("DEP_GCRYPT_INCLUDE").unwrap();
+    let lib_dir = env::var("DEP_GCRYPT_LIB").unwrap();
+
+    println!("cargo:rustc-link-search=native={lib_dir}");
+    println!("cargo:rustc-link-lib=static=gcrypt");
+    println!("cargo:rustc-link-lib=static=gpg-error");
 
     cc::Build::new()
         .file("c/cryptographic/gcrypt_mac.c")
         .file("c/cryptographic/gcrypt_error.c")
-        .include(canonicalize("./include").unwrap())
+        .include(canonicalize(include_dir).unwrap())
         .opt_level(2)
         .compile("crypt");
 }

rust/crates/nasl-c-lib/build.rs

@@ -3,3 +3,6 @@ name = "libgcrypt-sys"
 version = "0.1.0"
 edition = "2024"
 links = "gcrypt"
+
+[build-dependencies]
+autotools = "0.2"

rust/crates/nasl-c-lib/libgcrypt-sys/Cargo.toml

@@ -2,34 +2,66 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later WITH x11vnc-openssl-exception
 
-use std::{env, process::Command};
+use std::{
+    env,
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+const GPG_ERROR_VERSION: &str = "1.54";
+const LIBGCRYPT_VERSION: &str = "1.10.2";
 
 fn main() {
-    println!("cargo:rerun-if-changed=install-gcrypt.sh");
-    let target = env::var("TARGET").unwrap_or_default();
-    let cross = env::var("IN_CROSS").unwrap_or_default();
-    let clean = env::var("CLEAN").unwrap_or_default();
-    let out = Command::new("sh")
-        .arg("install-gcrypt.sh")
-        .env("TARGET", target)
-        .env("IN_CROSS", cross)
-        .env("CLEAN", clean)
-        .output();
-    match out {
-        Ok(out) => {
-            match out.status.code() {
-                Some(0) | None => {
-                    //everything is dandy
-                }
-                Some(status) => {
-                    panic!(
-                        "Script exited with {status}:\nstdout:\n{}\nstderr:\n{}",
-                        String::from_utf8_lossy(&out.stdout),
-                        String::from_utf8_lossy(&out.stderr)
-                    );
-                }
-            }
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+
+    let path = fetch_source("libgpg-error", GPG_ERROR_VERSION, &out_dir);
+    build_autotools_project(&path);
+
+    let path = fetch_source("libgcrypt", LIBGCRYPT_VERSION, &out_dir);
+    build_autotools_project(&path);
+
+    let include_dir = out_dir.join("include");
+    let lib_dir = out_dir.join("lib");
+
+    println!("cargo:include={}", include_dir.display());
+    println!("cargo:lib={}", lib_dir.display());
+}
+
+fn fetch_source(name: &str, version: &str, destination: &Path) -> PathBuf {
+    let folder_name = format!("{}-{}", name, version);
+    let extract_path = destination.join(&folder_name);
+    let tar_path = extract_path.with_added_extension("tar.bz2");
+
+    if !extract_path.exists() {
+        if !tar_path.exists() {
+            let url = format!("https://gnupg.org/ftp/gcrypt/{name}/{folder_name}.tar.bz2");
+
+            Command::new("curl")
+                .args(["--fail", "-O", &url])
+                .current_dir(destination)
+                .status()
+                .unwrap();
         }
-        Err(e) => panic!("Unexpected error: {e}"),
+
+        Command::new("tar")
+            .args(["-xf", &tar_path.to_string_lossy()])
+            .current_dir(destination)
+            .status()
+            .unwrap();
     }
+
+    extract_path
+}
+
+fn build_autotools_project(src: &Path) -> PathBuf {
+    let target = env::var("TARGET").unwrap();
+
+    let mut config = autotools::Config::new(src);
+    config
+        .enable_static()
+        .disable_shared()
+        .config_option("with-pic", None)
+        .host(&target);
+
+    config.build()
 }

rust/crates/nasl-c-lib/libgcrypt-sys/build.rs

@@ -16,13 +16,12 @@ mod isotime;
 mod knowledge_base;
 pub mod misc;
 pub mod network;
-mod snmp;
-
 mod preferences;
 #[cfg(feature = "nasl-builtin-raw-ip")]
 pub mod raw_ip;
 mod regex;
 mod report_functions;
+mod snmp;
 mod ssh;
 mod string;
 mod sys;