From b3df3a2e9613980c6749045f2d1c0a5bff410d4d Mon Sep 17 00:00:00 2001 From: yashashwi Date: Fri, 8 Mar 2024 16:02:27 +0000 Subject: [PATCH 1/4] feat(23.10):add archive for curl in mantic --- slices/curl.yaml | 10 ++++++++++ slices/libbrotli1.yaml | 11 +++++++++++ slices/libcurl4.yaml | 20 ++++++++++++++++++++ slices/libgcrypt20.yaml | 10 ++++++++++ slices/libgnutls30.yaml | 16 ++++++++++++++++ slices/libgpg-error0.yaml | 10 ++++++++++ slices/libhogweed6.yaml | 11 +++++++++++ slices/libldap2.yaml | 11 +++++++++++ slices/libnettle8.yaml | 8 ++++++++ slices/libnghttp2-14.yaml | 9 +++++++++ slices/libp11-kit0.yaml | 9 +++++++++ slices/librtmp1.yaml | 14 ++++++++++++++ slices/libsasl2-2.yaml | 10 ++++++++++ slices/libsasl2-modules-db.yaml | 9 +++++++++ slices/libssh-4.yaml | 11 +++++++++++ slices/libssh2-1.yaml | 15 +++++++++++++++ slices/libtasn1-6.yaml | 8 ++++++++ 17 files changed, 192 insertions(+) create mode 100644 slices/curl.yaml create mode 100644 slices/libbrotli1.yaml create mode 100644 slices/libcurl4.yaml create mode 100644 slices/libgcrypt20.yaml create mode 100644 slices/libgnutls30.yaml create mode 100644 slices/libgpg-error0.yaml create mode 100644 slices/libhogweed6.yaml create mode 100644 slices/libldap2.yaml create mode 100644 slices/libnettle8.yaml create mode 100644 slices/libnghttp2-14.yaml create mode 100644 slices/libp11-kit0.yaml create mode 100644 slices/librtmp1.yaml create mode 100644 slices/libsasl2-2.yaml create mode 100644 slices/libsasl2-modules-db.yaml create mode 100644 slices/libssh-4.yaml create mode 100644 slices/libssh2-1.yaml create mode 100644 slices/libtasn1-6.yaml diff --git a/slices/curl.yaml b/slices/curl.yaml new file mode 100644 index 000000000..b3bc25a3a --- /dev/null +++ b/slices/curl.yaml @@ -0,0 +1,10 @@ +package: curl + +slices: + bins: + essential: + - libc6_libs + - libcurl4_libs + - zlib1g_libs + contents: + /usr/bin/curl: diff --git a/slices/libbrotli1.yaml b/slices/libbrotli1.yaml new file mode 100644 index 000000000..cdfff6af4 --- /dev/null +++ b/slices/libbrotli1.yaml @@ -0,0 +1,11 @@ +# Library implementing brotli encoder and decoder (shared libraries) +package: libbrotli1 + +slices: + libs: + essentials: + - libc6_libs + contents: + /usr/lib/*-linux-*/libbrotlicommon.so.1*: + /usr/lib/*-linux-*/libbrotlidec.so.1*: + /usr/lib/*-linux-*/libbrotlienc.so.1*: diff --git a/slices/libcurl4.yaml b/slices/libcurl4.yaml new file mode 100644 index 000000000..aeffff739 --- /dev/null +++ b/slices/libcurl4.yaml @@ -0,0 +1,20 @@ +# Easy-to-use client-side URL transfer library (OpenSSL flavour) +package: libcurl4 + +slices: + libs: + essential: + - libbrotli1_libs + - libc6_libs + - libgssapi-krb5-2_libs + - libidn2-0_libs + - libldap2_libs + - libnghttp2-14_libs + - libpsl5_libs + - librtmp1_libs + - libssh-4_libs + - libssl3_libs + - libzstd1_libs + - zlib1g_libs + contents: + /usr/lib/*-linux-*/libcurl.so.4*: diff --git a/slices/libgcrypt20.yaml b/slices/libgcrypt20.yaml new file mode 100644 index 000000000..4d88eced0 --- /dev/null +++ b/slices/libgcrypt20.yaml @@ -0,0 +1,10 @@ +# LGPL Crypto library - runtime library +package: libgcrypt20 + +slices: + libs: + essential: + - libc6_libs + - libgpg-error0_libs + contents: + /usr/lib/*-linux-*/libgcrypt.so.20*: diff --git a/slices/libgnutls30.yaml b/slices/libgnutls30.yaml new file mode 100644 index 000000000..0093148df --- /dev/null +++ b/slices/libgnutls30.yaml @@ -0,0 +1,16 @@ +# GNU TLS library - main runtime library +package: libgnutls30 + +slices: + libs: + essentials: + - libc6_libs + - libgmp10_libs + - libhogweed6_libs + - libidn2-0_libs + - libnettle8_libs + - libp11-kit0_libs + - libtasn1-6_libs + - libunistring2_libs + contents: + /usr/lib/*-linux-*/libgnutls.so.30*: diff --git a/slices/libgpg-error0.yaml b/slices/libgpg-error0.yaml new file mode 100644 index 000000000..f688e607b --- /dev/null +++ b/slices/libgpg-error0.yaml @@ -0,0 +1,10 @@ +# Library that defines common error values, messages, and common +# runtime functionality for all GnuPG components. +package: libgpg-error0 + +slices: + libs: + essential: + - libc6_libs + contents: + /lib/*-linux-*/libgpg-error.so.0*: diff --git a/slices/libhogweed6.yaml b/slices/libhogweed6.yaml new file mode 100644 index 000000000..9df1a1f10 --- /dev/null +++ b/slices/libhogweed6.yaml @@ -0,0 +1,11 @@ +# Low level cryptographic library (public-key cryptos) +package: libhogweed6 + +slices: + libs: + essentials: + - libc6_libs + - libgmp10_libs + - libnettle8_libs + contents: + /usr/lib/*-linux-*/libhogweed.so.6*: diff --git a/slices/libldap2.yaml b/slices/libldap2.yaml new file mode 100644 index 000000000..24eed7972 --- /dev/null +++ b/slices/libldap2.yaml @@ -0,0 +1,11 @@ +package: libldap2 + +slices: + libs: + essential: + - libc6_libs + - libgnutls30_libs + - libsasl2-2_libs + contents: + /usr/lib/*-linux-*/liblber.so.2*: + /usr/lib/*-linux-*/libldap.so.2*: diff --git a/slices/libnettle8.yaml b/slices/libnettle8.yaml new file mode 100644 index 000000000..9579cb606 --- /dev/null +++ b/slices/libnettle8.yaml @@ -0,0 +1,8 @@ +package: libnettle8 + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libnettle.so.8*: diff --git a/slices/libnghttp2-14.yaml b/slices/libnghttp2-14.yaml new file mode 100644 index 000000000..dff9e1f56 --- /dev/null +++ b/slices/libnghttp2-14.yaml @@ -0,0 +1,9 @@ +# Library implementing HTTP/2 protocol +package: libnghttp2-14 + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libnghttp2.so.14*: diff --git a/slices/libp11-kit0.yaml b/slices/libp11-kit0.yaml new file mode 100644 index 000000000..8b9805ce5 --- /dev/null +++ b/slices/libp11-kit0.yaml @@ -0,0 +1,9 @@ +package: libp11-kit0 + +slices: + libs: + essential: + - libc6_libs + - libffi8_libs + contents: + /usr/lib/*-linux-*/libp11-kit.so.0*: diff --git a/slices/librtmp1.yaml b/slices/librtmp1.yaml new file mode 100644 index 000000000..398a395b2 --- /dev/null +++ b/slices/librtmp1.yaml @@ -0,0 +1,14 @@ +# Toolkit for RTMP streams +package: librtmp1 + +slices: + libs: + essential: + - libc6_libs + - libgmp10_libs + - libgnutls30_libs + - libhogweed6_libs + - libnettle8_libs + - zlib1g_libs + contents: + /usr/lib/*-linux-*/librtmp.so.1: diff --git a/slices/libsasl2-2.yaml b/slices/libsasl2-2.yaml new file mode 100644 index 000000000..3edb03be8 --- /dev/null +++ b/slices/libsasl2-2.yaml @@ -0,0 +1,10 @@ +package: libsasl2-2 + +slices: + libs: + essential: + - libc6_libs + - libsasl2-modules-db_libs + - libssl3_libs + contents: + /usr/lib/*-linux-*/libsasl2.so.2*: diff --git a/slices/libsasl2-modules-db.yaml b/slices/libsasl2-modules-db.yaml new file mode 100644 index 000000000..eeffadf2a --- /dev/null +++ b/slices/libsasl2-modules-db.yaml @@ -0,0 +1,9 @@ +package: libsasl2-modules-db + +slices: + libs: + essential: + - libc6_libs + - libdb5.3_libs + contents: + /usr/lib/*-linux-*/sasl2/libsasldb.so*: diff --git a/slices/libssh-4.yaml b/slices/libssh-4.yaml new file mode 100644 index 000000000..b47c5bf50 --- /dev/null +++ b/slices/libssh-4.yaml @@ -0,0 +1,11 @@ +package: libssh-4 + +slices: + libs: + essential: + - libc6_libs + - libgssapi-krb5-2_libs + - libssl3_libs + - zlib1g_libs + contents: + /usr/lib/*-linux-*/libssh.so.4*: diff --git a/slices/libssh2-1.yaml b/slices/libssh2-1.yaml new file mode 100644 index 000000000..01b5a93e0 --- /dev/null +++ b/slices/libssh2-1.yaml @@ -0,0 +1,15 @@ +# Libssh2 is a client-side C library implementing the SSH2 protocol. +# It supports regular terminal, SCP and SFTP (v1-v5) sessions; +# port forwarding, X11 forwarding; password, key-based and +# keyboard-interactive authentication. + +package: libssh2-1 + +slices: + libs: + essential: + - libc6_libs + - libssl3_libs + - zlib1g_libs + contents: + /usr/lib/*-linux-*/libssh2.so.1*: diff --git a/slices/libtasn1-6.yaml b/slices/libtasn1-6.yaml new file mode 100644 index 000000000..171ea0d52 --- /dev/null +++ b/slices/libtasn1-6.yaml @@ -0,0 +1,8 @@ +package: libtasn1-6 + +slices: + libs: + essential: + - libc6_libs + contents: + /usr/lib/*-linux-*/libtasn1.so.6*: From ac482ac89a069b1ff1b1d64585f2aee086a45989 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Thu, 16 May 2024 10:09:56 +0200 Subject: [PATCH 2/4] chore: add copyright slice --- slices/curl.yaml | 7 +++++++ slices/libbrotli1.yaml | 7 +++++++ slices/libcurl4.yaml | 7 +++++++ slices/libgcrypt20.yaml | 7 +++++++ slices/libgnutls30.yaml | 7 +++++++ slices/libgpg-error0.yaml | 7 +++++++ slices/libhogweed6.yaml | 7 +++++++ slices/libldap2.yaml | 7 +++++++ slices/libnettle8.yaml | 7 +++++++ slices/libnghttp2-14.yaml | 7 +++++++ slices/libp11-kit0.yaml | 7 +++++++ slices/librtmp1.yaml | 7 +++++++ slices/libsasl2-2.yaml | 7 +++++++ slices/libsasl2-modules-db.yaml | 7 +++++++ slices/libssh-4.yaml | 7 +++++++ slices/libssh2-1.yaml | 7 +++++++ slices/libtasn1-6.yaml | 7 +++++++ 17 files changed, 119 insertions(+) diff --git a/slices/curl.yaml b/slices/curl.yaml index b3bc25a3a..eef05f8db 100644 --- a/slices/curl.yaml +++ b/slices/curl.yaml @@ -1,5 +1,8 @@ package: curl +essential: + - curl_copyright + slices: bins: essential: @@ -8,3 +11,7 @@ slices: - zlib1g_libs contents: /usr/bin/curl: + + copyright: + contents: + /usr/share/doc/curl/copyright: diff --git a/slices/libbrotli1.yaml b/slices/libbrotli1.yaml index cdfff6af4..929001edb 100644 --- a/slices/libbrotli1.yaml +++ b/slices/libbrotli1.yaml @@ -1,6 +1,9 @@ # Library implementing brotli encoder and decoder (shared libraries) package: libbrotli1 +essential: + - libbrotli1_copyright + slices: libs: essentials: @@ -9,3 +12,7 @@ slices: /usr/lib/*-linux-*/libbrotlicommon.so.1*: /usr/lib/*-linux-*/libbrotlidec.so.1*: /usr/lib/*-linux-*/libbrotlienc.so.1*: + + copyright: + contents: + /usr/share/doc/libbrotli1/copyright: \ No newline at end of file diff --git a/slices/libcurl4.yaml b/slices/libcurl4.yaml index aeffff739..163c420a3 100644 --- a/slices/libcurl4.yaml +++ b/slices/libcurl4.yaml @@ -1,6 +1,9 @@ # Easy-to-use client-side URL transfer library (OpenSSL flavour) package: libcurl4 +essential: + - libcurl4_copyright + slices: libs: essential: @@ -18,3 +21,7 @@ slices: - zlib1g_libs contents: /usr/lib/*-linux-*/libcurl.so.4*: + + copyright: + contents: + /usr/share/doc/libcurl4/copyright: diff --git a/slices/libgcrypt20.yaml b/slices/libgcrypt20.yaml index 4d88eced0..9fa95b5e9 100644 --- a/slices/libgcrypt20.yaml +++ b/slices/libgcrypt20.yaml @@ -1,6 +1,9 @@ # LGPL Crypto library - runtime library package: libgcrypt20 +essential: + - libgcrypt20_copyright + slices: libs: essential: @@ -8,3 +11,7 @@ slices: - libgpg-error0_libs contents: /usr/lib/*-linux-*/libgcrypt.so.20*: + + copyright: + contents: + /usr/share/doc/libgcrypt20/copyright: diff --git a/slices/libgnutls30.yaml b/slices/libgnutls30.yaml index 0093148df..b54438ba0 100644 --- a/slices/libgnutls30.yaml +++ b/slices/libgnutls30.yaml @@ -1,6 +1,9 @@ # GNU TLS library - main runtime library package: libgnutls30 +essential: + - libgnutls30_copyright + slices: libs: essentials: @@ -14,3 +17,7 @@ slices: - libunistring2_libs contents: /usr/lib/*-linux-*/libgnutls.so.30*: + + copyright: + contents: + /usr/share/doc/libgnutls30/copyright: diff --git a/slices/libgpg-error0.yaml b/slices/libgpg-error0.yaml index f688e607b..847ff674b 100644 --- a/slices/libgpg-error0.yaml +++ b/slices/libgpg-error0.yaml @@ -2,9 +2,16 @@ # runtime functionality for all GnuPG components. package: libgpg-error0 +essential: + - libgpg-error0_copyright + slices: libs: essential: - libc6_libs contents: /lib/*-linux-*/libgpg-error.so.0*: + + copyright: + contents: + /usr/share/doc/libgpg-error0/copyright: diff --git a/slices/libhogweed6.yaml b/slices/libhogweed6.yaml index 9df1a1f10..984306787 100644 --- a/slices/libhogweed6.yaml +++ b/slices/libhogweed6.yaml @@ -1,6 +1,9 @@ # Low level cryptographic library (public-key cryptos) package: libhogweed6 +essential: + - libhogweed6_copyright + slices: libs: essentials: @@ -9,3 +12,7 @@ slices: - libnettle8_libs contents: /usr/lib/*-linux-*/libhogweed.so.6*: + + copyright: + contents: + /usr/share/doc/libhogweed6/copyright: diff --git a/slices/libldap2.yaml b/slices/libldap2.yaml index 24eed7972..7ab43906e 100644 --- a/slices/libldap2.yaml +++ b/slices/libldap2.yaml @@ -1,5 +1,8 @@ package: libldap2 +essential: + - libldap2_copyright + slices: libs: essential: @@ -9,3 +12,7 @@ slices: contents: /usr/lib/*-linux-*/liblber.so.2*: /usr/lib/*-linux-*/libldap.so.2*: + + copyright: + contents: + /usr/share/doc/libhogweed6/copyright: diff --git a/slices/libnettle8.yaml b/slices/libnettle8.yaml index 9579cb606..9c38ca439 100644 --- a/slices/libnettle8.yaml +++ b/slices/libnettle8.yaml @@ -1,8 +1,15 @@ package: libnettle8 +essential: + - libnettle8_copyright + slices: libs: essential: - libc6_libs contents: /usr/lib/*-linux-*/libnettle.so.8*: + + copyright: + contents: + /usr/share/doc/libnettle8/copyright: diff --git a/slices/libnghttp2-14.yaml b/slices/libnghttp2-14.yaml index dff9e1f56..bf7dd7cca 100644 --- a/slices/libnghttp2-14.yaml +++ b/slices/libnghttp2-14.yaml @@ -1,9 +1,16 @@ # Library implementing HTTP/2 protocol package: libnghttp2-14 +essential: + - libnghttp2-14_copyright + slices: libs: essential: - libc6_libs contents: /usr/lib/*-linux-*/libnghttp2.so.14*: + + copyright: + contents: + /usr/share/doc/libnghttp2-14/copyright: diff --git a/slices/libp11-kit0.yaml b/slices/libp11-kit0.yaml index 8b9805ce5..0be1f529c 100644 --- a/slices/libp11-kit0.yaml +++ b/slices/libp11-kit0.yaml @@ -1,5 +1,8 @@ package: libp11-kit0 +essential: + - libp11-kit0_copyright + slices: libs: essential: @@ -7,3 +10,7 @@ slices: - libffi8_libs contents: /usr/lib/*-linux-*/libp11-kit.so.0*: + + copyright: + contents: + /usr/share/doc/libp11-kit0/copyright: \ No newline at end of file diff --git a/slices/librtmp1.yaml b/slices/librtmp1.yaml index 398a395b2..ac76c4fd9 100644 --- a/slices/librtmp1.yaml +++ b/slices/librtmp1.yaml @@ -1,6 +1,9 @@ # Toolkit for RTMP streams package: librtmp1 +essential: + - librtmp1_copyright + slices: libs: essential: @@ -12,3 +15,7 @@ slices: - zlib1g_libs contents: /usr/lib/*-linux-*/librtmp.so.1: + + copyright: + contents: + /usr/share/doc/librtmp1/copyright: diff --git a/slices/libsasl2-2.yaml b/slices/libsasl2-2.yaml index 3edb03be8..c65a4f874 100644 --- a/slices/libsasl2-2.yaml +++ b/slices/libsasl2-2.yaml @@ -1,5 +1,8 @@ package: libsasl2-2 +essential: + - libsasl2-2_copyright + slices: libs: essential: @@ -8,3 +11,7 @@ slices: - libssl3_libs contents: /usr/lib/*-linux-*/libsasl2.so.2*: + + copyright: + contents: + /usr/share/doc/libsasl2-2/copyright: diff --git a/slices/libsasl2-modules-db.yaml b/slices/libsasl2-modules-db.yaml index eeffadf2a..564937c04 100644 --- a/slices/libsasl2-modules-db.yaml +++ b/slices/libsasl2-modules-db.yaml @@ -1,5 +1,8 @@ package: libsasl2-modules-db +essential: + - libsasl2-modules-db_copyright + slices: libs: essential: @@ -7,3 +10,7 @@ slices: - libdb5.3_libs contents: /usr/lib/*-linux-*/sasl2/libsasldb.so*: + + copyright: + contents: + /usr/share/doc/libsasl2-modules-db/copyright: diff --git a/slices/libssh-4.yaml b/slices/libssh-4.yaml index b47c5bf50..889726a42 100644 --- a/slices/libssh-4.yaml +++ b/slices/libssh-4.yaml @@ -1,5 +1,8 @@ package: libssh-4 +essential: + - libssh-4_copyright + slices: libs: essential: @@ -9,3 +12,7 @@ slices: - zlib1g_libs contents: /usr/lib/*-linux-*/libssh.so.4*: + + copyright: + contents: + /usr/share/doc/libssh-4/copyright: diff --git a/slices/libssh2-1.yaml b/slices/libssh2-1.yaml index 01b5a93e0..f1cb5a263 100644 --- a/slices/libssh2-1.yaml +++ b/slices/libssh2-1.yaml @@ -5,6 +5,9 @@ package: libssh2-1 +essential: + - libssh2-1_copyright + slices: libs: essential: @@ -13,3 +16,7 @@ slices: - zlib1g_libs contents: /usr/lib/*-linux-*/libssh2.so.1*: + + copyright: + contents: + /usr/share/doc/libssh2-1/copyright: diff --git a/slices/libtasn1-6.yaml b/slices/libtasn1-6.yaml index 171ea0d52..17b84251a 100644 --- a/slices/libtasn1-6.yaml +++ b/slices/libtasn1-6.yaml @@ -1,8 +1,15 @@ package: libtasn1-6 +essential: + - libtasn1-6_copyright + slices: libs: essential: - libc6_libs contents: /usr/lib/*-linux-*/libtasn1.so.6*: + + copyright: + contents: + /usr/share/doc/libtasn1-6/copyright: From 588a64f6430b7e2b9689b2a348089e6d575b84a5 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Thu, 16 May 2024 12:31:51 +0200 Subject: [PATCH 3/4] chore: add copyright slice --- slices/libldap2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slices/libldap2.yaml b/slices/libldap2.yaml index 7ab43906e..8efbbdacf 100644 --- a/slices/libldap2.yaml +++ b/slices/libldap2.yaml @@ -15,4 +15,4 @@ slices: copyright: contents: - /usr/share/doc/libhogweed6/copyright: + /usr/share/doc/libldap2/copyright: From 3d75207f5d94061749bd8de58f9712e1e7704281 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Thu, 16 May 2024 12:59:30 +0200 Subject: [PATCH 4/4] chore: lint --- slices/libbrotli1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slices/libbrotli1.yaml b/slices/libbrotli1.yaml index 929001edb..0333ed560 100644 --- a/slices/libbrotli1.yaml +++ b/slices/libbrotli1.yaml @@ -15,4 +15,4 @@ slices: copyright: contents: - /usr/share/doc/libbrotli1/copyright: \ No newline at end of file + /usr/share/doc/libbrotli1/copyright: