From e5444643544a41f64b83cce5c85af2da688205d9 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 19 Aug 2020 13:34:52 +0200 Subject: [PATCH] libsparkcrypto: src recipe, contrib alis, mk fixes * add libsparkcrypto source-recipe * provide ALI files through a new repository by mstein and add the repo download to the libsparcrypto port-file * remove dependencies to non-existent contrib ADB files from the library make files Fixes: #3852 --- repos/libports/lib/mk/libsparkcrypto.inc | 10 --- repos/libports/ports/libsparkcrypto.hash | 2 +- repos/libports/ports/libsparkcrypto.port | 6 +- .../recipes/api/libsparkcrypto/content.mk | 2 +- repos/libports/recipes/src/libsparkcrypto/api | 1 + .../recipes/src/libsparkcrypto/content.mk | 87 +++++++++++++++++++ .../libports/recipes/src/libsparkcrypto/hash | 1 + .../recipes/src/libsparkcrypto/used_apis | 2 + 8 files changed, 98 insertions(+), 13 deletions(-) create mode 100644 repos/libports/recipes/src/libsparkcrypto/api create mode 100644 repos/libports/recipes/src/libsparkcrypto/content.mk create mode 100644 repos/libports/recipes/src/libsparkcrypto/hash create mode 100644 repos/libports/recipes/src/libsparkcrypto/used_apis diff --git a/repos/libports/lib/mk/libsparkcrypto.inc b/repos/libports/lib/mk/libsparkcrypto.inc index 151ef2c6c6..2e95c78817 100644 --- a/repos/libports/lib/mk/libsparkcrypto.inc +++ b/repos/libports/lib/mk/libsparkcrypto.inc @@ -39,26 +39,16 @@ SRC_ADB = \ lsc-internal-sha1.adb \ lsc-internal-sha256.adb \ lsc-internal-sha512.adb \ - -SRC_ADB += \ - lsc-aes.adb \ - lsc-aes-cbc.adb \ lsc-aes_generic.adb \ lsc-aes_generic-cbc.adb \ lsc-internal-convert_hash.adb \ lsc-internal-convert_hmac.adb \ lsc-ops_generic.adb \ - lsc-ripemd160.adb \ lsc-ripemd160_generic.adb \ - lsc-ripemd160-hmac.adb \ lsc-ripemd160-hmac_generic.adb \ - lsc-sha1.adb \ lsc-sha1_generic.adb \ - lsc-sha1-hmac.adb \ lsc-sha1-hmac_generic.adb \ - lsc-sha2.adb \ lsc-sha2_generic.adb \ - lsc-sha2-hmac.adb \ lsc-sha2-hmac_generic.adb \ diff --git a/repos/libports/ports/libsparkcrypto.hash b/repos/libports/ports/libsparkcrypto.hash index fb7720ae8a..6863796f96 100644 --- a/repos/libports/ports/libsparkcrypto.hash +++ b/repos/libports/ports/libsparkcrypto.hash @@ -1 +1 @@ -128833c0cc96fb90bae3f02a69d1ea03dbf55d78 +924de3e010a59511447f0392a2df3e3565ccaf5f diff --git a/repos/libports/ports/libsparkcrypto.port b/repos/libports/ports/libsparkcrypto.port index 79b2228e09..1f069c8a99 100644 --- a/repos/libports/ports/libsparkcrypto.port +++ b/repos/libports/ports/libsparkcrypto.port @@ -1,7 +1,11 @@ LICENSE := BSD VERSION := git -DOWNLOADS := libsparkcrypto.git +DOWNLOADS := libsparkcrypto.git libsparkcrypto-alis.git URL(libsparkcrypto) := https://github.com/m-stein/libsparkcrypto.git DIR(libsparkcrypto) := libsparkcrypto REV(libsparkcrypto) := a8d7086714d90aa772829c69064a7236bddec6d9 + +URL(libsparkcrypto-alis) := https://github.com/m-stein/libsparkcrypto-alis.git +DIR(libsparkcrypto-alis) := libsparkcrypto-alis +REV(libsparkcrypto-alis) := b16d45ad204d252b4327ac3c062dcccebaac9380 diff --git a/repos/libports/recipes/api/libsparkcrypto/content.mk b/repos/libports/recipes/api/libsparkcrypto/content.mk index d54911a41f..7454e000c0 100644 --- a/repos/libports/recipes/api/libsparkcrypto/content.mk +++ b/repos/libports/recipes/api/libsparkcrypto/content.mk @@ -1,7 +1,7 @@ LSC_DIR := \ $(call port_dir,$(GENODE_DIR)/repos/libports/ports/libsparkcrypto) LSC_ALI_DIR := \ - $(call port_dir,$(GENODE_DIR)/repos/libports/ports/libsparkcrypto)/lib/ali/libsparkcrypto + $(call port_dir,$(GENODE_DIR)/repos/libports/ports/libsparkcrypto)/libsparkcrypto-alis/lib/ali/libsparkcrypto MIRROR_FROM_LSC_DIR := \ $(addprefix libsparkcrypto/src/shared/generic/,\ diff --git a/repos/libports/recipes/src/libsparkcrypto/api b/repos/libports/recipes/src/libsparkcrypto/api new file mode 100644 index 0000000000..e704c5d1ef --- /dev/null +++ b/repos/libports/recipes/src/libsparkcrypto/api @@ -0,0 +1 @@ +libsparkcrypto diff --git a/repos/libports/recipes/src/libsparkcrypto/content.mk b/repos/libports/recipes/src/libsparkcrypto/content.mk new file mode 100644 index 0000000000..0d3c22cdf9 --- /dev/null +++ b/repos/libports/recipes/src/libsparkcrypto/content.mk @@ -0,0 +1,87 @@ +LSC_DIR := \ + $(call port_dir,$(GENODE_DIR)/repos/libports/ports/libsparkcrypto) + +MIRROR_FROM_LSC_DIR := \ + $(addprefix libsparkcrypto/src/shared/generic/,\ + lsc-types.ads \ + lsc-internal-aes-tables.ads \ + lsc-internal-ripemd160-print.ads \ + lsc-internal-aes-print.ads \ + lsc-internal-sha512-tables.ads \ + lsc-internal-sha256-tables.ads \ + lsc-internal-math_int.ads \ + lsc-internal-convert.ads \ + lsc-internal.ads \ + lsc-internal-debug.ads \ + lsc.ads \ + lsc-aes_generic.adb \ + lsc-aes_generic-cbc.adb \ + lsc-internal-convert_hash.adb \ + lsc-internal-convert_hmac.adb \ + lsc-ops_generic.adb \ + lsc-ripemd160_generic.adb \ + lsc-ripemd160-hmac_generic.adb \ + lsc-sha1_generic.adb \ + lsc-sha1-hmac_generic.adb \ + lsc-sha2_generic.adb \ + lsc-sha2-hmac_generic.adb \ + lsc-internal-aes.adb \ + lsc-internal-aes-cbc.adb \ + lsc-internal-bignum.adb \ + lsc-internal-byteswap32.adb \ + lsc-internal-byteswap64.adb \ + lsc-internal-ec.adb \ + lsc-internal-ec_signature.adb \ + lsc-internal-hmac_ripemd160.adb \ + lsc-internal-hmac_sha1.adb \ + lsc-internal-hmac_sha256.adb \ + lsc-internal-hmac_sha384.adb \ + lsc-internal-hmac_sha512.adb \ + lsc-internal-ops32.adb \ + lsc-internal-ops64.adb \ + lsc-internal-pad32.adb \ + lsc-internal-pad64.adb \ + lsc-internal-ripemd160.adb \ + lsc-internal-sha1.adb \ + lsc-internal-sha256.adb \ + lsc-internal-sha512.adb) \ + $(addprefix libsparkcrypto/src/ada/nullio/,\ + lsc-internal-io.adb) \ + $(addprefix libsparkcrypto/src/shared/little_endian/,\ + lsc-internal-byteorder32.adb \ + lsc-internal-byteorder64.adb) \ + $(addprefix libsparkcrypto/src/ada/generic/,\ + lsc-internal-debug.ads \ + lsc-internal-types.adb) \ + $(addprefix libsparkcrypto/src/ada/debug/,\ + lsc-internal-ripemd160-print.ads \ + lsc-internal-aes-print.ads) \ + $(addprefix libsparkcrypto/build/,\ + pragmas.adc) + +content: $(MIRROR_FROM_LSC_DIR) + +$(MIRROR_FROM_LSC_DIR): + mkdir -p $(dir $@) + cp -a $(LSC_DIR)/$@ $(dir $@) + +MIRROR_FROM_REP_DIR := \ + lib/mk/libsparkcrypto.mk \ + lib/mk/libsparkcrypto.inc \ + lib/import/import-libsparkcrypto.mk \ + +content: $(MIRROR_FROM_REP_DIR) + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +content: LICENSE + +LICENSE: + echo "BSD-3-Clause-Attribution, see libsparkcrypto/README.rst" > $@ + +content: src/lib/libsparkcrypto/target.mk + +src/lib/libsparkcrypto/target.mk: + mkdir -p $(dir $@) + echo "LIBS = libsparkcrypto" > $@ diff --git a/repos/libports/recipes/src/libsparkcrypto/hash b/repos/libports/recipes/src/libsparkcrypto/hash new file mode 100644 index 0000000000..e9fed10130 --- /dev/null +++ b/repos/libports/recipes/src/libsparkcrypto/hash @@ -0,0 +1 @@ +2020-08-18-r 3b53eb3aaac1d8c59a404d9391387cb84068dc53 diff --git a/repos/libports/recipes/src/libsparkcrypto/used_apis b/repos/libports/recipes/src/libsparkcrypto/used_apis new file mode 100644 index 0000000000..da768300f0 --- /dev/null +++ b/repos/libports/recipes/src/libsparkcrypto/used_apis @@ -0,0 +1,2 @@ +base +spark