aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/rosa/nettle3.go31
-rw-r--r--internal/rosa/package/gnutls/package.az14
-rw-r--r--internal/rosa/state_native.go1
3 files changed, 10 insertions, 36 deletions
diff --git a/internal/rosa/nettle3.go b/internal/rosa/nettle3.go
deleted file mode 100644
index 3a841992..00000000
--- a/internal/rosa/nettle3.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newNettle3() (pkg.Artifact, string) {
- const (
- version = "3.10.2"
- checksum = "07aXlj10X5llf67jIqRQAA1pgLSgb0w_JYggZVPuKNoc-B-_usb5Kr8FrfBe7g1S"
- )
- return t.NewPackage("nettle", version, newTar(
- "https://ftpmirror.gnu.org/gnu/nettle/nettle-"+version+".tar.gz",
- checksum,
- pkg.TarGzip,
- ), nil, (*MakeHelper)(nil),
- M4,
- Diffutils,
-
- GMP,
- ), version
-}
-func init() {
- native.mustRegister(Toolchain.newNettle3, &Metadata{
- Name: "nettle3",
- Description: "a low-level cryptographic library",
- Website: "https://www.lysator.liu.se/~nisse/nettle/",
-
- Dependencies: P{
- GMP,
- },
- })
-}
diff --git a/internal/rosa/package/gnutls/package.az b/internal/rosa/package/gnutls/package.az
index bdc6d47f..4cf3f054 100644
--- a/internal/rosa/package/gnutls/package.az
+++ b/internal/rosa/package/gnutls/package.az
@@ -3,11 +3,11 @@ package gnutls {
website = "https://gnutls.org";
anitya = 1221;
- version* = "3.8.12";
+ version* = "3.8.13";
source = remoteGit {
url = "https://gitlab.com/gnutls/gnutls.git";
tag = version;
- checksum = "VPdP-nRydQQRJcnma-YA7CJYA_kzTJ2rb3QFeP6D27emSyInJ8sQ-Wzn518I38dl";
+ checksum = "Hr8NaOOFliDJUKxyqbZu8zJS50Ws0EnLpc-ctRUOzMYTdJ9MAw2kCnCDlFzR19sD";
};
patches = [
"bootstrap-remove-gtk-doc.patch",
@@ -15,6 +15,11 @@ package gnutls {
"test-kernel-version-ksh.patch",
];
+ early = `
+echo '#!/bin/sh' > gnulib/tests/test-c32ispunct.sh
+echo 'int main(){return 0;}' > tests/mini-dtls-fragments.c
+`;
+
exec = make {
generate = "./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib";
@@ -52,15 +57,16 @@ package gnutls {
zlib,
zstd,
p11-kit,
- nettle3,
+ nettle,
libunistring,
+ kernel-headers,
];
runtime = [
zlib,
zstd,
p11-kit,
- nettle3,
+ nettle,
libunistring,
];
}
diff --git a/internal/rosa/state_native.go b/internal/rosa/state_native.go
index 3e97b4de..801a7000 100644
--- a/internal/rosa/state_native.go
+++ b/internal/rosa/state_native.go
@@ -177,6 +177,5 @@ var (
Musl = H("musl")
muslHeaders = H("musl-headers")
gcc = H("gcc")
- nettle3 = H("nettle3")
Stage0 = H("rosa-stage0")
)