Date: Monday, May 15, 2023 @ 15:32:55
Author: artafinde
Revision: 1461834
archrelease: copy trunk to community-testing-any
Added:
solr/repos/community-testing-any/
solr/repos/community-testing-any/PKGBUILD
(from rev 1461833, solr/trunk/PKGBUILD)
solr/repos/community-testing-any/allow-using-system-gradle.patch
(from rev 1461833, solr/trunk/allow-using-system-gradle.patch)
solr/repos/community-testing-any/keys/
solr/repos/community-testing-any/skip-checks-for-git-repo.patch
(from rev 1461833, solr/trunk/skip-checks-for-git-repo.patch)
solr/repos/community-testing-any/skip-failing-test.patch
(from rev 1461833, solr/trunk/skip-failing-test.patch)
solr/repos/community-testing-any/solr.service
(from rev 1461833, solr/trunk/solr.service)
solr/repos/community-testing-any/solr.sysusers
(from rev 1461833, solr/trunk/solr.sysusers)
solr/repos/community-testing-any/solr.tmpfiles
(from rev 1461833, solr/trunk/solr.tmpfiles)
solr/repos/community-testing-any/support-reproducible-builds.patch
(from rev 1461833, solr/trunk/support-reproducible-builds.patch)
-----------------------------------+
PKGBUILD | 145 ++++++++++++++++++++++++++++++++++++
allow-using-system-gradle.patch | 35 ++++++++
skip-checks-for-git-repo.patch | 57 ++++++++++++++
skip-failing-test.patch | 19 ++++
solr.service | 38 +++++++++
solr.sysusers | 1
solr.tmpfiles | 5 +
support-reproducible-builds.patch | 36 ++++++++
8 files changed, 336 insertions(+)
Copied: solr/repos/community-testing-any/PKGBUILD (from rev 1461833,
solr/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD (rev 0)
+++ community-testing-any/PKGBUILD 2023-05-15 15:32:55 UTC (rev 1461834)
@@ -0,0 +1,145 @@
+# Maintainer: David Runge <[email protected]>
+
+pkgname=solr
+pkgver=9.2.1
+pkgrel=1
+pkgdesc="Open source enterprise search platform built on Apache Lucene"
+arch=(any)
+url="https://lucene.apache.org/solr/";
+license=(Apache)
+depends=(bash 'java-runtime=11')
+makedepends=(gradle git groovy 'java-environment=11')
+backup=(
+ etc/$pkgname/server/jetty-http.xml
+ etc/$pkgname/server/jetty-https.xml
+ etc/$pkgname/server/jetty-ssl.xml
+ etc/$pkgname/server/jetty.xml
+ etc/$pkgname/server/webdefault.xml
+ etc/$pkgname/$pkgname.in.sh
+ etc/$pkgname/$pkgname.xml
+ etc/$pkgname/zoo.cfg
+)
+source=(
+
https://archive.apache.org/dist/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc}
+ $pkgname.service
+ $pkgname.sysusers
+ $pkgname.tmpfiles
+ support-reproducible-builds.patch
+ skip-failing-test.patch
+ skip-checks-for-git-repo.patch
+ allow-using-system-gradle.patch
+)
+sha512sums=('b23c4a086fa9fb5fca1027ea751026e139babde486082039fd6ffbbb096445f38eb4d8486bfbf25fa407389e192a3b82b1da1651a083515e5c18f0d72078dfc0'
+ 'SKIP'
+
'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532'
+
'06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058'
+
'97252d1ba1e4e211a6b5a038981cbc9d6663a0d7a980b23484f838eebb2f8194571a3f34ea6b92ed0efd4b7f862e020b5e3e8478ad1de1c6832e232d0b20ff6d'
+
'd8c3fcf66b9ad0b101e0bcfb025546f7a708afc53c845a05e2346cb9a3659d3f2f8773a5754fefc6fe98693f6ade5e0c6346b710fe2d0c2c55b12fcaed0e1f18'
+
'8daad1f07686984d59c459317936a73dfc35599b4e50f0c2bab769b42950117aae56e775f028c5241c877c771241d9fc5666cc57500a4e94576bfd30be421fe9'
+
'7e917f42efb0e9bb01916842542fcbb4838a6ad0d318c8935f2649a63c70d8ab8e30930d7b87b2b0bce763382b8b810d2182ffcde9ada9092a499f657dd9c20c'
+
'5e45fcd63be50484dbdd7b909f187d4d90a89639b80571bd93c432599b2064498344d4168dd06dfc45368ce043a873ae6be804d3ff1a3c42746b045c215cab92')
+b2sums=('c9003c7a1534d1f3e71a150cfb1a17fcfdd890e1625b3182c6e1873c082bfa41fb46b2c15c2a117400a1ae7a5c1cfc891d6a2c7b6d4994cc18cdf58bb0420623'
+ 'SKIP'
+
'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7'
+
'60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb'
+
'37ab5d9af1da1178fcc58ce39654fdecb842b24d4e2264a2eec95c10223e7d003f27a6b2957a267a17ce0fa72258d96642d5b909963576a5a7d13e4e05c47a51'
+
'f9a7922b200942d0cf42920ffe9b39180dd7d370074c8d41c89d7096baac3dacd9ce4eb00d36f698ed5d27ef0e75e822c722029c93c22fd8c68a38bfe64ac42a'
+
'21c65f14aa76a8110fed7d7b684c22342c72510376f68c2cde5ebf4ea996f38e287a29429ac7ebd93b68dbbffe030149b31d06a1dbc4b80c2182c14c53684c0a'
+
'ae58f98e20e3dc68070e180c59884e747b19bec0ce6d6197cf85cff596ce99d1437386eb89b5aad494668bc19c021f89726826c6956cea14524f94879398c8dc'
+
'ef52cfc76c484b78bacfee8a6e6321d80d3a03bdf11f81ab15e8328dd680cc87010e34a3f59423325707f60c87fe03fb2e77a082140e364d61ebaf5582101f59')
+# list of trusted signing keys: https://downloads.apache.org/solr/KEYS
+validpgpkeys=(
+ 2085660D9C1FCCACC4A479A3BF160FF14992A24C # Ishan Chattopadhyaya
<[email protected]>
+ E58A6F4D5B2B48AC66D5E53BD4F181881A42F9E6 # Ignacio Vera (CODE SIGNING KEY)
<[email protected]>
+ 81D3EB0408B4E1EB10AF443BA4F4C886B29BC2F4 # Alan Woodward (CODE SIGNING KEY)
<[email protected]>
+ 86EDB9C33B8517228E88A8F93E48C0C6EF362B9E # Mike Drob (CODE SIGNING KEY)
<[email protected]>
+ 38DA0C3CE8181703A08E4D57377C3BA26AD29C0A # Bruno Roustant
<[email protected]>
+ 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC # Houston Paul Putman IV (CODE
SIGNING KEY) <[email protected]>
+ 902CC51935C140BF820230961FD5295281436075 # Jason Gerlowski (CODE SIGNING
KEY) <[email protected]>
+ 7D8D90F8F64F23077AC87CF7CB77CB79928BB0EC # Atri Sharma <[email protected]>
+ CFCE5FBB920C3C745CEEE084C38FF5EC3FCFDB3E # Noble Paul (CODE SIGNING KEY)
<[email protected]>
+ FBC25D7E1712025294FE66590A6AA179B9BBF45E # Timothy Potter (CODE SIGNING
KEY) <[email protected]>
+ 9722F25F650057E26C803B60A6D064D833B3A969 # Mayya Sharipova (CODE SIGNING
KEY) <[email protected]>
+ E6E21FFCDCEA14C95910EA65051A0FAF76BC6507 # Adrien Grand (CODE SIGNING KEY)
<[email protected]>
+ 3558857D1F5754B78C7F8B5A71A45A3D0D8D0B93 # Jan Høydahl (CODE SIGNING KEY)
<[email protected]>
+ C3E7CBD9B9FE2B419EB14B89612B39A5BC981763 # Michael A. Gibney
<[email protected]>
+ FDB3D11D716BB32ACF8C93AB919B21537AA80271 # Justin Sweeney (CODE SIGNING
KEY) <[email protected]>
+)
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i "$srcdir"/support-reproducible-builds.patch
+ patch -Np1 -i "$srcdir"/skip-failing-test.patch
+ patch -Np1 -i "$srcdir"/skip-checks-for-git-repo.patch
+ # patch -Np1 -i "$srcdir"/allow-using-system-gradle.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ # override adding -SNAPSHOT on version
+ # skip signing of jars
+ # skip generation of reference guide
+ #
+ ./gradlew \
+ -Dversion.release=$pkgver \
+ assembleRelease \
+ -Psign=false -x signJarsPublication \
+ -Prefguide.include=false
+
+ install -vdm 755 "$srcdir/$pkgname-$pkgver/dist"
+ tar -xf "$pkgname/distribution/build/release/$pkgname-$pkgver.tgz" --strip 1
-C "$srcdir/$pkgname-$pkgver/dist"
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ ./gradlew \
+ -Dversion.release=$pkgver \
+ test \
+ -Prefguide.include=false
+}
+
+package() {
+ local config
+
+ cd $pkgname-$pkgver
+
+ # remove unneeded and OS specific scripts
+ rm -rvf dist/bin/{install_solr_service.sh,solr.cmd,solr.in.cmd}
+
+ # make target script executable
+ chmod 755 dist/bin/${pkgname}
+ # symlink script into PATH
+ install -vdm 755 "$pkgdir/usr/bin/"
+ ln -sv /usr/share/$pkgname/bin/$pkgname "$pkgdir/usr/bin/$pkgname"
+
+ # configuration
+ install -vDm 644 dist/bin/$pkgname.in.sh -t "${pkgdir}/etc/$pkgname"
+ install -vDm 644 dist/server/etc/*.xml -t "${pkgdir}/etc/$pkgname/server"
+ install -vDm 644 dist/server/$pkgname/$pkgname.xml -t "$pkgdir/etc/$pkgname/"
+ install -vDm 644 dist/server/$pkgname/zoo.cfg -t "$pkgdir/etc/$pkgname/"
+
+ # copy application
+ install -vdm 755 "$pkgdir/usr/share/$pkgname/"
+ cp -dr --no-preserve='ownership'
dist/{bin,docs,example,licenses,modules,server} "$pkgdir/usr/share/$pkgname/"
+
+ # symlink configuration into place
+ ln -svf /etc/$pkgname/$pkgname.in.sh "$pkgdir/usr/share/$pkgname/"
+
+ install -vdm 750 "$pkgdir/var/lib/$pkgname"
+ ln -svf /etc/$pkgname/$pkgname.xml "$pkgdir/var/lib/$pkgname/"
+ ln -svf /etc/$pkgname/zoo.cfg "$pkgdir/var/lib/$pkgname/"
+ for config in {jetty,jetty-{http,https,ssl},webdefault}.xml; do
+ ln -svf /etc/$pkgname/server/$config
"$pkgdir/usr/share/$pkgname/server/etc/$config"
+ done
+
+ # logs directory
+ install -vdm 750 "$pkgdir/var/log/$pkgname/"
+ # docs
+ install -vDm 644 dist/{CHANGES,NOTICE}.txt -t
"$pkgdir/usr/share/doc/$pkgname/"
+ install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+ install -vDm 644 ../$pkgname.service -t "$pkgdir/usr/lib/systemd/system/"
+ install -vDm 644 ../$pkgname.sysusers
"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+ install -vDm 644 ../$pkgname.tmpfiles
"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
Copied: solr/repos/community-testing-any/allow-using-system-gradle.patch (from
rev 1461833, solr/trunk/allow-using-system-gradle.patch)
===================================================================
--- community-testing-any/allow-using-system-gradle.patch
(rev 0)
+++ community-testing-any/allow-using-system-gradle.patch 2023-05-15
15:32:55 UTC (rev 1461834)
@@ -0,0 +1,35 @@
+Subject: [PATCH] allow-system-gradle
+---
+Index: gradle/testing/defaults-tests.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/gradle/testing/defaults-tests.gradle
b/gradle/testing/defaults-tests.gradle
+--- a/gradle/testing/defaults-tests.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/gradle/testing/defaults-tests.gradle (date 1681295313069)
+@@ -89,7 +89,7 @@
+
+ tasks.withType(Test) {
+ ext {
+- testOutputsDir = file("${reports.junitXml.destination}/outputs")
++ testOutputsDir =
file("${reports.junitXml.outputLocation.get()}/outputs")
+ }
+
+ // LUCENE-9660: Make it possible to always rerun tests, even if they're
incrementally up-to-date.
+Index: buildSrc/build.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
+--- a/buildSrc/build.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/buildSrc/build.gradle (date 1681295152900)
+@@ -25,7 +25,6 @@
+ }
+
+ // Make sure the build environment is consistent.
+-apply from: file('../gradle/validation/check-environment.gradle')
+
+ // Load common buildSrc and script deps.
+ apply from: file("scriptDepVersions.gradle")
Copied: solr/repos/community-testing-any/skip-checks-for-git-repo.patch (from
rev 1461833, solr/trunk/skip-checks-for-git-repo.patch)
===================================================================
--- community-testing-any/skip-checks-for-git-repo.patch
(rev 0)
+++ community-testing-any/skip-checks-for-git-repo.patch 2023-05-15
15:32:55 UTC (rev 1461834)
@@ -0,0 +1,57 @@
+Subject: [PATCH] skip-checks-for-git-repo
+---
+Index: solr/distribution/source-release.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/solr/distribution/source-release.gradle
b/solr/distribution/source-release.gradle
+--- a/solr/distribution/source-release.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/solr/distribution/source-release.gradle (date 1681294983703)
+@@ -23,7 +23,6 @@
+ description "Assemble source Solr artifact as a .tgz file."
+
+ // Make sure no unstaged/ dirty files are present.
+- dependsOn ":gitStatus", ":checkWorkingCopyClean"
+
+ ext {
+ destination = file("${buildDir}/packages/solr-${version}-src.tgz")
+Index: gradle/validation/precommit.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/gradle/validation/precommit.gradle
b/gradle/validation/precommit.gradle
+--- a/gradle/validation/precommit.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/gradle/validation/precommit.gradle (date 1681294983698)
+@@ -48,6 +48,5 @@
+
+ // Each validation task should be attached to check but make sure
+ // precommit() as a whole is a dependency on rootProject.check
+- check.dependsOn precommit
+ }
+
+Index: solr/distribution/build.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle
+--- a/solr/distribution/build.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/solr/distribution/build.gradle (date 1681294983701)
+@@ -70,7 +70,6 @@
+
+ files = objects.fileCollection()
+ [
+- tasks.assembleSourceTgz,
+ distTarTask,
+ ].each { dep ->
+ dependsOn dep
+@@ -129,7 +128,6 @@
+ })
+
+ from tasks.prepareGitRev
+- from tasks.assembleSourceTgz
+ from distTarTask
+
+ from tasks.computeChecksums
Copied: solr/repos/community-testing-any/skip-failing-test.patch (from rev
1461833, solr/trunk/skip-failing-test.patch)
===================================================================
--- community-testing-any/skip-failing-test.patch
(rev 0)
+++ community-testing-any/skip-failing-test.patch 2023-05-15 15:32:55 UTC
(rev 1461834)
@@ -0,0 +1,19 @@
+Index:
solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
+---
a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
(revision 6ef1f55660ce83a2ef673d917fd6898ca7b9a9ef)
++++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
(date 1681130275284)
+@@ -38,8 +38,10 @@
+ import org.apache.solr.search.SolrReturnFields;
+ import org.junit.AfterClass;
+ import org.junit.BeforeClass;
++import org.junit.Ignore;
+ import org.junit.Test;
+
++@Ignore
+ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {
+
+ private static XLSXResponseWriter writerXlsx;
Copied: solr/repos/community-testing-any/solr.service (from rev 1461833,
solr/trunk/solr.service)
===================================================================
--- community-testing-any/solr.service (rev 0)
+++ community-testing-any/solr.service 2023-05-15 15:32:55 UTC (rev 1461834)
@@ -0,0 +1,38 @@
+[Unit]
+Description=Solr full text search engine
+After=network.target
+
+[Service]
+Type=simple
+Environment=SOLR_PID_DIR=/run/solr/
+Environment=SOLR_LOGS_DIR=/var/log/solr/
+User=solr
+WorkingDirectory=/var/lib/solr
+ExecStart=/usr/bin/solr start -f -d /usr/share/solr/server -s /var/lib/solr
+PrivateTmp=true
+ProtectSystem=strict
+ProtectHome=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+NoNewPrivileges=true
+LockPersonality=true
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=~CAP_NET_BROADCAST CAP_NET_RAW
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+RemoveIPC=true
+RestrictAddressFamilies=~AF_PACKET AF_NETLINK AF_UNIX
+RestrictSUIDSGID=true
+RestrictNamespaces=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+SystemCallFilter=~@privileged @resources
+RuntimeDirectory=solr
+StateDirectory=solr
+LogsDirectory=solr
+
+[Install]
+WantedBy=multi-user.target
Copied: solr/repos/community-testing-any/solr.sysusers (from rev 1461833,
solr/trunk/solr.sysusers)
===================================================================
--- community-testing-any/solr.sysusers (rev 0)
+++ community-testing-any/solr.sysusers 2023-05-15 15:32:55 UTC (rev 1461834)
@@ -0,0 +1 @@
+u solr - "Apache Solr user" - -
Copied: solr/repos/community-testing-any/solr.tmpfiles (from rev 1461833,
solr/trunk/solr.tmpfiles)
===================================================================
--- community-testing-any/solr.tmpfiles (rev 0)
+++ community-testing-any/solr.tmpfiles 2023-05-15 15:32:55 UTC (rev 1461834)
@@ -0,0 +1,5 @@
+d %L/solr 750 solr solr - -
+d %t/solr 750 solr solr - -
+d %S/solr 750 solr solr - -
+z /etc/solr/solr.xml 640 root solr - -
+z /etc/solr/zoo.cfg 640 root solr - -
Copied: solr/repos/community-testing-any/support-reproducible-builds.patch
(from rev 1461833, solr/trunk/support-reproducible-builds.patch)
===================================================================
--- community-testing-any/support-reproducible-builds.patch
(rev 0)
+++ community-testing-any/support-reproducible-builds.patch 2023-05-15
15:32:55 UTC (rev 1461834)
@@ -0,0 +1,36 @@
+Subject: [PATCH] allow system gradle
+---
+Index: gradle/globals.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/gradle/globals.gradle b/gradle/globals.gradle
+--- a/gradle/globals.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/gradle/globals.gradle (date 1681294916077)
+@@ -170,4 +170,8 @@
+ // anything starting with "JENKINS_" or "HUDSON_": Jenkins/Hudson
(https://jenkins.thetaphi.de/env-vars.html/)
+ isCIBuild = System.getenv().keySet().find { it ==~
/(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ } != null
+ }
++ tasks.withType(AbstractArchiveTask).configureEach {
++ preserveFileTimestamps = false
++ reproducibleFileOrder = true
++ }
+ }
+Index: gradle/java/jar-manifest.gradle
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
+--- a/gradle/java/jar-manifest.gradle (revision
92c5515e2918c22513f7aa527d6c6db943150fea)
++++ b/gradle/java/jar-manifest.gradle (date 1681294916075)
+@@ -46,7 +46,7 @@
+ } else {
+ def sysProps = System.properties
+ def manifestUsername =
sysProps.getOrDefault('manifest.username', sysProps['user.name'])
+- return "${project.version} ${gitRev} -
${manifestUsername} - ${buildDate} ${buildTime}"
++ return "${project.version} ${gitRev} -
${manifestUsername}"
+ }
+ }
+
