diff --git a/.SRCINFO b/.SRCINFO index daf60b85cfce..88e5e5c6e5e6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,21 +1,25 @@ pkgbase = gerrit - pkgdesc = A web-based code review tool built on top of the Git version control system - pkgver = 3.4.0 - pkgrel = 2 + pkgdesc = Web-based code review tool built on top of Git + pkgver = 3.4.1 + pkgrel = 1 url = https://www.gerritcodereview.com/ install = gerrit.install arch = any license = Apache + depends = java-runtime>=11 depends = java-runtime<13 depends = libcups optdepends = bcprov: Java cryptography APIs (Bouncy Castle) - noextract = gerrit.war backup = etc/default/gerritcodereview - source = https://gerrit-releases.storage.googleapis.com/gerrit-3.4.0.war + source = https://gerrit-releases.storage.googleapis.com/gerrit-3.4.1.war source = gerrit.conf - source = gerrit.systemd - sha256sums = 18d52948af5c7331884b2be8d392ab2f378efb3466e5d1183a65f63b2ed38f31 + source = gerrit.service + source = gerrit.sysusers + source = gerrit.tmpfiles + sha256sums = a47a2660a62957ad1220a2e8493e72f62dc5a6b315d551b2fb91a3869461054a sha256sums = 35becf2754e3779c750b2889909349160c2b0584ec201f6cfb5cf2c42e6fc598 - sha256sums = be1d205c6a0f3b24aad3c385f8188c64bfa3a9799ecf8ce5e089149af991a645 + sha256sums = fa21680907eb149707dd12b4637dd1b5c93cc019799fd61efd54d87f81b35f03 + sha256sums = 9f1dcfa057da72a8b4928f274920baedb2e9c4d1b3c08270720646e46a1799c6 + sha256sums = cd529d580bf744624bca9bb7b67ce39a7f70e0357f43714699fc0930635f1357 pkgname = gerrit diff --git a/PKGBUILD b/PKGBUILD index 5b91be29ceb7..c41b0b5e2926 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,33 +1,38 @@ -# Maintainer: Luis Martinez +# Maintainer: Luis Martinez # Contributor: Tyler Veness # Contributor: Daniel Nagy # Contributor: Thanh Ha # Contributor: Marcel Huber pkgname=gerrit -pkgver=3.4.0 -pkgrel=2 -pkgdesc="A web-based code review tool built on top of the Git version control system" +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Web-based code review tool built on top of Git" arch=('any') url="https://www.gerritcodereview.com/" license=('Apache') -depends=('java-runtime<13' 'libcups') +depends=('java-runtime>=11' 'java-runtime<13' 'libcups') optdepends=('bcprov: Java cryptography APIs (Bouncy Castle)') -backup=(etc/default/gerritcodereview) +backup=('etc/default/gerritcodereview') install=gerrit.install -source=("https://gerrit-releases.storage.googleapis.com/gerrit-$pkgver.war" - gerrit.conf - gerrit.systemd) -noextract=(gerrit.war) -sha256sums=('18d52948af5c7331884b2be8d392ab2f378efb3466e5d1183a65f63b2ed38f31' +source=( + "https://gerrit-releases.storage.googleapis.com/gerrit-$pkgver.war" + 'gerrit.conf' + 'gerrit.service' + 'gerrit.sysusers' + 'gerrit.tmpfiles') +sha256sums=('a47a2660a62957ad1220a2e8493e72f62dc5a6b315d551b2fb91a3869461054a' '35becf2754e3779c750b2889909349160c2b0584ec201f6cfb5cf2c42e6fc598' - 'be1d205c6a0f3b24aad3c385f8188c64bfa3a9799ecf8ce5e089149af991a645') + 'fa21680907eb149707dd12b4637dd1b5c93cc019799fd61efd54d87f81b35f03' + '9f1dcfa057da72a8b4928f274920baedb2e9c4d1b3c08270720646e46a1799c6' + 'cd529d580bf744624bca9bb7b67ce39a7f70e0357f43714699fc0930635f1357') package() { - install -D -m 444 "$srcdir/gerrit-$pkgver.war" "$pkgdir/usr/share/java/gerrit/gerrit.war" - install -D -m 644 "$srcdir/gerrit.systemd" "$pkgdir/usr/lib/systemd/system/gerrit.service" - install -D -m 644 "$srcdir/gerrit.conf" "$pkgdir/etc/default/gerritcodereview" - install -m 755 -d "$pkgdir/var/lib/gerrit" + install -Dm 644 "$pkgname-$pkgver.war" "$pkgdir/usr/share/java/$pkgname/$pkgname.war" + install -Dm 644 "$pkgname.service" -t "$pkgdir/usr/lib/systemd/system/" + install -Dm 644 "$pkgname.conf" "$pkgdir/etc/default/gerritcodereview" + install -Dm 644 "$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -Dm 644 "$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } # vim:set ts=2 sw=2 et: diff --git a/gerrit.install b/gerrit.install index 3be78591ac7c..a2effcb5e8d5 100644 --- a/gerrit.install +++ b/gerrit.install @@ -1,127 +1,14 @@ -#!/bin/sh - -## CHANGE the following two variables according to your preference -## /bin/true: start/enable systemd service during installation -## /bin/false: do not touch systemd services, manually enable/start the service -_service_start=/bin/false -_service_enable=/bin/true - -_service_name=gerrit.service -_service_username=gerrit -_service_groupname=${_service_username} -_service_install_dir=/var/lib/${_service_username} -_service_cache_dir= -_service_log_dir=/var/log/${_service_username} - -_set_dir_permissions() { - for d in "${_service_install_dir}" "${_service_cache_dir}"; do - [ -n "${d}" -a -d "${d}" ] && chown -R ${_service_username}:${_service_groupname} ${d} - done -} - -# Test whether the system is running with systemd. -_is_running_systemd() { - ps -p 1 | grep -q "systemd" -} - -# Test whether the systemd service is enabled (presuming that systemd is running). -_is_systemd_service_enabled() { - /usr/bin/systemctl is-enabled --quiet ${_service_name} 2>/dev/null -} - -_stop_systemd_service() { - if `eval ${_service_start}`; then - /usr/bin/systemctl stop ${_service_name} 2>/dev/null - fi; - return 0; -} - -_start_systemd_service() { - _is_running_systemd || return 0; - _is_systemd_service_enabled || return 0; - if `eval ${_service_start}`; then - /usr/bin/systemctl start ${_service_name}; - fi; - return 0; -} - -_disable_systemd_service() { - if `eval ${_service_enable}`; then - _is_systemd_service_enabled && /usr/bin/systemctl disable ${_service_name} 2>/dev/null - fi; - return 0; -} - -# Install systemd service. -_enable_systemd_service() { - _is_running_systemd || return 0; - _is_systemd_service_enabled && return 0; - if `eval ${_service_enable}`; then - /usr/bin/systemctl enable ${_service_name} 2>/dev/null - fi; - return 0; -} - -_reload_systemd_service() { - _is_running_systemd || return; - /usr/bin/systemctl --system daemon-reload 2>/dev/null - return 0; -} - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version post_install() { - getent passwd ${_service_username} > /dev/null || /usr/sbin/useradd --user-group --home-dir "${_service_install_dir}" --shell "/bin/bash" ${_service_username} &> /dev/null - _set_dir_permissions - _enable_systemd_service - _start_systemd_service - echo " To initialize gerrit, see https://gerrit-documentation.storage.googleapis.com/Documentation/3.3.2/index.html" - echo " To setup gerrit do:" - echo " sudo su - gerrit" - echo " java -jar /usr/share/java/gerrit/gerrit.war init -d /var/lib/gerrit" + echo ":: To initialize gerrit, see https://gerrit-documentation.storage.googleapis.com/Documentation/$1/index.html" + echo ':: To set up gerrit, run:' + echo ' sudo su - gerrit' + echo ' java -jar /usr/share/java/gerrit/gerrit.war init -d /var/lib/gerrit' } -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - _stop_systemd_service - _disable_systemd_service -} - -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - _set_dir_permissions - _enable_systemd_service - _reload_systemd_service - _start_systemd_service - echo " To update gerrit, see https://gerrit-documentation.storage.googleapis.com/Documentation/3.3.2/index.html" - echo " To update gerrit do:" - echo " sudo su - gerrit" - echo " java -jar /usr/share/java/gerrit/gerrit.war init -d /var/lib/gerrit" - echo " java -jar /usr/share/java/gerrit/gerrit.war reindex" + echo ":: To upgrade gerrit, see https://gerrit-documentation.storage.googleapis.com/Documentation/$1/index.html" + echo ':: To update gerrit, run:' + echo ' sudo su - gerrit' + echo ' java -jar /usr/share/java/gerrit/gerrit.war init -d /var/lib/gerrit' + echo ' java -jar /usr/share/java/gerrit/gerrit.war reindex' } - -# arg 1: the old package version -pre_remove() { - _stop_systemd_service - _disable_systemd_service - return 0; -} - -# arg 1: the old package version -post_remove() { - getent passwd ${_service_username} > /dev/null && /usr/sbin/userdel ${_service_username} &>/dev/null - for d in ${_service_cache_dir}; do - [ -n "${d}" -a -d "${d}" ] && rm -rf "${d}" - done - for d in ${_service_install_dir} ${_service_log_dir}; do - [ -n "${d}" -a -d "${d}" ] && echo ">>> directory ${d} needs to be removed manually" - done - return 0; -} -# vim:set ts=2 sw=2 et: diff --git a/gerrit.systemd b/gerrit.service similarity index 85% rename from gerrit.systemd rename to gerrit.service index c0992cc28299..90903e2a5050 100644 --- a/gerrit.systemd +++ b/gerrit.service @@ -9,7 +9,7 @@ EnvironmentFile=/etc/default/gerritcodereview StandardOutput=syslog StandardError=syslog SyslogIdentifier=gerrit -ExecStart=@/usr/bin/java gerrit -DGerritCodeReview=1 $JAVA_OPTIONS -jar $GERRIT_WAR daemon -d $GERRIT_SITE --console-log +ExecStart=@/usr/bin/java gerrit -DGerritCodeReview=1 $JAVA_OPTIONS -jar /usr/share/java/gerrit/gerrit.war daemon -d /var/lib/gerrit --console-log #MemoryLimit=768M OOMScoreAdjust=-1000 LimitCPU=infinity @@ -21,4 +21,3 @@ LimitLOCKS=infinity [Install] WantedBy=multi-user.target - diff --git a/gerrit.sysusers b/gerrit.sysusers new file mode 100644 index 000000000000..cff69118a03b --- /dev/null +++ b/gerrit.sysusers @@ -0,0 +1 @@ +u gerrit - 'Gerrit system user' diff --git a/gerrit.tmpfiles b/gerrit.tmpfiles new file mode 100644 index 000000000000..067082e17e41 --- /dev/null +++ b/gerrit.tmpfiles @@ -0,0 +1,3 @@ +D /var/lib/gerrit - gerrit gerrit +D /var/log/gerrit - gerrit gerrit +D /var/cache/gerrit - gerrit gerrit