summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-04-12 11:14:13 +0200
committerErich Eckner <git@eckner.net>2021-04-12 11:14:13 +0200
commit0df7805764ce3183e73f0ab9a37098b4a34d1366 (patch)
treeef1b34b56a022dd15384900f45de00aa3a2d8290
parent8c3768b384fecf48aff8dfce27490a402ee6f0f2 (diff)
downloadarchlinuxewe-0df7805764ce3183e73f0ab9a37098b4a34d1366.tar.xz
repair pkgver() to give *currently*checked*out* version, not *newest*
-rw-r--r--acme2certifier/PKGBUILD6
-rw-r--r--alpine/PKGBUILD2
-rw-r--r--cssh/PKGBUILD2
-rwxr-xr-xdbmodel/PKGBUILD5
-rw-r--r--fpc-svn/PKGBUILD5
-rw-r--r--gitstats-git/PKGBUILD11
-rw-r--r--knockd-ipv6-git/PKGBUILD2
-rw-r--r--pssh-git/PKGBUILD2
-rw-r--r--qwt5-qt5/PKGBUILD4
9 files changed, 19 insertions, 20 deletions
diff --git a/acme2certifier/PKGBUILD b/acme2certifier/PKGBUILD
index 60d83dc05..7a9a2ab3f 100644
--- a/acme2certifier/PKGBUILD
+++ b/acme2certifier/PKGBUILD
@@ -31,12 +31,6 @@ sha512sums=('SKIP'
install="${pkgname}.install"
pkgver() {
- for _trial in 'origin/devel' 'devel'; do
- _commit=$(
- git -C "${pkgname}" rev-parse "${_trial}" 2>/dev/null
- ) && break
- done
-
_line_revision="${_commit}"
while true; do
_version_line=$(
diff --git a/alpine/PKGBUILD b/alpine/PKGBUILD
index 533aeedd7..8ddacfe0e 100644
--- a/alpine/PKGBUILD
+++ b/alpine/PKGBUILD
@@ -47,7 +47,7 @@ prepare() {
pkgver() {
cd "${srcdir}/${pkgname}"
_rev=$(
- git rev-parse --short master
+ git rev-parse --short "${_commit}"
)
_pkgver=$(
git archive "${_rev}" -- configure | \
diff --git a/cssh/PKGBUILD b/cssh/PKGBUILD
index ae3fb0d30..881528e41 100644
--- a/cssh/PKGBUILD
+++ b/cssh/PKGBUILD
@@ -21,7 +21,7 @@ sha512sums=('SKIP')
pkgver() {
cd "${srcdir}/${pkgname}"
_rev=$(
- git rev-parse --short master
+ git rev-parse --short "${_commit}"
)
_rev_count=$(
git rev-list "${_rev}" --count
diff --git a/dbmodel/PKGBUILD b/dbmodel/PKGBUILD
index 79ee6f30d..2579a16e9 100755
--- a/dbmodel/PKGBUILD
+++ b/dbmodel/PKGBUILD
@@ -31,9 +31,8 @@ sha512sums=('SKIP')
pkgver(){
cd "${pkgname}"
- git fetch --all >/dev/null 2>&1
- _commit=$(
- git rev-parse master
+ _rev=$(
+ git rev-parse --short "${_commit}"
)
printf '%s.r%s.%s\n' \
"$(
diff --git a/fpc-svn/PKGBUILD b/fpc-svn/PKGBUILD
index d0fe42a67..901a032f5 100644
--- a/fpc-svn/PKGBUILD
+++ b/fpc-svn/PKGBUILD
@@ -15,7 +15,8 @@ pkgbase='fpc-svn'
pkgname=('fpc-svn' 'fpc-src-svn')
[[ $_build_docs -ne 0 ]] && pkgname+=('fpc-docs-svn')
pkgver=3.3.1.r49179
-_pkgver=${pkgver%.r*}
+_pkgver="${pkgver%.r*}"
+_revision="${pkgver##*.r}"
pkgrel=1
arch=('i486' 'i686' 'pentium4' 'x86_64')
url='http://www.freepascal.org/'
@@ -25,7 +26,7 @@ depends=('bash' 'ncurses' 'zlib' 'expat')
makedepends=('fpc' 'subversion')
[[ $_build_docs -ne 0 ]] && makedepends+=('texlive-core' 'texlive-htmlxml'
'texlive-latexextra' 'ghostscript')
-source=('fpcbuild::svn+http://svn.freepascal.org/svn/fpcbuild/trunk')
+source=('fpcbuild::svn+http://svn.freepascal.org/svn/fpcbuild/trunk#revision=${_revision}')
sha512sums=('SKIP')
pkgver() {
diff --git a/gitstats-git/PKGBUILD b/gitstats-git/PKGBUILD
index 2d1bf6f3e..e509b484e 100644
--- a/gitstats-git/PKGBUILD
+++ b/gitstats-git/PKGBUILD
@@ -2,20 +2,25 @@
# Contributor: Timo Schmiade <the_isz@gmx.de>
pkgname=gitstats-git
pkgver=294.55c5c28
+_commit="${_pkgver##*.}"
pkgrel=1
pkgdesc="A statistics generator for git repositories."
arch=("any")
url="http://gitstats.sourceforge.net"
license=('GPL3')
depends=('git' 'python2' 'gnuplot')
-source=("git+https://github.com/hoxu/gitstats.git")
+source=("git+https://github.com/hoxu/gitstats.git#commit=${_commit}")
md5sums=("SKIP")
pkgver() {
cd gitstats
printf '%s.%s\n' \
- "$(git rev-list --count master)" \
- "$(git rev-parse --short master)"
+ "$(
+ git rev-list --count "${_commit}"
+ )" \
+ "$(
+ git rev-parse --short "${_commit}"
+ )"
}
package() {
diff --git a/knockd-ipv6-git/PKGBUILD b/knockd-ipv6-git/PKGBUILD
index 65b4ed437..0add7bc1f 100644
--- a/knockd-ipv6-git/PKGBUILD
+++ b/knockd-ipv6-git/PKGBUILD
@@ -31,7 +31,7 @@ sha512sums=('SKIP'
pkgver() {
cd "${srcdir}/knock"
_rev=$(
- git rev-parse --short master
+ git rev-parse --short "${_commit}"
)
_pkgver=$(
git archive "${_rev}" -- src/knockd.c \
diff --git a/pssh-git/PKGBUILD b/pssh-git/PKGBUILD
index 26424d779..4f4ea6ad0 100644
--- a/pssh-git/PKGBUILD
+++ b/pssh-git/PKGBUILD
@@ -23,7 +23,7 @@ sha512sums=('SKIP')
pkgver() {
cd "${srcdir}/pssh"
- git describe --long --tags ${_commit} | \
+ git describe --long --tags "${_commit}" | \
sed '
s/^v//
y/-/+/
diff --git a/qwt5-qt5/PKGBUILD b/qwt5-qt5/PKGBUILD
index 035d80dbb..7c3616c97 100644
--- a/qwt5-qt5/PKGBUILD
+++ b/qwt5-qt5/PKGBUILD
@@ -19,10 +19,10 @@ sha512sums=('SKIP'
pkgver() {
printf '5.2.3.%s.%s\n' \
"$(
- git -C "${pkgname}" rev-list --count HEAD
+ git -C "${pkgname}" rev-list --count "${_commit}"
)" \
"$(
- git -C "${pkgname}" rev-parse --short HEAD
+ git -C "${pkgname}" rev-parse --short "${_commit}"
)"
}