diff options
| author | Dániel Bakai <bakaidl@gmail.com> | 2019-04-10 12:52:52 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-04-22 15:24:46 +0000 |
| commit | 9ce60b173bf17b7d20695d9dc1de050989019664 (patch) | |
| tree | 95ec8b8554415ef2c80d6d9950cc9201c8d22c94 /tools/rpm-setup.sh | |
| parent | 51ac1047a7e434a0b2e264780b2fa31f1d986898 (diff) | |
Add brotli decompression support for HTTP and HTTP2 dissectors.
Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03
Reviewed-on: https://code.wireshark.org/review/32745
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'tools/rpm-setup.sh')
| -rwxr-xr-x | tools/rpm-setup.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh index ba07180e82..75b9a766a0 100755 --- a/tools/rpm-setup.sh +++ b/tools/rpm-setup.sh @@ -106,6 +106,19 @@ add_package() { eval "${list}=\"\${${list}} \${pkgname}\"" } +# Adds packages $2-$n to list variable $1 if all the packages are found +add_packages() { + local list="$1" pkgnames="${@:2}" + + # fail if any package is not known + for pkgname in $pkgnames; do + $PM $PM_SEARCH "$pkgname" &> /dev/null || return 1 + done + + # all packages are found, append it to list + eval "${list}=\"\${${list}} \${pkgnames}\"" +} + # python3: OpenSUSE 43.3, Fedora 26 # python34: Centos 7 add_package BASIC_LIST python3 || add_package BASIC_LIST python34 || @@ -197,6 +210,9 @@ echo "ninja is unavailable" >&2 add_package ADDITIONAL_LIST libxslt || add_package ADDITIONAL_LIST libxslt1 || echo "xslt is unavailable" >&2 +add_package ADDITIONAL_LIST brotli-devel || add_packages ADDITIONAL_LIST libbrotli-devel libbrotlidec1 || +echo "brotli is unavailable" >&2 + ACTUAL_LIST=$BASIC_LIST # Now arrange for optional support libraries |