diff options
| author | Thomas Penteker <tek@serverop.de> | 2020-02-05 02:03:10 +0100 |
|---|---|---|
| committer | Thomas Penteker <tek@serverop.de> | 2020-02-05 02:03:10 +0100 |
| commit | b98657e0aa4cc80a1cfc3893e12205d1f95c8931 (patch) | |
| tree | cd18a194e8c5fd1f2a6ac0b20a429a769e3eb41e /jq | |
| parent | 652121fff43a00a2f62a60d49dd7cdc3d3ce1faf (diff) | |
| download | contrib-b98657e0aa4cc80a1cfc3893e12205d1f95c8931.tar.gz contrib-b98657e0aa4cc80a1cfc3893e12205d1f95c8931.tar.xz | |
jq: never use bundled oniguruma, fixes FS#1787
Diffstat (limited to 'jq')
| -rw-r--r-- | jq/.footprint | 11 | ||||
| -rw-r--r-- | jq/.signature | 6 | ||||
| -rw-r--r-- | jq/Pkgfile | 11 |
3 files changed, 9 insertions, 19 deletions
diff --git a/jq/.footprint b/jq/.footprint index 63817e87d..a4a51971f 100644 --- a/jq/.footprint +++ b/jq/.footprint @@ -1,26 +1,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/jq --rwxr-xr-x root/root usr/bin/onig-config drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/jq.h -rw-r--r-- root/root usr/include/jv.h --rw-r--r-- root/root usr/include/oniggnu.h --rw-r--r-- root/root usr/include/onigposix.h --rw-r--r-- root/root usr/include/oniguruma.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libjq.a -rwxr-xr-x root/root usr/lib/libjq.la lrwxrwxrwx root/root usr/lib/libjq.so -> libjq.so.1.0.4 lrwxrwxrwx root/root usr/lib/libjq.so.1 -> libjq.so.1.0.4 -rwxr-xr-x root/root usr/lib/libjq.so.1.0.4 --rw-r--r-- root/root usr/lib/libonig.a --rwxr-xr-x root/root usr/lib/libonig.la -lrwxrwxrwx root/root usr/lib/libonig.so -> libonig.so.4.0.0 -lrwxrwxrwx root/root usr/lib/libonig.so.4 -> libonig.so.4.0.0 --rwxr-xr-x root/root usr/lib/libonig.so.4.0.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/oniguruma.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/jq/.signature b/jq/.signature index ea1973294..2cd83b6c7 100644 --- a/jq/.signature +++ b/jq/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31Qe6MAvLbd5V+neQCrUSaWH8bGHRyb9he74v64zEnuizRdg3Y9lT3xZpRDJ6gEoNzeoH4xmlOG+dM8kOV0edww= -SHA256 (Pkgfile) = 8c3c611f2e9f5bf31eb9842a64a9f4b90768e68dbf8c9af56cf2280cf5f009ad -SHA256 (.footprint) = 7a08ca1a12e1920ea0309620e381e7116fdc72e51b041c6c628a165a2b362668 +RWSagIOpLGJF33Hg7nk6sAgNQ0vlldRiuRkeDp4SAduQunYFQTLk5d7NbZ9TSreFKyrBVC3/fKB5xkHfE3NhkwfLsWDb2J2dlwU= +SHA256 (Pkgfile) = fa365e7339e17bf80ecd8e52bd66766708b2c46fc2d29bc292dc9a5315ad5a7a +SHA256 (.footprint) = ed1ce136382cf2464b74b5dfa2ebf6c840558f61fb589c8961a4ac16aa995465 SHA256 (jq-1.6.tar.gz) = 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 diff --git a/jq/Pkgfile b/jq/Pkgfile index f7d8dc979..3654e13e5 100644 --- a/jq/Pkgfile +++ b/jq/Pkgfile @@ -1,21 +1,22 @@ # Description: Lightweight and flexible command-line JSON processor # URL: https://stedolan.github.io/jq/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: +# Optional: oniguruma name=jq version=1.6 -release=1 +release=2 source=(https://github.com/stedolan/jq/releases/download/jq-$version/jq-$version.tar.gz) build() { cd $name-$version - autoreconf -i modules/oniguruma + # never use bundlded oniguruma for regex support + sed -i '242,245d;248,250d;256,267d' configure.ac + autoreconf -i ./configure --prefix=/usr \ - --disable-maintainer-mode \ - --with-oniguruma=builtin + --with-oniguruma=/usr make make DESTDIR=$PKG install |