From eaef644bd53a2167aa8876e8e1620948b3b0878b Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Wed, 4 Dec 2024 15:04:26 -0600 Subject: [PATCH 1/6] Updating OS Package metadata: license and description --- build.assets/build-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index 56274d0a1dee8..7d022a86e4502 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -74,9 +74,9 @@ FPM_IMAGE_RPM="public.ecr.aws/gravitational/fpm:centos8-1.15.1-1" # extra package information for linux MAINTAINER="info@goteleport.com" -LICENSE="Apache-2.0" +LICENSE="AGPL-3.0-or-later" VENDOR="Gravitational" -DESCRIPTION="Teleport is a gateway for managing access to clusters of Linux servers via SSH or the Kubernetes API" +DESCRIPTION="Teleport provides on-demand, least-privileged access to your infrastructure, on a foundation of cryptographic identity and zero trust, with built-in identity and policy governance" DOCS_URL="https://goteleport.com/docs" # check that curl is installed From 14467624749913f1ed4dcc27bd37a712ed5906a1 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Thu, 5 Dec 2024 13:06:02 -0600 Subject: [PATCH 2/6] Adding community license to tarball --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ba8d83de4a6db..21178ba3f1b6a 100644 --- a/Makefile +++ b/Makefile @@ -590,6 +590,7 @@ build-archive: | $(RELEASE_DIR) "$(INSTALL_SCRIPT)" \ README.md \ CHANGELOG.md \ + build.assets/LICENSE-community \ teleport/ echo $(GITTAG) > teleport/VERSION tar $(TAR_FLAGS) -c teleport | gzip -n > $(RELEASE).tar.gz From 618275e5daaa3e0ad65a681add6d342ecdc4bb2f Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Thu, 5 Dec 2024 13:06:34 -0600 Subject: [PATCH 3/6] Updating build-package to include license for OSS package metadata --- build.assets/build-package.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index 7d022a86e4502..7b90d9377f7d0 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -74,7 +74,7 @@ FPM_IMAGE_RPM="public.ecr.aws/gravitational/fpm:centos8-1.15.1-1" # extra package information for linux MAINTAINER="info@goteleport.com" -LICENSE="AGPL-3.0-or-later" +LICENSE="" VENDOR="Gravitational" DESCRIPTION="Teleport provides on-demand, least-privileged access to your infrastructure, on a foundation of cryptographic identity and zero trust, with built-in identity and policy governance" DOCS_URL="https://goteleport.com/docs" @@ -195,6 +195,7 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]" fi else + LICENSE="Teleport Community Edition License" TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz" TAR_PATH="teleport" RPM_NAME="teleport" @@ -204,6 +205,7 @@ else else TYPE_DESCRIPTION="[${TEXT_ARCH} Open source edition]" fi + TYPE_DESCRIPTION="${TYPE_DESCRIPTION}\n\nDistributed under the ${LICENSE}" fi # set file list From cd2236994823c64e9ceb50b07399967d616f49f9 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Fri, 6 Dec 2024 13:43:03 -0600 Subject: [PATCH 4/6] Fixing some interpolation errors --- build.assets/build-package.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index 7b90d9377f7d0..f3348489da7de 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -74,7 +74,7 @@ FPM_IMAGE_RPM="public.ecr.aws/gravitational/fpm:centos8-1.15.1-1" # extra package information for linux MAINTAINER="info@goteleport.com" -LICENSE="" +LICENSE="Teleport Community Edition License" VENDOR="Gravitational" DESCRIPTION="Teleport provides on-demand, least-privileged access to your infrastructure, on a foundation of cryptographic identity and zero trust, with built-in identity and policy governance" DOCS_URL="https://goteleport.com/docs" @@ -256,6 +256,7 @@ else OUTPUT_FILENAME="${TAR_PATH}_${TELEPORT_VERSION}${OPTIONAL_RUNTIME_SECTION}_${DEB_OUTPUT_ARCH}.deb" FILE_PERMISSIONS_STANZA="--deb-user root --deb-group root " fi + LICENSE_STANZA=(--license "${LICENSE}") fi # create a temporary directory and download specified Teleport version @@ -361,7 +362,6 @@ else --version "${TELEPORT_VERSION}" \ --maintainer "${MAINTAINER}" \ --url "${DOCS_URL}" \ - --license "${LICENSE}" \ --vendor "${VENDOR}" \ --description "${DESCRIPTION} ${TYPE_DESCRIPTION}" \ --architecture ${PACKAGE_ARCH} \ @@ -374,6 +374,7 @@ else --after-upgrade /src/post-upgrade \ ${CONFIG_FILE_STANZA} \ ${FILE_PERMISSIONS_STANZA} \ + "${LICENSE_STANZA[@]}" \ ${RPM_SIGN_STANZA} . # copy created package back to current directory From b7b6c877aa4cc11de8f632f8301bf2f80b237f66 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Fri, 6 Dec 2024 13:44:45 -0600 Subject: [PATCH 5/6] Removing unecessary line --- build.assets/build-package.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index f3348489da7de..0d42d226cdf43 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -195,7 +195,6 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]" fi else - LICENSE="Teleport Community Edition License" TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz" TAR_PATH="teleport" RPM_NAME="teleport" From 908ab48c6b9693465eac7b30ab5fa3372b2b91ea Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Mon, 9 Dec 2024 11:50:46 -0600 Subject: [PATCH 6/6] Cleaning up the metadata formatting --- build.assets/build-package.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh index 0d42d226cdf43..91bb4daa8409a 100755 --- a/build.assets/build-package.sh +++ b/build.assets/build-package.sh @@ -194,6 +194,7 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then else TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]" fi + LICENSE_STANZA=() else TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz" TAR_PATH="teleport" @@ -204,7 +205,8 @@ else else TYPE_DESCRIPTION="[${TEXT_ARCH} Open source edition]" fi - TYPE_DESCRIPTION="${TYPE_DESCRIPTION}\n\nDistributed under the ${LICENSE}" + TYPE_DESCRIPTION="${TYPE_DESCRIPTION} Distributed under the ${LICENSE}" + LICENSE_STANZA=(--license "${LICENSE}") fi # set file list @@ -255,7 +257,6 @@ else OUTPUT_FILENAME="${TAR_PATH}_${TELEPORT_VERSION}${OPTIONAL_RUNTIME_SECTION}_${DEB_OUTPUT_ARCH}.deb" FILE_PERMISSIONS_STANZA="--deb-user root --deb-group root " fi - LICENSE_STANZA=(--license "${LICENSE}") fi # create a temporary directory and download specified Teleport version