Date: Thursday, November 10, 2022 @ 21:47:41 Author: dvzrv Revision: 1346496
Update sources to 9.0.0. Remove unnecessary quotes and curly braces. Replace ant/ivy with gradle (the build is currently still broken). Modified: solr/trunk/PKGBUILD ----------+ PKGBUILD | 134 +++++++++++++++++++++++++++---------------------------------- 1 file changed, 61 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-10 21:43:46 UTC (rev 1346495) +++ PKGBUILD 2022-11-10 21:47:41 UTC (rev 1346496) @@ -1,7 +1,7 @@ # Maintainer: David Runge <[email protected]> pkgname=solr -pkgver=8.11.1 +pkgver=9.0.0 pkgrel=1 pkgdesc="Open source enterprise search platform built on Apache Lucene" arch=(any) @@ -8,60 +8,61 @@ url="https://lucene.apache.org/solr/"; license=(Apache) depends=(bash 'java-runtime>=8') -makedepends=(ant ivy 'java-environment>=8' strip-nondeterminism) -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") +makedepends=(gradle groovy 'java-environment>=8' strip-nondeterminism) +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://archive.apache.org/dist/lucene/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tgz"{,.asc} - "${pkgname}.service" - "${pkgname}.sysusers" - "${pkgname}.tmpfiles" + https://downloads.apache.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tgz{,.asc} + $pkgname.service + $pkgname.sysusers + $pkgname.tmpfiles ) -sha512sums=('99619e5295b06b08625f849af67b634a17c75a3593625a9890fa34f9850413290c4557d6ed6f070a55a53eed0761df0405b365fa824b0b834e1ab33a6cda0b9a' +sha512sums=('e9802443b6f9ca1621b22aab226daef788b863f0508f44a062fac04dbd7a04d796787f8b7f57408ca4049e668799b8e76fe6ea1acb82a54253c8b5244baf3a14' 'SKIP' 'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532' '06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058' '97252d1ba1e4e211a6b5a038981cbc9d6663a0d7a980b23484f838eebb2f8194571a3f34ea6b92ed0efd4b7f862e020b5e3e8478ad1de1c6832e232d0b20ff6d') -b2sums=('52f557a3c5f1828486cc67774903eba8937d08662425737f72eb395009018fb084d7310def8e21c1c566f7ce4bee8ec6497dc51195de2820d54c32feb4dcc343' +b2sums=('d3e837e09a8a5e954591edea7f293971cab560ce41c6e3e842e686dfa32b450bff95670c61bf99a7124fdc4e1e0fabd9f5dd2b676b79bab542a929208e79063b' 'SKIP' 'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7' '60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb' '37ab5d9af1da1178fcc58ce39654fdecb842b24d4e2264a2eec95c10223e7d003f27a6b2957a267a17ce0fa72258d96642d5b909963576a5a7d13e4e05c47a51') # 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]> +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" - ant ivy-bootstrap - rm -rvf "${pkgname}/bin/init.d" + cd $pkgname-$pkgver + rm -frv $pkgname/bin/init.d } build() { - cd "$pkgname-$pkgver" - cd "${pkgname}" - ant compile - ant server - ant dist + cd $pkgname-$pkgver/$pkgname + + gradle assemble --stacktrace --debug + gradle -p solr documentation # Timestamps in JAR files generated by Maven do not honour SOURCE_DATE_EPOCH # (https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=74682318) find . \ @@ -75,59 +76,46 @@ # check() { # cd "$pkgname-$pkgver" # cd "${pkgname}" -# ant test # } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver # removing unneeded sources and build artifacts - rm -rvf ${pkgname}/contrib/*/src + rm -rvf $pkgname/contrib/*/src find . -type f \( -iname "*build.xml" -o -iname "*ivy.xml" \) -delete # remove unneeded and OS specific scripts - rm -rvf "${pkgname}/bin/"{install_solr_service.sh,solr.cmd,solr.in.cmd} + rm -rvf $pkgname/bin/{install_solr_service.sh,solr.cmd,solr.in.cmd} # make target script executable - chmod 755 "${pkgname}/bin/${pkgname}" + chmod 755 $pkgname/bin/$pkgname # symlink script into PATH - install -vdm 755 "${pkgdir}/usr/bin/" - ln -sv "/usr/share/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + install -vdm 755 "$pkgdir/usr/bin/" + ln -sv /usr/share/$pkgname/bin/$pkgname "$pkgdir/usr/bin/$pkgname" # configuration - install -vDm 644 "${pkgname}/bin/${pkgname}.in.sh" \ - -t "${pkgdir}/etc/${pkgname}" - install -vDm 644 "${pkgname}/server/etc/"*.xml \ - -t "${pkgdir}/etc/${pkgname}/server" - install -vDm 644 "${pkgname}/server/${pkgname}/${pkgname}.xml" \ - -t "${pkgdir}/etc/${pkgname}/" - install -vDm 644 "${pkgname}/server/${pkgname}/zoo.cfg" \ - -t "${pkgdir}/etc/${pkgname}/" - install -vdm 755 "${pkgdir}/usr/share/${pkgname}" + install -vDm 644 $pkgname/bin/$pkgname.in.sh -t "$pkgdir/etc/$pkgname" + install -vDm 644 $pkgname/server/etc/*.xml -t "$pkgdir/etc/$pkgname/server" + install -vDm 644 $pkgname/server/$pkgname/$pkgname.xml -t "$pkgdir/etc/$pkgname/" + install -vDm 644 $pkgname/server/$pkgname/zoo.cfg -t "$pkgdir/etc/$pkgname/" + install -vdm 755 "$pkgdir/usr/share/$pkgname/" # copy application - cp -rvL "${pkgname}/"{bin,contrib,dist,docs,example,licenses,server} \ - "${pkgdir}/usr/share/${pkgname}" + cp -rvL $pkgname/{bin,contrib,dist,docs,example,licenses,server} "$pkgdir/usr/share/$pkgname/" # symlink configuration into place - ln -svf "/etc/${pkgname}/${pkgname}.in.sh" \ - "${pkgdir}/usr/share/${pkgname}/" + 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}" + 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}" + ln -svf /etc/$pkgname/server/$config "$pkgdir/usr/share/$pkgname/server/etc/$config" done # logs directory - install -vdm 750 "${pkgdir}/var/log/${pkgname}" + install -vdm 750 "$pkgdir/var/log/$pkgname" # docs - install -vDm 644 "${pkgname}/"{CHANGES,LUCENE_CHANGES,NOTICE,README}.txt \ - -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" + install -vDm 644 $pkgname/{CHANGES,LUCENE_CHANGES,NOTICE,README}.txt -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" }
