[arch-commits] Commit in solr/repos/community-any (8 files)

David Runge dvzrv at archlinux.org
Tue Jul 14 10:31:28 UTC 2020


    Date: Tuesday, July 14, 2020 @ 10:31:28
  Author: dvzrv
Revision: 663679

archrelease: copy trunk to community-any

Added:
  solr/repos/community-any/PKGBUILD
    (from rev 663678, solr/trunk/PKGBUILD)
  solr/repos/community-any/solr.service
    (from rev 663678, solr/trunk/solr.service)
  solr/repos/community-any/solr.sysusers
    (from rev 663678, solr/trunk/solr.sysusers)
  solr/repos/community-any/solr.tmpfiles
    (from rev 663678, solr/trunk/solr.tmpfiles)
Deleted:
  solr/repos/community-any/PKGBUILD
  solr/repos/community-any/solr.service
  solr/repos/community-any/solr.sysusers
  solr/repos/community-any/solr.tmpfiles

---------------+
 PKGBUILD      |  209 +++++++++++++++++++++++++++++---------------------------
 solr.service  |   76 ++++++++++----------
 solr.sysusers |    2 
 solr.tmpfiles |    6 -
 4 files changed, 153 insertions(+), 140 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 10:27:31 UTC (rev 663678)
+++ PKGBUILD	2020-07-14 10:31:28 UTC (rev 663679)
@@ -1,98 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=solr
-pkgver=8.5.2
-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>=8')
-makedepends=('ant' 'ivy' 'java-environment>=8')
-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")
-sha512sums=('cced21440ef023d4bf7ad58d07aa33ce13c38eedce5bbc2592e8ac0133880514d0fac352ff9aeb63673e2cd24b15f715cb4925afe0bba839744295288cb86b59'
-            'SKIP'
-            'a34121427e9d3362e3424c8bf1f13e50dccbee4a1870bd8713a39c8bf79450462b12a98cc981af3a3522d176094b05e300468465100f27bcd44f08129f324430'
-            '06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058'
-            '9cc97763a50c11c305b06ce07f0b2936b8fcb0b1d43f8b469fe1399850cb009fc1eba297d295a386a556e5c042e189dba1b1fc96a54aa46964ed4db8e17d40a8')
-validpgpkeys=('2085660D9C1FCCACC4A479A3BF160FF14992A24C'  # Ishan Chattopadhyaya <ishan at apache.org>
-              'E58A6F4D5B2B48AC66D5E53BD4F181881A42F9E6'  # Ignacio Vera (CODE SIGNING KEY) <ivera at apache.org>
-              '81D3EB0408B4E1EB10AF443BA4F4C886B29BC2F4'  # Alan Woodward (CODE SIGNING KEY) <romseygeek at apache.org>
-              '86EDB9C33B8517228E88A8F93E48C0C6EF362B9E') # Mike Drob (CODE SIGNING KEY) <mdrob at apache.org>
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  ant ivy-bootstrap
-  rm -rvf "${pkgname}/bin/init.d"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  cd "${pkgname}"
-  ant compile
-  ant server
-  ant dist
-}
-
-# TODO: make org.apache.solr.cloud.MetricsHistoryIntegrationTest.testGet pass
-# seemingly requires lucene to be built as well X_X
-# check() {
-#   cd "$pkgname-$pkgver"
-#   cd "${pkgname}"
-#   ant test
-# }
-
-package() {
-  cd "$pkgname-$pkgver"
-  # removing unneeded sources and build artifacts
-  rm -rvf ${pkgname}/contrib/*/src
-  find . -type f \( -iname "*build.xml" -o -iname "*ivy.xml" \) -delete
-  # script
-  install -vDm 755 "${pkgname}/bin/${pkgname}" -t "${pkgdir}/usr/bin"
-  # 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}"
-  # copy application
-  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}.xml" \
-    "${pkgdir}/usr/share/${pkgname}/server/${pkgname}"
-  ln -svf "/etc/${pkgname}/zoo.cfg" \
-    "${pkgdir}/usr/share/${pkgname}/server/${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 "${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"
-}

Copied: solr/repos/community-any/PKGBUILD (from rev 663678, solr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-14 10:31:28 UTC (rev 663679)
@@ -0,0 +1,111 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=solr
+pkgver=8.6.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>=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")
+source=("https://archive.apache.org/dist/lucene/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tgz"{,.asc}
+        "${pkgname}.service"
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles")
+sha512sums=('cb0e6c5e1145c19089ec15729974157d93d680a6bf34220e73c89b5c889ac62e2d5c76a8318383d4f71116f585faf7657909363c15495b81d9c380ff5ac7387f'
+            'SKIP'
+            'a34121427e9d3362e3424c8bf1f13e50dccbee4a1870bd8713a39c8bf79450462b12a98cc981af3a3522d176094b05e300468465100f27bcd44f08129f324430'
+            '06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058'
+            '9cc97763a50c11c305b06ce07f0b2936b8fcb0b1d43f8b469fe1399850cb009fc1eba297d295a386a556e5c042e189dba1b1fc96a54aa46964ed4db8e17d40a8')
+b2sums=('1d28debb3c51596f219627a1fadf194b2b82485b3d5c8c768a6b32aa08640eaad6d5a28d2d5b5267455b8d0e169e6b62ac122ae9d3e7393675fff1d2e510c1a5'
+        'SKIP'
+        '05f5927019eb0e622417092399ed8358184cd332ba7bf929af74e64cfb190f7e7c88c0caaac9b3fa182b063085045431bf74e7b7dd9d31f7041778fc92c923f5'
+        '60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb'
+        'a596a3d33e8466861fc0947d9b573812835ca5adccf20dac7c9de5ba88b206de5f0cb2e317edae239b7c47cfb0e3ef5f5c8778ee719d6b955de934e9e8267596')
+validpgpkeys=('2085660D9C1FCCACC4A479A3BF160FF14992A24C'  # Ishan Chattopadhyaya <ishan at apache.org>
+              'E58A6F4D5B2B48AC66D5E53BD4F181881A42F9E6'  # Ignacio Vera (CODE SIGNING KEY) <ivera at apache.org>
+              '81D3EB0408B4E1EB10AF443BA4F4C886B29BC2F4'  # Alan Woodward (CODE SIGNING KEY) <romseygeek at apache.org>
+              '86EDB9C33B8517228E88A8F93E48C0C6EF362B9E'  # Mike Drob (CODE SIGNING KEY) <mdrob at apache.org>
+              '38DA0C3CE8181703A08E4D57377C3BA26AD29C0A'  # Bruno Roustant <broustant at apache.org>
+)
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  ant ivy-bootstrap
+  rm -rvf "${pkgname}/bin/init.d"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  cd "${pkgname}"
+  ant compile
+  ant server
+  ant dist
+  # Timestamps in JAR files generated by Maven do not honour SOURCE_DATE_EPOCH
+  # (https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=74682318)
+  find . \
+    -type f \
+    -iname "*.jar" \
+    -exec strip-nondeterminism --timestamp "$SOURCE_DATE_EPOCH" {} \;
+}
+
+# TODO: make org.apache.solr.cloud.MetricsHistoryIntegrationTest.testGet pass
+# seemingly requires lucene to be built as well X_X
+# check() {
+#   cd "$pkgname-$pkgver"
+#   cd "${pkgname}"
+#   ant test
+# }
+
+package() {
+  cd "$pkgname-$pkgver"
+  # removing unneeded sources and build artifacts
+  rm -rvf ${pkgname}/contrib/*/src
+  find . -type f \( -iname "*build.xml" -o -iname "*ivy.xml" \) -delete
+  # script
+  install -vDm 755 "${pkgname}/bin/${pkgname}" -t "${pkgdir}/usr/bin"
+  # 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}"
+  # copy application
+  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}.xml" \
+    "${pkgdir}/usr/share/${pkgname}/server/${pkgname}"
+  ln -svf "/etc/${pkgname}/zoo.cfg" \
+    "${pkgdir}/usr/share/${pkgname}/server/${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 "${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"
+}

Deleted: solr.service
===================================================================
--- solr.service	2020-07-14 10:27:31 UTC (rev 663678)
+++ solr.service	2020-07-14 10:31:28 UTC (rev 663679)
@@ -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 /usr/share/solr/server/solr -t /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 663678, solr/trunk/solr.service)
===================================================================
--- solr.service	                        (rev 0)
+++ solr.service	2020-07-14 10:31:28 UTC (rev 663679)
@@ -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 /usr/share/solr/server/solr -t /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	2020-07-14 10:27:31 UTC (rev 663678)
+++ solr.sysusers	2020-07-14 10:31:28 UTC (rev 663679)
@@ -1 +0,0 @@
-u solr - "Apache Solr user" - -

Copied: solr/repos/community-any/solr.sysusers (from rev 663678, solr/trunk/solr.sysusers)
===================================================================
--- solr.sysusers	                        (rev 0)
+++ solr.sysusers	2020-07-14 10:31:28 UTC (rev 663679)
@@ -0,0 +1 @@
+u solr - "Apache Solr user" - -

Deleted: solr.tmpfiles
===================================================================
--- solr.tmpfiles	2020-07-14 10:27:31 UTC (rev 663678)
+++ solr.tmpfiles	2020-07-14 10:31:28 UTC (rev 663679)
@@ -1,3 +0,0 @@
-d %L/solr 750 solr solr
-d %t/solr 750 solr solr
-d %S/solr 750 solr solr

Copied: solr/repos/community-any/solr.tmpfiles (from rev 663678, solr/trunk/solr.tmpfiles)
===================================================================
--- solr.tmpfiles	                        (rev 0)
+++ solr.tmpfiles	2020-07-14 10:31:28 UTC (rev 663679)
@@ -0,0 +1,3 @@
+d %L/solr 750 solr solr
+d %t/solr 750 solr solr
+d %S/solr 750 solr solr



More information about the arch-commits mailing list