Date: Thursday, April 13, 2023 @ 09:48:16
Author: artafinde
Revision: 1445798
archrelease: copy trunk to community-any
Added:
keycloak-metrics-spi/repos/community-any/PKGBUILD
(from rev 1445797, keycloak-metrics-spi/trunk/PKGBUILD)
keycloak-metrics-spi/repos/community-any/move-version-to-properties.patch
(from rev 1445797,
keycloak-metrics-spi/trunk/move-version-to-properties.patch)
keycloak-metrics-spi/repos/community-any/remove-manifest-variable-fields.patch
(from rev 1445797,
keycloak-metrics-spi/trunk/remove-manifest-variable-fields.patch)
keycloak-metrics-spi/repos/community-any/reproducible-build.patch
(from rev 1445797, keycloak-metrics-spi/trunk/reproducible-build.patch)
Deleted:
keycloak-metrics-spi/repos/community-any/PKGBUILD
keycloak-metrics-spi/repos/community-any/move-version-to-properties.patch
keycloak-metrics-spi/repos/community-any/reproducible-build.patch
---------------------------------------+
PKGBUILD | 101 ++++++++++++++++----------------
move-version-to-properties.patch | 68 ++++++++++-----------
remove-manifest-variable-fields.patch | 29 +++++++++
reproducible-build.patch | 74 +++++++++++------------
4 files changed, 152 insertions(+), 120 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-13 09:48:07 UTC (rev 1445797)
+++ PKGBUILD 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -1,49 +0,0 @@
-# Maintainer: Jelle van der Waa <[email protected]>
-
-pkgname=keycloak-metrics-spi
-pkgver=3.0.0
-pkgrel=1
-pkgdesc='A Service Provider that adds a Prometheus metrics endpoint to
Keycloak'
-url="https://github.com/aerogear/keycloak-metrics-spi";
-arch=('any')
-license=('Apache')
-_jrever=11
-_jdkver=11
-depends=("java-runtime>=${_jrever}")
-makedepends=("jdk${_jdkver}-openjdk" 'gradle' 'keycloak')
-source=($pkgname-$pkgver.tar.gz::https://github.com/aerogear/keycloak-metrics-spi/archive/${pkgver}.tar.gz
- move-version-to-properties.patch
- reproducible-build.patch)
-sha512sums=('2fdb15cc44f3325e47ae31bcc8a861556fd399d66a48771744820ec1e614380fef2fc8596644288b32093a3e17be7dcf84325403e2663419ff457e51d1a2a12a'
-
'6b4190835f6d0cb85d57a3aa50c0c87eae1bcf4865797b3208ecf85faa6bd35b483db73dd2f34e8479fa851dbf6595cecbf97fc72cc8d1a2df1e2fdfbdf6209e'
-
'238cd8e201d2831686890eacc4c0188e2f56c93212d66a367a37921408ad768a463aa088472140bc5701f70e0d32c637c75cc18a1bb4b3d2d9d14654888a70f7')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- # https://github.com/aerogear/keycloak-metrics-spi/pull/164
- patch -Np1 < "${srcdir}/move-version-to-properties.patch"
- # https://github.com/aerogear/keycloak-metrics-spi/pull/165
- patch -Np1 < "${srcdir}/reproducible-build.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
- export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
- gradle -Pversion=${pkgver} assemble
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
- export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
- gradle -Pversion=${pkgver} test
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- install -d "${pkgdir}/usr/share/java/keycloak/providers/"
- install -Dm644 "build/libs/keycloak-metrics-spi-${pkgver}.jar"
"${pkgdir}/usr/share/java/${pkgname}/keycloak-metrics-spi-${pkgver}.jar"
- ln -s "/usr/share/java/${pkgname}/keycloak-metrics-spi-${pkgver}.jar"
"${pkgdir}/usr/share/java/keycloak/providers/keycloak-metrics-spi-${pkgver}.jar"
-}
Copied: keycloak-metrics-spi/repos/community-any/PKGBUILD (from rev 1445797,
keycloak-metrics-spi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -0,0 +1,52 @@
+# Maintainer: Jelle van der Waa <[email protected]>
+
+pkgname=keycloak-metrics-spi
+pkgver=3.0.0
+pkgrel=2
+pkgdesc='A Service Provider that adds a Prometheus metrics endpoint to
Keycloak'
+url="https://github.com/aerogear/keycloak-metrics-spi";
+arch=('any')
+license=('Apache')
+_jrever=11
+_jdkver=11
+depends=("java-runtime>=${_jrever}")
+makedepends=("jdk${_jdkver}-openjdk" 'gradle' 'keycloak')
+source=($pkgname-$pkgver.tar.gz::https://github.com/aerogear/keycloak-metrics-spi/archive/${pkgver}.tar.gz
+ move-version-to-properties.patch
+ reproducible-build.patch
+ remove-manifest-variable-fields.patch)
+sha512sums=('2fdb15cc44f3325e47ae31bcc8a861556fd399d66a48771744820ec1e614380fef2fc8596644288b32093a3e17be7dcf84325403e2663419ff457e51d1a2a12a'
+
'6b4190835f6d0cb85d57a3aa50c0c87eae1bcf4865797b3208ecf85faa6bd35b483db73dd2f34e8479fa851dbf6595cecbf97fc72cc8d1a2df1e2fdfbdf6209e'
+
'238cd8e201d2831686890eacc4c0188e2f56c93212d66a367a37921408ad768a463aa088472140bc5701f70e0d32c637c75cc18a1bb4b3d2d9d14654888a70f7'
+
'356507ba6f056ea33522d7e3e297fd17df84eb8243d9802a8b902dd59808ea1237f2d138487d5061a68d849e289daf5c4e7738ee6facb28987a6df20def83fce')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # https://github.com/aerogear/keycloak-metrics-spi/pull/164
+ patch -Np1 < "${srcdir}/move-version-to-properties.patch"
+ # https://github.com/aerogear/keycloak-metrics-spi/pull/165
+ patch -Np1 < "${srcdir}/reproducible-build.patch"
+ patch -Np1 < "${srcdir}/remove-manifest-variable-fields.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
+ export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
+ gradle -Pversion=${pkgver} assemble
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
+ export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
+ gradle -Pversion=${pkgver} test
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ install -d "${pkgdir}/usr/share/java/keycloak/providers/"
+ install -Dm644 "build/libs/keycloak-metrics-spi-${pkgver}.jar"
"${pkgdir}/usr/share/java/${pkgname}/keycloak-metrics-spi-${pkgver}.jar"
+ ln -s "/usr/share/java/${pkgname}/keycloak-metrics-spi-${pkgver}.jar"
"${pkgdir}/usr/share/java/keycloak/providers/keycloak-metrics-spi-${pkgver}.jar"
+}
Deleted: move-version-to-properties.patch
===================================================================
--- move-version-to-properties.patch 2023-04-13 09:48:07 UTC (rev 1445797)
+++ move-version-to-properties.patch 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -1,34 +0,0 @@
-From ce68fc7826bf190abaa77decbf8093a3f020bd3b Mon Sep 17 00:00:00 2001
-From: Leonidas Spyropoulos <[email protected]>
-Date: Fri, 7 Apr 2023 14:56:57 +0300
-Subject: [PATCH] feat: move version in gradle.properties
-
-This makes it easier to set the version from the command line when we
-build.
-
-Signed-off-by: Leonidas Spyropoulos <[email protected]>
----
- build.gradle | 1 -
- gradle.properties | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.gradle b/build.gradle
-index a2ea3d0..31b2fbb 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -13,7 +13,6 @@ configurations {
- }
-
- group 'org.jboss.aerogear'
--version '3.0.1-SNAPSHOT'
-
- apply plugin: 'java'
-
-diff --git a/gradle.properties b/gradle.properties
-index 2fb4e20..bf0ce7f 100644
---- a/gradle.properties
-+++ b/gradle.properties
-@@ -1,2 +1,3 @@
- keycloakVersion=21.0.1
- prometheusVersion=0.16.0
-+version=3.0.1-SNAPSHOT
Copied:
keycloak-metrics-spi/repos/community-any/move-version-to-properties.patch (from
rev 1445797, keycloak-metrics-spi/trunk/move-version-to-properties.patch)
===================================================================
--- move-version-to-properties.patch (rev 0)
+++ move-version-to-properties.patch 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -0,0 +1,34 @@
+From ce68fc7826bf190abaa77decbf8093a3f020bd3b Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <[email protected]>
+Date: Fri, 7 Apr 2023 14:56:57 +0300
+Subject: [PATCH] feat: move version in gradle.properties
+
+This makes it easier to set the version from the command line when we
+build.
+
+Signed-off-by: Leonidas Spyropoulos <[email protected]>
+---
+ build.gradle | 1 -
+ gradle.properties | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index a2ea3d0..31b2fbb 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -13,7 +13,6 @@ configurations {
+ }
+
+ group 'org.jboss.aerogear'
+-version '3.0.1-SNAPSHOT'
+
+ apply plugin: 'java'
+
+diff --git a/gradle.properties b/gradle.properties
+index 2fb4e20..bf0ce7f 100644
+--- a/gradle.properties
++++ b/gradle.properties
+@@ -1,2 +1,3 @@
+ keycloakVersion=21.0.1
+ prometheusVersion=0.16.0
++version=3.0.1-SNAPSHOT
Copied:
keycloak-metrics-spi/repos/community-any/remove-manifest-variable-fields.patch
(from rev 1445797,
keycloak-metrics-spi/trunk/remove-manifest-variable-fields.patch)
===================================================================
--- remove-manifest-variable-fields.patch (rev 0)
+++ remove-manifest-variable-fields.patch 2023-04-13 09:48:16 UTC (rev
1445798)
@@ -0,0 +1,29 @@
+From 6cb0c196f1a8baff86c75d0d11b04198e83b65ad Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <[email protected]>
+Date: Thu, 13 Apr 2023 10:29:13 +0100
+Subject: [PATCH] feat: remove variable fields from manifest
+
+Including the gradle,jdk versions along with kernel versiona dn JDK
+might be variable in different systems and affects the hash of each jar.
+
+Signed-off-by: Leonidas Spyropoulos <[email protected]>
+---
+ build.gradle | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 10c8dda..0003ea5 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -53,11 +53,7 @@ jar {
+ }
+ manifest {
+ attributes(
+- 'Built-By' : System.properties['user.name'],
+ 'Build-Revision' : versioning.info.commit,
+- 'Created-By' : "Gradle ${gradle.gradleVersion}",
+- 'Build-Jdk' : "${System.properties['java.version']}
(${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+- 'Build-OS' : "${System.properties['os.name']}
${System.properties['os.arch']} ${System.properties['os.version']}",
+ 'Version' : "${gradle.rootProject.version}"
+ )
+ }
Deleted: reproducible-build.patch
===================================================================
--- reproducible-build.patch 2023-04-13 09:48:07 UTC (rev 1445797)
+++ reproducible-build.patch 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -1,37 +0,0 @@
-From e6b091f39735dfb4de3dbaeeb1d729fd21ec4657 Mon Sep 17 00:00:00 2001
-From: Leonidas Spyropoulos <[email protected]>
-Date: Fri, 7 Apr 2023 15:07:05 +0300
-Subject: [PATCH] feat: add support for reproducible builds
-
-As per gradle [docs] add support to remove timestamps and package with same
order
-which is required from [reproducible] builds
-
-[docs]:
https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
-[reproducible]: https://reproducible-builds.org/
-
-Signed-off-by: Leonidas Spyropoulos <[email protected]>
----
- build.gradle | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/build.gradle b/build.gradle
-index a2ea3d0..10c8dda 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -54,7 +54,6 @@ jar {
- manifest {
- attributes(
- 'Built-By' : System.properties['user.name'],
-- 'Build-Timestamp': new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
- 'Build-Revision' : versioning.info.commit,
- 'Created-By' : "Gradle ${gradle.gradleVersion}",
- 'Build-Jdk' : "${System.properties['java.version']}
(${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
-@@ -63,3 +62,8 @@ jar {
- )
- }
- }
-+
-+tasks.withType(AbstractArchiveTask.class).configureEach {
-+ preserveFileTimestamps = false
-+ reproducibleFileOrder = true
-+}
Copied: keycloak-metrics-spi/repos/community-any/reproducible-build.patch (from
rev 1445797, keycloak-metrics-spi/trunk/reproducible-build.patch)
===================================================================
--- reproducible-build.patch (rev 0)
+++ reproducible-build.patch 2023-04-13 09:48:16 UTC (rev 1445798)
@@ -0,0 +1,37 @@
+From e6b091f39735dfb4de3dbaeeb1d729fd21ec4657 Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <[email protected]>
+Date: Fri, 7 Apr 2023 15:07:05 +0300
+Subject: [PATCH] feat: add support for reproducible builds
+
+As per gradle [docs] add support to remove timestamps and package with same
order
+which is required from [reproducible] builds
+
+[docs]:
https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
+[reproducible]: https://reproducible-builds.org/
+
+Signed-off-by: Leonidas Spyropoulos <[email protected]>
+---
+ build.gradle | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index a2ea3d0..10c8dda 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -54,7 +54,6 @@ jar {
+ manifest {
+ attributes(
+ 'Built-By' : System.properties['user.name'],
+- 'Build-Timestamp': new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+ 'Build-Revision' : versioning.info.commit,
+ 'Created-By' : "Gradle ${gradle.gradleVersion}",
+ 'Build-Jdk' : "${System.properties['java.version']}
(${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+@@ -63,3 +62,8 @@ jar {
+ )
+ }
+ }
++
++tasks.withType(AbstractArchiveTask.class).configureEach {
++ preserveFileTimestamps = false
++ reproducibleFileOrder = true
++}
