Date: Monday, November 28, 2022 @ 09:50:57
Author: dvzrv
Revision: 1354750
archrelease: copy trunk to community-any
Added:
solr/repos/community-any/PKGBUILD
(from rev 1354744, solr/trunk/PKGBUILD)
solr/repos/community-any/allow-using-system-gradle.patch
(from rev 1354745, solr/trunk/allow-using-system-gradle.patch)
solr/repos/community-any/keys/
solr/repos/community-any/skip-checks-for-git-repo.patch
(from rev 1354745, solr/trunk/skip-checks-for-git-repo.patch)
solr/repos/community-any/skip-failing-test.patch
(from rev 1354746, solr/trunk/skip-failing-test.patch)
solr/repos/community-any/solr.service
(from rev 1354746, solr/trunk/solr.service)
solr/repos/community-any/solr.sysusers
(from rev 1354746, solr/trunk/solr.sysusers)
solr/repos/community-any/solr.tmpfiles
(from rev 1354746, solr/trunk/solr.tmpfiles)
solr/repos/community-any/support-reproducible-builds.patch
(from rev 1354747, solr/trunk/support-reproducible-builds.patch)
Deleted:
solr/repos/community-any/PKGBUILD
solr/repos/community-any/allow-using-system-gradle.patch
solr/repos/community-any/keys/
solr/repos/community-any/skip-checks-for-git-repo.patch
solr/repos/community-any/skip-failing-test.patch
solr/repos/community-any/solr.service
solr/repos/community-any/solr.sysusers
solr/repos/community-any/solr.tmpfiles
solr/repos/community-any/support-reproducible-builds.patch
-----------------------------------+
PKGBUILD | 282 ++++++++++++++++++------------------
allow-using-system-gradle.patch | 44 ++---
skip-checks-for-git-repo.patch | 60 +++----
skip-failing-test.patch | 28 +--
solr.service | 76 ++++-----
solr.sysusers | 2
solr.tmpfiles | 10 -
support-reproducible-builds.patch | 48 +++---
8 files changed, 276 insertions(+), 274 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-28 09:50:47 UTC (rev 1354749)
+++ PKGBUILD 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,140 +0,0 @@
-# Maintainer: David Runge <[email protected]>
-
-pkgname=solr
-pkgver=9.0.0
-pkgrel=2
-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-https8.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://downloads.apache.org/$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=('e9802443b6f9ca1621b22aab226daef788b863f0508f44a062fac04dbd7a04d796787f8b7f57408ca4049e668799b8e76fe6ea1acb82a54253c8b5244baf3a14'
- 'SKIP'
-
'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532'
-
'06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058'
-
'97252d1ba1e4e211a6b5a038981cbc9d6663a0d7a980b23484f838eebb2f8194571a3f34ea6b92ed0efd4b7f862e020b5e3e8478ad1de1c6832e232d0b20ff6d'
-
'a56465b202fb55b5f84a98a42b6a6c5b83325a0b96142b158f80dd161d04b9001e3bc84c0555871f07cf6ea3932b31b9f4d98981090080afde3577045db21f53'
-
'43267da8d3061ddb6a1e93166e049a1381fd926e7738d858be4eea65fc09def9edc9890e5b78f1a3445dae301cae358542cbb3ab1b5b805275834b77452fa9cc'
-
'45e4811cd6018e9591d883039d051c3df3d0cc9aa852baf9eb5ca01c57df9818bb038da3da8b9f5fed161af66f241b9fed08dcaaf2344d82917785980345d1bd'
-
'b5d62225e623b0256eadfc58c0d9d7827ba933d3c9ef8840e2d3661549d575994166114cf7addfcb598f71f336cf93152db8e5ff50e7dd3657efbef9cbac8381')
-b2sums=('d3e837e09a8a5e954591edea7f293971cab560ce41c6e3e842e686dfa32b450bff95670c61bf99a7124fdc4e1e0fabd9f5dd2b676b79bab542a929208e79063b'
- 'SKIP'
-
'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7'
-
'60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb'
-
'37ab5d9af1da1178fcc58ce39654fdecb842b24d4e2264a2eec95c10223e7d003f27a6b2957a267a17ce0fa72258d96642d5b909963576a5a7d13e4e05c47a51'
-
'a0eeaa826414413f3ef428909ecef42a5f34c3633725fef0c0369a792fba347fd3021a400cf8377eb86adba7da87792c6014c49c9fd681ff39952f82bc5c98c2'
-
'4aa232c056725eb7fac58d2ba1531209c706e8a3a6982c7cc9ad214b8105ef0950d872f272c4b3be5e4145dee1d2185ca6840d796b01d973219508ca31352ba0'
-
'caf29ec61c49e099cefbf1145dc21da1dd6f0813791a2c538fc670f8e2eb8a9292100026926012e963090391b69344593173dfcbce16e8bc4337e206ee87f58f'
-
'833cb24c10d0c7ed65d330565d9442f756243b3d541e548a01ee9f5619db68d0c10f14a86c0dadba2d67ecadfa54e6f07db87a1db475f4a291a37cb4bcae8ead')
-# list of trusted signing keys: https://downloads.apache.org/lucene/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]>
-)
-
-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
- /usr/bin/gradle \
- -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"
- /usr/bin/gradle \
- -Dversion.release=${pkgver} \
- test \
- -Prefguide.include=false
-}
-
-package() {
- 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}/"
- install -vdm 755 "${pkgdir}/usr/share/${pkgname}/"
-
- # copy application
- 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,https8,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 dist/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-any/PKGBUILD (from rev 1354744,
solr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1,142 @@
+# Maintainer: David Runge <[email protected]>
+
+pkgname=solr
+pkgver=9.1.0
+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://downloads.apache.org/$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=('1beaa819f6574ec4d5d8b2b4fc89db46f0b47109c175000ea51b5d0440fdb2845939f758bd6219d35ab991df9084550ec0ff6d8f635a278865b8115439044c25'
+ 'SKIP'
+
'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532'
+
'06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058'
+
'97252d1ba1e4e211a6b5a038981cbc9d6663a0d7a980b23484f838eebb2f8194571a3f34ea6b92ed0efd4b7f862e020b5e3e8478ad1de1c6832e232d0b20ff6d'
+
'a56465b202fb55b5f84a98a42b6a6c5b83325a0b96142b158f80dd161d04b9001e3bc84c0555871f07cf6ea3932b31b9f4d98981090080afde3577045db21f53'
+
'43267da8d3061ddb6a1e93166e049a1381fd926e7738d858be4eea65fc09def9edc9890e5b78f1a3445dae301cae358542cbb3ab1b5b805275834b77452fa9cc'
+
'45e4811cd6018e9591d883039d051c3df3d0cc9aa852baf9eb5ca01c57df9818bb038da3da8b9f5fed161af66f241b9fed08dcaaf2344d82917785980345d1bd'
+
'b5d62225e623b0256eadfc58c0d9d7827ba933d3c9ef8840e2d3661549d575994166114cf7addfcb598f71f336cf93152db8e5ff50e7dd3657efbef9cbac8381')
+b2sums=('b73900c1d4df8124a0effa3c8dfc166c7144ce96321b5cc36e249545760a1b75e913cf0a0edd2d29e158dcbf1c350b6c2531c0df4410d2f2f92e8b69253737a2'
+ 'SKIP'
+
'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7'
+
'60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb'
+
'37ab5d9af1da1178fcc58ce39654fdecb842b24d4e2264a2eec95c10223e7d003f27a6b2957a267a17ce0fa72258d96642d5b909963576a5a7d13e4e05c47a51'
+
'a0eeaa826414413f3ef428909ecef42a5f34c3633725fef0c0369a792fba347fd3021a400cf8377eb86adba7da87792c6014c49c9fd681ff39952f82bc5c98c2'
+
'4aa232c056725eb7fac58d2ba1531209c706e8a3a6982c7cc9ad214b8105ef0950d872f272c4b3be5e4145dee1d2185ca6840d796b01d973219508ca31352ba0'
+
'caf29ec61c49e099cefbf1145dc21da1dd6f0813791a2c538fc670f8e2eb8a9292100026926012e963090391b69344593173dfcbce16e8bc4337e206ee87f58f'
+
'833cb24c10d0c7ed65d330565d9442f756243b3d541e548a01ee9f5619db68d0c10f14a86c0dadba2d67ecadfa54e6f07db87a1db475f4a291a37cb4bcae8ead')
+# list of trusted signing keys: https://downloads.apache.org/lucene/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]>
+)
+
+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
+ /usr/bin/gradle \
+ -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
+
+ /usr/bin/gradle \
+ -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"
+}
Deleted: allow-using-system-gradle.patch
===================================================================
--- allow-using-system-gradle.patch 2022-11-28 09:50:47 UTC (rev 1354749)
+++ allow-using-system-gradle.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,22 +0,0 @@
-diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
---- a/buildSrc/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/buildSrc/build.gradle (date 1668163583892)
-@@ -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")
-diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
---- a/solr/packaging/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/solr/packaging/build.gradle (date 1668163013921)
-@@ -120,7 +120,6 @@
- "**/bin/post",
- "**/bin/postlogs",
- "**/bin/solr",
-- "**/bin/init.d/solr",
- "**/bin/solr-exporter",
- ]) { copy ->
- copy.setMode(0755)
Copied: solr/repos/community-any/allow-using-system-gradle.patch (from rev
1354745, solr/trunk/allow-using-system-gradle.patch)
===================================================================
--- allow-using-system-gradle.patch (rev 0)
+++ allow-using-system-gradle.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1,22 @@
+diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
+--- a/buildSrc/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/buildSrc/build.gradle (date 1668163583892)
+@@ -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")
+diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
+--- a/solr/packaging/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/solr/packaging/build.gradle (date 1668163013921)
+@@ -120,7 +120,6 @@
+ "**/bin/post",
+ "**/bin/postlogs",
+ "**/bin/solr",
+- "**/bin/init.d/solr",
+ "**/bin/solr-exporter",
+ ]) { copy ->
+ copy.setMode(0755)
Deleted: skip-checks-for-git-repo.patch
===================================================================
--- skip-checks-for-git-repo.patch 2022-11-28 09:50:47 UTC (rev 1354749)
+++ skip-checks-for-git-repo.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,30 +0,0 @@
-diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle
---- a/solr/distribution/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/solr/distribution/build.gradle (date 1668163583889)
-@@ -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
-diff --git a/solr/distribution/source-release.gradle
b/solr/distribution/source-release.gradle
---- a/solr/distribution/source-release.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/solr/distribution/source-release.gradle (date 1668163583894)
-@@ -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")
Copied: solr/repos/community-any/skip-checks-for-git-repo.patch (from rev
1354745, solr/trunk/skip-checks-for-git-repo.patch)
===================================================================
--- skip-checks-for-git-repo.patch (rev 0)
+++ skip-checks-for-git-repo.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1,30 @@
+diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle
+--- a/solr/distribution/build.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/solr/distribution/build.gradle (date 1668163583889)
+@@ -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
+diff --git a/solr/distribution/source-release.gradle
b/solr/distribution/source-release.gradle
+--- a/solr/distribution/source-release.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/solr/distribution/source-release.gradle (date 1668163583894)
+@@ -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")
Deleted: skip-failing-test.patch
===================================================================
--- skip-failing-test.patch 2022-11-28 09:50:47 UTC (rev 1354749)
+++ skip-failing-test.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,14 +0,0 @@
-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 a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
(date 1668161796366)
-@@ -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-any/skip-failing-test.patch (from rev 1354746,
solr/trunk/skip-failing-test.patch)
===================================================================
--- skip-failing-test.patch (rev 0)
+++ skip-failing-test.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1,14 @@
+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 a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++
b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
(date 1668161796366)
+@@ -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;
Deleted: solr.service
===================================================================
--- solr.service 2022-11-28 09:50:47 UTC (rev 1354749)
+++ solr.service 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,38 +0,0 @@
-[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-any/solr.service (from rev 1354746,
solr/trunk/solr.service)
===================================================================
--- solr.service (rev 0)
+++ solr.service 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -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
Deleted: solr.sysusers
===================================================================
--- solr.sysusers 2022-11-28 09:50:47 UTC (rev 1354749)
+++ solr.sysusers 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1 +0,0 @@
-u solr - "Apache Solr user" - -
Copied: solr/repos/community-any/solr.sysusers (from rev 1354746,
solr/trunk/solr.sysusers)
===================================================================
--- solr.sysusers (rev 0)
+++ solr.sysusers 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1 @@
+u solr - "Apache Solr user" - -
Deleted: solr.tmpfiles
===================================================================
--- solr.tmpfiles 2022-11-28 09:50:47 UTC (rev 1354749)
+++ solr.tmpfiles 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,5 +0,0 @@
-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-any/solr.tmpfiles (from rev 1354746,
solr/trunk/solr.tmpfiles)
===================================================================
--- solr.tmpfiles (rev 0)
+++ solr.tmpfiles 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -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 - -
Deleted: support-reproducible-builds.patch
===================================================================
--- support-reproducible-builds.patch 2022-11-28 09:50:47 UTC (rev 1354749)
+++ support-reproducible-builds.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -1,24 +0,0 @@
-diff --git a/gradle/globals.gradle b/gradle/globals.gradle
---- a/gradle/globals.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/gradle/globals.gradle (date 1668129963200)
-@@ -152,4 +152,8 @@
- return taskList
- }
- }
-+ tasks.withType(AbstractArchiveTask).configureEach {
-+ preserveFileTimestamps = false
-+ reproducibleFileOrder = true
-+ }
- }
-diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
---- a/gradle/java/jar-manifest.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
-+++ b/gradle/java/jar-manifest.gradle (date 1668116039242)
-@@ -44,7 +44,7 @@
- if (snapshotBuild) {
- return "${project.version} ${gitRev} [snapshot build,
details omitted]"
- } else {
-- return "${project.version} ${gitRev} -
${System.properties['user.name']} - ${buildDate} ${buildTime}"
-+ return "${project.version} ${gitRev} -
${System.properties['user.name']}"
- }
- }
-
Copied: solr/repos/community-any/support-reproducible-builds.patch (from rev
1354747, solr/trunk/support-reproducible-builds.patch)
===================================================================
--- support-reproducible-builds.patch (rev 0)
+++ support-reproducible-builds.patch 2022-11-28 09:50:57 UTC (rev 1354750)
@@ -0,0 +1,24 @@
+diff --git a/gradle/globals.gradle b/gradle/globals.gradle
+--- a/gradle/globals.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/gradle/globals.gradle (date 1668129963200)
+@@ -152,4 +152,8 @@
+ return taskList
+ }
+ }
++ tasks.withType(AbstractArchiveTask).configureEach {
++ preserveFileTimestamps = false
++ reproducibleFileOrder = true
++ }
+ }
+diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
+--- a/gradle/java/jar-manifest.gradle (revision
a4eb7aa123dc53f8dac74d80b66a490f2d6b4a26)
++++ b/gradle/java/jar-manifest.gradle (date 1668116039242)
+@@ -44,7 +44,7 @@
+ if (snapshotBuild) {
+ return "${project.version} ${gitRev} [snapshot build,
details omitted]"
+ } else {
+- return "${project.version} ${gitRev} -
${System.properties['user.name']} - ${buildDate} ${buildTime}"
++ return "${project.version} ${gitRev} -
${System.properties['user.name']}"
+ }
+ }
+
