From 3d496f6a9f542173d50f776f18fde2b74b947a23 Mon Sep 17 00:00:00 2001 From: David Harder Date: Tue, 10 Dec 2024 08:47:06 -0600 Subject: [PATCH] repo-wide: Remove re-licensed HashiCorp products **Summary** - HashiCorp has re-licensed many of its products under the Business Source License (BUSL-1.1) - This license places limits on "production use" of these products that we cannot enforce, so they are deprecated - [Business Source License](https://spdx.org/licenses/BUSL-1.1.html) Resolves https://github.com/getsolus/packages/issues/2633 --- packages/c/consul/monitoring.yml | 9 -- packages/c/consul/package.yml | 21 ----- packages/c/consul/pspec_x86_64.xml | 35 ------- packages/n/nomad/abi_used_libs | 1 - packages/n/nomad/abi_used_symbols | 127 -------------------------- packages/n/nomad/monitoring.yml | 7 -- packages/n/nomad/package.yml | 24 ----- packages/n/nomad/pspec_x86_64.xml | 35 ------- packages/t/terraform/MAINTAINERS.md | 4 - packages/t/terraform/abi_used_libs | 1 - packages/t/terraform/abi_used_symbols | 45 --------- packages/t/terraform/monitoring.yml | 7 -- packages/t/terraform/package.yml | 19 ---- packages/t/terraform/pspec_x86_64.xml | 35 ------- repo_data/distribution.xml | 6 ++ repo_data/distribution.xml.in | 8 ++ 16 files changed, 14 insertions(+), 370 deletions(-) delete mode 100644 packages/c/consul/monitoring.yml delete mode 100644 packages/c/consul/package.yml delete mode 100644 packages/c/consul/pspec_x86_64.xml delete mode 100644 packages/n/nomad/abi_used_libs delete mode 100644 packages/n/nomad/abi_used_symbols delete mode 100644 packages/n/nomad/monitoring.yml delete mode 100644 packages/n/nomad/package.yml delete mode 100644 packages/n/nomad/pspec_x86_64.xml delete mode 100644 packages/t/terraform/MAINTAINERS.md delete mode 100644 packages/t/terraform/abi_used_libs delete mode 100644 packages/t/terraform/abi_used_symbols delete mode 100644 packages/t/terraform/monitoring.yml delete mode 100644 packages/t/terraform/package.yml delete mode 100644 packages/t/terraform/pspec_x86_64.xml diff --git a/packages/c/consul/monitoring.yml b/packages/c/consul/monitoring.yml deleted file mode 100644 index edf1d9eb959..00000000000 --- a/packages/c/consul/monitoring.yml +++ /dev/null @@ -1,9 +0,0 @@ -releases: - id: 10952 - rss: https://github.com/hashicorp/consul/tags.atom -security: - cpe: - - vendor: hashicorp - product: consul_template - - vendor: hashicorp - product: consul diff --git a/packages/c/consul/package.yml b/packages/c/consul/package.yml deleted file mode 100644 index a1a8359064a..00000000000 --- a/packages/c/consul/package.yml +++ /dev/null @@ -1,21 +0,0 @@ -name : consul -version : 1.16.1 -release : 7 -source : - - https://github.com/hashicorp/consul/archive/refs/tags/v1.16.1.tar.gz : 9fec1683131ff122a43512f265131729e20212e26353d017805c5566dfec2333 -homepage : https://www.consul.io/ -license : MPL-2.0 -component : virt -summary : A tool for service discovery, monitoring and configuration -description: | - Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure. -networking : yes -builddeps : - - git - - golang -setup : | - %make tools -build : | - %make dev -install : | - install -Dm00755 bin/consul $installdir/usr/bin/consul diff --git a/packages/c/consul/pspec_x86_64.xml b/packages/c/consul/pspec_x86_64.xml deleted file mode 100644 index f57be4cd561..00000000000 --- a/packages/c/consul/pspec_x86_64.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - consul - https://www.consul.io/ - - Algent Albrahimi - algent@protonmail.com - - MPL-2.0 - virt - A tool for service discovery, monitoring and configuration - Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure. - - https://getsol.us/sources/README.Solus - - - consul - A tool for service discovery, monitoring and configuration - Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure. - - virt - - /usr/bin/consul - - - - - 2023-09-16 - 1.16.1 - Packaging update - Algent Albrahimi - algent@protonmail.com - - - \ No newline at end of file diff --git a/packages/n/nomad/abi_used_libs b/packages/n/nomad/abi_used_libs deleted file mode 100644 index 631aa1dda40..00000000000 --- a/packages/n/nomad/abi_used_libs +++ /dev/null @@ -1 +0,0 @@ -libc.so.6 diff --git a/packages/n/nomad/abi_used_symbols b/packages/n/nomad/abi_used_symbols deleted file mode 100644 index 780eff0b0ff..00000000000 --- a/packages/n/nomad/abi_used_symbols +++ /dev/null @@ -1,127 +0,0 @@ -libc.so.6:__cxa_atexit -libc.so.6:__environ -libc.so.6:__errno_location -libc.so.6:__isoc23_strtol -libc.so.6:__libc_start_main -libc.so.6:__pthread_register_cancel -libc.so.6:__pthread_unregister_cancel -libc.so.6:__register_atfork -libc.so.6:__sigsetjmp -libc.so.6:__stack_chk_fail -libc.so.6:_exit -libc.so.6:_setjmp -libc.so.6:abort -libc.so.6:asprintf -libc.so.6:calloc -libc.so.6:clone -libc.so.6:close -libc.so.6:dprintf -libc.so.6:dup3 -libc.so.6:environ -libc.so.6:execve -libc.so.6:exit -libc.so.6:fchmod -libc.so.6:fcntl -libc.so.6:fexecve -libc.so.6:fork -libc.so.6:fprintf -libc.so.6:fputc -libc.so.6:free -libc.so.6:freeaddrinfo -libc.so.6:fstat -libc.so.6:fstatfs -libc.so.6:fwrite -libc.so.6:gai_strerror -libc.so.6:getaddrinfo -libc.so.6:getenv -libc.so.6:getgrgid_r -libc.so.6:getgrnam_r -libc.so.6:getgrouplist -libc.so.6:getnameinfo -libc.so.6:getpid -libc.so.6:getpwnam_r -libc.so.6:getpwuid_r -libc.so.6:kill -libc.so.6:longjmp -libc.so.6:malloc -libc.so.6:memcpy -libc.so.6:mkostemp -libc.so.6:mkstemp -libc.so.6:mmap -libc.so.6:mount -libc.so.6:munmap -libc.so.6:nanosleep -libc.so.6:open -libc.so.6:perror -libc.so.6:prctl -libc.so.6:pthread_attr_destroy -libc.so.6:pthread_attr_getstack -libc.so.6:pthread_attr_getstacksize -libc.so.6:pthread_attr_init -libc.so.6:pthread_cond_broadcast -libc.so.6:pthread_cond_init -libc.so.6:pthread_cond_signal -libc.so.6:pthread_cond_wait -libc.so.6:pthread_create -libc.so.6:pthread_detach -libc.so.6:pthread_getattr_np -libc.so.6:pthread_getspecific -libc.so.6:pthread_key_create -libc.so.6:pthread_kill -libc.so.6:pthread_mutex_destroy -libc.so.6:pthread_mutex_init -libc.so.6:pthread_mutex_lock -libc.so.6:pthread_mutex_unlock -libc.so.6:pthread_once -libc.so.6:pthread_self -libc.so.6:pthread_setspecific -libc.so.6:pthread_sigmask -libc.so.6:putenv -libc.so.6:read -libc.so.6:realloc -libc.so.6:recvmsg -libc.so.6:res_search -libc.so.6:sched_yield -libc.so.6:sendfile -libc.so.6:sendmsg -libc.so.6:setegid -libc.so.6:setenv -libc.so.6:seteuid -libc.so.6:setgid -libc.so.6:setgroups -libc.so.6:setns -libc.so.6:setregid -libc.so.6:setresgid -libc.so.6:setresuid -libc.so.6:setreuid -libc.so.6:setsid -libc.so.6:setuid -libc.so.6:sigaction -libc.so.6:sigaddset -libc.so.6:sigemptyset -libc.so.6:sigfillset -libc.so.6:sigismember -libc.so.6:sigprocmask -libc.so.6:snprintf -libc.so.6:socketpair -libc.so.6:stderr -libc.so.6:strchr -libc.so.6:strcmp -libc.so.6:strdup -libc.so.6:strerror -libc.so.6:strlen -libc.so.6:strncpy -libc.so.6:strpbrk -libc.so.6:strspn -libc.so.6:strtok_r -libc.so.6:syscall -libc.so.6:sysconf -libc.so.6:umount2 -libc.so.6:unlink -libc.so.6:unsetenv -libc.so.6:unshare -libc.so.6:vasprintf -libc.so.6:vfprintf -libc.so.6:vsnprintf -libc.so.6:waitpid -libc.so.6:write diff --git a/packages/n/nomad/monitoring.yml b/packages/n/nomad/monitoring.yml deleted file mode 100644 index 8066d4efa63..00000000000 --- a/packages/n/nomad/monitoring.yml +++ /dev/null @@ -1,7 +0,0 @@ -releases: - id: 141380 - rss: https://github.com/hashicorp/nomad/releases.atom -security: - cpe: - - vendor: hashicorp - product: nomad diff --git a/packages/n/nomad/package.yml b/packages/n/nomad/package.yml deleted file mode 100644 index 01d96a625c2..00000000000 --- a/packages/n/nomad/package.yml +++ /dev/null @@ -1,24 +0,0 @@ -name : nomad -version : 1.5.12 -release : 9 -source : - - git|https://github.com/hashicorp/nomad.git : v1.5.12 -homepage : https://www.nomadproject.io/ -license : MPL-2.0 -component : virt -summary : Nomad is a simple and flexible workload orchestrator -description: | - Nomad is a simple and flexible workload orchestrator to deploy and manage containers (docker, podman), non-containerized applications (executable, Java), and virtual machines (qemu) across on-prem and clouds at scale. -networking : yes -builddeps : - - git - - golang -environment: | - export GOPATH=$workdir/../ - export PATH=$PATH:$GOPATH/bin/ -setup : | - %make deps -build : | - %make dev -install : | - install -Dm00755 bin/nomad $installdir/usr/bin/nomad diff --git a/packages/n/nomad/pspec_x86_64.xml b/packages/n/nomad/pspec_x86_64.xml deleted file mode 100644 index 4936e84ead1..00000000000 --- a/packages/n/nomad/pspec_x86_64.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - nomad - https://www.nomadproject.io/ - - Muhammad Alfi Syahrin - malfisya.dev@hotmail.com - - MPL-2.0 - virt - Nomad is a simple and flexible workload orchestrator - Nomad is a simple and flexible workload orchestrator to deploy and manage containers (docker, podman), non-containerized applications (executable, Java), and virtual machines (qemu) across on-prem and clouds at scale. - - https://sources.getsol.us/README.Solus - - - nomad - Nomad is a simple and flexible workload orchestrator - Nomad is a simple and flexible workload orchestrator to deploy and manage containers (docker, podman), non-containerized applications (executable, Java), and virtual machines (qemu) across on-prem and clouds at scale. - - virt - - /usr/bin/nomad - - - - - 2024-05-18 - 1.5.12 - Packaging update - Muhammad Alfi Syahrin - malfisya.dev@hotmail.com - - - \ No newline at end of file diff --git a/packages/t/terraform/MAINTAINERS.md b/packages/t/terraform/MAINTAINERS.md deleted file mode 100644 index cf27c42b4cc..00000000000 --- a/packages/t/terraform/MAINTAINERS.md +++ /dev/null @@ -1,4 +0,0 @@ -This file is used to indicate primary maintainership for this package. A package may list more than one maintainer to avoid bus factor issues. People on this list may be considered “subject-matter experts”. Please note that Solus staff may need to perform necessary rebuilds, upgrades, or security fixes as part of the normal maintenance of the Solus package repository. If you believe this package requires an update, follow documentation from https://help.getsol.us/docs/packaging/procedures/request-a-package-update. In the event that this package becomes insufficiently maintained, the Solus staff reserves the right to request a new maintainer, or deprecate and remove this package from the repository entirely. - -- Martin Bürge - - Email: martin.buerge@gmail.com diff --git a/packages/t/terraform/abi_used_libs b/packages/t/terraform/abi_used_libs deleted file mode 100644 index 631aa1dda40..00000000000 --- a/packages/t/terraform/abi_used_libs +++ /dev/null @@ -1 +0,0 @@ -libc.so.6 diff --git a/packages/t/terraform/abi_used_symbols b/packages/t/terraform/abi_used_symbols deleted file mode 100644 index 353eabf609f..00000000000 --- a/packages/t/terraform/abi_used_symbols +++ /dev/null @@ -1,45 +0,0 @@ -libc.so.6:__errno_location -libc.so.6:abort -libc.so.6:fprintf -libc.so.6:fputc -libc.so.6:free -libc.so.6:freeaddrinfo -libc.so.6:fwrite -libc.so.6:gai_strerror -libc.so.6:getaddrinfo -libc.so.6:getgrgid_r -libc.so.6:getgrnam_r -libc.so.6:getnameinfo -libc.so.6:getpwnam_r -libc.so.6:getpwuid_r -libc.so.6:malloc -libc.so.6:mmap -libc.so.6:munmap -libc.so.6:nanosleep -libc.so.6:pthread_attr_destroy -libc.so.6:pthread_attr_getstack -libc.so.6:pthread_attr_getstacksize -libc.so.6:pthread_attr_init -libc.so.6:pthread_cond_broadcast -libc.so.6:pthread_cond_wait -libc.so.6:pthread_create -libc.so.6:pthread_detach -libc.so.6:pthread_getattr_np -libc.so.6:pthread_key_create -libc.so.6:pthread_mutex_lock -libc.so.6:pthread_mutex_unlock -libc.so.6:pthread_self -libc.so.6:pthread_setspecific -libc.so.6:pthread_sigmask -libc.so.6:res_search -libc.so.6:setenv -libc.so.6:sigaction -libc.so.6:sigaddset -libc.so.6:sigemptyset -libc.so.6:sigfillset -libc.so.6:sigismember -libc.so.6:stderr -libc.so.6:strerror -libc.so.6:sysconf -libc.so.6:unsetenv -libc.so.6:vfprintf diff --git a/packages/t/terraform/monitoring.yml b/packages/t/terraform/monitoring.yml deleted file mode 100644 index e33832255b3..00000000000 --- a/packages/t/terraform/monitoring.yml +++ /dev/null @@ -1,7 +0,0 @@ -releases: - id: 13654 - rss: https://github.com/hashicorp/terraform/releases.atom -security: - cpe: - - vendor: hashicorp - product: terraform diff --git a/packages/t/terraform/package.yml b/packages/t/terraform/package.yml deleted file mode 100644 index b485f668883..00000000000 --- a/packages/t/terraform/package.yml +++ /dev/null @@ -1,19 +0,0 @@ -name : terraform -version : 1.5.7 -release : 20 -source : - - https://github.com/hashicorp/terraform/archive/refs/tags/v1.5.7.tar.gz : 6742fc87cba5e064455393cda12f0e0241c85a7cb2a3558d13289380bb5f26f5 -homepage : https://www.terraform.io/ -license : MPL-2.0 -component : programming.tools -summary : Terraform is a tool for building, changing, and combining infrastructure safely and efficiently -description: | - Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions. -networking : true -builddeps : - - golang -build : | - go mod vendor - go build -o terraform-binary -install : | - install -Dm00755 terraform-binary $installdir/usr/bin/terraform diff --git a/packages/t/terraform/pspec_x86_64.xml b/packages/t/terraform/pspec_x86_64.xml deleted file mode 100644 index 5dd388ec36e..00000000000 --- a/packages/t/terraform/pspec_x86_64.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - terraform - https://www.terraform.io/ - - Algent Albrahimi - algent@protonmail.com - - MPL-2.0 - programming.tools - Terraform is a tool for building, changing, and combining infrastructure safely and efficiently - Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions. - - https://getsol.us/sources/README.Solus - - - terraform - Terraform is a tool for building, changing, and combining infrastructure safely and efficiently - Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and popular service providers as well as custom in-house solutions. - - programming.tools - - /usr/bin/terraform - - - - - 2023-09-26 - 1.5.7 - Packaging update - Algent Albrahimi - algent@protonmail.com - - - \ No newline at end of file diff --git a/repo_data/distribution.xml b/repo_data/distribution.xml index 9987e4d4db1..fb400292f74 100644 --- a/repo_data/distribution.xml +++ b/repo_data/distribution.xml @@ -2773,5 +2773,11 @@ b3sum-dbginfo nitroshare-desktop nitroshare-desktop-dbginfo + consul + consul-dbginfo + nomad + nomad-dbginfo + terraform + terraform-dbginfo \ No newline at end of file diff --git a/repo_data/distribution.xml.in b/repo_data/distribution.xml.in index 0c979d6d312..b7a35dec063 100644 --- a/repo_data/distribution.xml.in +++ b/repo_data/distribution.xml.in @@ -3719,6 +3719,14 @@ nitroshare-desktop nitroshare-desktop-dbginfo + + + consul + consul-dbginfo + nomad + nomad-dbginfo + terraform + terraform-dbginfo