diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-31 01:56:33 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-10-31 01:56:33 +0000 |
| commit | ddf85990b692f5d261b65414d9103be95a174b5b (patch) | |
| tree | 4ef8bb60f23c6e511966694d258fe1caeb0ff0b7 /system | |
| parent | 896626ac0cd72389510ce5073b592297ec2f5885 (diff) | |
| parent | 6fabd1136c870c9b684f62a5c1280ed893b2f0e1 (diff) | |
| download | packages-ddf85990b692f5d261b65414d9103be95a174b5b.tar.gz packages-ddf85990b692f5d261b65414d9103be95a174b5b.tar.bz2 packages-ddf85990b692f5d261b65414d9103be95a174b5b.tar.xz packages-ddf85990b692f5d261b65414d9103be95a174b5b.zip | |
Merge branch 'json-c' into 'master'
system/json-c: upgrade to 0.15
See merge request adelie/packages!535
Diffstat (limited to 'system')
| -rw-r--r-- | system/cryptsetup/APKBUILD | 2 | ||||
| -rw-r--r-- | system/json-c/APKBUILD | 46 | ||||
| -rw-r--r-- | system/json-c/fix-libdir.patch | 11 |
3 files changed, 16 insertions, 43 deletions
diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD index f9d5dab28..1786fbb0d 100644 --- a/system/cryptsetup/APKBUILD +++ b/system/cryptsetup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=cryptsetup pkgver=2.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="Utility for setting up encrypted filesystems" url="https://gitlab.com/cryptsetup/cryptsetup" arch="all" diff --git a/system/json-c/APKBUILD b/system/json-c/APKBUILD index 32ee431dd..c05a7d9b7 100644 --- a/system/json-c/APKBUILD +++ b/system/json-c/APKBUILD @@ -1,52 +1,36 @@ # Maintainer: pkgname=json-c -pkgver=0.13.1 -pkgrel=1 +pkgver=0.15 +pkgrel=0 pkgdesc="A JSON implementation in C" url="https://github.com/json-c/json-c/wiki" arch="all" license="MIT" depends="" -makedepends="autoconf automake libtool" -subpackages="$pkgname-static $pkgname-dev" +makedepends="cmake doxygen" +subpackages="$pkgname-dev" source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz - fix-libdir.patch " -prepare() { - default_prepare - autoreconf -f -v -i -} +# secfixes: +# 0.15-r0: +# - CVE-2020-12762 build() { - export CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" - ./configure --prefix=/usr \ - --build=$CBUILD \ - --host=$CHOST \ - --libdir=/lib \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-shared \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes - make -j1 + cmake -B "$builddir" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON + make + make doc } check() { - make check + make test } package() { make -j1 DESTDIR="$pkgdir" install } -static() { - pkgdesc="Static JSON C library" - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ -} - -sha512sums="e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 json-c-0.13.1.tar.gz -939f2b02fe5beb5d85ebc3fd8463bee0cff6b7da98b48edb599e88dda7955b6ba65afc17f9e828025086a1b384aa99703be06b6613e405d9c48541cf52c380f0 fix-libdir.patch" +sha512sums="dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34 json-c-0.15.tar.gz" diff --git a/system/json-c/fix-libdir.patch b/system/json-c/fix-libdir.patch deleted file mode 100644 index bf69168e7..000000000 --- a/system/json-c/fix-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- json-c-0.13.1/Makefile.am.old 2018-03-06 04:13:22.000000000 +0000 -+++ json-c-0.13.1/Makefile.am 2018-07-19 02:12:00.270000000 +0000 -@@ -14,7 +14,7 @@ - - lib_LTLIBRARIES = libjson-c.la - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = /usr/lib/pkgconfig - pkgconfig_DATA = json-c.pc - - libjson_cincludedir = $(includedir)/json-c |