Merge pull request #12068 from Chocimier/olm

olm: update to 3.1.2.
This commit is contained in:
Piotr 2019-06-01 19:46:40 +02:00 committed by GitHub
commit 7847910b49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 13 deletions

View file

@ -48,12 +48,13 @@ update_check() {
*cpan.*|\ *cpan.*|\
*pythonhosted.org*|\ *pythonhosted.org*|\
*github.com*|\ *github.com*|\
*gitlab.com*|*gitlab.gnome.org*|*gitlab.freedesktop.org*|\ *//gitlab.*|\
*bitbucket.org*|\ *bitbucket.org*|\
*ftp.gnome.org*|\ *ftp.gnome.org*|\
*kernel.org/pub/linux/kernel/*|\ *kernel.org/pub/linux/kernel/*|\
*cran.r-project.org/src/contrib*|\ *cran.r-project.org/src/contrib*|\
*rubygems.org*) *rubygems.org*|\
*crates.io*)
continue continue
;; ;;
*) *)
@ -110,7 +111,7 @@ update_check() {
githubname="$(printf %s "$url" | cut -d/ -f4,5)" githubname="$(printf %s "$url" | cut -d/ -f4,5)"
url="https://github.com/$githubname/tags" url="https://github.com/$githubname/tags"
rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';; rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
*gitlab.com*|*gitlab.gnome.org*|*gitlab.freedesktop.org*) *//gitlab.*)
gitlaburl="$(printf %s "$url" | cut -d/ -f1-5)" gitlaburl="$(printf %s "$url" | cut -d/ -f1-5)"
url="$gitlaburl/tags" url="$gitlaburl/tags"
rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';; rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';;

View file

@ -1,6 +1,6 @@
# Template file for 'olm-python' # Template file for 'olm-python'
pkgname=olm-python pkgname=olm-python
version=3.0.0 version=3.1.2
revision=1 revision=1
wrksrc="olm-${version}" wrksrc="olm-${version}"
build_wrksrc=python build_wrksrc=python
@ -12,9 +12,9 @@ depends="python-cffi python-future python-typing"
short_desc="Implementation of the Double Ratchet cryptographic ratchet (Python2)" short_desc="Implementation of the Double Ratchet cryptographic ratchet (Python2)"
maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>" maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://git.matrix.org/git/olm/about/" homepage="https://gitlab.matrix.org/matrix-org/olm"
distfiles="https://git.matrix.org/git/olm/snapshot/olm-${version}.tar.gz" distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
checksum=4c54f93e4f426a9d5c8e66e63113d42fd2afca240cdcff30a469a342a6ec3bc6 checksum=d09f9082cdbaf4d95b0a372affdf6129a6b451913831c5915e799877acab6d49
pre_build() { pre_build() {
make include/olm/olm.h make include/olm/olm.h

View file

@ -0,0 +1 @@
pkgname=olm

View file

@ -1,15 +1,19 @@
# Template file for 'olm' # Template file for 'olm'
pkgname=olm pkgname=olm
version=3.0.0 version=3.1.2
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DOLM_TESTS=OFF"
short_desc="Implementation of the Double Ratchet cryptographic ratchet" short_desc="Implementation of the Double Ratchet cryptographic ratchet"
maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>" maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://git.matrix.org/git/olm/about/" homepage="https://gitlab.matrix.org/matrix-org/olm"
distfiles="https://git.matrix.org/git/olm/snapshot/olm-${version}.tar.gz" distfiles="https://gitlab.matrix.org/matrix-org/olm/-/archive/${version}/olm-${version}.tar.bz2"
checksum=4c54f93e4f426a9d5c8e66e63113d42fd2afca240cdcff30a469a342a6ec3bc6 checksum=d09f9082cdbaf4d95b0a372affdf6129a6b451913831c5915e799877acab6d49
do_check() {
cd build/tests
ctest
}
olm-devel_package() { olm-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"

View file

@ -1 +0,0 @@
site=https://git.matrix.org/git/olm/refs/