summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-09-29 14:34:44 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-09-29 14:34:44 +0000
commit8f4a117b39003d0efe8518052ca044e25172b58f (patch)
treec5f7b1d8a82640ff637c85279bb2d45c3d5e4fcb
parent7cec36c2876610cbfb5a8238b107ed0de479f978 (diff)
parent028c2a86b67cb59cd784a8989fb94856fbb54fb1 (diff)
downloadpackages-8f4a117b39003d0efe8518052ca044e25172b58f.tar.gz
packages-8f4a117b39003d0efe8518052ca044e25172b58f.tar.bz2
packages-8f4a117b39003d0efe8518052ca044e25172b58f.tar.xz
packages-8f4a117b39003d0efe8518052ca044e25172b58f.zip
Merge branch 'cve-check-tool' into 'master'
Add user/jansson; bump user/cve-check-tool See merge request adelie/packages!340
-rw-r--r--user/cve-check-tool/APKBUILD6
-rw-r--r--user/jansson/APKBUILD34
2 files changed, 37 insertions, 3 deletions
diff --git a/user/cve-check-tool/APKBUILD b/user/cve-check-tool/APKBUILD
index b0c2db9ba..879cdcada 100644
--- a/user/cve-check-tool/APKBUILD
+++ b/user/cve-check-tool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cve-check-tool
-pkgver=5.6.4_p1
+pkgver=5.6.4_p2
_pkgver=${pkgver%_p*}+adelie${pkgver#*_p}
pkgrel=0
pkgdesc="Vulnerability checker for Linux packaging"
@@ -10,7 +10,7 @@ arch="all"
license="GPL-2.0+"
depends=""
makedepends="bash curl-dev glib-dev gobject-introspection-dev
- libxml2-dev openssl-dev sqlite-dev"
+ jansson-dev libxml2-dev openssl-dev sqlite-dev"
checkdepends="check-dev"
subpackages="$pkgname-doc"
source="https://dev.sick.bike/dist/cve-check-tool-$_pkgver.tar.gz"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6af4778752c1c64c9a7c747f5a099ac83a42b9c92e273b315a386547144bfcdcd325dac9f17cfea16944442cdd20faf829ec401792ba67a34ec21fc65046dfac cve-check-tool-5.6.4+adelie1.tar.gz"
+sha512sums="ee3e8edde7a21a139a7ff9853959487d980e703dbd52c653dd88892ecb1770e52568cf37168c9069378141c159730aa9631dca0e72630e1b67bb8a3f3d835a0e cve-check-tool-5.6.4+adelie2.tar.gz"
diff --git a/user/jansson/APKBUILD b/user/jansson/APKBUILD
new file mode 100644
index 000000000..b6f332c62
--- /dev/null
+++ b/user/jansson/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Max Rees <maxcrees@me.com>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=jansson
+pkgver=2.12
+pkgrel=0
+pkgdesc="C library for encoding, decoding and manipulating JSON data"
+url="http://www.digip.org/jansson/" # No HTTPS
+arch="all"
+license="MIT"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev"
+source="http://www.digip.org/jansson/releases/jansson-$pkgver.tar.gz"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb jansson-2.12.tar.gz"