diff options
| author | Chocobo1 | 2023-05-20 22:24:16 +0800 |
|---|---|---|
| committer | Chocobo1 | 2023-05-20 22:25:12 +0800 |
| commit | e7ccd0e28d58179f13b467b768770d64eed9abbf (patch) | |
| tree | 31c52f7bf1c5c2ce378b0a2c09b423c17a76f938 | |
| parent | c7ada30fbee521a5b384edad1ef83815868679af (diff) | |
| download | aur-e7ccd0e28d58179f13b467b768770d64eed9abbf.tar.gz | |
upgpkg: rp-pppoe-git 4.0.r2.g5cd6616-1
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
2 files changed, 12 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = rp-pppoe-git pkgdesc = PPPoE client, relay and server for Linux - pkgver = r35.g3c9ac2b + pkgver = 4.0.r2.g5cd6616 pkgrel = 1 url = https://dianne.skoll.ca/projects/rp-pppoe/ arch = i686 @@ -11,14 +11,14 @@ pkgbase = rp-pppoe-git depends = iproute2 depends = ppp depends = sh - provides = rp-pppoe=r35.g3c9ac2b + provides = rp-pppoe=4.0.r2.g5cd6616 conflicts = rp-pppoe backup = etc/ppp/firewall-masq backup = etc/ppp/firewall-standalone backup = etc/ppp/pppoe.conf backup = etc/ppp/pppoe-server-options source = git+https://github.com/dfskoll/rp-pppoe.git - source = adsl.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/rp-pppoe/trunk/adsl.service + source = adsl.service::https://gitlab.archlinux.org/archlinux/packaging/packages/rp-pppoe/-/raw/main/adsl.service sha256sums = SKIP sha256sums = SKIP @@ -1,7 +1,7 @@ # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net> pkgname=rp-pppoe-git -pkgver=r35.g3c9ac2b +pkgver=4.0.r2.g5cd6616 pkgrel=1 pkgdesc="PPPoE client, relay and server for Linux" arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ depends=('glibc' 'iproute2' 'ppp' 'sh') makedepends=('git') provides=("rp-pppoe=$pkgver") conflicts=('rp-pppoe') -backup=(etc/ppp/firewall-masq - etc/ppp/firewall-standalone - etc/ppp/pppoe.conf - etc/ppp/pppoe-server-options) +backup=('etc/ppp/firewall-masq' + 'etc/ppp/firewall-standalone' + 'etc/ppp/pppoe.conf' + 'etc/ppp/pppoe-server-options') source=("git+https://github.com/dfskoll/rp-pppoe.git" - "adsl.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/rp-pppoe/trunk/adsl.service") + "adsl.service::https://gitlab.archlinux.org/archlinux/packaging/packages/rp-pppoe/-/raw/main/adsl.service") sha256sums=('SKIP' 'SKIP') @@ -24,9 +24,10 @@ sha256sums=('SKIP' pkgver() { cd "rp-pppoe" - _rev=$(git rev-list --count --all) + _tag=$(git tag -l --sort -v:refname | grep -E '^v?[0-9\.]+$' | head -n1) + _rev=$(git rev-list --count $_tag..HEAD) _hash=$(git rev-parse --short HEAD) - printf "r%s.g%s" "$_rev" "$_hash" + printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//' } build() { |