aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/accerciser/APKBUILD31
-rw-r--r--testing/adapta-kde/APKBUILD32
-rw-r--r--testing/aerc/APKBUILD8
-rw-r--r--testing/age/APKBUILD44
-rw-r--r--testing/aisleriot/APKBUILD37
-rw-r--r--testing/aisleriot/fix-bash-shebang.patch10
-rw-r--r--testing/akonadi-calendar-tools/APKBUILD8
-rw-r--r--testing/akonadi-calendar/APKBUILD8
-rw-r--r--testing/akonadi-contacts/APKBUILD6
-rw-r--r--testing/akonadi-import-wizard/APKBUILD6
-rw-r--r--testing/akonadi-mime/APKBUILD6
-rw-r--r--testing/akonadi-notes/APKBUILD6
-rw-r--r--testing/akonadi-search/APKBUILD8
-rw-r--r--testing/akonadi/APKBUILD8
-rw-r--r--testing/akonadiconsole/APKBUILD8
-rw-r--r--testing/akregator/APKBUILD6
-rw-r--r--testing/alkimia/APKBUILD4
-rw-r--r--testing/allegro/APKBUILD30
-rw-r--r--testing/alsa-topology-conf/APKBUILD18
-rw-r--r--testing/alsa-ucm-conf/APKBUILD18
-rw-r--r--testing/alttab/0001-Fix-memleaks-in-error-case.patch41
-rw-r--r--testing/alttab/0002-Remove-check-around-free.patch27
-rw-r--r--testing/alttab/APKBUILD29
-rw-r--r--testing/ameba/APKBUILD8
-rw-r--r--testing/ampy/APKBUILD19
-rw-r--r--testing/amule/APKBUILD2
-rw-r--r--testing/analitza/APKBUILD8
-rw-r--r--testing/animatch/APKBUILD49
-rw-r--r--testing/artikulate/APKBUILD8
-rw-r--r--testing/asciiquarium/APKBUILD18
-rw-r--r--testing/assimp/01-rm-revision-test.patch12
-rw-r--r--testing/assimp/02-fix-ssize-32bit.patch40
-rw-r--r--testing/assimp/APKBUILD10
-rw-r--r--testing/atari800/APKBUILD16
-rw-r--r--testing/audiofile/APKBUILD35
-rw-r--r--testing/audiofile/gcc8-build-fixes.patch127
-rw-r--r--testing/ausweisapp2/APKBUILD29
-rw-r--r--testing/avarice/APKBUILD36
-rw-r--r--testing/aws-cli/APKBUILD68
-rw-r--r--testing/azure-iot-sdk-c-static/001-c-utility.patch13
-rw-r--r--testing/azure-iot-sdk-c-static/APKBUILD92
-rw-r--r--testing/b3sum/APKBUILD32
-rw-r--r--testing/badwolf/APKBUILD22
-rw-r--r--testing/barman/APKBUILD6
-rw-r--r--testing/bazel/APKBUILD97
-rw-r--r--testing/bazel/bash_completion.patch13
-rw-r--r--testing/bazel/python3.patch36
-rw-r--r--testing/bemenu/APKBUILD4
-rw-r--r--testing/bfs/APKBUILD4
-rw-r--r--testing/binutils-cross-embedded/APKBUILD2
-rw-r--r--testing/binwalk/APKBUILD4
-rw-r--r--testing/blender/APKBUILD41
-rw-r--r--testing/blender/blender-2.78a-musl.patch67
-rw-r--r--testing/blender/ffmpeg4.0.patch113
-rw-r--r--testing/blender/gcc8.patch196
-rw-r--r--testing/blender/musl-fixes.patch78
-rw-r--r--testing/blender/openimageio-lib.patch13
-rw-r--r--testing/blender/python-3.8.patch49
-rw-r--r--testing/blinken/APKBUILD6
-rw-r--r--testing/bloaty/2aec85618e91af975af3146563333c2c2e97260.patch213
-rw-r--r--testing/bloaty/APKBUILD41
-rw-r--r--testing/bloaty/f66077506462bf96fee79f7f20516ca5d1e02f8a.patch22
-rw-r--r--testing/bmake/APKBUILD41
-rw-r--r--testing/bmake/separate-tests.patch26
-rw-r--r--testing/bmake/sjg.patch59
-rw-r--r--testing/bovo/APKBUILD6
-rw-r--r--testing/bpftrace/APKBUILD6
-rw-r--r--testing/broot/APKBUILD25
-rw-r--r--testing/buildah/APKBUILD24
-rw-r--r--testing/buku/APKBUILD4
-rw-r--r--testing/bullet/APKBUILD6
-rw-r--r--testing/burp/APKBUILD4
-rw-r--r--testing/cage/APKBUILD27
-rw-r--r--testing/calendarsupport/APKBUILD8
-rw-r--r--testing/calls/APKBUILD34
-rw-r--r--testing/cantor/APKBUILD8
-rw-r--r--testing/catatonit/APKBUILD30
-rw-r--r--testing/catatonit/fix-undeclared-identifier.patch13
-rw-r--r--testing/cdist/APKBUILD6
-rw-r--r--testing/cervisia/APKBUILD6
-rw-r--r--testing/cfssl/APKBUILD4
-rw-r--r--testing/cgal/APKBUILD2
-rw-r--r--testing/charls/APKBUILD10
-rw-r--r--testing/chatty/APKBUILD34
-rw-r--r--testing/clapf/APKBUILD101
-rw-r--r--testing/clapf/clapf.confd6
-rw-r--r--testing/clapf/clapf.initd27
-rw-r--r--testing/clapf/clapf.pre-install6
-rw-r--r--testing/clapf/def__user.patch23
-rw-r--r--testing/clapf/gsl-libs.patch14
-rw-r--r--testing/clapf/ldflags.patch38
-rw-r--r--testing/cloudfoundry-cli/APKBUILD4
-rw-r--r--testing/cmatrix/APKBUILD35
-rw-r--r--testing/cni-plugins/APKBUILD4
-rw-r--r--testing/conmon/APKBUILD26
-rw-r--r--testing/consolation/APKBUILD34
-rw-r--r--testing/consolation/consolation.initd29
-rw-r--r--testing/console_bridge/APKBUILD4
-rw-r--r--testing/consul-template/APKBUILD34
-rw-r--r--testing/consul-template/consul-template.hcl351
-rw-r--r--testing/consul-template/consul-template.initd20
-rw-r--r--testing/consul/APKBUILD15
-rw-r--r--testing/copyq/APKBUILD8
-rw-r--r--testing/corecollector/APKBUILD35
-rw-r--r--testing/corecollector/corecollector.pre-install6
l---------testing/corecollector/corecollector.pre-upgrade1
-rw-r--r--testing/coretoppings/APKBUILD25
-rw-r--r--testing/cppzmq/APKBUILD4
-rw-r--r--testing/createrepo_c/APKBUILD6
-rw-r--r--testing/criu/APKBUILD8
-rw-r--r--testing/crun/APKBUILD27
-rw-r--r--testing/cwm/APKBUILD13
-rw-r--r--testing/cwm/menu-border.patch13
-rw-r--r--testing/dav1d/APKBUILD6
-rw-r--r--testing/deluge/APKBUILD3
-rw-r--r--testing/deutex/APKBUILD41
-rw-r--r--testing/dfc/APKBUILD26
-rw-r--r--testing/diffstat/APKBUILD7
-rw-r--r--testing/dino/APKBUILD49
-rw-r--r--testing/distrobuilder/APKBUILD11
-rw-r--r--testing/dlib/APKBUILD30
-rw-r--r--testing/dolphin-emu/APKBUILD9
-rw-r--r--testing/dolphin-plugins/APKBUILD6
-rw-r--r--testing/dragon/APKBUILD8
-rw-r--r--testing/drone/APKBUILD4
-rw-r--r--testing/dub/APKBUILD10
-rw-r--r--testing/dxvk/APKBUILD6
-rw-r--r--testing/dzonegit/APKBUILD27
-rw-r--r--testing/easytag/APKBUILD39
-rw-r--r--testing/ecasound/APKBUILD6
-rw-r--r--testing/editline/APKBUILD6
-rw-r--r--testing/efl/APKBUILD8
-rw-r--r--testing/elektra/APKBUILD22
-rw-r--r--testing/elisa/APKBUILD41
-rw-r--r--testing/elvish/APKBUILD12
-rw-r--r--testing/emulationstation/APKBUILD9
-rw-r--r--testing/enscript/APKBUILD2
-rw-r--r--testing/envconsul/APKBUILD4
-rw-r--r--testing/eolie/APKBUILD4
-rw-r--r--testing/eventviews/APKBUILD8
-rw-r--r--testing/f3/APKBUILD38
-rwxr-xr-xtesting/fennel/APKBUILD36
-rw-r--r--testing/fennel/lua5.3-fennel.patch8
-rw-r--r--testing/ffmpegthumbs/APKBUILD31
-rw-r--r--testing/ffsend/APKBUILD6
-rw-r--r--testing/filebeat/APKBUILD9
-rw-r--r--testing/filebeat/filebeat.confd2
-rw-r--r--testing/filebeat/filebeat.initd2
-rw-r--r--testing/filelight/APKBUILD6
-rw-r--r--testing/firefox/8e71fa07fe00.patch83
-rw-r--r--testing/firefox/APKBUILD71
-rw-r--r--testing/firefox/fd6847c9416f9eebde636e21d794d25d1be8791d.patch37
-rw-r--r--testing/firefox/fix-sandbox-membarrier.patch54
-rw-r--r--testing/firefox/fix-third_party.patch20
-rw-r--r--testing/firefox/rust_audio-thread-priority.patch39
-rw-r--r--testing/firefox/x86_64-alpine-linux-musl.json35
-rw-r--r--testing/flightgear/APKBUILD17
-rw-r--r--testing/fluidsynth/APKBUILD4
-rw-r--r--testing/font-comfortaa/APKBUILD29
-rw-r--r--testing/font-fantasque-sans/APKBUILD10
-rw-r--r--testing/font-iosevka-nerd/APKBUILD20
-rw-r--r--testing/font-ipa/APKBUILD4
-rw-r--r--testing/font-overpass/APKBUILD28
-rw-r--r--testing/font-tamzen/APKBUILD21
-rw-r--r--testing/font-tewi/APKBUILD26
-rw-r--r--testing/fontforge/APKBUILD2
-rw-r--r--testing/freedoom/APKBUILD24
-rw-r--r--testing/frei0r-plugins/APKBUILD25
-rw-r--r--testing/frr/APKBUILD17
-rw-r--r--testing/frr/py3.patch1001
-rw-r--r--testing/gajim-plugin-omemo/APKBUILD28
-rw-r--r--testing/gajim/APKBUILD42
-rw-r--r--testing/gammaray/APKBUILD40
-rw-r--r--testing/gammaray/f50f74f.patch26
-rw-r--r--testing/gcc-cross-embedded/APKBUILD26
-rw-r--r--testing/gdal/APKBUILD73
-rw-r--r--testing/gdb-embedded/APKBUILD102
-rw-r--r--testing/gdmd/APKBUILD23
-rw-r--r--testing/gearmand/APKBUILD2
-rw-r--r--testing/geos/10-configure-python3.patch35
-rw-r--r--testing/geos/APKBUILD69
-rw-r--r--testing/getssl/APKBUILD12
-rw-r--r--testing/gforth/APKBUILD2
-rw-r--r--testing/git-cola/APKBUILD10
-rw-r--r--testing/gnome-2048/APKBUILD33
-rw-r--r--testing/gnome-chess/APKBUILD33
-rw-r--r--testing/gnome-podcasts/APKBUILD41
-rw-r--r--testing/gnome-taquin/APKBUILD33
-rw-r--r--testing/gnome-weather/APKBUILD35
-rw-r--r--testing/gnurl/APKBUILD80
-rw-r--r--testing/googler/APKBUILD4
-rw-r--r--testing/gpg-remailer/APKBUILD4
-rw-r--r--testing/gpm/APKBUILD5
-rw-r--r--testing/gpm/gpm-include-sysmacros.patch10
-rw-r--r--testing/gradio/APKBUILD6
-rw-r--r--testing/grafana-image-renderer/10-host-param.patch11
-rw-r--r--testing/grafana-image-renderer/APKBUILD12
-rw-r--r--testing/grafana-image-renderer/grafana-image-renderer.initd7
-rw-r--r--testing/grafana/APKBUILD43
-rw-r--r--testing/grafana/apk.go6
-rw-r--r--testing/grafana/go.mod8
-rw-r--r--testing/grafana/go.sum335
-rw-r--r--testing/grafana/iltorb.patch379
-rw-r--r--testing/granatier/APKBUILD6
-rw-r--r--testing/grantlee-editor/APKBUILD6
-rw-r--r--testing/grantleetheme/APKBUILD6
-rw-r--r--testing/graphene/APKBUILD34
-rw-r--r--testing/grpc-java/APKBUILD4
-rw-r--r--testing/gst-rtsp-server/APKBUILD4
-rw-r--r--testing/gstreamer-vaapi/APKBUILD8
-rw-r--r--testing/gtk-layer-shell/APKBUILD32
-rw-r--r--testing/gtk4.0/APKBUILD105
-rw-r--r--testing/gtk4.0/gtk4.0.post-deinstall4
-rw-r--r--testing/gtk4.0/gtk4.0.post-install5
l---------testing/gtk4.0/gtk4.0.post-upgrade1
-rw-r--r--testing/gtkd/APKBUILD33
-rw-r--r--testing/gyp/APKBUILD21
-rw-r--r--testing/h1-cli/APKBUILD4
-rw-r--r--testing/handbrake/APKBUILD32
-rw-r--r--testing/handbrake/disable-nvenc.patch10
-rw-r--r--testing/handbrake/handbrake-9999-fix-missing-x265-link-flag.patch13
-rw-r--r--testing/harminv/APKBUILD10
-rw-r--r--testing/hdf5/APKBUILD20
-rw-r--r--testing/hexer/APKBUILD28
-rw-r--r--testing/hitch/APKBUILD19
-rw-r--r--testing/hitch/disable-Werror.patch14
-rw-r--r--testing/homebank/APKBUILD6
-rw-r--r--testing/hotspot/APKBUILD44
-rw-r--r--testing/howard-bc/APKBUILD4
-rw-r--r--testing/hsetroot/APKBUILD23
-rw-r--r--testing/hyperfine/APKBUILD6
-rw-r--r--testing/i2pd/APKBUILD2
-rw-r--r--testing/i3status/APKBUILD31
-rw-r--r--testing/i3status/no-pulseaudio.patch88
-rw-r--r--testing/i3wm-gaps/APKBUILD3
-rw-r--r--testing/i3wm-gaps/i3wm-musl-glob-tilde.patch71
-rw-r--r--testing/ibus-anthy/APKBUILD4
-rw-r--r--testing/id3lib/10-fix-compilation-with-cpp-headers.patch21
-rw-r--r--testing/id3lib/30-fix-utf16.patch38
-rw-r--r--testing/id3lib/50-remove-outdated-check.patch11
-rw-r--r--testing/id3lib/60-id3lib-missing-nullpointer-check.patch12
-rw-r--r--testing/id3lib/61-fix_vbr_stack_smash.patch19
-rw-r--r--testing/id3lib/APKBUILD53
-rw-r--r--testing/id3lib/CVE-2007-4460.patch55
-rw-r--r--testing/iio-sensor-proxy/0001-Revert-build-Check-for-.pc-files-before-using-them.patch34
-rw-r--r--testing/iio-sensor-proxy/APKBUILD45
-rw-r--r--testing/iio-sensor-proxy/iio-sensor-proxy.initd4
-rw-r--r--testing/imapfilter/APKBUILD4
-rw-r--r--testing/imgbrd-grabber/APKBUILD39
-rw-r--r--testing/incidenceeditor/APKBUILD8
-rw-r--r--testing/intel-gmmlib/APKBUILD37
-rw-r--r--testing/intel-media-driver/APKBUILD41
-rw-r--r--testing/iozone/APKBUILD8
-rw-r--r--testing/ipt-netflow-vanilla/APKBUILD56
-rw-r--r--testing/jdupes/APKBUILD6
-rw-r--r--testing/jfrog-cli/APKBUILD4
-rw-r--r--testing/jhead/APKBUILD14
-rw-r--r--testing/jo/APKBUILD27
-rw-r--r--testing/juk/APKBUILD30
-rw-r--r--testing/k3s/APKBUILD27
-rw-r--r--testing/kaccounts-integration/APKBUILD28
-rw-r--r--testing/kaccounts-providers/APKBUILD27
-rw-r--r--testing/kajongg/APKBUILD6
-rw-r--r--testing/kakoune/APKBUILD12
-rw-r--r--testing/kakoune/alpine-linux.kak4
-rw-r--r--testing/kalarm/APKBUILD8
-rw-r--r--testing/kalarmcal/APKBUILD8
-rw-r--r--testing/kalgebra/APKBUILD8
-rw-r--r--testing/kalzium/APKBUILD6
-rw-r--r--testing/kamera/APKBUILD6
-rw-r--r--testing/kamoso/APKBUILD8
-rw-r--r--testing/kanagram/APKBUILD8
-rw-r--r--testing/kanshi/APKBUILD33
-rw-r--r--testing/kanshi/no-maybe-uninitialized.patch10
-rw-r--r--testing/kapman/APKBUILD6
-rw-r--r--testing/kapptemplate/APKBUILD6
-rw-r--r--testing/katomic/APKBUILD6
-rw-r--r--testing/kbackup/APKBUILD6
-rw-r--r--testing/kblackbox/APKBUILD6
-rw-r--r--testing/kbruch/APKBUILD6
-rw-r--r--testing/kcachegrind/APKBUILD6
-rw-r--r--testing/kcalutils/APKBUILD8
-rw-r--r--testing/kcgi/APKBUILD30
-rw-r--r--testing/kcharselect/APKBUILD6
-rw-r--r--testing/kcolorchooser/APKBUILD31
-rw-r--r--testing/kcron/APKBUILD30
-rw-r--r--testing/kde-applications/APKBUILD6
-rw-r--r--testing/kde-dev-scripts/APKBUILD6
-rw-r--r--testing/kde-dev-utils/APKBUILD6
-rw-r--r--testing/kdebugsettings/APKBUILD6
-rw-r--r--testing/kdeconnect/APKBUILD37
-rw-r--r--testing/kdenetwork-filesharing/APKBUILD6
-rw-r--r--testing/kdenlive/APKBUILD6
-rw-r--r--testing/kdepim-addons/APKBUILD8
-rw-r--r--testing/kdepim-apps-libs/APKBUILD6
-rw-r--r--testing/kdesdk-kioslaves/APKBUILD6
-rw-r--r--testing/kdesdk-thumbnailers/APKBUILD6
-rw-r--r--testing/kdf/APKBUILD6
-rw-r--r--testing/kea-hook-runscript/APKBUILD31
-rw-r--r--testing/kea/APKBUILD157
-rw-r--r--testing/kea/fix-scripts-include-path.patch271
-rwxr-xr-xtesting/kea/kea-ctrl-agent.initd12
-rwxr-xr-xtesting/kea/kea-dhcp-ddns.initd12
-rwxr-xr-xtesting/kea/kea-dhcp4.initd12
-rwxr-xr-xtesting/kea/kea-dhcp6.initd12
-rw-r--r--testing/keama/APKBUILD34
-rw-r--r--testing/kexec-tools/APKBUILD12
-rw-r--r--testing/keysmith/APKBUILD38
-rw-r--r--testing/kfloppy/APKBUILD6
-rw-r--r--testing/kgeography/APKBUILD6
-rw-r--r--testing/kget/APKBUILD31
-rw-r--r--testing/kgpg/APKBUILD6
-rw-r--r--testing/khangman/APKBUILD8
-rw-r--r--testing/kicad-library/APKBUILD18
-rw-r--r--testing/kicad/APKBUILD62
-rw-r--r--testing/kidentitymanagement/APKBUILD6
-rw-r--r--testing/kig/APKBUILD6
-rw-r--r--testing/kimagemapeditor/APKBUILD21
-rw-r--r--testing/kimap/APKBUILD6
-rw-r--r--testing/kio-fuse/APKBUILD45
-rw-r--r--testing/kio-fuse/kio-fuse.post-install5
-rw-r--r--testing/kio-fuse/modules-load.conf1
-rw-r--r--testing/kio-gdrive/APKBUILD39
-rw-r--r--testing/kirigami-gallery/APKBUILD8
-rw-r--r--testing/kiten/APKBUILD6
-rw-r--r--testing/kitinerary/APKBUILD25
-rw-r--r--testing/kitty/APKBUILD9
-rw-r--r--testing/kldap/APKBUILD6
-rw-r--r--testing/kleopatra/APKBUILD8
-rw-r--r--testing/klettres/APKBUILD6
-rw-r--r--testing/kmag/APKBUILD30
-rw-r--r--testing/kmail-account-wizard/APKBUILD6
-rw-r--r--testing/kmail/APKBUILD8
-rw-r--r--testing/kmailtransport/APKBUILD6
-rw-r--r--testing/kmbox/APKBUILD6
-rw-r--r--testing/kmime/APKBUILD6
-rw-r--r--testing/kmix/APKBUILD6
-rw-r--r--testing/kmousetool/APKBUILD30
-rw-r--r--testing/kmouth/APKBUILD30
-rw-r--r--testing/kmplot/APKBUILD6
-rw-r--r--testing/knotes/APKBUILD6
-rw-r--r--testing/kompare/APKBUILD6
-rw-r--r--testing/kontact/APKBUILD6
-rw-r--r--testing/kontactinterface/APKBUILD6
-rw-r--r--testing/kookbook/APKBUILD50
-rw-r--r--testing/kopete/APKBUILD19
-rw-r--r--testing/korganizer/APKBUILD8
-rw-r--r--testing/kpimtextedit/APKBUILD6
-rw-r--r--testing/kpkpass/APKBUILD6
-rw-r--r--testing/krdc/APKBUILD6
-rw-r--r--testing/krfb/APKBUILD6
-rw-r--r--testing/krita/APKBUILD4
-rw-r--r--testing/kruler/APKBUILD31
-rw-r--r--testing/ksmtp/APKBUILD6
-rw-r--r--testing/kteatime/APKBUILD6
-rw-r--r--testing/ktimer/APKBUILD6
-rw-r--r--testing/ktimetracker/APKBUILD45
-rw-r--r--testing/ktnef/APKBUILD8
-rw-r--r--testing/ktorrent/APKBUILD2
-rw-r--r--testing/ktouch/APKBUILD8
-rw-r--r--testing/kturtle/APKBUILD6
-rw-r--r--testing/kvantum/APKBUILD37
-rw-r--r--testing/kwalletmanager/APKBUILD6
-rw-r--r--testing/kwave/APKBUILD33
-rw-r--r--testing/kwordquiz/APKBUILD6
-rw-r--r--testing/lab/APKBUILD15
-rw-r--r--testing/lab/allow-completion.patch38
-rw-r--r--testing/lab/xdg.patch27
-rw-r--r--testing/ldc/APKBUILD36
-rw-r--r--testing/ledger/APKBUILD2
-rw-r--r--testing/libaccounts-glib/APKBUILD30
-rw-r--r--testing/libaccounts-qt/APKBUILD35
-rw-r--r--testing/libax25/APKBUILD44
-rw-r--r--testing/libax25/musl.patch10
-rw-r--r--testing/libb2/APKBUILD2
-rw-r--r--testing/libbaseencode/APKBUILD4
-rw-r--r--testing/libbloom/APKBUILD2
-rw-r--r--testing/libcli/APKBUILD6
-rw-r--r--testing/libcork/APKBUILD2
-rw-r--r--testing/libcorkipset/APKBUILD2
-rw-r--r--testing/libctl/APKBUILD4
-rw-r--r--testing/libgeotiff/APKBUILD2
-rw-r--r--testing/libgnome-games-support/APKBUILD35
-rw-r--r--testing/libgnome-games-support/meson-support.patch170
-rw-r--r--testing/libgpiod/APKBUILD37
-rw-r--r--testing/libgravatar/APKBUILD6
-rw-r--r--testing/libimagequant/APKBUILD29
-rw-r--r--testing/libkdegames/APKBUILD8
-rw-r--r--testing/libkdepim/APKBUILD6
-rw-r--r--testing/libkeduvocdocument/APKBUILD6
-rw-r--r--testing/libkgapi/APKBUILD8
-rw-r--r--testing/libkleo/APKBUILD8
-rw-r--r--testing/libkmahjongg/APKBUILD6
-rw-r--r--testing/libkml/APKBUILD4
-rw-r--r--testing/libkomparediff2/APKBUILD6
-rw-r--r--testing/libksieve/APKBUILD10
-rw-r--r--testing/libktorrent/APKBUILD38
-rw-r--r--testing/libmesode/10-patch-configure.patch32
-rw-r--r--testing/libmesode/APKBUILD50
-rw-r--r--testing/libosip2/APKBUILD2
-rw-r--r--testing/libpipeline/APKBUILD33
-rw-r--r--testing/libqtolm/APKBUILD30
-rw-r--r--testing/libretro-beetle-psx/APKBUILD40
-rw-r--r--testing/libretro-bsnes/APKBUILD30
-rw-r--r--testing/libretro-bsnes/flags.patch33
-rw-r--r--testing/libretro-core-info/APKBUILD19
-rw-r--r--testing/libretro-database/APKBUILD19
-rw-r--r--testing/libretro-database/fix-busybox-incompability.patch13
-rw-r--r--testing/libretro-desmume/APKBUILD34
-rw-r--r--testing/libretro-mgba/APKBUILD24
-rw-r--r--testing/libretro-mupen64plus/APKBUILD37
-rw-r--r--testing/libretro-mupen64plus/musl-incompatibility.patch15
-rw-r--r--testing/libretro-nestopia/APKBUILD26
-rw-r--r--testing/libsigc++3/APKBUILD26
-rw-r--r--testing/libsignal-protocol-c/APKBUILD43
-rw-r--r--testing/libsigrok/APKBUILD15
-rw-r--r--testing/libsigrokdecode/APKBUILD19
-rw-r--r--testing/libsigrokdecode/python3-embed.patch13
-rw-r--r--testing/libspatialite/APKBUILD2
-rw-r--r--testing/libtorrent-rasterbar/APKBUILD6
-rw-r--r--testing/libva-utils/APKBUILD8
-rw-r--r--testing/libzim/APKBUILD4
-rw-r--r--testing/light/APKBUILD12
-rw-r--r--testing/lightsoff/APKBUILD33
-rw-r--r--testing/linux-tools/APKBUILD12
-rw-r--r--testing/livestreamer/APKBUILD8
-rw-r--r--testing/lizardfs/677.patch22
-rw-r--r--testing/lizardfs/APKBUILD174
-rw-r--r--testing/lizardfs/lizardfs-cgiserv.initd10
-rw-r--r--testing/lizardfs/lizardfs-chunkserver.initd10
-rw-r--r--testing/lizardfs/lizardfs-master.initd9
-rw-r--r--testing/lizardfs/lizardfs-metalogger.initd9
-rw-r--r--testing/lizardfs/lizardfs.pre-install7
-rw-r--r--testing/lldb/APKBUILD8
-rw-r--r--testing/llvm6/APKBUILD8
-rw-r--r--testing/log4cplus/APKBUILD55
-rw-r--r--testing/logstash/APKBUILD4
-rw-r--r--testing/logwatch/APKBUILD9
-rw-r--r--testing/lokalize/APKBUILD6
-rwxr-xr-xtesting/love/APKBUILD31
-rw-r--r--testing/low-memory-monitor/APKBUILD38
-rw-r--r--testing/low-memory-monitor/low-memory-monitor.initd18
-rw-r--r--testing/low-memory-monitor/musl.patch22
-rw-r--r--testing/lowjs/APKBUILD82
-rw-r--r--testing/lowjs/lib-path.patch33
-rw-r--r--testing/lowjs/make-flags.patch20
-rw-r--r--testing/lowjs/open62541-gcc9.patch14
-rw-r--r--testing/lowjs/test.js1
-rw-r--r--testing/lowjs/unbundle-c-ares.patch93
-rw-r--r--testing/lowjs/unbundle-mbedtls.patch44
-rw-r--r--testing/lowjs/use-npm-ci.patch13
-rw-r--r--testing/lttng-tools/APKBUILD6
-rw-r--r--testing/lua-jsonschema/APKBUILD61
-rw-r--r--testing/lua-net-url/APKBUILD55
-rw-r--r--testing/lua-resty-core/APKBUILD26
-rw-r--r--testing/lua-resty-lrucache/APKBUILD26
-rw-r--r--testing/lua-resty-redis/APKBUILD26
-rw-r--r--testing/lxd/APKBUILD10
-rw-r--r--testing/lynis/APKBUILD44
-rw-r--r--testing/lynis/lynis.cron3
-rw-r--r--testing/mailcommon/APKBUILD19
-rw-r--r--testing/mailimporter/APKBUILD6
-rw-r--r--testing/mame/APKBUILD20
-rw-r--r--testing/mame/m68000_archopts.patch17
-rw-r--r--testing/mame/revert-764f04c.patch14
-rw-r--r--testing/man-db/APKBUILD38
-rw-r--r--testing/man-db/man-db.trigger3
-rw-r--r--testing/mapnik/APKBUILD2
-rw-r--r--testing/mapserver/APKBUILD6
-rw-r--r--testing/marble/APKBUILD8
-rw-r--r--testing/matrix-appservice-irc/APKBUILD55
-rw-r--r--testing/matrix-appservice-irc/matrix-appservice-irc.confd11
-rw-r--r--testing/matrix-appservice-irc/matrix-appservice-irc.initd32
-rw-r--r--testing/mdbook/APKBUILD4
-rw-r--r--testing/mdcat/APKBUILD36
-rw-r--r--testing/meep/APKBUILD27
-rw-r--r--testing/mellowplayer/APKBUILD12
-rw-r--r--testing/messagelib/APKBUILD19
-rw-r--r--testing/micropython/0000-unix-mpconfigport.patch25
-rw-r--r--testing/micropython/APKBUILD37
-rw-r--r--testing/micropython/no_legacy_berkeley_db.patch11
-rw-r--r--testing/micropython/no_ussl.patch15
-rw-r--r--testing/miniflux/APKBUILD4
-rw-r--r--testing/minio-client/APKBUILD4
-rw-r--r--testing/minio/APKBUILD4
-rw-r--r--testing/minuet/APKBUILD8
-rw-r--r--testing/monero/APKBUILD4
-rw-r--r--testing/moosefs/APKBUILD6
-rw-r--r--testing/mozjs68/0001-silence-sandbox-violations.patch25
-rw-r--r--testing/mozjs68/APKBUILD127
-rw-r--r--testing/mozjs68/disable-jslint.patch18
-rw-r--r--testing/mozjs68/fd6847c9416f9eebde636e21d794d25d1be8791d.patch37
-rw-r--r--testing/mozjs68/fix-musl-build.patch16
-rw-r--r--testing/mozjs68/fix-rust-target.patch23
-rw-r--r--testing/mpop/APKBUILD4
-rw-r--r--testing/mtg/APKBUILD11
-rw-r--r--testing/mtg/go.mod2
-rw-r--r--testing/mtg/go.sum121
-rw-r--r--testing/mtg/mtg.confd6
-rw-r--r--testing/mtg/mtg.initd2
-rw-r--r--testing/mtxclient/APKBUILD2
-rw-r--r--testing/mu/APKBUILD5
-rw-r--r--testing/multibootusb/APKBUILD2
-rw-r--r--testing/musl-nscd/APKBUILD43
-rwxr-xr-xtesting/musl-nscd/musl-nscd.initd6
-rw-r--r--testing/musl-nscd/musl-nscd.post-deinstall6
-rw-r--r--testing/musl-nscd/musl-nscd.pre-install6
-rw-r--r--testing/musl-obstack/APKBUILD29
-rw-r--r--testing/ncmpcpp/APKBUILD2
-rw-r--r--testing/ncpamixer/APKBUILD25
-rw-r--r--testing/ndisc6/APKBUILD43
-rw-r--r--testing/ndisc6/rdnssd.initd20
-rw-r--r--testing/ndisc6/remove-undef-gnu-source.patch14
-rw-r--r--testing/nemo-qml-plugin-dbus/APKBUILD2
-rw-r--r--testing/netbox/APKBUILD102
-rw-r--r--testing/netbox/gunicorn_config.py5
-rw-r--r--testing/netbox/netbox.initd21
-rw-r--r--testing/netbox/netbox.logrotated8
-rw-r--r--testing/netbox/netbox.nginx-sample20
-rwxr-xr-xtesting/netbox/netbox.post-upgrade8
-rwxr-xr-xtesting/netbox/netbox.pre-install4
-rw-r--r--testing/netbox/set-config-defaults.patch11
-rw-r--r--testing/netcdf/APKBUILD10
-rw-r--r--testing/netdata/APKBUILD23
-rw-r--r--testing/netdata/netdata.initd6
-rw-r--r--testing/netpbm/01-makefile.patch11
-rw-r--r--testing/netpbm/02-installnetpbm.patch51
-rw-r--r--testing/netpbm/APKBUILD38
-rw-r--r--testing/netpbm/config.mk14
-rw-r--r--testing/networkmanager-openvpn/APKBUILD36
-rw-r--r--testing/networkmanager-openvpn/networkmanager-openvpn.pre-install6
l---------testing/networkmanager-openvpn/networkmanager-openvpn.pre-upgrade1
-rw-r--r--testing/newlib-stage1/APKBUILD32
-rw-r--r--testing/next/APKBUILD12
-rw-r--r--testing/ngspice/APKBUILD4
-rw-r--r--testing/nix/APKBUILD4
-rw-r--r--testing/nlohmann-json/APKBUILD4
-rw-r--r--testing/nomad/APKBUILD8
-rw-r--r--testing/nomad/ui-upgrade-node-sass.patch76
-rw-r--r--testing/nomad/update-yarn-lock.patch5861
-rw-r--r--testing/noprs/APKBUILD33
-rw-r--r--testing/noprs/noprs.confd11
-rw-r--r--testing/noprs/noprs.initd26
-rw-r--r--testing/noprs/noprs.pre-install7
-rw-r--r--testing/nototools/APKBUILD2
-rw-r--r--testing/nscd/APKBUILD46
-rw-r--r--testing/nscd/nscd.initd10
-rw-r--r--testing/nscd/nscd.post-deinstall9
-rw-r--r--testing/nscd/nscd.pre-install6
-rw-r--r--testing/nsq/APKBUILD44
-rw-r--r--testing/nsq/glibc-test.patch13
-rw-r--r--testing/numix-icon-theme-circle/APKBUILD27
-rw-r--r--testing/numix-icon-theme/APKBUILD26
-rw-r--r--testing/nyancat/APKBUILD26
-rw-r--r--testing/obs-studio/APKBUILD6
-rw-r--r--testing/ocaml-obuild/APKBUILD30
-rw-r--r--testing/ocaml-ounit/APKBUILD2
-rw-r--r--testing/ocaml-ptmap/APKBUILD44
-rw-r--r--testing/ocaml-qcheck/APKBUILD59
-rw-r--r--testing/ocaml-qtest/APKBUILD56
-rw-r--r--testing/ocaml-sha/APKBUILD49
-rw-r--r--testing/octave/APKBUILD2
-rw-r--r--testing/odt2txt/APKBUILD28
-rw-r--r--testing/okteta/APKBUILD2
-rw-r--r--testing/opencascade/APKBUILD10
-rw-r--r--testing/opencascade/fix_ffmpeg.patch34
-rw-r--r--testing/opencascade/no_feenableexcept.patch63
-rw-r--r--testing/opencascade/vtk7.patch49
-rw-r--r--testing/opencolorio/APKBUILD2
-rw-r--r--testing/openimageio/APKBUILD2
-rw-r--r--testing/openjdk12/APKBUILD308
-rw-r--r--testing/openjdk12/Alpine_Bug_10126.java13
-rw-r--r--testing/openjdk12/HelloWorld.java3
-rw-r--r--testing/openjdk12/TestCryptoLevel.java72
-rw-r--r--testing/openjdk12/TestECDSA.java49
-rw-r--r--testing/openjdk12/aarch64.patch10
-rw-r--r--testing/openjdk12/arm.patch28
-rw-r--r--testing/openjdk12/build.patch517
-rw-r--r--testing/openjdk12/ppc64le.patch183
-rw-r--r--testing/openjdk12/x86.patch140
-rw-r--r--testing/openresty/APKBUILD40
-rw-r--r--testing/openscad/APKBUILD61
-rw-r--r--testing/openscad/boost-1.72.patch24
-rw-r--r--testing/openscap/0001-Handle-rpmVerifyFile-removal-in-rpm-4.15.patch67
-rw-r--r--testing/openscap/0002-Refer-to-the-RPMVERIFY_-constants-instead-of-VERIFY_.patch99
-rw-r--r--testing/openscap/0003-Drop-bogus-VERIFY_SIGNATURE-and-VERIFY_DIGEST-checks.patch56
-rw-r--r--testing/openscap/APKBUILD17
-rw-r--r--testing/openscenegraph/APKBUILD10
-rw-r--r--testing/opensm/APKBUILD23
-rw-r--r--testing/opensubdiv/APKBUILD12
-rw-r--r--testing/openv2g/APKBUILD34
-rw-r--r--testing/openv2g/makefiles.patch192
-rw-r--r--testing/openwsman/APKBUILD16
-rw-r--r--testing/oq/APKBUILD30
-rw-r--r--testing/ospd-netstat/APKBUILD35
-rw-r--r--testing/ossec-hids/APKBUILD9
-rw-r--r--testing/ostinato/APKBUILD2
-rw-r--r--testing/packer/APKBUILD39
-rw-r--r--testing/papirus-icon-theme/APKBUILD17
-rw-r--r--testing/paprefs/APKBUILD6
-rw-r--r--testing/paris-traceroute/APKBUILD46
-rw-r--r--testing/paris-traceroute/clean-errno.patch23
-rw-r--r--testing/paris-traceroute/fix-idn.patch24
-rw-r--r--testing/paris-traceroute/in6-union.patch56
-rw-r--r--testing/parley/APKBUILD6
-rw-r--r--testing/pass-otp/APKBUILD31
-rw-r--r--testing/pcl/APKBUILD2
-rw-r--r--testing/pcsc-tools/APKBUILD6
-rw-r--r--testing/pdal/APKBUILD2
-rw-r--r--testing/perl-archive-extract/APKBUILD10
-rw-r--r--testing/perl-dbix-class-helpers/APKBUILD4
-rw-r--r--testing/perl-extutils-makemaker/APKBUILD4
-rw-r--r--testing/perl-io-socket-timeout/APKBUILD34
-rw-r--r--testing/perl-io-string/APKBUILD38
-rw-r--r--testing/perl-mce/APKBUILD4
-rw-r--r--testing/perl-module-find/APKBUILD35
-rw-r--r--testing/perl-net-mpd/APKBUILD2
-rw-r--r--testing/perl-perlio-via-timeout/APKBUILD32
-rw-r--r--testing/perl-redis/APKBUILD34
-rw-r--r--testing/perl-term-animation/APKBUILD34
-rw-r--r--testing/perl-test-toolbox/APKBUILD18
-rw-r--r--testing/perl-test-unit/APKBUILD24
-rw-r--r--testing/perl-www-mechanize/APKBUILD4
-rw-r--r--testing/pg_cron/APKBUILD6
-rw-r--r--testing/pgcli/APKBUILD8
-rw-r--r--testing/phoc/APKBUILD32
-rw-r--r--testing/phoronix-test-suite/APKBUILD4
-rw-r--r--testing/phosh/APKBUILD49
-rw-r--r--testing/phosh/phosh.desktop11
-rw-r--r--testing/phosh/sm.puri.OSK0.desktop12
-rw-r--r--testing/php7-mustache/APKBUILD52
-rw-r--r--testing/php7-pdlib/APKBUILD42
-rw-r--r--testing/php7-pecl-grpc/APKBUILD7
-rw-r--r--testing/php7-pecl-memcache/APKBUILD34
-rw-r--r--testing/php7-pecl-mongodb/APKBUILD8
-rw-r--r--testing/php7-pecl-mustache/APKBUILD38
-rw-r--r--testing/php7-pecl-rdkafka/APKBUILD4
-rw-r--r--testing/php7-pecl-swoole/APKBUILD8
-rw-r--r--testing/php7-pecl-uuid/APKBUILD39
-rw-r--r--testing/php7-pecl-xlswriter/APKBUILD28
-rw-r--r--testing/php7-pecl-zstd/APKBUILD36
-rw-r--r--testing/php7-spx/APKBUILD21
-rw-r--r--testing/php7-tideways_xhprof/APKBUILD4
-rw-r--r--testing/php7-xhprof/APKBUILD54
-rw-r--r--testing/phpspy/APKBUILD42
-rw-r--r--testing/phpspy/libpthread.patch11
-rw-r--r--testing/picard/APKBUILD30
-rw-r--r--testing/picotts/APKBUILD40
-rw-r--r--testing/pimcommon/APKBUILD6
-rw-r--r--testing/podman/APKBUILD30
-rw-r--r--testing/podman/libpod-config.patch26
-rw-r--r--testing/poedit/APKBUILD2
-rw-r--r--testing/poetry/APKBUILD11
-rw-r--r--testing/polybar/APKBUILD4
-rw-r--r--testing/postgis/APKBUILD33
-rw-r--r--testing/poxml/APKBUILD6
-rw-r--r--testing/ppsspp/APKBUILD82
-rwxr-xr-xtesting/ppsspp/ppsspp3
-rwxr-xr-xtesting/ppsspp/ppsspp-headless3
-rw-r--r--testing/ppsspp/ppsspp-version.patch9
-rw-r--r--testing/ppsspp/ppsspp.desktop11
-rw-r--r--testing/procs/APKBUILD4
-rw-r--r--testing/profanity/APKBUILD57
-rw-r--r--testing/proj/10-test-tolerance.patch14
-rw-r--r--testing/proj/APKBUILD107
-rw-r--r--testing/proj/TestJni.java20
-rw-r--r--testing/prometheus-snmp-exporter/APKBUILD54
-rw-r--r--testing/prometheus-snmp-exporter/prometheus-snmp-exporter.confd1
-rw-r--r--testing/prometheus-snmp-exporter/prometheus-snmp-exporter.initd8
-rw-r--r--testing/prometheus-snmp-exporter/prometheus-snmp-exporter.pre-install5
-rw-r--r--testing/pulseaudio-qt/APKBUILD33
-rw-r--r--testing/pulsemixer/APKBUILD23
-rw-r--r--testing/pulseview/APKBUILD2
-rw-r--r--testing/pup/APKBUILD44
-rw-r--r--testing/purple-mm-sms/APKBUILD23
-rw-r--r--testing/py3-affine/APKBUILD38
-rw-r--r--testing/py3-argcomplete/APKBUILD7
-rw-r--r--testing/py3-arrow/APKBUILD7
-rw-r--r--testing/py3-astor/APKBUILD8
-rw-r--r--testing/py3-astor/put-2-newlines-between-func-defs.patch25
-rw-r--r--testing/py3-biopython/APKBUILD4
-rw-r--r--testing/py3-bleach/APKBUILD28
-rw-r--r--testing/py3-blis/APKBUILD21
-rw-r--r--testing/py3-boltons/APKBUILD28
-rw-r--r--testing/py3-boto3/APKBUILD28
-rw-r--r--testing/py3-botocore/APKBUILD32
-rw-r--r--testing/py3-cachecontrol/APKBUILD8
-rw-r--r--testing/py3-cachy/APKBUILD2
-rw-r--r--testing/py3-canonicaljson/APKBUILD24
-rw-r--r--testing/py3-cassandra-driver/APKBUILD6
-rw-r--r--testing/py3-catalogue/APKBUILD32
-rw-r--r--testing/py3-catkin-pkg/APKBUILD6
-rw-r--r--testing/py3-cherrypy/APKBUILD6
-rw-r--r--testing/py3-cleo/APKBUILD8
-rw-r--r--testing/py3-click-plugins/APKBUILD35
-rw-r--r--testing/py3-cligj/APKBUILD38
-rw-r--r--testing/py3-clikit/APKBUILD8
-rw-r--r--testing/py3-colorama/APKBUILD33
-rw-r--r--testing/py3-colorlog/APKBUILD6
-rw-r--r--testing/py3-commonmark/APKBUILD31
-rw-r--r--testing/py3-confluent-kafka/APKBUILD6
-rw-r--r--testing/py3-coreapi/APKBUILD2
-rw-r--r--testing/py3-cymem/APKBUILD7
-rw-r--r--testing/py3-cymem/tox.ini6
-rw-r--r--testing/py3-daemonize/APKBUILD27
-rw-r--r--testing/py3-ddt/APKBUILD6
-rw-r--r--testing/py3-deprecated/APKBUILD28
-rw-r--r--testing/py3-django-cors-headers/APKBUILD6
-rw-r--r--testing/py3-django-debug-toolbar/APKBUILD6
-rw-r--r--testing/py3-django-rest-swagger/APKBUILD2
-rw-r--r--testing/py3-django-taggit/APKBUILD6
-rw-r--r--testing/py3-dnslib/APKBUILD6
-rw-r--r--testing/py3-doit/APKBUILD6
-rw-r--r--testing/py3-dominate/APKBUILD2
-rw-r--r--testing/py3-dulwich/APKBUILD6
-rw-r--r--testing/py3-elasticsearch/APKBUILD6
-rw-r--r--testing/py3-eliot/APKBUILD31
-rw-r--r--testing/py3-fastavro/APKBUILD6
-rw-r--r--testing/py3-fido2/APKBUILD11
-rw-r--r--testing/py3-fido2/broken-check.patch23
-rw-r--r--testing/py3-flake8-builtins/APKBUILD6
-rw-r--r--testing/py3-fonttools/APKBUILD45
-rw-r--r--testing/py3-freezegun/APKBUILD30
-rw-r--r--testing/py3-frozendict/APKBUILD26
-rw-r--r--testing/py3-fs/APKBUILD32
-rw-r--r--testing/py3-funcy/APKBUILD29
-rw-r--r--testing/py3-geoip2/APKBUILD6
-rw-r--r--testing/py3-gitdb2/APKBUILD2
-rw-r--r--testing/py3-gitlab/APKBUILD8
-rw-r--r--testing/py3-gitpython/APKBUILD8
-rw-r--r--testing/py3-grpcio/APKBUILD4
-rw-r--r--testing/py3-h5py/APKBUILD2
-rw-r--r--testing/py3-html2text/APKBUILD30
-rw-r--r--testing/py3-intervals/APKBUILD8
-rw-r--r--testing/py3-intervals/pytest5.patch21
-rw-r--r--testing/py3-invoke/APKBUILD8
-rw-r--r--testing/py3-iso8601/APKBUILD2
-rw-r--r--testing/py3-jmespath/APKBUILD32
-rw-r--r--testing/py3-keyring/APKBUILD6
-rw-r--r--testing/py3-kombu/APKBUILD6
-rw-r--r--testing/py3-libevdev/APKBUILD2
-rw-r--r--testing/py3-m2crypto/APKBUILD9
-rw-r--r--testing/py3-maxminddb/APKBUILD6
-rw-r--r--testing/py3-mimeparse/APKBUILD2
-rw-r--r--testing/py3-nbxmpp/APKBUILD27
-rw-r--r--testing/py3-ncclient/APKBUILD6
-rw-r--r--testing/py3-nikola/APKBUILD10
-rw-r--r--testing/py3-nikola/fix-requirements.patch11
-rw-r--r--testing/py3-openapi-codec/APKBUILD2
-rw-r--r--testing/py3-parameterized/APKBUILD6
-rw-r--r--testing/py3-pass-git-helper/APKBUILD27
-rw-r--r--testing/py3-passlib/0001-Remove-time-clock.patch52
-rw-r--r--testing/py3-passlib/0002-Fix-for-Python-3-8.patch48
-rw-r--r--testing/py3-passlib/APKBUILD12
-rw-r--r--testing/py3-pastel/APKBUILD8
-rw-r--r--testing/py3-path.py/APKBUILD29
-rw-r--r--testing/py3-path/APKBUILD29
-rw-r--r--testing/py3-pbkdf2/APKBUILD4
-rw-r--r--testing/py3-peewee/APKBUILD6
-rw-r--r--testing/py3-pelican/APKBUILD5
-rw-r--r--testing/py3-pem/APKBUILD29
-rw-r--r--testing/py3-pep8-naming/APKBUILD6
-rw-r--r--testing/py3-pgspecial/APKBUILD6
-rw-r--r--testing/py3-pkgconfig/APKBUILD2
-rw-r--r--testing/py3-praw/APKBUILD11
-rw-r--r--testing/py3-prometheus-client/APKBUILD24
-rw-r--r--testing/py3-protobuf/APKBUILD6
-rw-r--r--testing/py3-pyaes/APKBUILD2
-rw-r--r--testing/py3-pydocstyle/APKBUILD6
-rw-r--r--testing/py3-pyftpdlib/APKBUILD31
-rw-r--r--testing/py3-pygithub/APKBUILD4
-rw-r--r--testing/py3-pylev/APKBUILD2
-rw-r--r--testing/py3-pylint/APKBUILD6
-rw-r--r--testing/py3-pymacaroons/APKBUILD24
-rw-r--r--testing/py3-pynvim/APKBUILD29
-rw-r--r--testing/py3-pyotherside/APKBUILD2
-rw-r--r--testing/py3-pyparted/APKBUILD6
-rw-r--r--testing/py3-pypeg2/APKBUILD33
-rw-r--r--testing/py3-pysendfile/APKBUILD28
-rw-r--r--testing/py3-pysimplesoap/APKBUILD2
-rw-r--r--testing/py3-pytest-timeout/APKBUILD2
-rw-r--r--testing/py3-qtpy/APKBUILD29
-rw-r--r--testing/py3-rasterio/10-cython.patch15
-rw-r--r--testing/py3-rasterio/20-gdal.patch21
-rw-r--r--testing/py3-rasterio/APKBUILD54
-rw-r--r--testing/py3-readme_renderer/APKBUILD2
-rw-r--r--testing/py3-recommonmark/APKBUILD30
-rw-r--r--testing/py3-regex/APKBUILD6
-rw-r--r--testing/py3-requests-file/APKBUILD27
-rw-r--r--testing/py3-requests-mock/APKBUILD34
-rw-r--r--testing/py3-responses/APKBUILD8
-rw-r--r--testing/py3-rss2email/APKBUILD27
-rw-r--r--testing/py3-rstr/APKBUILD25
-rw-r--r--testing/py3-s3transfer/APKBUILD31
-rw-r--r--testing/py3-scikit-learn/APKBUILD6
-rw-r--r--testing/py3-scrapy/APKBUILD6
-rw-r--r--testing/py3-secretstorage/APKBUILD6
-rw-r--r--testing/py3-semantic-version/APKBUILD6
-rw-r--r--testing/py3-shapely/APKBUILD13
-rw-r--r--testing/py3-shellingham/APKBUILD2
-rw-r--r--testing/py3-signedjson/APKBUILD27
-rw-r--r--testing/py3-smmap2/APKBUILD2
-rw-r--r--testing/py3-snuggs/APKBUILD41
-rw-r--r--testing/py3-spacy/APKBUILD5
-rw-r--r--testing/py3-sparqlwrapper/APKBUILD6
-rw-r--r--testing/py3-sphinxcontrib-inheritance/APKBUILD4
-rw-r--r--testing/py3-sqlalchemy-utils/APKBUILD6
-rw-r--r--testing/py3-srsly/APKBUILD6
-rw-r--r--testing/py3-subunit/APKBUILD26
-rw-r--r--testing/py3-tabulate/APKBUILD6
-rw-r--r--testing/py3-testrepository/APKBUILD26
-rw-r--r--testing/py3-testresources/APKBUILD30
-rw-r--r--testing/py3-thinc/APKBUILD10
-rw-r--r--testing/py3-tinydb/APKBUILD6
-rw-r--r--testing/py3-tldextract/APKBUILD28
-rw-r--r--testing/py3-tomlkit/APKBUILD2
-rw-r--r--testing/py3-transitions/APKBUILD6
-rw-r--r--testing/py3-treq/APKBUILD24
-rw-r--r--testing/py3-twine/APKBUILD11
-rw-r--r--testing/py3-txacme/APKBUILD35
-rw-r--r--testing/py3-txsni/APKBUILD24
-rw-r--r--testing/py3-typed-ast/APKBUILD6
-rw-r--r--testing/py3-typing-extensions/APKBUILD27
-rw-r--r--testing/py3-unpaddedbase64/APKBUILD28
-rw-r--r--testing/py3-visitor/APKBUILD2
-rw-r--r--testing/py3-wasabi/APKBUILD4
-rw-r--r--testing/py3-weasyprint/APKBUILD6
-rw-r--r--testing/py3-webencodings/APKBUILD28
-rw-r--r--testing/py3-whatever/APKBUILD32
-rw-r--r--testing/py3-wrapt/APKBUILD29
-rw-r--r--testing/py3-xlib/APKBUILD32
-rw-r--r--testing/py3-zope-i18nmessageid/APKBUILD6
-rw-r--r--testing/qbittorrent-nox/APKBUILD2
-rw-r--r--testing/qmlrunner/APKBUILD2
-rw-r--r--testing/qownnotes/APKBUILD26
-rw-r--r--testing/qt-creator/APKBUILD14
-rw-r--r--testing/qt-creator/fix-execinfo.patch5
-rw-r--r--testing/qt-creator/qtcreator.desktop10
-rw-r--r--testing/qt5-qtgamepad/APKBUILD34
-rw-r--r--testing/qutebrowser/APKBUILD35
-rw-r--r--testing/rabbitmq-server/APKBUILD2
-rw-r--r--testing/rabbitmq-server/rabbitmq-server.pre-install2
-rw-r--r--testing/range-v3/APKBUILD39
-rw-r--r--testing/rasdaemon/APKBUILD6
-rw-r--r--testing/rav1e/APKBUILD39
-rw-r--r--testing/rclone/APKBUILD11
-rw-r--r--testing/refind/APKBUILD23
-rw-r--r--testing/reprotest/APKBUILD27
-rw-r--r--testing/retroarch-assets/APKBUILD23
-rw-r--r--testing/retroarch-joypad-autoconfig/APKBUILD19
-rw-r--r--testing/retroarch/APKBUILD38
-rw-r--r--testing/retroarch/config.patch68
-rw-r--r--testing/ripgrep/APKBUILD61
-rw-r--r--testing/rocs/APKBUILD8
-rw-r--r--testing/rofi-pass/APKBUILD19
-rw-r--r--testing/rofi/APKBUILD4
-rw-r--r--testing/rustup/APKBUILD5
-rw-r--r--testing/ruuvi-prometheus/APKBUILD6
-rw-r--r--testing/sblim-wbemcli/APKBUILD32
-rw-r--r--testing/scrcpy/APKBUILD19
-rw-r--r--testing/scream/APKBUILD56
-rw-r--r--testing/scream/scream-alsa.confd20
-rwxr-xr-xtesting/scream/scream-alsa.initd21
-rw-r--r--testing/screenfetch/APKBUILD4
-rw-r--r--testing/sdfat/APKBUILD2
-rw-r--r--testing/seamonkey/APKBUILD20
-rw-r--r--testing/seamonkey/fix-crmf.patch13
-rw-r--r--testing/seamonkey/mozconfig3
-rw-r--r--testing/shadowsocks-libev/APKBUILD9
-rw-r--r--testing/shairport-sync/APKBUILD4
-rw-r--r--testing/shotcut/APKBUILD4
-rw-r--r--testing/signond/APKBUILD36
-rw-r--r--testing/signond/busybox-incompatibility.patch14
-rw-r--r--testing/simgear/APKBUILD30
-rw-r--r--testing/simplesnap/APKBUILD6
-rw-r--r--testing/singularity/APKBUILD15
-rw-r--r--testing/skim/APKBUILD4
-rw-r--r--testing/slop/APKBUILD34
-rw-r--r--testing/snapper/APKBUILD4
-rw-r--r--testing/snapper/musl-mktime.patch2
-rw-r--r--testing/snes9x/APKBUILD62
-rw-r--r--testing/sniffglue/APKBUILD48
-rw-r--r--testing/sniffglue/sniffglue.conf3
-rw-r--r--testing/sniffglue/sniffglue.pre-install5
-rw-r--r--testing/solidity/APKBUILD2
-rw-r--r--testing/spectral/APKBUILD49
-rw-r--r--testing/spectrwm/APKBUILD8
-rw-r--r--testing/spin/APKBUILD4
-rw-r--r--testing/squeekboard/APKBUILD33
-rw-r--r--testing/ssh-audit/APKBUILD17
-rw-r--r--testing/sshuttle/APKBUILD32
-rw-r--r--testing/sshuttle/no-scm.patch18
-rw-r--r--testing/sslscan/APKBUILD10
-rw-r--r--testing/sssd/APKBUILD28
-rw-r--r--testing/stellarium/APKBUILD37
-rw-r--r--testing/step/APKBUILD6
-rw-r--r--testing/streamlink/APKBUILD34
-rw-r--r--testing/supertux/APKBUILD44
-rw-r--r--testing/svt-av1/APKBUILD42
-rw-r--r--testing/svt-hevc/APKBUILD42
-rw-r--r--testing/svt-vp9/APKBUILD42
-rw-r--r--testing/sweeper/APKBUILD6
-rw-r--r--testing/synapse/APKBUILD81
-rw-r--r--testing/synapse/synapse.confd7
-rw-r--r--testing/synapse/synapse.initd23
-rw-r--r--testing/synapse/synapse.post-install11
-rw-r--r--testing/synapse/synapse.pre-install6
-rw-r--r--testing/tau/APKBUILD10
-rw-r--r--testing/tdrop/APKBUILD23
-rw-r--r--testing/tectonic/APKBUILD4
-rw-r--r--testing/telegraf/APKBUILD16
-rw-r--r--testing/telegraf/telegraf.confd2
-rw-r--r--testing/telegram-desktop/0002-tdesktop.patch466
-rw-r--r--testing/telegram-desktop/0003-fix-missing-use-of-pch.patch11
-rw-r--r--testing/telegram-desktop/0005-system-wide-fonts.patch33
-rw-r--r--testing/telegram-desktop/0006-ppc64le-enable-arch.patch37
-rw-r--r--testing/telegram-desktop/0009-lz4.patch48
-rw-r--r--testing/telegram-desktop/0010-libtgvoip.patch19
-rw-r--r--testing/telegram-desktop/0014-clock_gettime.patch44
-rw-r--r--testing/telegram-desktop/0015-revert-headers.patch40
-rw-r--r--testing/telegram-desktop/0016-no-gtk2.patch32
-rw-r--r--testing/telegram-desktop/APKBUILD166
-rw-r--r--testing/telegram-desktop/CMakeLists.inj21
-rw-r--r--testing/telegram-desktop/minizip-includes.patch16
-rw-r--r--testing/telegram-desktop/musl-basename.patch (renamed from testing/telegram-desktop/0001-musl.patch)3
-rw-r--r--testing/telegram-desktop/ppc.patch16
-rw-r--r--testing/telegram-desktop/qt-plugin-path.patch24
-rw-r--r--testing/telegram-desktop/xdg.patch (renamed from testing/telegram-desktop/0004-xdg.patch)0
-rw-r--r--testing/termite/APKBUILD69
-rw-r--r--testing/thermald/APKBUILD4
-rw-r--r--testing/thunderbird/APKBUILD45
-rw-r--r--testing/thunderbird/fd6847c9416f9eebde636e21d794d25d1be8791d.patch37
-rw-r--r--testing/thunderbird/fix-rust-target.patch9
-rw-r--r--testing/tiled/APKBUILD24
-rw-r--r--testing/tilix/APKBUILD42
-rw-r--r--testing/tilix/ce11b0bd936fe8fee9c5ac7025ea5864b99ed7d3.patch34
-rw-r--r--testing/tilix/dont-use-dub.patch17
-rw-r--r--testing/tilix/fix-meson.patch11
-rw-r--r--testing/tilix/musl-hacks.patch81
-rw-r--r--testing/timew/APKBUILD6
-rw-r--r--testing/tinycbor/APKBUILD8
-rw-r--r--testing/tmate/APKBUILD6
-rw-r--r--testing/tpm2-tools/APKBUILD9
-rw-r--r--testing/traefik/APKBUILD18
-rw-r--r--testing/ttf-roboto-mono/APKBUILD39
-rw-r--r--testing/ttf-roboto/APKBUILD22
-rw-r--r--testing/udftools/APKBUILD6
-rw-r--r--testing/uglify-js/APKBUILD26
-rw-r--r--testing/uglifycss/APKBUILD26
-rw-r--r--testing/umbrello/APKBUILD21
-rw-r--r--testing/unicode-emoji/APKBUILD12
-rw-r--r--testing/upmpdcli/APKBUILD2
-rw-r--r--testing/uucp/APKBUILD2
-rw-r--r--testing/vboot-utils/0001-Remove-static-futility.patch38
-rw-r--r--testing/vboot-utils/APKBUILD45
-rw-r--r--testing/vcdimager/APKBUILD2
-rw-r--r--testing/vidcutter/APKBUILD4
-rw-r--r--testing/vint/APKBUILD8
-rw-r--r--testing/vpnc/APKBUILD8
-rw-r--r--testing/vpnc/musl-libc.patch42
-rw-r--r--testing/vtk/APKBUILD2
-rw-r--r--testing/vulkan-tools/APKBUILD4
-rw-r--r--testing/watchexec/APKBUILD4
-rw-r--r--testing/wayfire/APKBUILD4
-rw-r--r--testing/wcm/APKBUILD4
-rw-r--r--testing/websocat/APKBUILD26
-rw-r--r--testing/wf-config/APKBUILD4
-rw-r--r--testing/wf-recorder/APKBUILD32
-rw-r--r--testing/wifish/APKBUILD22
-rw-r--r--testing/wiringx/APKBUILD40
-rw-r--r--testing/wiringx/fix_time_t.patch31
-rw-r--r--testing/wl-clipboard/APKBUILD31
-rw-r--r--testing/wob/APKBUILD32
-rw-r--r--testing/wofi/APKBUILD29
-rw-r--r--testing/xdg-desktop-portal-gtk/APKBUILD52
-rw-r--r--testing/xdg-desktop-portal-gtk/x11.patch32
-rw-r--r--testing/xdg-user-dirs/APKBUILD32
-rw-r--r--testing/xerces-c/APKBUILD45
-rw-r--r--testing/xf86-input-wacom/APKBUILD6
-rw-r--r--testing/xmrig-proxy/APKBUILD6
-rw-r--r--testing/xmrig/APKBUILD11
-rw-r--r--testing/xorgxrdp/APKBUILD4
-rw-r--r--testing/xournalpp/APKBUILD39
-rw-r--r--testing/xsel/APKBUILD17
-rw-r--r--testing/yakuake/APKBUILD6
-rw-r--r--testing/yara/APKBUILD28
-rw-r--r--testing/yaru-themes/APKBUILD83
-rw-r--r--testing/yubikey-manager-qt/APKBUILD2
-rw-r--r--testing/zanshin/APKBUILD59
-rw-r--r--testing/zeroconf-ioslave/APKBUILD6
-rw-r--r--testing/zfs-auto-snapshot/0001-alpine.patch40
-rw-r--r--testing/zfs-auto-snapshot/APKBUILD29
-rw-r--r--testing/zile/APKBUILD2
-rw-r--r--testing/zim-tools/APKBUILD4
-rw-r--r--testing/zimwriterfs/APKBUILD4
-rw-r--r--testing/zola/APKBUILD3
996 files changed, 13065 insertions, 17845 deletions
diff --git a/testing/accerciser/APKBUILD b/testing/accerciser/APKBUILD
deleted file mode 100644
index 226db6a150..0000000000
--- a/testing/accerciser/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=accerciser
-pkgver=3.34.1
-pkgrel=1
-pkgdesc="Interactive Python accessibility explorer"
-url="https://wiki.gnome.org/Apps/Accerciser"
-arch="all !s390x" #librsvg
-license="BSD-3-Clause"
-depends="libwnck3 py3-gobject3 py3-atspi gtk+3.0 librsvg py3-xlib ipython"
-makedepends="gtk+3.0-dev py3-gobject3-dev glib-dev at-spi2-core-dev itstool"
-options="!check" # no tests
-subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.gnome.org/sources/accerciser/${pkgver%.*}/accerciser-$pkgver.tar.xz"
-
-build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var
- make
-}
-
-package() {
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="52bd4a4cb763743bf3657b299e1037a6567f8525345939874fd58660281a523cdfb934aeebbf8f62ded314daaced52941e5f36da79d65227aeebd65b0ea4cacd accerciser-3.34.1.tar.xz"
diff --git a/testing/adapta-kde/APKBUILD b/testing/adapta-kde/APKBUILD
deleted file mode 100644
index 722ef1f1b0..0000000000
--- a/testing/adapta-kde/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
-pkgname=adapta-kde
-pkgver=20180828
-pkgrel=1
-pkgdesc="Adapta theme for KDE Plasma 5"
-url="https://github.com/PapirusDevelopmentTeam/adapta-kde"
-arch="noarch"
-license="GPL-3.0-or-later"
-subpackages="kvantum-theme-adapta:_kvantum:noarch"
-source="$pkgname-$pkgver.tar.gz::https://github.com/PapirusDevelopmentTeam/adapta-kde/archive/$pkgver.tar.gz"
-
-package() {
- mkdir -p "$pkgdir"/usr/share
-
- cp -r plasma \
- aurorae \
- color-schemes \
- konsole \
- yakuake \
- "$pkgdir"/usr/share
-}
-
-_kvantum() {
- depends="kvantum"
- pkgdesc="Adapta theme for KDE Plasma 5 under Kvantum"
- install_if="$pkgname=$pkgver-r$pkgrel kvantum"
-
- mkdir -p "$subpkgdir"/usr/share
- cp -r "$builddir"/Kvantum "$subpkgdir"/usr/share
-}
-sha512sums="e4265a1a22a270c17b8b99d3b0289a4221c84159d148a687f8c6dd6cb883dba43302afbdb0c9d6d6810e6500a1b84c17f3e65c758a9ad5eeabd6e454bea41dca adapta-kde-20180828.tar.gz"
diff --git a/testing/aerc/APKBUILD b/testing/aerc/APKBUILD
index c08ec275ad..50aa01b046 100644
--- a/testing/aerc/APKBUILD
+++ b/testing/aerc/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=aerc
-pkgver=0.2.1
-pkgrel=1
+pkgver=0.3.0
+pkgrel=0
pkgdesc="an email client for your terminal"
url="https://aerc-mail.org"
arch="all"
license="MIT"
-depends="less"
+depends="less ncurses"
makedepends="go scdoc"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/aerc/archive/$pkgver.tar.gz"
@@ -22,4 +22,4 @@ check() {
package() {
make install PREFIX=/usr DESTDIR="$pkgdir"
}
-sha512sums="8d1903215d654885d5011e0408d3c15d53a3bf9ec7f9f537c9b9b560b2324fb13876ce96da0525f1d0a354e0580ad24ebc5da4f4e623403d31ecde27ee29c3ac aerc-0.2.1.tar.gz"
+sha512sums="7f2b285b1045d1f271e3741a3d66fb48afbd7a372eea70c89307d8853f5dffd8e25d077c51da4139ed2568ec465782c97091da3b5fd0fd03b89e9cec936d6f27 aerc-0.3.0.tar.gz"
diff --git a/testing/age/APKBUILD b/testing/age/APKBUILD
new file mode 100644
index 0000000000..0779b2e88c
--- /dev/null
+++ b/testing/age/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer:
+pkgname=age
+pkgver=1.0.0_p2
+_realver=${pkgver/_p/-beta}
+pkgrel=0
+pkgdesc="Simple, modern and secure encryption tool"
+url="https://github.com/FiloSottile/age"
+arch="all"
+license="BSD-3-Clause"
+makedepends="go"
+options="net"
+source="https://github.com/FiloSottile/age/archive/v$_realver/age-$_realver.tar.gz"
+builddir="$srcdir/filippo.io/age"
+
+export GOPATH="$srcdir"
+
+prepare() {
+ default_prepare
+ cd "$srcdir"
+ mkdir -p "$(dirname "$builddir")"
+ cp -r "$srcdir/$pkgname-$_realver" "$builddir"
+}
+
+build() {
+ mkdir -p bin
+ go build -o bin filippo.io/age/cmd/...
+}
+
+check() {
+ go test ./...
+}
+
+package() {
+ mkdir -p "$pkgdir"/usr/bin
+ install -m755 bin/* "$pkgdir"/usr/bin/
+}
+
+cleanup_srcdir() {
+ go clean -modcache
+ default_cleanup_srcdir
+}
+
+sha512sums="461a5b98924081420dbc43fdc2ed870fa8f51249fb6a34287963bc3b96f31308b1f729228d7019a3d5640f24374227c52a2dcfd4f87e19b5a5ad5968dfbc78c7 age-1.0.0-beta2.tar.gz"
diff --git a/testing/aisleriot/APKBUILD b/testing/aisleriot/APKBUILD
new file mode 100644
index 0000000000..de683514ec
--- /dev/null
+++ b/testing/aisleriot/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
+# Maintainer: Antoine Fontaine <antoine.fontaine@epfl.ch>
+pkgname="aisleriot"
+pkgver="3.22.10"
+pkgrel=1
+pkgdesc="Solitaire and other card games for GNOME"
+url="https://wiki.gnome.org/Apps/Aisleriot"
+arch="all !s390x"
+license="GPL-3.0-or-later"
+makedepends="meson bash librsvg-dev guile-dev libxml2 libxml2-dev libxml2-utils
+ itstool gtk+3.0-dev libcanberra-dev gmp-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://gitlab.gnome.org/GNOME/aisleriot/-/archive/$pkgver/aisleriot-$pkgver.tar.gz
+ fix-bash-shebang.patch"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=debugoptimized \
+ -D theme_kde=false \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja -C output test
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="c041fcf51949b5e0b6e0a1efb5665e0853537694e5fc35ac15f4f41d6133c56e078fcd92710da0cce957432883a7cea636698c3fc4e83e54262c25273c551eb3 aisleriot-3.22.10.tar.gz
+9db40fb258e8d70de8d1763eaf08fc1c9b79291efff8018556f2a18d40dd66c0f73b37083199bee6e41130766b91b124e539afed2a8ccde8105e34a0bc8f1f43 fix-bash-shebang.patch"
diff --git a/testing/aisleriot/fix-bash-shebang.patch b/testing/aisleriot/fix-bash-shebang.patch
new file mode 100644
index 0000000000..d4b12988ca
--- /dev/null
+++ b/testing/aisleriot/fix-bash-shebang.patch
@@ -0,0 +1,10 @@
+diff --git a/cards/meson_svgz.sh b/cards/meson_svgz.sh
+index 5a0bf01..20f0de9 100755
+--- a/cards/meson_svgz.sh
++++ b/cards/meson_svgz.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/usr/bin/env bash
+ # Copyright © 2019 Christian Persch
+ #
+ # This programme is free software; you can redistribute it and/or modify it
diff --git a/testing/akonadi-calendar-tools/APKBUILD b/testing/akonadi-calendar-tools/APKBUILD
index 7d20f6e867..174137b5b6 100644
--- a/testing/akonadi-calendar-tools/APKBUILD
+++ b/testing/akonadi-calendar-tools/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-calendar-tools
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
arch="all !ppc64le !s390x" # Limited by akonadi-calendar -> kmailtransport -> libkgapi -> qt5-qtwebengine
url="https://kontact.kde.org/"
pkgdesc="CLI tools to manage akonadi calendars"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev kdoctools-dev akonadi-dev kcalendarcore-dev kcalutils-dev akonadi-calendar-dev libkdepim-dev calendarsupport-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-calendar-tools-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-calendar-tools-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # No tests available
@@ -37,4 +37,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="ff57af694d8fdd6c3bf08c0bdfb58d5cf2e54cccc74fcef1a74321fd1109b2fc0f4a902597fd2461fe91e6e17dd457db50f6b1d22b468afd391175cea0822627 akonadi-calendar-tools-19.08.2.tar.xz"
+sha512sums="90df1342f3685df0c0496d83dc1b483d0c126bbc7ad03d6abd51c421c5edeae18b3b677b790e3646f55bfd37d27d9aaa0f484ac8983755de20b187efed34cd76 akonadi-calendar-tools-19.12.0.tar.xz"
diff --git a/testing/akonadi-calendar/APKBUILD b/testing/akonadi-calendar/APKBUILD
index 6b4e346a65..5521826632 100644
--- a/testing/akonadi-calendar/APKBUILD
+++ b/testing/akonadi-calendar/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-calendar
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
pkgdesc="Libraries and daemons to implement basic email handling"
arch="all !ppc64le !s390x" # Limited by kmailtransport -> libkgapi -> qt5-qtwebengine
url="https://community.kde.org/KDE_PIM"
@@ -12,7 +12,7 @@ depends_dev="ki18n-dev kwidgetsaddons-dev kxmlgui-dev kio-dev kcodecs-dev
kcalendarcore-dev kcalutils-dev akonadi-dev akonadi-contacts-dev"
makedepends="$depends_dev extra-cmake-modules"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-calendar-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-calendar-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
options="!check" # Broken
@@ -40,4 +40,4 @@ package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
}
-sha512sums="387b9c8cebce8f4480e18888f55c183021a9d84d356074b17e4b1def5e6f1a7bd8deae1a54441bad19c47fa16d40d476119ed621ab8414ff42e669584bb972be akonadi-calendar-19.08.2.tar.xz"
+sha512sums="414720ee822103c940fbab39f8272f2ab52f32e32c60bb1630e0eb4805ee778d9ca772c4f5a40859f2ceae2eac569202a98a485d31f3b41799d4d2100e4c578a akonadi-calendar-19.12.0.tar.xz"
diff --git a/testing/akonadi-contacts/APKBUILD b/testing/akonadi-contacts/APKBUILD
index 87b100c00b..3591f8b32f 100644
--- a/testing/akonadi-contacts/APKBUILD
+++ b/testing/akonadi-contacts/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-contacts
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
pkgdesc="Libraries and daemons to implement Contact Management in Akonadi"
arch="all"
@@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev kio-dev ki18n-dev kcompletion-dev kconfig-dev
akonadi-dev"
makedepends="$depends_dev extra-cmake-modules"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
build() {
@@ -31,4 +31,4 @@ check() {
package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="9311068388b4a5f4be047849e93e5de82febd2fe7ee25c518ece41058ed71797200217d7ee2668d42a743e95f5fe1df5a60c7a83c5376adb3fb345e36333e232 akonadi-contacts-19.08.2.tar.xz"
+sha512sums="ebf93cb3e40da1115be36455fd89ab3204648e98c917bb817bbe36ece4fd9c983e2552a8dbb8005ef6adef645898b012d8f34806ebabd5d3e03c2ef7d59cddcf akonadi-contacts-19.12.0.tar.xz"
diff --git a/testing/akonadi-import-wizard/APKBUILD b/testing/akonadi-import-wizard/APKBUILD
index 751204ebb7..70aae39abc 100644
--- a/testing/akonadi-import-wizard/APKBUILD
+++ b/testing/akonadi-import-wizard/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-import-wizard
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all !ppc64le !s390x" # Limited by kmailtransport -> libkgapi -> qt5-qtwebengine
url="https://kontact.kde.org/"
pkgdesc="Import data from other mail clients to KMail"
license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev kwallet-dev kconfig-dev kdbusaddons-dev kauth-dev kdoctools-dev kcrash-dev kio-dev akonadi-dev kcontacts-dev kidentitymanagement-dev kmailtransport-dev mailcommon-dev messagelib-dev pimcommon-dev libkdepim-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
build() {
@@ -27,4 +27,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="9f9645912a1e3767779637f58c9e9f5925bc7023aef3d3a9ed6c56b6f338d0e271d5920a784b95f9fe389b17b7adfa18b7ee38332fd3eaf18c9538beaa6897e4 akonadi-import-wizard-19.08.2.tar.xz"
+sha512sums="d6e2f75f23f139bbdd0d520756976af83193430de75e193d281b40754fb891ada62359a575233f5ef7210cdeba71bcc3be3a133a58e12a173894043d8c189736 akonadi-import-wizard-19.12.0.tar.xz"
diff --git a/testing/akonadi-mime/APKBUILD b/testing/akonadi-mime/APKBUILD
index 7b718f2af7..42d30df969 100644
--- a/testing/akonadi-mime/APKBUILD
+++ b/testing/akonadi-mime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-mime
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
pkgdesc="Libraries and daemons to implement basic email handling"
arch="all"
@@ -9,7 +9,7 @@ url="https://community.kde.org/KDE_PIM"
license="LGPL-2.0-or-later"
depends_dev="qt5-qtbase-dev kcodecs-dev kconfigwidgets-dev kdbusaddons-dev kio-dev ki18n-dev kxmlgui-dev kmime-dev kitemmodels-dev akonadi-dev shared-mime-info libxslt-dev"
makedepends="$depends_dev extra-cmake-modules"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
build() {
@@ -28,4 +28,4 @@ check() {
package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="44f8462c41b3ea6537def599add41f9f250265851e00ac29028e6ea45a74050a5679bc15979b8bb4d791708a54e2db0c62d73e4726c1352c10cdac54436dc73d akonadi-mime-19.08.2.tar.xz"
+sha512sums="27c66e8c6069fbca2d82fccd1c2dbf77c3dfcda97e5f16353db5efd4928b361a719da964397fb04322f32b2a147d25b3310f7101886ec94c959c71ebe62c6a23 akonadi-mime-19.12.0.tar.xz"
diff --git a/testing/akonadi-notes/APKBUILD b/testing/akonadi-notes/APKBUILD
index e3cdcbd09c..4e3c4305ed 100644
--- a/testing/akonadi-notes/APKBUILD
+++ b/testing/akonadi-notes/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-notes
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
pkgdesc="Libraries and daemons to implement management of notes"
arch="all"
@@ -9,7 +9,7 @@ url="https://community.kde.org/KDE_PIM"
license="LGPL-2.0-or-later"
depends_dev="qt5-qtbase-dev ki18n-dev kmime-dev"
makedepends="$depends_dev extra-cmake-modules"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
build() {
@@ -27,4 +27,4 @@ check() {
package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="76185971e43ccf318a2bd958ae042c34bc2ef3915047525d5bcbe498d1ef7933a859606efd1429489a42c735a07d9bc883d836a15c2292f2937d1ec2f94c74dd akonadi-notes-19.08.2.tar.xz"
+sha512sums="353a468233d30dc1aa75a1e16e0a879dfb8b493c99305b4c30befeaf6e9c080571105c672af8043d3352a4b120d70e44a9c5369b5bb6d6940783383932324b2b akonadi-notes-19.12.0.tar.xz"
diff --git a/testing/akonadi-search/APKBUILD b/testing/akonadi-search/APKBUILD
index f9b17f0c13..00c3f48304 100644
--- a/testing/akonadi-search/APKBUILD
+++ b/testing/akonadi-search/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi-search
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
pkgdesc="Libraries and daemons to implement searching in Akonadi"
arch="all"
url="https://community.kde.org/KDE_PIM"
@@ -10,7 +10,7 @@ license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)"
depends_dev="qt5-qtbase-dev ki18n-dev kconfig-dev kcrash-dev kdbusaddons-dev kcmutils-dev kio-dev krunner-dev xapian-core-dev akonadi-dev kcontacts-dev kmime-dev akonadi-mime-dev kcalendarcore-dev"
makedepends="$depends_dev extra-cmake-modules"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-search-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-search-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
prepare() {
@@ -53,4 +53,4 @@ package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
}
-sha512sums="bf7d3006d03d1fda9ace33eeeb93e24263006fd6829f3e94f2932e0afa20f1cdbd859fe68227fb5602b007aab3c386803cdd458bb911774703a873975072ccad akonadi-search-19.08.2.tar.xz"
+sha512sums="a0d2964e582d7c5bf536a4d617be7e322b00306aaef1149973dfedd897a2ad524752966ef733c80f6e1df66a27f919219716e1f5300f5e308f543e5937d47e9b akonadi-search-19.12.0.tar.xz"
diff --git a/testing/akonadi/APKBUILD b/testing/akonadi/APKBUILD
index e86845678e..c832d41892 100644
--- a/testing/akonadi/APKBUILD
+++ b/testing/akonadi/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadi
-pkgver=19.08.2
-pkgrel=0
+pkgver=19.12.0
+pkgrel=1
pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access"
arch="all"
url="https://community.kde.org/KDE_PIM"
@@ -11,7 +11,7 @@ depends="mariadb"
depends_dev="qt5-qtbase-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kiconthemes-dev kitemmodels-dev kitemviews-dev kio-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev kcrash-dev boost-dev shared-mime-info libxml2-dev sqlite-dev"
makedepends="$depends_dev extra-cmake-modules qt5-qttools-dev"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
options="!check" # Requires running dbus server
@@ -31,4 +31,4 @@ check() {
package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="80dc550a7502bde7edaf59c7fd765992569204ae5b56b9026e29c1b6103240b379ebe72c1b9804336d679aa0db3a3c2231140516d492d760497bdd59cff9b354 akonadi-19.08.2.tar.xz"
+sha512sums="1c3d770dfccae7b596dd45af65aa05652a96f2c81fbd6094a089d7fa610b55b30339eb2b2cecb798ed8a40f389f896fcbd381ea8a8bb6f05951a7f8b7dc5fed3 akonadi-19.12.0.tar.xz"
diff --git a/testing/akonadiconsole/APKBUILD b/testing/akonadiconsole/APKBUILD
index 9ccc497200..eb84bf2958 100644
--- a/testing/akonadiconsole/APKBUILD
+++ b/testing/akonadiconsole/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akonadiconsole
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
arch="all !s390x !ppc64le" # calendarsupport messagelib missing
url="https://kontact.kde.org/"
pkgdesc="Application for debugging Akonadi Resources"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kdbusaddons-dev kdoctools-dev ki18n-dev kitemmodels-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev kcrash-dev kcompletion-dev kitemviews-dev kio-dev akonadi-dev kcontacts-dev kcalendarcore-dev kmime-dev akonadi-contacts-dev calendarsupport-dev messagelib-dev libkdepim-dev akonadi-search-dev xapian-bindings"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadiconsole-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadiconsole-$pkgver.tar.xz"
prepare() {
default_prepare
@@ -36,4 +36,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="88b86fad2244d34256de4ff15ae7eba3cea6e130256b16e610e6391464856353c7c601460dd45bd29f4bc91e7d05cd38fe52c8a6d4bc4d47d688796774e197c3 akonadiconsole-19.08.2.tar.xz"
+sha512sums="429699e2b6ae54e2b62fbeebfd5250d310dbd049251a1521f3610b6aeaee057d8257a4d2c881349e179ebf4e7442885d7a231e68b1601eec7390595a8f9a1b7c akonadiconsole-19.12.0.tar.xz"
diff --git a/testing/akregator/APKBUILD b/testing/akregator/APKBUILD
index 1393793dcb..132d28d6df 100644
--- a/testing/akregator/APKBUILD
+++ b/testing/akregator/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=akregator
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all !ppc64le !s390x" # Limited by qt5-qtwebengine
url="https://kontact.kde.org/components/akregator.html"
@@ -9,7 +9,7 @@ pkgdesc="RSS Feed Reader"
license="GPL-2.0-or-later AND LGPL-2.0-or-later"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtwebengine-dev grantlee-dev kcrash-dev kdoctools-dev kcmutils-dev knotifyconfig-dev kparts-dev ktexteditor-dev kxmlgui-dev kiconthemes-dev knotifications-dev syndication-dev grantleetheme-dev kontactinterface-dev libkdepim-dev libkleo-dev messagelib-dev kpimtextedit-dev akonadi-mime-dev pimcommon-dev"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
build() {
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="75cc826ae54bc34d4941fada5f8b48e5db3133b65b0dc121bfd59bf1e49c67f28b63fa1a1dbb4e945f660f9f1f0c9cdb87e0df2c61a695bb7cc6d2bff357a998 akregator-19.08.2.tar.xz"
+sha512sums="95608dfb3857400e4c07a553250df5616e695b486f74d105c6ec422728d593c1d836b5b8b782608bf4c97062002522d81f4bfa815b106e5fe4193e690284ba50 akregator-19.12.0.tar.xz"
diff --git a/testing/alkimia/APKBUILD b/testing/alkimia/APKBUILD
index 40b2b71b26..5e43dcb469 100644
--- a/testing/alkimia/APKBUILD
+++ b/testing/alkimia/APKBUILD
@@ -3,11 +3,11 @@
pkgname=alkimia
pkgver=8.0.2
pkgrel=0
-arch="all"
+arch="all !armhf" # armhf blocked by qt5-qtdeclarative
url="https://community.kde.org/Alkimia/libalkimia"
pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC"
license="GPL-3.0-or-later"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtdeclarative-dev kconfig-dev kcoreaddons-dev kcompletion-dev ki18n-dev kpackage-dev plasma-framework-dev knewstuff-dev kio-dev kiconthemes-dev ktextwidgets-dev kdoctools-dev kitemmodels-dev kdelibs4support-dev gmp-dev doxygen graphviz"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtdeclarative-dev kconfig-dev kcoreaddons-dev kcompletion-dev ki18n-dev kpackage-dev plasma-framework-dev knewstuff-dev kio-dev kiconthemes-dev ktextwidgets-dev kdoctools-dev kitemmodels-dev kdelibs4support-dev kinit-dev gmp-dev doxygen graphviz"
checkdepends="xvfb-run"
source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
diff --git a/testing/allegro/APKBUILD b/testing/allegro/APKBUILD
new file mode 100644
index 0000000000..d2afb3221a
--- /dev/null
+++ b/testing/allegro/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=allegro
+pkgver=5.2.5.0
+pkgrel=0
+arch="all"
+url="https://liballeg.org"
+pkgdesc="Portable library mainly aimed at video game and multimedia programming"
+license="BSD-3-Clause"
+makedepends="cmake xorg-server-dev mesa-dev glu-dev libxcursor-dev libjpeg-turbo-dev
+ libwebp-dev flac-dev libvorbis-dev libxi-dev libtheora-dev alsa-lib-dev
+ pulseaudio-dev sdl2-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/liballeg/allegro5/archive/$pkgver/allegro5-$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+options="!check" # No tests
+builddir="$srcdir/allegro5-$pkgver"
+
+build() {
+ cmake \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DALLEGRO_SDL=ON
+ make
+}
+
+package() {
+ DESTDIR="$pkgdir" make install
+}
+
+sha512sums="9b97a46f0fd146c3958a5f8333822665ae06b984b3dbedc1356afdac8fe3248203347cb08b30ebda049a7320948c7844e9d00dc055c317836c2557b5bfc2ab04 allegro-5.2.5.0.tar.gz"
diff --git a/testing/alsa-topology-conf/APKBUILD b/testing/alsa-topology-conf/APKBUILD
new file mode 100644
index 0000000000..a2d36916d3
--- /dev/null
+++ b/testing/alsa-topology-conf/APKBUILD
@@ -0,0 +1,18 @@
+# Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+pkgname=alsa-topology-conf
+pkgver=1.2.1
+pkgrel=0
+pkgdesc="ALSA topology configuration files"
+url="https://www.alsa-project.org"
+arch="noarch"
+license="BSD-3-Clause"
+source="ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-$pkgver.tar.bz2"
+options="!check" # no tests
+
+package() {
+ mkdir -p "$pkgdir"/usr/share/alsa
+ cp -r "$srcdir"/topology "$pkgdir"/usr/share/alsa
+}
+
+sha512sums="3480e58f12aeca04b0c1821e074daeb369949acbcf7bc61b09895ee43de84cb716566518a56a4d681babbb3f13faace5a16fff079d8bdaefc7c27fc1382cd41a alsa-topology-conf-1.2.1.tar.bz2"
diff --git a/testing/alsa-ucm-conf/APKBUILD b/testing/alsa-ucm-conf/APKBUILD
new file mode 100644
index 0000000000..23d2135e00
--- /dev/null
+++ b/testing/alsa-ucm-conf/APKBUILD
@@ -0,0 +1,18 @@
+# Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+pkgname=alsa-ucm-conf
+pkgver=1.2.1.2
+pkgrel=0
+pkgdesc="ALSA Use Case Manager configuration"
+url="https://www.alsa-project.org"
+arch="noarch"
+license="BSD-3-Clause"
+source="ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-$pkgver.tar.bz2"
+options="!check" # no tests
+
+package() {
+ mkdir -p "$pkgdir"/usr/share/alsa
+ cp -r "$srcdir"/ucm2 "$pkgdir"/usr/share/alsa
+}
+
+sha512sums="e498c4355a765eb6ecd03f03611c8904f757bf73619a3c8159c044f80a4c3ab5cbd343692c227e13c6da307fc2e35259b4726902d3ab8e03eff11aa1c74027d5 alsa-ucm-conf-1.2.1.2.tar.bz2"
diff --git a/testing/alttab/0001-Fix-memleaks-in-error-case.patch b/testing/alttab/0001-Fix-memleaks-in-error-case.patch
new file mode 100644
index 0000000000..730e0fff54
--- /dev/null
+++ b/testing/alttab/0001-Fix-memleaks-in-error-case.patch
@@ -0,0 +1,41 @@
+From 980bdef0fde36772e283e36a7e12ce28ff1901aa Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Thu, 3 Oct 2019 17:25:19 +0200
+Subject: [PATCH] Fix memleaks in error case
+
+We should free img.data.
+---
+ src/pngd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/pngd.c b/src/pngd.c
+index ef46621..fb3fd25 100644
+--- a/src/pngd.c
++++ b/src/pngd.c
+@@ -250,6 +250,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+ fclose(infile);
+ if (!img.data || img.width == 0 || img.height == 0) {
+ fprintf(stderr, "error loading png data\n");
++ pngFree(&img);
+ return 0;
+ }
+ if (debug > 0)
+@@ -259,6 +260,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+ pad = 32;
+ if (!xdata) {
+ fprintf(stderr, "xdata malloc error\n");
++ pngFree(&img);
+ return 0;
+ }
+ ximage =
+@@ -267,6 +269,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+ if (!ximage) {
+ fprintf(stderr, "error creating ximage\n");
+ free(xdata);
++ pngFree(&img);
+ return 0;
+ }
+ ximage->byte_order = MSBFirst;
+--
+2.24.0
+
diff --git a/testing/alttab/0002-Remove-check-around-free.patch b/testing/alttab/0002-Remove-check-around-free.patch
new file mode 100644
index 0000000000..a3f26b3b90
--- /dev/null
+++ b/testing/alttab/0002-Remove-check-around-free.patch
@@ -0,0 +1,27 @@
+From f7e8ff30190a3134863d7ff03becc2e397ec9db0 Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Thu, 3 Oct 2019 17:20:40 +0200
+Subject: [PATCH] Remove check around free()
+
+free(NULL) is noop. We don't need to check for this.
+---
+ src/randr.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/randr.c b/src/randr.c
+index e4ebe9d..0622c73 100644
+--- a/src/randr.c
++++ b/src/randr.c
+@@ -186,8 +186,7 @@ bool randrGetViewport(quad * res, bool * multihead)
+ if (no < 1) {
+ msg(0, "randr didn't detect any output\n");
+ *multihead = false;
+- if (oq != NULL)
+- free(oq);
++ free(oq);
+ return false;
+ }
+ if (no == 1) {
+--
+2.24.0
+
diff --git a/testing/alttab/APKBUILD b/testing/alttab/APKBUILD
index b61a7ffd39..ff90e2938b 100644
--- a/testing/alttab/APKBUILD
+++ b/testing/alttab/APKBUILD
@@ -1,23 +1,27 @@
# Contributor: Alexander Kulak <sa-dev@rainbow.by>
# Maintainer: Alexander Kulak <sa-dev@rainbow.by>
pkgname=alttab
-pkgver=1.1.0.57
+pkgver=1.4.0
pkgrel=0
-pkgdesc="X11 window switcher designed for minimalistic window managers or standalone X11 session"
+pkgdesc="X11 window switcher designed for minimalistic window managers"
url="https://github.com/sagb/alttab"
+options="!check"
arch="all"
license="GPL-3.0-or-later"
-depends="libx11 libxft libxrender libpng fts"
-makedepends="libx11-dev libxft-dev uthash-dev libxrender-dev libpng-dev fts-dev"
-install=""
+makedepends="libx11-dev libxft-dev fts-dev libxrender-dev libxrandr-dev
+ libpng-dev uthash-dev"
subpackages="$pkgname-doc"
-source="${pkgname}-${pkgver}.tar.gz::https://api.github.com/repos/sagb/alttab/tarball/0c14ea2080c5603fbebe9cbca3f198fabb30d2d9"
-builddir="$srcdir/sagb-alttab-0c14ea2"
-options="!check"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sagb/alttab/archive/v$pkgver.tar.gz
+ 0001-Fix-memleaks-in-error-case.patch
+ 0002-Remove-check-around-free.patch
+ "
+
+prepare() {
+ default_prepare
+ ./bootstrap.sh
+}
build() {
- cd "$builddir" && \
- ./bootstrap.sh && \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,8 +33,9 @@ build() {
}
package() {
- cd "$builddir" && \
make DESTDIR="$pkgdir" install
}
-sha512sums="6dd6cc8b28eb05e5148854304e75de31e5975aff213d70d67d12fa3d935639cde6dd57a032690495f603baeea50a7fa057651b672e4d9aa7d602b4ac8f50b3c6 alttab-1.1.0.57.tar.gz"
+sha512sums="263625e4dfabcb697fdf38b330fd7e179a36e5c1111fe8a2aa98a6eb1434c8ff20400f0317845bd5a0f0454baf6b59369ab25270953690f544d0923fc4deab3b alttab-1.4.0.tar.gz
+7368b0706ccca5ae70cb050912be06b718a9727f3460abd5f349834f16f0d45a643e3f0914875a0aaa5d275d55d10953b302eb1d0891e179a3ecf62fdd34fbd7 0001-Fix-memleaks-in-error-case.patch
+d69d5b9d90d84cc8c7f54ba7132602ab4e3ed8b0bdcf3ff07cc317f093c925855dfd15f883809e710fb0cbfebcf05dbcdca58e69842e050ef7ad6dc903a52c1b 0002-Remove-check-around-free.patch"
diff --git a/testing/ameba/APKBUILD b/testing/ameba/APKBUILD
index 4d76f97e34..313d4a5d57 100644
--- a/testing/ameba/APKBUILD
+++ b/testing/ameba/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=ameba
-pkgver=0.10.1
-pkgrel=1
+pkgver=0.11.0
+pkgrel=0
pkgdesc="A static code analysis tool for Crystal"
-url="https://veelenga.github.io/ameba/"
+url="https://github.com/crystal-ameba/ameba"
arch="x86_64 aarch64"
license="MIT"
makedepends="crystal libxml2-dev shards yaml-dev"
@@ -28,4 +28,4 @@ package() {
make install PREFIX="$pkgdir/usr"
}
-sha512sums="1a9e2591e603eb1824584aced7025903554a24c42d7eab4d370b471db944340df03abe4c0447a4016a62501265bb27aafedb923faf2a06024c66c97406e52f36 ameba-0.10.1.tar.gz"
+sha512sums="3dd410480693dd6cd6f98b5eee4f7cb72f7a3ede3acf3fdbc1aa717ae8001431628e5c1f81322cf78b3cce192be942e813ee853dd954f221eea46dc3704bd723 ameba-0.11.0.tar.gz"
diff --git a/testing/ampy/APKBUILD b/testing/ampy/APKBUILD
index 8cf8db46d8..3242b9d596 100644
--- a/testing/ampy/APKBUILD
+++ b/testing/ampy/APKBUILD
@@ -1,38 +1,33 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=ampy
pkgver=0.20171212
-pkgrel=2
+pkgrel=3
pkgdesc="Utility to interact with a MicroPython board over a serial connection"
url="https://github.com/adafruit/ampy"
arch="noarch"
license="MIT"
-depends="python3 py3-serial py3-click py-setuptools"
-makedepends="python3-dev"
-install=""
+depends="python3 py3-serial py3-click py3-setuptools"
subpackages="$pkgname-doc"
_commit="d3df5f57398c581f8a6c1b930b740fd7060e6833"
-source="https://github.com/adafruit/${pkgname}/archive/${_commit}/master.tar.gz"
+source="https://github.com/adafruit/ampy/archive/$_commit/master.tar.gz"
-builddir="${srcdir}/${pkgname}-${_commit}"
+builddir="$srcdir/$pkgname-$_commit"
prepare() {
- cd "$builddir"
touch CONTRIBUTING.md
}
build() {
- cd "$builddir"
- python3 setup.py build || return 1
+ python3 setup.py build
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr \
- --root="$pkgdir" || return 1
+ --root="$pkgdir"
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
install -m644 CONTRIBUTING.md README.md \
- "$pkgdir"/usr/share/doc/$pkgname/ || return 1
+ "$pkgdir"/usr/share/doc/$pkgname/
}
sha512sums="b075745030e924be6bc0eb83fbb2960f27932dd44399a8fe6ce1e54bfbb2bdeba9c159db1add337023327a86ca3808479873afc92ff99b9c024e244cb53bafd5 master.tar.gz"
diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD
index 1c22cc3223..58893f7edb 100644
--- a/testing/amule/APKBUILD
+++ b/testing/amule/APKBUILD
@@ -3,7 +3,7 @@
pkgname=amule
_commit=314e62e87ff0481d3171f74751aaf0179e518765
pkgver=11025
-pkgrel=0
+pkgrel=1
pkgdesc="An eMule-like client for the eD2k and Kademlia networks"
url="http://www.amule.org"
arch="all"
diff --git a/testing/analitza/APKBUILD b/testing/analitza/APKBUILD
index eec4d9c0ea..a25b4623b6 100644
--- a/testing/analitza/APKBUILD
+++ b/testing/analitza/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=analitza
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
-arch="all"
+arch="all !armhf" # armhf blocked by qt5-qtdeclarative
url="https://edu.kde.org/"
pkgdesc="A library to add mathematical features to your program"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qttools-dev eigen-dev"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/analitza-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
build() {
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="cab6796e0b2e6223ad59b9754add045277834c6b4ae2ed4a498d116d9daec158543a8d1276db65a5f34c41064094ee4534f7fd87d3dc991825731f87a151eb87 analitza-19.08.2.tar.xz"
+sha512sums="6a885e18d6242f560df6ae3bdd3f8450effef4cd49461f3ea4971f4de42d2d0b90874c74a7ed5bf68caf2f4e34e837f788b741b906dc9b320ec75181240520da analitza-19.12.0.tar.xz"
diff --git a/testing/animatch/APKBUILD b/testing/animatch/APKBUILD
new file mode 100644
index 0000000000..57b4ef742d
--- /dev/null
+++ b/testing/animatch/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=animatch
+pkgver=1.0.0
+pkgrel=0
+_commit_libsuperderpy="e9d645ecee0ff7f72c9b8f05b920289a26a20cdb"
+arch="all"
+url="https://gitlab.com/HolyPangolin/animatch"
+pkgdesc="Animatch is a match-three game with cute animals"
+license="GPL-3.0-or-later"
+makedepends="cmake ninja allegro-dev mesa-dev"
+source="https://gitlab.com/HolyPangolin/animatch/-/archive/v$pkgver/animatch-v$pkgver.tar.gz
+ libsuperderpy-$_commit_libsuperderpy.tar.gz::https://gitlab.com/dosowisko.net/libsuperderpy/-/archive/$_commit_libsuperderpy.tar.gz"
+subpackages="$pkgname-static $pkgname-doc"
+options="!check" # No tests
+builddir="$srcdir/$pkgname-v$pkgver"
+
+prepare() {
+ default_prepare
+
+ mkdir "$builddir"/build
+
+ # libsuperderpy doesn't have a stable ABI yet so build it statically to prevent conflicts with other packages using it
+ rmdir "$builddir"/libsuperderpy
+ mv "$srcdir"/libsuperderpy-$_commit_libsuperderpy "$builddir"/libsuperderpy
+}
+
+build() {
+ cd "$builddir"/build
+ cmake "$builddir" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DLIBSUPERDERPY_IMGUI=OFF \
+ -GNinja
+ ninja
+}
+
+check() {
+ cd "$builddir"/build
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+}
+
+sha512sums="1076517ee332dd2b13f8f78054787aeaa60dafdc76c6455936e04f1509618ffb3954589809ab3afbe38b268570960445919ea856bf63bdc48eda92e5c602c267 animatch-v1.0.0.tar.gz
+70a035db24b15f44ae5feac8c8459c16f6c068d5e0f93e9ba37f2772597d32d0c37c61387abc0718efa85c3fa7afc2d7f70b3c2088f496fb2a01532b72bef25e libsuperderpy-e9d645ecee0ff7f72c9b8f05b920289a26a20cdb.tar.gz"
diff --git a/testing/artikulate/APKBUILD b/testing/artikulate/APKBUILD
index eb10847bfd..d17db7c4f2 100644
--- a/testing/artikulate/APKBUILD
+++ b/testing/artikulate/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=artikulate
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
-arch="all"
+arch="all !armhf" # armhf blocked by qt5-qtdeclarative
url="https://edu.kde.org/artikulate"
pkgdesc="Improve your pronunciation by listening to native speakers"
license="(GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only"
depends="kirigami2"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtxmlpatterns-dev qt5-qtmultimedia-dev karchive-dev kconfig-dev kcrash-dev ki18n-dev knewstuff-dev kxmlgui-dev kdoctools-dev kirigami2-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/artikulate-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
build() {
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="72e4d0bfaa88b4133964f07fe2e20d9f2cc0bee718388fe56f1f1518f75acf31b4068fa87e652c370e18e6b53addce3414430ee43c9118782925c55bb2536dc6 artikulate-19.08.2.tar.xz"
+sha512sums="3c06b2764812cf4f816a75b47f30e45a81b65df82a554a9b52c1116dd3e6e8713e16dd03cc3ac843d1419c55300c8f21c985ce05b27d76a6d2dd49d06080e802 artikulate-19.12.0.tar.xz"
diff --git a/testing/asciiquarium/APKBUILD b/testing/asciiquarium/APKBUILD
new file mode 100644
index 0000000000..f9cff40be9
--- /dev/null
+++ b/testing/asciiquarium/APKBUILD
@@ -0,0 +1,18 @@
+# Contributor: alpterry <alpterry@protonmail.com>
+# Maintainer: alpterry <alpterry@protonmail.com>
+pkgname=asciiquarium
+pkgver=1.1
+pkgrel=0
+pkgdesc="An aquarium/sea animation in ASCII art"
+url="https://robobunny.com/projects/asciiquarium/html/"
+arch="noarch"
+license="GPL-2.0-or-later"
+depends="perl perl-term-animation"
+options="!check" # no test suite
+source="http://robobunny.com/projects/asciiquarium/asciiquarium_$pkgver.tar.gz"
+
+package() {
+ install -Dm755 "$srcdir/${pkgname}_$pkgver"/asciiquarium "$pkgdir"/usr/bin/asciiquarium
+}
+
+sha512sums="109da0aaba272465aa2cf5ce010e9ca1ece3be5be996dfe12709b3c10e44572492196b1852e8c103ed89d2c6efd0b05e454a718267cbcc4924806d30a072d926 asciiquarium_1.1.tar.gz"
diff --git a/testing/assimp/01-rm-revision-test.patch b/testing/assimp/01-rm-revision-test.patch
index 28d0871485..47a2a61fe6 100644
--- a/testing/assimp/01-rm-revision-test.patch
+++ b/testing/assimp/01-rm-revision-test.patch
@@ -1,12 +1,14 @@
---- src/test/unit/utVersion.cpp.orig
-+++ src/test/unit/utVersion.cpp
-@@ -65,7 +65,6 @@
+--- assimp-5.0.0/test/unit/utVersion.cpp.orig 2019-10-27 02:51:11.128925442 +0000
++++ assimp-5.0.0/test/unit/utVersion.cpp 2019-10-27 02:54:22.554333936 +0000
+@@ -66,9 +66,9 @@
EXPECT_NE( aiGetCompileFlags(), 0U );
}
-
+
-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+/*TEST_F( utVersion, aiGetVersionRevisionTest ) {
EXPECT_NE( aiGetVersionRevision(), 0U );
-}
--
+}*/
+
+ TEST_F( utVersion, aiGetBranchNameTest ) {
+ EXPECT_NE( nullptr, aiGetBranchName() );
diff --git a/testing/assimp/02-fix-ssize-32bit.patch b/testing/assimp/02-fix-ssize-32bit.patch
new file mode 100644
index 0000000000..f1df86d1db
--- /dev/null
+++ b/testing/assimp/02-fix-ssize-32bit.patch
@@ -0,0 +1,40 @@
+From 0fb68863ffb226044200e5ed1c70eb882be60f78 Mon Sep 17 00:00:00 2001
+From: kuba-- <kuba@sourced.tech>
+Date: Mon, 11 Nov 2019 20:37:48 +0100
+Subject: [PATCH] Add __DEFINED_ssize_t for alpine gcc
+
+---
+ src/zip.h | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/zip.h b/src/zip.h
+index c9463a1..a48d64d 100644
+--- a/contrib/zip/src/zip.h
++++ b/contrib/zip/src/zip.h
+@@ -20,8 +20,9 @@ extern "C" {
+ #endif
+
+ #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \
+- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined)
+-#define _SSIZE_T
++ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \
++ !defined(_SSIZE_T) && !defined(_SSIZE_T_)
++
+ // 64-bit Windows is the only mainstream platform
+ // where sizeof(long) != sizeof(void*)
+ #ifdef _WIN64
+@@ -29,6 +30,14 @@ typedef long long ssize_t; /* byte count or error */
+ #else
+ typedef long ssize_t; /* byte count or error */
+ #endif
++
++#define _SSIZE_T_DEFINED
++#define _SSIZE_T_DEFINED_
++#define __DEFINED_ssize_t
++#define __ssize_t_defined
++#define _SSIZE_T
++#define _SSIZE_T_
++
+ #endif
+
+ #ifndef MAX_PATH
diff --git a/testing/assimp/APKBUILD b/testing/assimp/APKBUILD
index 47262ab2b0..1c8b0fc383 100644
--- a/testing/assimp/APKBUILD
+++ b/testing/assimp/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Russ Webber <russ@rw.id.au>
# Maintainer: Russ Webber <russ@rw.id.au>
pkgname=assimp
-pkgver=4.1.0
+pkgver=5.0.0
pkgrel=0
pkgdesc="Open Asset Import Library imports and exports 3D model formats."
url="http://www.assimp.org/"
@@ -10,7 +10,8 @@ license="BSD-3-Clause"
makedepends="cmake zlib-dev minizip-dev"
subpackages="$pkgname-dev"
source="assimp-$pkgver.tar.gz::https://github.com/assimp/assimp/archive/v$pkgver.tar.gz
- 01-rm-revision-test.patch"
+ 01-rm-revision-test.patch
+ 02-fix-ssize-32bit.patch"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,5 +40,6 @@ package() {
rm -vf "$pkgdir"/usr/lib/libIrrXML.a
}
-sha512sums="5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a assimp-4.1.0.tar.gz
-4cbcf0d8c91a5d727de25af2444f9a997e111b8cc3cfb951ec7f1ad4f4d0a1bce5300a853a3788a3da787245fd373bfbf9a0f767ec902343e47c366c070b28f3 01-rm-revision-test.patch"
+sha512sums="0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a assimp-5.0.0.tar.gz
+535a80c5899a2994735e7b17b4e3fdb3ff2b53e64c09ec8fcab1dbcea2ad696fed50aeb1667a3c4e00a8a3ddf411d33ec1d36fcb256e26f02cf951f0e2c83a73 01-rm-revision-test.patch
+19a52d40887de945b74efe0f7e105a02eab306e6295d2d9b32f76bed9596c93ab954118df6e7afdafd2488e0e1feb666c734a8eb56e0edc34510efe3f8f99374 02-fix-ssize-32bit.patch"
diff --git a/testing/atari800/APKBUILD b/testing/atari800/APKBUILD
index 62c6a926d8..4d8b3273fa 100644
--- a/testing/atari800/APKBUILD
+++ b/testing/atari800/APKBUILD
@@ -1,32 +1,32 @@
# Contributor: Paul Bredbury <brebs@sent.com>
pkgname=atari800
-pkgver=4.0.0
+pkgver=4.1.0
pkgrel=0
pkgdesc="Atari 8-bit computer emulator"
url="https://atari800.github.io/"
arch="x86_64"
license="GPL-2.0-or-later"
-depends=""
makedepends="autoconf automake sdl-dev mesa-dev unzip"
options="!check" # No test suite
subpackages="$pkgname-doc"
-source="https://github.com/$pkgname/$pkgname/archive/ATARI800_${pkgver//./_}.tar.gz"
-builddir="$srcdir/atari800-ATARI800_${pkgver//./_}/src"
+source="https://github.com/atari800/atari800/archive/ATARI800_${pkgver//./_}.tar.gz
+ onscreenkeyboard.patch::https://github.com/atari800/atari800/commit/5c6410cca5accc9540e461d312e9becf64a67baa.patch
+ "
+builddir="$srcdir/atari800-ATARI800_${pkgver//./_}"
prepare() {
default_prepare
- ./autogen.sh
+ autoreconf -fi
}
build() {
- cd "$builddir"
./configure --prefix=/usr
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="58725c099d421ceeadb1d37a370c61d6846827af6d87d131db3326016be48b4b1193acbc0cfdd54dc396bb97c760b6338006ca30b28a9f74eb881274056bd589 ATARI800_4_0_0.tar.gz"
+sha512sums="a93ff5380d1e5fcdaf1e88eb63e89f4b2228314836dc71d1591ec2699cad9f775d2ea47b46b4be2620a0b65ed7b1b4c019715d647ddda94155c96770defed23c ATARI800_4_1_0.tar.gz
+84c666a4d594b4d195a170db511f029bc0c0ef8bddf8c74847599b7b2ce168bc9bdd7960b9c7b6301a64cb00793ff3f5f79293d159cb54869f977a4cdff345f4 onscreenkeyboard.patch"
diff --git a/testing/audiofile/APKBUILD b/testing/audiofile/APKBUILD
deleted file mode 100644
index 8af13e53ec..0000000000
--- a/testing/audiofile/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=audiofile
-pkgver=0.3.6
-pkgrel=0
-arch="all"
-url="https://audiofile.68k.org/"
-pkgdesc="Silicon Graphics Audio File Library"
-license="LGPL-2.1-or-later"
-makedepends="linux-headers alsa-lib-dev"
-source="https://audiofile.68k.org/$pkgname-$pkgver.tar.gz
- gcc8-build-fixes.patch"
-subpackages="$pkgname-static $pkgname-dev $pkgname-libs $pkgname-doc"
-
-prepare() {
- default_prepare
- update_config_guess
-}
-
-build() {
- ./configure \
- --prefix=/usr
- make
-}
-
-check() {
- make check
-}
-
-package() {
- DESTDIR="$pkgdir" make install
-}
-
-sha512sums="f9a1182d93e405c21eba79c5cc40962347bff13f1b3b732d9a396e3d1675297515188bd6eb43033aaa00e9bde74ff4628c1614462456529cabba464f03c1d5fa audiofile-0.3.6.tar.gz
-60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976 gcc8-build-fixes.patch"
diff --git a/testing/audiofile/gcc8-build-fixes.patch b/testing/audiofile/gcc8-build-fixes.patch
deleted file mode 100644
index 02d96f1985..0000000000
--- a/testing/audiofile/gcc8-build-fixes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 308571e254ad30101be8c1247d2b0b64cf488386 Mon Sep 17 00:00:00 2001
-From: Michael Schwendt <mschwendt@fedoraproject.org>
-Date: Wed, 3 Feb 2016 21:56:11 +0100
-Subject: [PATCH] left shifting a negative int is undefined behaviour /
- narrowing conversion issues / for GCC 6
-
-fix left shifts for 32-bit to avoid int overflow
-
-avoid int overflow too
-
-char on ARM is unsigned by default
----
- libaudiofile/modules/SimpleModule.h | 2 +-
- test/FloatToInt.cpp | 2 +-
- test/IntToFloat.cpp | 2 +-
- test/NeXT.cpp | 14 +++++++-------
- test/Sign.cpp | 2 +-
- 5 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h
-index 03c6c69..e4cc138 100644
---- a/libaudiofile/modules/SimpleModule.h
-+++ b/libaudiofile/modules/SimpleModule.h
-@@ -123,7 +123,7 @@ struct signConverter
- typedef typename IntTypes<Format>::UnsignedType UnsignedType;
-
- static const int kScaleBits = (Format + 1) * CHAR_BIT - 1;
-- static const int kMinSignedValue = -1 << kScaleBits;
-+ static const int kMinSignedValue = 0-(1U<<kScaleBits);
-
- struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType>
- {
-diff --git a/test/FloatToInt.cpp b/test/FloatToInt.cpp
-index 0d179a8..bf491b2 100644
---- a/test/FloatToInt.cpp
-+++ b/test/FloatToInt.cpp
-@@ -115,7 +115,7 @@ TEST_F(FloatToIntTest, Int16)
- EXPECT_EQ(readData[i], expectedData[i]);
- }
-
--static const int32_t kMinInt24 = -1<<23;
-+static const int32_t kMinInt24 = 0-(1U<<23);
- static const int32_t kMaxInt24 = (1<<23) - 1;
-
- TEST_F(FloatToIntTest, Int24)
-diff --git a/test/IntToFloat.cpp b/test/IntToFloat.cpp
-index b716635..1d91b58 100644
---- a/test/IntToFloat.cpp
-+++ b/test/IntToFloat.cpp
-@@ -117,7 +117,7 @@ TEST_F(IntToFloatTest, Int16)
- EXPECT_EQ(readData[i], expectedData[i]);
- }
-
--static const int32_t kMinInt24 = -1<<23;
-+static const int32_t kMinInt24 = 0-(1U<<23);
- static const int32_t kMaxInt24 = (1<<23) - 1;
-
- TEST_F(IntToFloatTest, Int24)
-diff --git a/test/NeXT.cpp b/test/NeXT.cpp
-index 7e39850..a37cea1 100644
---- a/test/NeXT.cpp
-+++ b/test/NeXT.cpp
-@@ -37,13 +37,13 @@
-
- #include "TestUtilities.h"
-
--const char kDataUnspecifiedLength[] =
-+const signed char kDataUnspecifiedLength[] =
- {
- '.', 's', 'n', 'd',
- 0, 0, 0, 24, // offset of 24 bytes
-- 0xff, 0xff, 0xff, 0xff, // unspecified length
-+ -1, -1, -1, -1, // unspecified length
- 0, 0, 0, 3, // 16-bit linear
-- 0, 0, 172, 68, // 44100 Hz
-+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
- 0, 0, 0, 1, // 1 channel
- 0, 1,
- 0, 1,
-@@ -57,13 +57,13 @@ const char kDataUnspecifiedLength[] =
- 0, 55
- };
-
--const char kDataTruncated[] =
-+const signed char kDataTruncated[] =
- {
- '.', 's', 'n', 'd',
- 0, 0, 0, 24, // offset of 24 bytes
- 0, 0, 0, 20, // length of 20 bytes
- 0, 0, 0, 3, // 16-bit linear
-- 0, 0, 172, 68, // 44100 Hz
-+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
- 0, 0, 0, 1, // 1 channel
- 0, 1,
- 0, 1,
-@@ -152,13 +152,13 @@ TEST(NeXT, Truncated)
- ASSERT_EQ(::unlink(testFileName.c_str()), 0);
- }
-
--const char kDataZeroChannels[] =
-+const signed char kDataZeroChannels[] =
- {
- '.', 's', 'n', 'd',
- 0, 0, 0, 24, // offset of 24 bytes
- 0, 0, 0, 2, // 2 bytes
- 0, 0, 0, 3, // 16-bit linear
-- 0, 0, 172, 68, // 44100 Hz
-+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
- 0, 0, 0, 0, // 0 channels
- 0, 1
- };
-diff --git a/test/Sign.cpp b/test/Sign.cpp
-index 7275399..c339514 100644
---- a/test/Sign.cpp
-+++ b/test/Sign.cpp
-@@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16)
- EXPECT_EQ(readData[i], expectedData[i]);
- }
-
--static const int32_t kMinInt24 = -1<<23;
-+static const int32_t kMinInt24 = 0-(1U<<23);
- static const int32_t kMaxInt24 = (1<<23) - 1;
- static const uint32_t kMaxUInt24 = (1<<24) - 1;
-
---
-2.10.1
-
diff --git a/testing/ausweisapp2/APKBUILD b/testing/ausweisapp2/APKBUILD
new file mode 100644
index 0000000000..db648a5c6a
--- /dev/null
+++ b/testing/ausweisapp2/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: André Klitzing <aklitzing@gmail.com>
+# Maintainer: André Klitzing <aklitzing@gmail.com>
+pkgname=ausweisapp2
+pkgver=1.20.0
+pkgrel=0
+pkgdesc="Official authentication app for German ID card and residence permit"
+url="https://www.ausweisapp.bund.de/"
+arch="all"
+license="EUPL-1.2"
+depends="pcsc-lite pcsc-cyberjack ccid acsccid"
+makedepends="cmake pkgconf pcsc-lite-dev http-parser-dev openssl-dev
+ qt5-qtbase-dev qt5-qtsvg-dev qt5-qtwebsockets-dev qt5-qttools-dev
+ qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev"
+source="https://github.com/Governikus/AusweisApp2/releases/download/$pkgver/AusweisApp2-$pkgver.tar.gz"
+options="!check" # no upstream tests in release build
+builddir="$srcdir/AusweisApp2-$pkgver"
+
+build() {
+ mkdir -p build && cd build
+ cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr ..
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="9fe83d59a02e8ae89dae9264a94b3d1bd943b6d4843dd8a833e9bb65a0d98c6d78f7c7b69f5cae74f013b84bf580228e1a9805f8deb8fcfc33f002f73e61d4ee AusweisApp2-1.20.0.tar.gz"
diff --git a/testing/avarice/APKBUILD b/testing/avarice/APKBUILD
new file mode 100644
index 0000000000..9095163074
--- /dev/null
+++ b/testing/avarice/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+pkgname=avarice
+_releasever=2.13
+_svnver=375
+_svndate=20160229
+# The latest AVaRICE release doesn't comply on all but history environments.
+# Sadly, new release are no longer created.
+pkgver=${_releasever}_svn$_svnver
+pkgrel=1
+pkgdesc="AVaRICE interfaces with GDB and allows debugging of AVR MCUs"
+url="http://avarice.sourceforge.net/"
+arch="all"
+license="GPL-2.0-only"
+makedepends="binutils-dev libusb-dev libusb-compat-dev autoconf automake"
+depends="gdb-multiarch"
+subpackages="$pkgname-doc"
+source="http://deb.debian.org/debian/pool/main/a/avarice/avarice_$_releasever+svn$_svnver.orig.tar.xz"
+builddir="$srcdir/$pkgname-${_releasever}svn$_svndate"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="8050948ebea9cc4f9d2e90a1eb97962d6335b5a7b750b92ea16e3add4e9163a9fae10cb8c72ddc303126090472aabff21ea6286ac5e33a21800f09886b63000e avarice_2.13+svn375.orig.tar.xz"
diff --git a/testing/aws-cli/APKBUILD b/testing/aws-cli/APKBUILD
deleted file mode 100644
index 3d80a2c298..0000000000
--- a/testing/aws-cli/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-pkgname=aws-cli
-pkgver=1.16.244
-pkgrel=1
-_python="python3"
-_libname=${pkgname/-/}
-pkgdesc="Universal Command Line Interface for Amazon Web Services"
-url="https://github.com/aws/aws-cli"
-arch="noarch"
-license="Apache-2.0"
-provides=$_libname
-depends="$_python groff py3-botocore py3-jmespath py3-s3transfer py3-docutils py3-colorama py3-yaml py3-rsa"
-makedepends="$_python-dev py-setuptools"
-subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp $pkgname-bash-completion:bashcomp $pkgname-completer"
-source="aws-cli-$pkgver.tar.gz::https://github.com/aws/aws-cli/archive/$pkgver.tar.gz"
-
-build() {
- $_python setup.py build
-}
-
-check() {
- $_python setup.py check
-}
-
-package() {
- $_python setup.py install --prefix=/usr --root="$pkgdir"
- rm -fr "$pkgdir"/usr/bin/aws.cmd \
- $(find "$pkgdir" -name "*.egg-info")
-}
-
-bashcomp() {
- depends="$pkgname-completer"
- pkgdesc="$pkgdesc (bash completions)"
- install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
- mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
- mv "$pkgdir"/usr/bin/aws_bash_completer \
- "$subpkgdir"/usr/share/bash-completion/completions
-}
-
-zshcomp() {
- depends="$pkgname-completer"
- pkgdesc="$pkgdesc (zsh completions)"
- install_if="$pkgname=$pkgver-r$pkgrel zsh"
- mkdir -p "$subpkgdir"/usr/share/zsh/site-functions
- mv "$pkgdir"/usr/bin/aws_zsh_completer.sh \
- "$subpkgdir"/usr/share/zsh/site-functions
-}
-
-completer() {
- depends=""
- pkgdesc="$pkgdesc (completions helper)"
- cd "$pkgdir"
- local file; for file in $(find . -name "*completer*"); do
- echo $(dirname $file)
- mkdir -p "$subpkgdir"/$(dirname $file)
- mv "$pkgdir"/$file "$subpkgdir"/$file
- done
-}
-
-doc() {
- default_doc
- local path=$($_python -c "import sys;print(sys.path[-1])")/$_libname
- mkdir -p "$subpkgdir"/$path
- mv "$pkgdir"/$path/examples "$pkgdir"/$path/topics \
- "$subpkgdir"/$path/
-}
-sha512sums="4b79d9cb03bb16aedd192985db190412104d98c1fd25c1587ea079f5df13dc9e20b2f0d86536c0cdb5ce31da04c79d7c0a601593104cfa6e38416b75bb3c0fa4 aws-cli-1.16.244.tar.gz"
diff --git a/testing/azure-iot-sdk-c-static/001-c-utility.patch b/testing/azure-iot-sdk-c-static/001-c-utility.patch
new file mode 100644
index 0000000000..9b746a1317
--- /dev/null
+++ b/testing/azure-iot-sdk-c-static/001-c-utility.patch
@@ -0,0 +1,13 @@
+diff --git a/c-utility/pal/linux/socket_async_os.h b/c-utility/pal/linux/socket_async_os.h
+index bd59e48..1797089 100644
+--- a/c-utility/pal/linux/socket_async_os.h
++++ b/c-utility/pal/linux/socket_async_os.h
+@@ -10,7 +10,7 @@
+ #include <sys/select.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <netdb.h>
diff --git a/testing/azure-iot-sdk-c-static/APKBUILD b/testing/azure-iot-sdk-c-static/APKBUILD
new file mode 100644
index 0000000000..f4aa735711
--- /dev/null
+++ b/testing/azure-iot-sdk-c-static/APKBUILD
@@ -0,0 +1,92 @@
+# Contributor: Michael John <gosh.mike@gmail.com>
+# Maintainer: Michael John <gosh.mike@gmail.com>
+pkgname=azure-iot-sdk-c-static
+pkgver=1.3.7
+pkgrel=0
+pkgdesc="Azure IoT SDK"
+url="https://github.com/Azure/azure-iot-sdk-c"
+arch="all"
+license="MIT"
+options="!check" # make check not implemented
+makedepends="cmake openssl-dev openssl-libs-static libcurl curl-dev libuuid util-linux-dev busybox"
+_azure_c_shared_utility_commit="48f7a556865731f0e96c47eb5e9537361f24647c"
+_azure_umqtt_c_commit="65cdd1013715fb9d208c42f957eb353fbe22bafb"
+_azure_uamqp_c_commit="142cfab9d66c6f81ea0cceb635f31e00cfa51c77"
+_parson_commit="c5bb9557fe98367aa8e041c65863909f12ee76b2"
+_uhttp_commit="b67a6bfa0d018a8a23176ee214e46c208fc323c3"
+_riot_commit="bc97a5eaff53535eddbdf95b4f477c6caf3b7788"
+_utpm_commit="afe8ad192502979e2b754c7d7c0b2e7178c78d09"
+_azure_macro_utils_c_commit="5926caf4e42e98e730e6d03395788205649a3ada"
+_umock_c_commit="5e3d93112360ee2d4a622b1c48eb70896da3e8c7"
+_azure_c_testrunnerswitcher_commit="a33cd0a8524da8e45642baa112a506d4d2e5a59e"
+_azure_ctest_commit="13baad856c3cb9e5457bff52bc8c2de87f21fa07"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Azure/azure-iot-sdk-c/archive/$pkgver.tar.gz
+ $pkgname-$pkgver-azure_c_shared_utility.tar.gz::https://github.com/Azure/azure-c-shared-utility/archive/$_azure_c_shared_utility_commit.tar.gz
+ $pkgname-$pkgver-azure_umqtt_c.tar.gz::https://github.com/Azure/azure-umqtt-c/archive/$_azure_umqtt_c_commit.tar.gz
+ $pkgname-$pkgver-azure_uamqp_c.tar.gz::https://github.com/Azure/azure-uamqp-c/archive/$_azure_uamqp_c_commit.tar.gz
+ $pkgname-$pkgver-parson.tar.gz::https://github.com/kgabis/parson/archive/$_parson_commit.tar.gz
+ $pkgname-$pkgver-uhttp.tar.gz::https://github.com/Azure/azure-uhttp-c/archive/$_uhttp_commit.tar.gz
+ $pkgname-$pkgver-riot.tar.gz::https://github.com/Microsoft/RIoT/archive/$_riot_commit.tar.gz
+ $pkgname-$pkgver-utpm.tar.gz::https://github.com/Azure/azure-utpm-c/archive/$_utpm_commit.tar.gz
+ $pkgname-$pkgver-azure_macro_utils_c.tar.gz::https://github.com/Azure/azure-macro-utils-c/archive/$_azure_macro_utils_c_commit.tar.gz
+ $pkgname-$pkgver-umock_c.tar.gz::https://github.com/Azure/umock-c/archive/$_umock_c_commit.tar.gz
+ $pkgname-$pkgver-azure_c_testrunnerswitcher.tar.gz::https://github.com/Azure/azure-c-testrunnerswitcher/archive/$_azure_c_testrunnerswitcher_commit.tar.gz
+ $pkgname-$pkgver-azure_ctest.tar.gz::https://github.com/Azure/azure-ctest/archive/$_azure_ctest_commit.tar.gz
+ 001-c-utility.patch
+ "
+builddir="$srcdir/${pkgname%-static}-$pkgver"
+
+prepare() {
+ # adding submodules needed by azure-iot-sdk-c
+ mv "$srcdir"/azure-c-shared-utility-$_azure_c_shared_utility_commit/* "$builddir"/c-utility/
+ mv "$srcdir"/azure-umqtt-c-$_azure_umqtt_c_commit/* "$builddir"/umqtt/
+ mv "$srcdir"/azure-uamqp-c-$_azure_uamqp_c_commit/* "$builddir"/uamqp/
+ mv "$srcdir"/parson-$_parson_commit/* "$builddir"/deps/parson/
+ mv "$srcdir"/azure-uhttp-c-$_uhttp_commit/* "$builddir"/deps/uhttp/
+ mv "$srcdir"/RIoT-$_riot_commit/* "$builddir"/provisioning_client/deps/RIoT/
+ mv "$srcdir"/azure-utpm-c-$_utpm_commit/* "$builddir"/provisioning_client/deps/utpm/
+ mv "$srcdir"/azure-macro-utils-c-$_azure_macro_utils_c_commit/* "$builddir"/deps/azure-macro-utils-c/
+ mv "$srcdir"/umock-c-$_umock_c_commit/* "$builddir"/deps/umock-c/
+ mv "$srcdir"/azure-c-testrunnerswitcher-$_azure_c_testrunnerswitcher_commit/* "$builddir"/deps/azure-c-testrunnerswitcher/
+ mv "$srcdir"/azure-ctest-$_azure_ctest_commit/* "$builddir"/deps/azure-ctest/
+
+ default_prepare
+}
+
+build() {
+ mkdir -p cmake-build
+ cd cmake-build
+
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ -Duse_amqp=OFF \
+ ${CMAKE_CROSSOPTS} ..
+ cmake --build .
+}
+
+package() {
+ cd "$builddir"/cmake-build
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="a6e9b15d42d91c7c5bd553317af1e4cc1bd84b87da447e476ad2c851db264aaab21da8d1816542cb7a6f12f0ca34a7e09349f6d0af3517567fdf3ff904ce48b3 azure-iot-sdk-c-static-1.3.7.tar.gz
+c20074707e8601e090ee8daac1d96fdfb4f60ac60fd9c824dad81aa4c2f22b04733c82c01c1ae92110c26871b81674e8771d9ed65081f1c0c197a362275a28f1 azure-iot-sdk-c-static-1.3.7-azure_c_shared_utility.tar.gz
+8cd33dcde966132e2aa0c6d931e75f9bcdc5734d57d8f6bb8a922711b0b63c2f0e58d379fe92371886387dfbb0b8c117b512873363eb76cf22fa985dbf11d52e azure-iot-sdk-c-static-1.3.7-azure_umqtt_c.tar.gz
+80f95bc969c2e50124622561b5f939e981a8d317e3e9514e52ce020f0f20a125622bf914f16927edafc7ff3c878fb1d6a28f4f5e66bda52dcc8aa2dc34761f73 azure-iot-sdk-c-static-1.3.7-azure_uamqp_c.tar.gz
+8c9a4ebd4e2cccac17b21bc8e51e38b185b5b87ba7fb77321158751978bef2f40166acd8265e8b0589fb76b93998a40a09d5cd2030e59c3f01c6c4727b8abc0b azure-iot-sdk-c-static-1.3.7-parson.tar.gz
+75fafe242324bb2fc72befdd06427350e6f99aec9496fdf38b9660e7965fad89276ee543f36c3ba3360fc99b8301e74e2c1723d17f39e8471beee3e32cacb348 azure-iot-sdk-c-static-1.3.7-uhttp.tar.gz
+e2655a4846c7ae15e1a0d3638b49e99dcb1d50b6aeb6ac9a85498be66e904af84d86ee1d739fa3122e539a5a1fdc125dcb679098be040f386bf4ec63c0679570 azure-iot-sdk-c-static-1.3.7-riot.tar.gz
+75b7ac6a2686bb09fe0ff17c159d2b7043dca37a63f91939904e187955ce63c1736393bf16674ff25443cf1898a0b319ae4a326a12af5b733bc7fd54c86c0584 azure-iot-sdk-c-static-1.3.7-utpm.tar.gz
+97621f276657af976c4022c9600540ecae2287b3b386b9e097d661828a62c120348d354b3f86f3ef4d49f3c54830887662d3910ed5cec4a634949fa389b4ad55 azure-iot-sdk-c-static-1.3.7-azure_macro_utils_c.tar.gz
+9f5c0ce782f66a41e702e2d54dcff92b07b30e7c2be0ee2c63a56e2bff0c26a1de7f77abcb2a964d668deea817dcb3a4771e328707c2d982c23526465c950608 azure-iot-sdk-c-static-1.3.7-umock_c.tar.gz
+c42350f39116dfdc3788d596ca22cf7e6040745e795c11ca1f6cb4fd63eeb2d913e89a1a50e8170612dea28b2a01306e04d865bd26046a10458ecffac3c0b6a1 azure-iot-sdk-c-static-1.3.7-azure_c_testrunnerswitcher.tar.gz
+2f2dca81f101c33bf0a99c5e86012c0830686797b2934c7972c411f108ce0c31570988321cc58aabb3fcc0a2ecefbdab9dc950c7f922065b7bde8eb3207f2059 azure-iot-sdk-c-static-1.3.7-azure_ctest.tar.gz
+419f71afc6be9e9ee27c11d5bdc7cad3e417ac3bd2d8cbb2a706c9be81ff88d99fb810bfc84a2424fefb2076e27f13bfaf14370e450c08ac09e8ebadfe1ac5cd 001-c-utility.patch"
diff --git a/testing/b3sum/APKBUILD b/testing/b3sum/APKBUILD
new file mode 100644
index 0000000000..f941a04500
--- /dev/null
+++ b/testing/b3sum/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
+pkgname=b3sum
+pkgver=0.1.2
+pkgrel=0
+pkgdesc="Command line implementation of the BLAKE3 hash function"
+url="https://blake3.io"
+arch="all !s390x !armhf" # armhf: 'vaddq_u32': target specific option mismatch
+license="CC0-1.0 OR Apache-2.0"
+makedepends="cargo"
+source="b3sum-$pkgver.tar.gz::https://crates.io/api/v1/crates/b3sum/$pkgver/download"
+
+case "$CARCH" in
+ arm*) _features="c_neon rayon" ;;
+ x86_64) _features="c_avx512 rayon" ;;
+ *) _features="rayon" ;;
+esac
+
+build() {
+ cargo build --release --locked --no-default-features --features="$_features"
+}
+
+check() {
+ cargo test --release --locked --no-default-features --features="$_features"
+}
+
+package() {
+ cargo install --path . --root="$pkgdir/usr" --no-default-features --features "$_features"
+ rm "$pkgdir"/usr/.crates.toml
+}
+
+sha512sums="cbbd57c80f1ad4dac7dc29f8e0755547574036a7ce9017fb0f798af04938c0e2652f7c8c9a62a3e9379a3eeed7ee17dd261eac854123721432ed84f09c372e0b b3sum-0.1.2.tar.gz"
diff --git a/testing/badwolf/APKBUILD b/testing/badwolf/APKBUILD
new file mode 100644
index 0000000000..f42381da72
--- /dev/null
+++ b/testing/badwolf/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Haelwenn (lanodan) Monnier <contact+alpine@hacktivis.me>
+pkgname=badwolf
+pkgver=0.4.0
+pkgrel=0
+pkgdesc="A minimalist and privacy-oriented WebKit browser"
+url="https://hacktivis.me/projects/badwolf"
+arch="all"
+license="BSD-3-Clause"
+makedepends="webkit2gtk-dev"
+subpackages="$pkgname-doc"
+options="!check" # unit tests coming in next release
+source="https://hacktivis.me/releases/badwolf-$pkgver.tar.gz"
+
+build() {
+ make PREFIX=/usr CFLAGS="$CFLAGS"
+}
+
+package() {
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="572e1c18223ded5989da9c47e42c9dcbf66903e38b672e33b098cc3f84965d9da8e0a8b71e5ec88f17879c8d2f931d9625ca26a9c5ae81cc925d62fbf2abd4f1 badwolf-0.4.0.tar.gz"
diff --git a/testing/barman/APKBUILD b/testing/barman/APKBUILD
index f753463577..202993f484 100644
--- a/testing/barman/APKBUILD
+++ b/testing/barman/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=barman
-pkgver=2.9
-pkgrel=1
+pkgver=2.10
+pkgrel=0
pkgdesc="Backup and recovery manager for PostgreSQL"
url="http://www.pgbarman.org"
arch="noarch"
@@ -27,4 +27,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="13122f3437b84b1369dbccac25f4e5afc335d7ba0c8b9d807bb8c2c67c0a744999c8176e9079335e8199048b7a18bff3d74f5dafe9ea388662fa7f4259f463bd barman-2.9.tar.gz"
+sha512sums="64e9386603158bfe19723ec273f8fb3e6856d76315a3e3c31ef489fcb8caaa44a019fff6087dd3d8810661ca8c613552680e5a10e9d673ef96962340dd12dd6a barman-2.10.tar.gz"
diff --git a/testing/bazel/APKBUILD b/testing/bazel/APKBUILD
new file mode 100644
index 0000000000..01c061d060
--- /dev/null
+++ b/testing/bazel/APKBUILD
@@ -0,0 +1,97 @@
+# Contributor: Oleg Titov <oleg.titov@gmail.com>
+# Maintainer: Oleg Titov <oleg.titov@gmail.com>
+pkgname=bazel
+pkgver=2.0.0
+pkgrel=5
+pkgdesc="A fast, scalable, multi-language and extensible build system"
+url="https://bazel.build"
+arch="x86_64"
+license="Apache-2.0"
+depends="bash libarchive openjdk8 zip unzip"
+makedepends="python3 linux-headers protobuf"
+options="!strip"
+subpackages="
+ $pkgname-doc
+ $pkgname-bash-completion:bashcomp:noarch
+ $pkgname-zsh-completion:zshcomp:noarch
+ $pkgname-examples::noarch
+ "
+source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip
+ bash_completion.patch
+ python3.patch"
+
+build() {
+ export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+ export PYTHON_BIN_PATH=/usr/bin/python3
+
+ env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" \
+ bash ./compile.sh
+
+ ./output/bazel shutdown
+
+ ./scripts/generate_bash_completion.sh \
+ --bazel=output/bazel \
+ --output=output/bazel-complete.bash \
+ --prepend=scripts/bazel-complete-header.bash \
+ --prepend=scripts/bazel-complete-template.bash
+
+ echo startup --server_javabase=$JAVA_HOME \
+ >> scripts/packages/bazel.bazelrc
+}
+
+check() {
+ ./output/bazel test \
+ --verbose_failures \
+ --spawn_strategy=standalone \
+ --genrule_strategy=standalone \
+ --verbose_test_summary \
+ --test_verbose_timeout_warnings \
+ examples/cpp:hello-success_test
+
+ ./output/bazel shutdown
+}
+
+package() {
+ install -Dm755 ./scripts/packages/bazel.sh "$pkgdir"/usr/bin/bazel
+ install -Dm755 ./output/bazel "$pkgdir"/usr/bin/bazel-real
+ install -Dm755 ./scripts/packages/bazel.bazelrc \
+ "$pkgdir"/etc/bazel.bazelrc
+
+ install -m644 -D -t "$pkgdir"/usr/share/doc/$pkgname README.md
+}
+
+bashcomp() {
+ depends=""
+ pkgdesc="Bash completion for $pkgname"
+ install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+
+ mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+ mv "$builddir"/output/bazel-complete.bash \
+ "$subpkgdir"/usr/share/bash-completion/completions/bazel
+}
+
+zshcomp() {
+ depends=""
+ pkgdesc="Zsh completion for $pkgname"
+ install_if="$pkgname=$pkgver-r$pkgrel zsh"
+
+ mkdir -p "$subpkgdir"/usr/share/zsh/site-functions
+ mv "$builddir"/scripts/zsh_completion/_bazel \
+ "$subpkgdir"/usr/share/zsh/site-functions/_bazel
+}
+
+examples() {
+ mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"
+ for d in examples third_party tools; do
+ mv "$builddir/$d" "$subpkgdir/usr/share/doc/$pkgname"
+ done
+}
+
+unpack() {
+ mkdir -p "$builddir"
+ unzip "$srcdir"/bazel-$pkgver-dist.zip -d "$builddir" > /dev/null
+}
+
+sha512sums="db609e9d0ee0cdbfb999de850db17907af02dc26e605f4617dfeb2fbac5c30c4c0a9f48c6ba3673ffe8babb5b9e157cc51c32832015b85ed279b6b160506cdae bazel-2.0.0-dist.zip
+6eb1fcb553518348f5c2dacf239377dbaa2593b751ba98c0c257d0138c55b159891fa3744168a6cff8b305758c64f9153cdc01dd3394b5fff2168319188288df bash_completion.patch
+0f8fddb7a43f6382a003037e1ba0cfc0e7f510f341a4a29c73e13cc7f64862d6156e14111005f300b0dad22815bd95b3670f8e0d33ce3f4388b0990bbbc5c5e6 python3.patch"
diff --git a/testing/bazel/bash_completion.patch b/testing/bazel/bash_completion.patch
new file mode 100644
index 0000000000..74cedc6a77
--- /dev/null
+++ b/testing/bazel/bash_completion.patch
@@ -0,0 +1,13 @@
+Bash completion patch to fix error in expr
+
+--- a/scripts/generate_bash_completion.sh.orig
++++ a/scripts/generate_bash_completion.sh
+@@ -34,7 +34,7 @@
+ }
+
+ get_optarg() {
+- expr -- "${1}" : "[^=]*=\\(.*\\)"
++ expr "${1}" : "[^=]*=\\(.*\\)"
+ }
+
+ append=
diff --git a/testing/bazel/python3.patch b/testing/bazel/python3.patch
new file mode 100644
index 0000000000..e427ba83ad
--- /dev/null
+++ b/testing/bazel/python3.patch
@@ -0,0 +1,36 @@
+Some scripts rely on /usr/bin/pyhton.
+
+python2 package provides /usr/bin/python as a link to /usr/bin/python2
+so there is no any issue here, but we do not want python2.
+
+python3 package do not provide /usr/bin/python, only /usr/bin/python3.
+
+To make things work we need to change shebang '#!/usr/bin/env python' to
+'#!/usr/bin/env python3'.
+
+This is a longstanding issue, one of the first traces to it could be seen
+here [1] and here [2].
+
+[1] https://github.com/bazelbuild/bazel/issues/544
+[2] https://github.com/bazelbuild/bazel/issues/8446
+
+
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ from __future__ import absolute_import
+ from __future__ import division
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
+@@ -241,7 +241,7 @@
+ .addOutput(executable)
+ .setShellCommand(
+ shExecutable,
+- "echo '#!/usr/bin/env python' | cat - "
++ "echo '#!/usr/bin/env python3' | cat - "
+ + zipFile.getExecPathString()
+ + " > "
+ + executable.getExecPathString())
diff --git a/testing/bemenu/APKBUILD b/testing/bemenu/APKBUILD
index 9bf979185d..e214df9f8b 100644
--- a/testing/bemenu/APKBUILD
+++ b/testing/bemenu/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Cosmo Borsky <me@cosmoborsky.com>
# Maintainer: Cosmo Borsky <me@cosmoborsky.com>
pkgname="bemenu"
-pkgver="0.2.0"
+pkgver="0.3.0"
pkgrel=0
pkgdesc="Dynamic menu library and client program inspired by dmenu with support for wayland compositors"
url="https://github.com/Cloudef/bemenu"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="05ddc79b2f4152fe4a3cbbec500f21f0b3e045aeb0e18bd5749acfe16ed41d7d933accf68a4793345cb20543620894847cec34236684d8cb4d42f20454d31b4e bemenu-0.2.0.tar.gz"
+sha512sums="7e68d11954517f41c9669055c28b375c4f13ddfee8aae6a8e67c3282fe9118229d9ab072dc5e264e4204803b1a5ab715c6a5c9565ad4b7436cc172b9e455c05b bemenu-0.3.0.tar.gz"
diff --git a/testing/bfs/APKBUILD b/testing/bfs/APKBUILD
index 22b46ccee6..b04653d315 100644
--- a/testing/bfs/APKBUILD
+++ b/testing/bfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: dai9ah <dai9ah@protonmail.com>
# Maintainer: dai9ah <dai9ah@protonmail.com>
pkgname=bfs
-pkgver=1.5.1
+pkgver=1.5.2
pkgrel=0
pkgdesc="Breadth-first variant of the UNIX find command"
url="https://github.com/tavianator/bfs"
@@ -26,4 +26,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f501f2acaa19c772a350863539030c60299c3b001ebd3d473add4e8975f4fda3a79a6a524a0d1fbf729a66a943557cb66aa6d65a8aae41ab88b81a7740b17874 bfs-1.5.1.tar.gz"
+sha512sums="0b079521ead825bb3b45841cae2016a2bd993d5e2a9f8d0988eade10711f590bad28a18e0363f1e49252b8fa0200d579dceceff187b4f374b73eb9c268568739 bfs-1.5.2.tar.gz"
diff --git a/testing/binutils-cross-embedded/APKBUILD b/testing/binutils-cross-embedded/APKBUILD
index 79a3ebcac1..ad087584f1 100644
--- a/testing/binutils-cross-embedded/APKBUILD
+++ b/testing/binutils-cross-embedded/APKBUILD
@@ -18,7 +18,7 @@ for target in $_targets; do
targetnorm="${target//-/_}"
subpackages="$_pkgbase-$target:$targetnorm $subpackages"
done
-source="http://ftp.gnu.org/gnu/$_pkgbase/$_pkgbase-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/$_pkgbase/$_pkgbase-$pkgver.tar.bz2"
builddir="$srcdir/$_pkgbase-$pkgver"
diff --git a/testing/binwalk/APKBUILD b/testing/binwalk/APKBUILD
index 67475a77c7..cf94300151 100644
--- a/testing/binwalk/APKBUILD
+++ b/testing/binwalk/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=binwalk
pkgver=2.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Fast, easy to use tool for analyzing and extracting firmware images"
url="https://github.com/ReFirmLabs/binwalk/"
arch="noarch"
license="MIT"
-depends="py3-crypto python3"
+depends="py3-pycryptodome python3"
source="$pkgname-$pkgver.tar.gz::https://github.com/ReFirmLabs/binwalk/archive/v$pkgver.tar.gz"
build() {
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index 0ac6616616..6253e34f78 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -1,43 +1,43 @@
# Contributor: Mark Riedesel <mark@klowner.com>
# Maintainer: Mark Riedesel <mark@klowner.com>
pkgname=blender
-pkgver=2.79b
+pkgver=2.81a
_pkgver=${pkgver/[a-z]}
-pkgrel=6
+pkgrel=0
pkgdesc="3D Creation/Animation/Publishing System"
url="https://www.blender.org/"
-arch="x86_64"
+#arch="x86_64"
license="GPL-2.0-or-later"
depends="blender-shared=$pkgver-r$pkgrel"
-makedepends="cmake libx11-dev jpeg-dev zlib-dev libpng-dev freetype-dev python3-dev
+makedepends="cmake libx11-dev libjpeg-turbo-dev zlib-dev libpng-dev freetype-dev python3-dev
openimageio-dev opencolorio-dev glew-dev openal-soft-dev ffmpeg-dev
fftw-dev tiff-dev mesa-dev libxi-dev libsndfile-dev libxmu-dev boost-dev
- openexr-dev py3-numpy-dev opensubdiv-dev"
+ openexr-dev py3-numpy-dev opensubdiv-dev lzo-dev libxrender-dev openjpeg-dev"
subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless $pkgname-player py3-$pkgname:python"
-source="http://download.blender.org/source/${pkgname}-${pkgver}.tar.gz
- blender-2.78a-musl.patch
- gcc8.patch
- ffmpeg4.0.patch
+source="https://download.blender.org/source/blender-$_pkgver.tar.xz
+ musl-fixes.patch
+ python-3.8.patch
+ openimageio-lib.patch
"
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$_pkgver
build() {
# Headless
cd "$builddir"
- mkdir "$builddir"/build-headless
+ mkdir -p "$builddir"/build-headless
cd "$builddir"/build-headless
_build -C../build_files/cmake/config/blender_headless.cmake
# Full
cd "$builddir"
- mkdir "$builddir"/build-full
+ mkdir -p "$builddir"/build-full
cd "$builddir"/build-full
_build -C../build_files/cmake/config/blender_full.cmake
# Python module
cd "$builddir"
- mkdir "$builddir"/build-py
+ mkdir -p "$builddir"/build-py
cd "$builddir"/build-py
_build -C../build_files/cmake/config/bpy_module.cmake
@@ -52,10 +52,11 @@ _build() {
-DWITH_PYTHON_INSTALL:BOOL=OFF \
-DWITH_INSTALL_PORTABLE:BOOL=OFF \
-DWITH_OPENCOLORIO:BOOL=ON \
+ -DWITH_IMAGE_OPENEXR=ON \
+ -DWITH_IMAGE_OPENJPEG=ON \
+ -DWITH_TBB:BOOL=OFF \
+ -DWITH_SYSTEM_LZO=ON \
-DPYTHON_VERSION=$PY_VERSION \
- -DPYTHON_LIBPATH=/usr/lib \
- -DPYTHON_LIBRARY=python${PY_VERSION}m \
- -DPYTHON_INCLUDE_DIRS=/usr/include/python${PY_VERSION}m \
-DNO_EXECINFO:BOOL=ON
make
}
@@ -111,7 +112,7 @@ python() {
ln -s /usr/share/blender/${_pkgver} "$subpkgdir"/usr/lib/python${PY_VERSION}/site-packages/${_pkgver}
}
-sha512sums="2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f blender-2.79b.tar.gz
-47e8a6a017cea8c004d7e4205f201f167dd81ba95a4aadf9e55d01e81cc4a23e4d7f1d6aa7a6d1300fe3a5f5c98c664f584e7551fcde7fb1137147e2438f7ed5 blender-2.78a-musl.patch
-59cc54ddc772ed02db8e6ef94b18bad5c7ec8c1bb8cdc2231a6747063ac386f31a77e58322acf32ef4d5d9278ac0449bbf78e440134bfb612d1c86bb67f9df55 gcc8.patch
-446dd46557c7c976a68010c62e04693c61171980abea1cd0a900b00bcc3d525b83bb6ee200739623110e592e37e8f4783a18f234b40e9f85483830ea9785640d ffmpeg4.0.patch"
+sha512sums="b7eed47afc4bdb87e9e8a579565935ae8489459197fb9b5978285cfe255ea4fc4151a1178526857921f3b2d54cf63b68dda66586565340f7bfd4274b82e7e9ff blender-2.81.tar.xz
+f931712c27d5012f1fb01b97107eba9e3bc195c0aafb0a1e782030b5eedf8beb4d15153b46464492098974e17e0b0a1659a078e811423b5a27cdd350209d90c3 musl-fixes.patch
+d95456d26bcf0b28776d4b36a20a210235b11b2ee32b6f051c88d08199792484811573b55f1850f3c1cda816d491ef332de1fe81421b761a7b4be515df726b4e python-3.8.patch
+42ed74bfae38721b7e8301dfe00a97cba0b25886cb39017620d442f9403386b5ca68daa0907d003e210ae01321986772c9721ea3de512701e6565d60a19f0c8e openimageio-lib.patch"
diff --git a/testing/blender/blender-2.78a-musl.patch b/testing/blender/blender-2.78a-musl.patch
deleted file mode 100644
index 1ffd09cd57..0000000000
--- a/testing/blender/blender-2.78a-musl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ru blender-2.78.orig/CMakeLists.txt blender-2.78a/CMakeLists.txt
---- blender-2.78.orig/CMakeLists.txt 2016-10-25 12:09:56.000000000 +0000
-+++ blender-2.78a/CMakeLists.txt 2017-02-07 14:50:03.967828817 +0000
-@@ -181,6 +181,18 @@
- set(_init_SDL OFF)
- set(_init_FFTW3 OFF)
- set(_init_OPENSUBDIV OFF)
-+ # musl-libc related checks (missing execinfo.h, and feenableexcept())
-+ include(CheckIncludeFiles)
-+ check_include_files(execinfo.h HAVE_EXECINFO_H)
-+ if (HAVE_EXECINFO_H)
-+ add_definitions(-DHAVE_EXECINFO_H)
-+ endif()
-+
-+ include(CheckLibraryExists)
-+ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+ if (HAVE_FEENABLEEXCEPT)
-+ add_definitions(-DHAVE_FEENABLEEXCEPT)
-+ endif()
- elseif(WIN32)
- set(_init_JACK OFF)
- elseif(APPLE)
-diff -ru blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h
---- blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h 2016-09-28 09:26:55.000000000 +0000
-+++ blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h 2017-02-07 14:44:35.213040733 +0000
-@@ -52,7 +52,7 @@
- #undef HAVE_MALLOC_STATS
- #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
-
--#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
-+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__)
- # include <malloc.h>
- # define HAVE_MALLOC_STATS
- #elif defined(__FreeBSD__)
-diff -ru blender-2.78.orig/source/blender/blenlib/intern/system.c blender-2.78a/source/blender/blenlib/intern/system.c
---- blender-2.78.orig/source/blender/blenlib/intern/system.c 2016-10-25 09:59:23.000000000 +0000
-+++ blender-2.78a/source/blender/blenlib/intern/system.c 2017-02-07 14:44:35.213040733 +0000
-@@ -31,7 +31,7 @@
- #include "MEM_guardedalloc.h"
-
- /* for backtrace */
--#if defined(__linux__) || defined(__APPLE__)
-+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__)
- # include <execinfo.h>
- #elif defined(WIN32)
- # include <windows.h>
-@@ -77,7 +77,7 @@
- {
- /* ------------- */
- /* Linux / Apple */
--#if defined(__linux__) || defined(__APPLE__)
-+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__)
-
- #define SIZE 100
- void *buffer[SIZE];
-diff -ru blender-2.78.orig/source/creator/creator_signals.c blender-2.78a/source/creator/creator_signals.c
---- blender-2.78.orig/source/creator/creator_signals.c 2016-10-24 14:13:56.000000000 +0000
-+++ blender-2.78a/source/creator/creator_signals.c 2017-02-07 14:47:01.888625973 +0000
-@@ -309,7 +309,7 @@
- * set breakpoints on sig_handle_fpe */
- signal(SIGFPE, sig_handle_fpe);
-
--# if defined(__linux__) && defined(__GNUC__)
-+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
- feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
- # endif /* defined(__linux__) && defined(__GNUC__) */
- # if defined(OSX_SSE_FPE)
diff --git a/testing/blender/ffmpeg4.0.patch b/testing/blender/ffmpeg4.0.patch
deleted file mode 100644
index 4fd7801bc3..0000000000
--- a/testing/blender/ffmpeg4.0.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
-index e9eea195208..84aea330313 100644
---- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
-+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
-@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr<AUD_Buffer> buffer) :
- m_membuffer(buffer),
- m_membufferpos(0)
- {
-- m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
-+ m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE));
-
-- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this,
-+ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this,
- read_packet, NULL, seek_packet);
-
- if(!m_aviocontext)
-diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
-index 3f95ac7a4da..2c2f0916406 100644
---- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
-+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
-@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
- try
- {
- if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER)
-- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id);
- if(!codec)
-@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
- if(avcodec_open2(m_codecCtx, codec, NULL))
- AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
-
-- m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
-+ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE);
- int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs));
-
- if(m_codecCtx->frame_size <= 1) {
-- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
-+ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
- m_input_buffer.resize(m_input_size * samplesize);
- }
- else
-diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
-index d7fcd896e11..9e82df17dce 100644
---- a/source/blender/blenkernel/intern/writeffmpeg.c
-+++ b/source/blender/blenkernel/intern/writeffmpeg.c
-@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
- c->rc_buffer_aggressivity = 1.0;
- #endif
-
-- c->me_method = ME_EPZS;
--
- codec = avcodec_find_encoder(c->codec_id);
- if (!codec)
- return NULL;
-@@ -682,14 +680,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
- )
- {
- PRINT("Using global header\n");
-- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
-
- /* Determine whether we are encoding interlaced material or not */
- if (rd->mode & R_FIELDS) {
- PRINT("Encoding interlaced video\n");
-- c->flags |= CODEC_FLAG_INTERLACED_DCT;
-- c->flags |= CODEC_FLAG_INTERLACED_ME;
-+ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
-+ c->flags |= AV_CODEC_FLAG_INTERLACED_ME;
- }
-
- /* xasp & yasp got float lately... */
-@@ -779,7 +777,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
- }
-
- if (of->oformat->flags & AVFMT_GLOBALHEADER) {
-- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
-
- set_ffmpeg_properties(rd, c, "audio", &opts);
-@@ -798,14 +796,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
- st->codec->time_base.den = st->codec->sample_rate;
-
- #ifndef FFMPEG_HAVE_ENCODE_AUDIO2
-- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE;
-+ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE;
- #endif
-
- if (c->frame_size == 0)
- // used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
- // not sure if that is needed anymore, so let's try out if there are any
- // complaints regarding some ffmpeg versions users might have
-- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels;
-+ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels;
- else {
- context->audio_input_samples = c->frame_size;
- #ifndef FFMPEG_HAVE_ENCODE_AUDIO2
-diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
-index eaf4dfd84b4..9c2f42feb52 100644
---- a/source/blender/imbuf/intern/indexer.c
-+++ b/source/blender/imbuf/intern/indexer.c
-@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg(
- av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0);
-
- if (rv->of->flags & AVFMT_GLOBALHEADER) {
-- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- }
-
- if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
diff --git a/testing/blender/gcc8.patch b/testing/blender/gcc8.patch
deleted file mode 100644
index c3aafd8593..0000000000
--- a/testing/blender/gcc8.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/intern/itasc/kdl/tree.hpp b/intern/itasc/kdl/tree.hpp
-index c8a253fc901..bd35f82d185 100644
---- a/intern/itasc/kdl/tree.hpp
-+++ b/intern/itasc/kdl/tree.hpp
-@@ -1,177 +1,177 @@
- // Copyright (C) 2007 Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
-
- // Version: 1.0
- // Author: Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
- // Maintainer: Ruben Smits <ruben dot smits at mech dot kuleuven dot be>
- // URL: http://www.orocos.org/kdl
-
- // This library is free software; you can redistribute it and/or
- // modify it under the terms of the GNU Lesser General Public
- // License as published by the Free Software Foundation; either
- // version 2.1 of the License, or (at your option) any later version.
-
- // This library is distributed in the hope that it will be useful,
- // but WITHOUT ANY WARRANTY; without even the implied warranty of
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- // Lesser General Public License for more details.
-
- // You should have received a copy of the GNU Lesser General Public
- // License along with this library; if not, write to the Free Software
- // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- #ifndef KDL_TREE_HPP
- #define KDL_TREE_HPP
-
- #include "segment.hpp"
- #include "chain.hpp"
-
- #include <string>
- #include <map>
- #include <Eigen/Core>
-
- namespace KDL
- {
- //Forward declaration
- class TreeElement;
- // Eigen allocator is needed for alignment of Eigen data types
-- typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
-+ typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
-
- class TreeElement
- {
- public:
- TreeElement():q_nr(0),parent(0)
- {};
- public:
- Segment segment;
- unsigned int q_nr;
- SegmentMap::value_type const *parent;
- std::vector<SegmentMap::const_iterator > children;
- TreeElement(const Segment& segment_in,const SegmentMap::value_type& parent_in,unsigned int q_nr_in)
- {
- q_nr=q_nr_in;
- segment=segment_in;
- parent=&parent_in;
- };
- static TreeElement Root()
- {
- return TreeElement();
- };
- };
-
- /**
- * \brief This class encapsulates a <strong>tree</strong>
- * kinematic interconnection structure. It is build out of segments.
- *
- * @ingroup KinematicFamily
- */
- class Tree
- {
- private:
- SegmentMap segments;
- unsigned int nrOfJoints;
- unsigned int nrOfSegments;
-
- bool addTreeRecursive(SegmentMap::const_iterator root, const std::string& tree_name, const std::string& hook_name);
-
- public:
- /**
- * The constructor of a tree, a new tree is always empty
- */
- Tree();
- Tree(const Tree& in);
- Tree& operator= (const Tree& arg);
-
- /**
- * Adds a new segment to the end of the segment with
- * hook_name as segment_name
- *
- * @param segment new segment to add
- * @param segment_name name of the new segment
- * @param hook_name name of the segment to connect this
- * segment with.
- *
- * @return false if hook_name could not be found.
- */
- bool addSegment(const Segment& segment, const std::string& segment_name, const std::string& hook_name);
-
- /**
- * Adds a complete chain to the end of the segment with
- * hook_name as segment_name. Segment i of
- * the chain will get chain_name+".Segment"+i as segment_name.
- *
- * @param chain Chain to add
- * @param chain_name name of the chain
- * @param hook_name name of the segment to connect the chain with.
- *
- * @return false if hook_name could not be found.
- */
- bool addChain(const Chain& chain, const std::string& chain_name, const std::string& hook_name);
-
- /**
- * Adds a complete tree to the end of the segment with
- * hookname as segment_name. The segments of the tree will get
- * tree_name+segment_name as segment_name.
- *
- * @param tree Tree to add
- * @param tree_name name of the tree
- * @param hook_name name of the segment to connect the tree with
- *
- * @return false if hook_name could not be found
- */
- bool addTree(const Tree& tree, const std::string& tree_name,const std::string& hook_name);
-
- /**
- * Request the total number of joints in the tree.\n
- * <strong> Important:</strong> It is not the same as the
- * total number of segments since a segment does not need to have
- * a joint.
- *
- * @return total nr of joints
- */
- unsigned int getNrOfJoints()const
- {
- return nrOfJoints;
- };
-
- /**
- * Request the total number of segments in the tree.
- * @return total number of segments
- */
- unsigned int getNrOfSegments()const {return nrOfSegments;};
-
- /**
- * Request the segment of the tree with name segment_name.
- *
- * @param segment_name the name of the requested segment
- *
- * @return constant iterator pointing to the requested segment
- */
- SegmentMap::const_iterator getSegment(const std::string& segment_name)const
- {
- return segments.find(segment_name);
- };
-
- SegmentMap::value_type const* getSegmentPtr(const std::string& segment_name)const
- {
- SegmentMap::const_iterator it = segments.find(segment_name);
-
- if (it == segments.end())
- return 0;
-
- return &*it;
- };
-
- const SegmentMap& getSegments()const
- {
- return segments;
- }
-
- virtual ~Tree(){};
- };
- }
- #endif
-
-
-
-
-
-diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h
-index 6e669701f3b..9ffe391666a 100644
---- a/intern/cycles/util/util_sseb.h
-+++ b/intern/cycles/util/util_sseb.h
-@@ -116,7 +116,7 @@ __forceinline const sseb unpacklo( const sseb& a, const sseb& b ) { return _mm_u
- __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
-
- template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
-- return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
-+ return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
- }
-
- template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
diff --git a/testing/blender/musl-fixes.patch b/testing/blender/musl-fixes.patch
new file mode 100644
index 0000000000..89ecee7087
--- /dev/null
+++ b/testing/blender/musl-fixes.patch
@@ -0,0 +1,78 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c2e4f8..5b7b747 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,6 +185,18 @@ if(UNIX AND NOT APPLE)
+ set(_init_OPENSUBDIV OFF)
+ set(_init_OPENVDB OFF)
+ set(_init_OPENIMAGEDENOISE OFF)
++ # musl-libc related checks (missing execinfo.h, and feenableexcept())
++ include(CheckIncludeFiles)
++ check_include_files(execinfo.h HAVE_EXECINFO_H)
++ if (HAVE_EXECINFO_H)
++ add_definitions(-DHAVE_EXECINFO_H)
++ endif()
++
++ include(CheckLibraryExists)
++ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
++ if (HAVE_FEENABLEEXCEPT)
++ add_definitions(-DHAVE_FEENABLEEXCEPT)
++ endif()
+ elseif(WIN32)
+ set(_init_JACK OFF)
+ elseif(APPLE)
+diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
+index e6e0907..6868a88 100644
+--- a/intern/guardedalloc/intern/mallocn_intern.h
++++ b/intern/guardedalloc/intern/mallocn_intern.h
+@@ -40,7 +40,8 @@
+ #undef HAVE_MALLOC_STATS
+ #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
+
+-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) \
++ || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
+ defined(__GLIBC__)
+ # include <malloc.h>
+ # define HAVE_MALLOC_STATS
+diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
+index 941c2b6..2b710a4 100644
+--- a/source/blender/blenlib/intern/system.c
++++ b/source/blender/blenlib/intern/system.c
+@@ -38,7 +38,9 @@
+ # include <dbghelp.h>
+ # pragma warning(pop)
+ #else
+-# include <execinfo.h>
++# if defined(HAVE_EXECINFO_H)
++# include <execinfo.h>
++# endif
+ # include <unistd.h>
+ #endif
+
+diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
+index e8c6e92..5b54ea9 100644
+--- a/source/creator/creator_signals.c
++++ b/source/creator/creator_signals.c
+@@ -329,7 +329,7 @@ void main_signal_setup_fpe(void)
+ * set breakpoints on sig_handle_fpe */
+ signal(SIGFPE, sig_handle_fpe);
+
+-# if defined(__linux__) && defined(__GNUC__)
++# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
+ feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+ # endif /* defined(__linux__) && defined(__GNUC__) */
+ # if defined(OSX_SSE_FPE)
+diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
+index 2b710a4..0e2948c 100644
+--- a/source/blender/blenlib/intern/system.c
++++ b/source/blender/blenlib/intern/system.c
+@@ -83,7 +83,7 @@ void BLI_system_backtrace(FILE *fp)
+ {
+ /* ------------- */
+ /* Linux / Apple */
+-#if defined(__linux__) || defined(__APPLE__)
++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__)
+
+ # define SIZE 100
+ void *buffer[SIZE];
diff --git a/testing/blender/openimageio-lib.patch b/testing/blender/openimageio-lib.patch
new file mode 100644
index 0000000000..81d2a20936
--- /dev/null
+++ b/testing/blender/openimageio-lib.patch
@@ -0,0 +1,13 @@
+diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
+index 5652e16..9358cc7 100644
+--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
++++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
+@@ -71,7 +71,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
+ OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
+
+ IF(OPENIMAGEIO_FOUND)
+- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++ SET(OPENIMAGEIO_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENIMAGEIO_LIBRARY})
+ SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+ IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
+ SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
diff --git a/testing/blender/python-3.8.patch b/testing/blender/python-3.8.patch
new file mode 100644
index 0000000000..c26934e344
--- /dev/null
+++ b/testing/blender/python-3.8.patch
@@ -0,0 +1,49 @@
+Index: blender-2.80_patched/source/blender/python/generic/py_capi_utils.c
+===================================================================
+--- blender-2.80_patched/source/blender/python/generic/py_capi_utils.c
++++ blender-2.80_patched/source/blender/python/generic/py_capi_utils.c
+@@ -717,9 +717,11 @@
+ ****************************************************************************/
+ PyObject *PyC_DefaultNameSpace(const char *filename)
+ {
+- PyInterpreterState *interp = PyThreadState_GET()->interp;
++ PyObject *modules = PyImport_GetModuleDict();
++ PyObject *builtins = PyDict_GetItemString(modules, "builtins");
++
+ PyObject *mod_main = PyModule_New("__main__");
+- PyDict_SetItemString(interp->modules, "__main__", mod_main);
++ PyDict_SetItemString(modules, "__main__", mod_main);
+ Py_DECREF(mod_main); /* sys.modules owns now */
+ PyModule_AddStringConstant(mod_main, "__name__", "__main__");
+ if (filename) {
+@@ -727,8 +729,8 @@
+ * note: this wont map to a real file when executing text-blocks and buttons. */
+ PyModule_AddObject(mod_main, "__file__", PyC_UnicodeFromByte(filename));
+ }
+- PyModule_AddObject(mod_main, "__builtins__", interp->builtins);
+- Py_INCREF(interp->builtins); /* AddObject steals a reference */
++ PyModule_AddObject(mod_main, "__builtins__", builtins);
++ Py_INCREF(builtins); /* AddObject steals a reference */
+ return PyModule_GetDict(mod_main);
+ }
+
+@@ -755,15 +757,15 @@
+ /* restore MUST be called after this */
+ void PyC_MainModule_Backup(PyObject **main_mod)
+ {
+- PyInterpreterState *interp = PyThreadState_GET()->interp;
+- *main_mod = PyDict_GetItemString(interp->modules, "__main__");
++ PyObject *modules = PyImport_GetModuleDict();
++ *main_mod = PyDict_GetItemString(modules, "__main__");
+ Py_XINCREF(*main_mod); /* don't free */
+ }
+
+ void PyC_MainModule_Restore(PyObject *main_mod)
+ {
+- PyInterpreterState *interp = PyThreadState_GET()->interp;
+- PyDict_SetItemString(interp->modules, "__main__", main_mod);
++ PyObject *modules = PyImport_GetModuleDict();
++ PyDict_SetItemString(modules, "__main__", main_mod);
+ Py_XDECREF(main_mod);
+ }
+
diff --git a/testing/blinken/APKBUILD b/testing/blinken/APKBUILD
index 87c29a8892..5bcdf227bb 100644
--- a/testing/blinken/APKBUILD
+++ b/testing/blinken/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=blinken
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all"
url="http://edu.kde.org/blinken/"
pkgdesc="Memory Enhancement Game"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev ki18n-dev kxmlgui-dev kguiaddons-dev kdoctools-dev kdbusaddons-dev kcrash-dev phonon-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/blinken-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/blinken-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # No tests
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="5a78e8677aa0f2796b6177e60b387bdb0af580f4a1231f89c90c8e58b224c7d7162c6f2d0830005fb6059cdb2a5463cb51a8c7162e1bb54c2d52dcd81e22850a blinken-19.08.2.tar.xz"
+sha512sums="61e74c8e96105d1f25897d93fba70b2b7f8e56c75021f33f4096452e273e27c0cc4e84765686f5e887babf675fde81f7f84484b84b2b2c747938853fde52e03f blinken-19.12.0.tar.xz"
diff --git a/testing/bloaty/2aec85618e91af975af3146563333c2c2e97260.patch b/testing/bloaty/2aec85618e91af975af3146563333c2c2e97260.patch
new file mode 100644
index 0000000000..939ea01146
--- /dev/null
+++ b/testing/bloaty/2aec85618e91af975af3146563333c2c2e97260.patch
@@ -0,0 +1,213 @@
+From 2aec85618e91af975af3146563333c2c2e972607 Mon Sep 17 00:00:00 2001
+From: Steve Wills <steve@mouf.net>
+Date: Fri, 4 Jan 2019 14:12:40 -0500
+Subject: [PATCH] Use system deps for protobuf, capstone and re2
+
+Also, add option to disable setting build id for systems where this flag
+is not supported by ld and an option to disable installing cmake target
+files in case they aren't needed.
+---
+ CMakeLists.txt | 140 ++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 120 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f8da51..b61ffea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,34 @@ project (Bloaty VERSION 1.0)
+ # Options we define for users.
+ option(BLOATY_ENABLE_ASAN "Enable address sanitizer." OFF)
+ option(BLOATY_ENABLE_UBSAN "Enable undefined behavior sanitizer." OFF)
++option(BLOATY_ENABLE_CMAKETARGETS "Enable installing cmake target files." ON)
++option(BLOATY_ENABLE_BUILDID "Enable build id." ON)
++
++if(UNIX)
++find_package(PkgConfig)
++if(${PKG_CONFIG_FOUND})
++pkg_search_module(RE2 re2)
++pkg_search_module(CAPSTONE capstone)
++pkg_search_module(PROTOBUF protobuf)
++if(${RE2_FOUND})
++ MESSAGE(STATUS "System re2 found, using")
++else(${RE2_FOUND})
++ MESSAGE(STATUS "System re2 not found, using bundled version")
++endif(${RE2_FOUND})
++if(${CAPSTONE_FOUND})
++ MESSAGE(STATUS "System capstone found, using")
++else(${CAPSTONE_FOUND})
++ MESSAGE(STATUS "System capstone not found, using bundled version")
++endif(${CAPSTONE_FOUND})
++if(${PROTOBUF_FOUND})
++ MESSAGE(STATUS "System protobuf found, using")
++else(${PROTOBUF_FOUND})
++ MESSAGE(STATUS "System protobuf not found, using bundled version")
++endif(${PROTOBUF_FOUND})
++else(${PKG_CONFIG_FOUND})
++ MESSAGE(STATUS "pkg-config not found, using bundled dependencies")
++endif(${PKG_CONFIG_FOUND})
++endif(UNIX)
+
+ # Set default build type.
+ if(NOT CMAKE_BUILD_TYPE)
+@@ -21,19 +49,42 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules")
+ endif()
+
+ # Add third_party libraries, disabling as much as we can of their builds.
+-set(RE2_BUILD_TESTING OFF CACHE BOOL "enable testing for RE2" FORCE)
+-set(CAPSTONE_BUILD_SHARED OFF CACHE BOOL "Build shared library" FORCE)
+-set(CAPSTONE_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
+-set(protobuf_BUILD_TESTS OFF CACHE BOOL "enable tests for proto2" FORCE)
+-set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "enable shared libs for proto2" FORCE)
++
+ add_definitions(-D_LIBCXXABI_FUNC_VIS=) # For Demumble.
+-add_subdirectory(third_party/re2)
+-add_subdirectory(third_party/capstone)
+-add_subdirectory(third_party/protobuf/cmake)
+
+-include_directories(third_party/capstone/include)
+-include_directories(third_party/re2)
+-include_directories(third_party/protobuf/src)
++if(UNIX)
++ if(${RE2_FOUND})
++ include_directories(${RE2_INCLUDE_DIRS})
++ else(${RE2_FOUND})
++ set(RE2_BUILD_TESTING OFF CACHE BOOL "enable testing for RE2" FORCE)
++ add_subdirectory(third_party/re2)
++ include_directories(third_party/re2)
++ endif(${RE2_FOUND})
++ if(${CAPSTONE_FOUND})
++ include_directories(${CAPSTONE_INCLUDE_DIRS})
++ else(${CAPSTONE_FOUND})
++ set(CAPSTONE_BUILD_SHARED OFF CACHE BOOL "Build shared library" FORCE)
++ set(CAPSTONE_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
++ add_subdirectory(third_party/capstone)
++ include_directories(third_party/capstone/include)
++ endif(${CAPSTONE_FOUND})
++ if(${PROTOBUF_FOUND})
++ include_directories(${PROTOBUF_INCLUDE_DIRS})
++ else(${PROTOBUF_FOUND})
++ set(protobuf_BUILD_TESTS OFF CACHE BOOL "enable tests for proto2" FORCE)
++ set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "enable shared libs for proto2" FORCE)
++ add_subdirectory(third_party/protobuf/cmake)
++ include_directories(third_party/protobuf/src)
++ endif(${PROTOBUF_FOUND})
++else(UNIX)
++ add_subdirectory(third_party/re2)
++ add_subdirectory(third_party/capstone)
++ add_subdirectory(third_party/protobuf/cmake)
++ include_directories(third_party/re2)
++ include_directories(third_party/capstone/include)
++ include_directories(third_party/protobuf/src)
++endif(UNIX)
++
+ include_directories(.)
+ include_directories(src)
+ include_directories(third_party/abseil-cpp)
+@@ -47,7 +98,9 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g1")
+
+ if(APPLE)
+ elseif(UNIX)
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
++ if(BLOATY_ENABLE_BUILDID)
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
++ endif(BLOATY_ENABLE_BUILDID)
+ endif()
+
+ # When using Ninja, compiler output won't be colorized without this.
+@@ -73,6 +126,7 @@ if(DEFINED ENV{CXXFLAGS})
+ endif()
+
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src)
++if(${PROTOC_FOUND})
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/bloaty.pb.cc
+ DEPENDS protoc ${CMAKE_CURRENT_SOURCE_DIR}/src/bloaty.proto
+@@ -80,6 +134,14 @@ add_custom_command(
+ --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/src
+ -I${CMAKE_CURRENT_SOURCE_DIR}/src
+ )
++else(${PROTOC_FOUND})
++add_custom_command(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/bloaty.pb.cc
++ COMMAND protoc ${CMAKE_CURRENT_SOURCE_DIR}/src/bloaty.proto
++ --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/src
++ -I${CMAKE_CURRENT_SOURCE_DIR}/src
++)
++endif(${PROTOC_FOUND})
+
+ add_library(libbloaty
+ src/bloaty.cc
+@@ -112,9 +174,38 @@ add_library(libbloaty
+ third_party/demumble/third_party/libcxxabi/cxa_demangle.cpp
+ )
+
++if(UNIX)
++ set(LIBBLOATY_LIBS libbloaty)
++ if(${PROTOBUF_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} ${PROTOBUF_LIBRARIES})
++ else(${PROTOBUF_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} libprotoc)
++ endif(${PROTOBUF_FOUND})
++ if(${RE2_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} ${RE2_LIBRARIES})
++ else(${RE2_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} re2)
++ endif(${RE2_FOUND})
++ if(${CAPSTONE_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} ${CAPSTONE_LIBRARIES})
++ else(${CAPSTONE_FOUND})
++ set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} capstone-static)
++ endif(${CAPSTONE_FOUND})
++else(UNIX)
++ set(LIBBLOATY_LIBS libbloaty libprotoc re2 capstone-static)
++endif(UNIX)
+
+-set(LIBBLOATY_LIBS libbloaty libprotoc re2 capstone-static)
+-
++if(UNIX)
++ if(${RE2_FOUND})
++ link_directories(${RE2_LIBRARY_DIRS})
++ endif(${RE2_FOUND})
++ if(${CAPSTONE_FOUND})
++ link_directories(${CAPSTONE_LIBRARY_DIRS})
++ endif(${CAPSTONE_FOUND})
++ if(${PROTOBUF_FOUND})
++ link_directories(${PROTOBUF_LIBRARY_DIRS})
++ endif(${PROTOBUF_FOUND})
++endif(UNIX)
+
+ if(DEFINED ENV{LIB_FUZZING_ENGINE})
+ message("LIB_FUZZING_ENGINE set, building fuzz_target instead of Bloaty")
+@@ -134,11 +225,18 @@ else()
+ target_link_libraries(bloaty "${CMAKE_THREAD_LIBS_INIT}")
+ endif()
+
+- install(
+- TARGETS bloaty
+- EXPORT ${PROJECT_NAME}Targets
+- RUNTIME DESTINATION bin
+- )
++ if(BLOATY_ENABLE_CMAKETARGETS)
++ install(
++ TARGETS bloaty
++ EXPORT ${PROJECT_NAME}Targets
++ RUNTIME DESTINATION bin
++ )
++ else(BLOATY_ENABLE_CMAKETARGETS)
++ install(
++ TARGETS bloaty
++ RUNTIME DESTINATION bin
++ )
++ endif(BLOATY_ENABLE_CMAKETARGETS)
+
+ if (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/tests")
+ enable_testing()
+@@ -172,5 +270,7 @@ else()
+ endif()
+ endif()
+
+- install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})
++ if(BLOATY_ENABLE_CMAKETARGETS)
++ install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})
++ endif(BLOATY_ENABLE_CMAKETARGETS)
+ endif()
diff --git a/testing/bloaty/APKBUILD b/testing/bloaty/APKBUILD
new file mode 100644
index 0000000000..72d88c2a1a
--- /dev/null
+++ b/testing/bloaty/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=bloaty
+pkgver=1.0
+pkgrel=0
+pkgdesc="Bloaty McBloatface: a size profiler for binaries"
+url="https://github.com/google/bloaty"
+arch="all"
+license="Apache-2.0"
+makedepends="cmake protobuf-dev re2-dev capstone-dev"
+options="!check" # no test suite
+source="https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2
+ f66077506462bf96fee79f7f20516ca5d1e02f8a.patch
+ 2aec85618e91af975af3146563333c2c2e97260.patch"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} .
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ # Upstream forgot to install this via CMake.
+ install -m755 liblibbloaty.so "$pkgdir"/usr/lib/liblibbloaty.so.1.0.0
+ ln -s liblibbloaty.so.1.0.0 "$pkgdir"/usr/lib/liblibbloaty.so.1
+ ln -s liblibbloaty.so.1 "$pkgdir"/usr/lib/liblibbloaty.so
+}
+
+sha512sums="3dd6cd25f5fdffc8702ac84fc87d7ab79c5fc0662a2ece3df0b531ebca368f78155b3f2eb646077e0ba91205b5bf8c4727587097b90162af6066ca6bfb3d4084 bloaty-1.0.tar.bz2
+fdb6b116bdc8cff8c00e73306d110a08e47bb28c8df280c292ecdb4bf0ed683fa3a6a08f21863afb0bb3552b3520a10047f08efc0e9f522f7f6cf03f1d55f527 f66077506462bf96fee79f7f20516ca5d1e02f8a.patch
+ef5231aec33e2e2db9b7c793d92af5ea97c29d6bf874b6a1356ea2b77f79b2d592c553e145aa4b8e65d93c2abf71cbb51d493e6d77cdb46805afaa9a34a7f0e4 2aec85618e91af975af3146563333c2c2e97260.patch"
diff --git a/testing/bloaty/f66077506462bf96fee79f7f20516ca5d1e02f8a.patch b/testing/bloaty/f66077506462bf96fee79f7f20516ca5d1e02f8a.patch
new file mode 100644
index 0000000000..8ebc442895
--- /dev/null
+++ b/testing/bloaty/f66077506462bf96fee79f7f20516ca5d1e02f8a.patch
@@ -0,0 +1,22 @@
+From f66077506462bf96fee79f7f20516ca5d1e02f8a Mon Sep 17 00:00:00 2001
+From: Julie Hockett <juliehockett@google.com>
+Date: Fri, 17 Aug 2018 12:50:22 -0700
+Subject: [PATCH] Propagate linker flags from the command line
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ae4569..918b2fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g1")
+
+ if(APPLE)
+ elseif(UNIX)
+- set(CMAKE_EXE_LINKER_FLAGS "-Wl,--build-id")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
+ endif()
+
+ # When using Ninja, compiler output won't be colorized without this.
diff --git a/testing/bmake/APKBUILD b/testing/bmake/APKBUILD
index d6835a2753..92e4976528 100644
--- a/testing/bmake/APKBUILD
+++ b/testing/bmake/APKBUILD
@@ -1,37 +1,38 @@
-# Maintainer:
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=bmake
-pkgver=20180919
+pkgver=20181221
pkgrel=1
pkgdesc="Portable version of the NetBSD make build tool"
url="http://www.crufty.net/help/sjg/bmake.html"
-arch=""
-license="BSD"
+arch="all"
+license="BSD-2-Clause"
subpackages="$pkgname-doc"
source="http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz
- install-sh.patch"
-
+ install-sh.patch
+ separate-tests.patch"
builddir="$srcdir/$pkgname"
-options="!check" # Check automatically performed after build
+
+# Reset MAKEFLAGS since it might contain options not supported
+# by bmake. This is, for instance, the case on the builders.
+export MAKEFLAGS="-j${JOBS:-1}"
build() {
- cd "$builddir"
- mkdir -p build
- cd build
- sh ../boot-strap --with-default-sys-path=/usr/share/mk
+ sh ./boot-strap --with-default-sys-path=/usr/share/mk op=build
+}
+
+check() {
+ sh ./boot-strap op=test
}
package() {
- cd "$builddir/build"
- sh ../boot-strap --prefix=/usr --with-mksrc=/usr/share/mk \
+ sh ./boot-strap --prefix=/usr --with-mksrc=/usr/share/mk \
--install-destdir="$pkgdir" op=install
rm -rf "$pkgdir"/usr/share/man/cat1
- mkdir "$pkgdir"/usr/share/man/man1
- cp ../bmake.1 "$pkgdir"/usr/share/man/man1/
- mkdir -p "$pkgdir"/usr/share/licenses/"$pkgname"
- sed -e 3,69p -e d ../main.c >\
- "$pkgdir"/usr/share/licenses/"$pkgname"/COPYING
+ install -Dm644 bmake.1 \
+ "$pkgdir"/usr/share/man/man1/bmake.1
}
-sha512sums="5147513a0fd05b73ccd5ab057bcfd9e0c5d21681a5229d8ea870da7ad72fbd140b4b89245fdb2ef276152d237e478d64923623b99ce7bb85f746b01593d4fd1a bmake-20180919.tar.gz
-0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch"
+sha512sums="7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b bmake-20181221.tar.gz
+0de9022a2991c5ef02c09ab592a3e2d218cd0bbf58e54f21bc7694110f3dd9e4589bf2b3d241fd167fb220b425007863f20e71e141b4f65bf92d305ba94209da install-sh.patch
+04217b04aca4252f54c836e982d95106a09166370f84fa672c418d1b1799adb9697f5ac9eb10a6ee3a8527e39196a37ad92bb5945733407bf9ec1a7f223183bb separate-tests.patch"
diff --git a/testing/bmake/separate-tests.patch b/testing/bmake/separate-tests.patch
new file mode 100644
index 0000000000..0e306652c1
--- /dev/null
+++ b/testing/bmake/separate-tests.patch
@@ -0,0 +1,26 @@
+By default tests are run on build and install. Normally, Alpine
+tests are invoked separately in a check stage. To allow doing
+that this patch disable the automatic test invocations during build and
+install.
+
+diff -upr bmake.orig/boot-strap bmake/boot-strap
+--- bmake.orig/boot-strap 2019-12-21 13:39:52.658136365 +0100
++++ bmake/boot-strap 2019-12-21 13:40:25.954816539 +0100
+@@ -414,9 +414,6 @@ op_build() {
+ [ -s make-bootstrap.sh ] || op_configure
+ chmod 755 make-bootstrap.sh || exit 1
+ ./make-bootstrap.sh || exit 1
+- case "$op" in
+- build) op_test;;
+- esac
+ }
+
+ op_test() {
+@@ -435,7 +432,6 @@ op_clean() {
+ }
+
+ op_install() {
+- op_test
+ case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
+ ,$HOST_TARGET/bin,*/$HOST_TARGET)
+ INSTALL_PREFIX=`dirname $prefix`
diff --git a/testing/bmake/sjg.patch b/testing/bmake/sjg.patch
deleted file mode 100644
index 11b617b91a..0000000000
--- a/testing/bmake/sjg.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From sjg@crufty.net Wed Oct 4 00:46:22 2017
-From: Simon Gerraty <sjg@crufty.net>
-To: Steffen Nurpmeso <steffen@sdaoden.eu>
-Subject: Re: bmake: errors when creating Alpine Linux/Musl package
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-ID: <24543.1507070779.1@bad.crufty.net>
-Date: Tue, 03 Oct 2017 15:46:19 -0700
-Message-ID: <20363.1507070779@bad.crufty.net>
-Status: RO
-
-> |The warning about __inline being redefined - I would not expect
-> |missing/sys/cdefs.h to be used on a Linux platform - every one I'd used
-> |(not many) has sys/cdefs.h
-
-Not much we can do about that warning.
-Fortunately nothing in bmake uses __inline
-
-For the tcc getopt bit, try running strings on the object
-to see where that Del char is.
-
-For gcc, try the patch below
-
-Index: unit-tests/dotwait.exp
-===================================================================
-RCS file: /volume/cvs/bmake/unit-tests/dotwait.exp,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 dotwait.exp
---- XXX/unit-tests/dotwait.exp 30 Aug 2014 18:57:18 -0000 1.1.1.1
-+++ XXX/unit-tests/dotwait.exp 3 Oct 2017 22:43:52 -0000
-@@ -22,9 +22,9 @@ shared.2.1
- shared.2.1
- shared.2.99
- shared.2.99
-+cycle.1.99
-+cycle.1.99
- make: Graph cycles through `cycle.2.99'
- make: Graph cycles through `cycle.2.98'
- make: Graph cycles through `cycle.2.97'
--cycle.1.99
--cycle.1.99
- exit status 0
-Index: unit-tests/dotwait.mk
-===================================================================
-RCS file: /volume/cvs/bmake/unit-tests/dotwait.mk,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 dotwait.mk
---- XXX/unit-tests/dotwait.mk 30 Aug 2014 18:57:18 -0000 1.1.1.1
-+++ XXX/unit-tests/dotwait.mk 3 Oct 2017 22:42:44 -0000
-@@ -11,7 +11,7 @@ PAUSE= sleep 1
- # Ignore "--- target ---" lines printed by parallel make.
- all:
- .for t in ${TESTS}
-- @${.MAKE} -f ${THISMAKEFILE} -j4 $t | grep -v "^--- "
-+ @${.MAKE} -f ${THISMAKEFILE} -j4 $t 2>&1 | grep -v "^--- "
- .endfor
-
- #
-
diff --git a/testing/bovo/APKBUILD b/testing/bovo/APKBUILD
index 4642369462..dbb27d9dff 100644
--- a/testing/bovo/APKBUILD
+++ b/testing/bovo/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=bovo
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all"
url="https://kde.org/applications/games/org.kde.bovo"
pkgdesc="A Gomoku like game for two players"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev kxmlgui-dev libkdegames-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
build() {
@@ -27,4 +27,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="c6072b2a86135bb6eac6e654e3af82cf783a602bb9b9e45ac8aea9de6479e5ba0958ecff42172ab9c356f5d7ea8a7b4805e3a11094b3cafb887d947347216529 bovo-19.08.2.tar.xz"
+sha512sums="01b44e84847f9de98f8ac881220b719112923422666ef9f724e5ad338244ef4e482d192e8dd9eb5456e2010ca7d26bfbcad7672608a53ae3f3adf5c26948b82e bovo-19.12.0.tar.xz"
diff --git a/testing/bpftrace/APKBUILD b/testing/bpftrace/APKBUILD
index 513e7600a3..397191c5cd 100644
--- a/testing/bpftrace/APKBUILD
+++ b/testing/bpftrace/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=bpftrace
-pkgver=0.9.2
-pkgrel=2
+pkgver=0.9.3
+pkgrel=0
pkgdesc="High-level tracing language for Linux eBPF"
url="https://github.com/iovisor/bpftrace"
arch="x86_64"
@@ -57,4 +57,4 @@ tools_doc() {
mv "$pkgdir/usr/share/bpftrace/man" "$subpkgdir/usr/share/bpftrace/man"
}
-sha512sums="5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0 bpftrace-0.9.2.tar.gz"
+sha512sums="49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be bpftrace-0.9.3.tar.gz"
diff --git a/testing/broot/APKBUILD b/testing/broot/APKBUILD
new file mode 100644
index 0000000000..96dcc80c73
--- /dev/null
+++ b/testing/broot/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Leo <thinkabit.ukim@gmail.com>
+pkgname=broot
+pkgver=0.12.0
+pkgrel=0
+pkgdesc="New way to see and navigate directory trees"
+url="https://github.com/Canop/broot"
+arch="all !s390x"
+license="MIT"
+makedepends="cargo"
+source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/broot/$pkgver/download"
+
+build() {
+ cargo build --release --locked
+}
+
+check() {
+ cargo test --release --locked
+}
+
+package() {
+ install -Dm0755 target/release/broot "$pkgdir"/usr/bin/broot
+}
+
+sha512sums="a53386710c8a5dab68f2bc72b9fcfcf424ec3dca5441cf224fe90e6a9ddae4abd66a47e0bcdc9c0c9c47a77e819478de5068acaf5d5c48ba09a0ee27384007f1 broot-0.12.0.tar.gz"
diff --git a/testing/buildah/APKBUILD b/testing/buildah/APKBUILD
new file mode 100644
index 0000000000..b210302295
--- /dev/null
+++ b/testing/buildah/APKBUILD
@@ -0,0 +1,24 @@
+# Contributor: kohnish <kohnish@gmx.com>
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: kohnish <kohnish@gmx.com>
+pkgname="buildah"
+pkgver="1.13.1"
+pkgrel=0
+pkgdesc="A tool that facilitates building OCI container images"
+url="https://github.com/containers/buildah"
+arch="all"
+license="Apache-2.0"
+makedepends="go go-md2man lvm2-dev gpgme-dev libseccomp-dev btrfs-progs-dev bash"
+subpackages="$pkgname-doc"
+options="!check" # TODO: enable tests
+source="$pkgname-$pkgver.tar.gz::https://github.com/containers/buildah/archive/v$pkgver.tar.gz"
+
+build() {
+ GIT_COMMIT="$pkgver" make
+}
+
+package() {
+ GIT_COMMIT="$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir"
+}
+
+sha512sums="89c02f3c485408f16d6334bb4621accbb7de5f8d3d4458eb4c925468da1f6c14a18132e8f643e965d3054f05a90ada3c4911e539541f9ca045ca606c9ce1bed9 buildah-1.13.1.tar.gz"
diff --git a/testing/buku/APKBUILD b/testing/buku/APKBUILD
index dfae12eaf0..b73a096c7b 100644
--- a/testing/buku/APKBUILD
+++ b/testing/buku/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=buku
pkgver=4.2.2
pkgrel=0
@@ -14,7 +14,7 @@ makedepends="py3-setuptools"
subpackages="$pkgname-doc $pkgname-bash-completion:_bashcomp:noarch
$pkgname-zsh-completion:_zshcomp:noarch
$pkgname-fish-completion:_fishcomp:noarch"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jarun/Buku/archive/v${pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/jarun/Buku/archive/v$pkgver.tar.gz"
builddir="$srcdir"/Buku-$pkgver
package() {
diff --git a/testing/bullet/APKBUILD b/testing/bullet/APKBUILD
index 81bd0c61cf..847abfc217 100644
--- a/testing/bullet/APKBUILD
+++ b/testing/bullet/APKBUILD
@@ -2,13 +2,13 @@
# Contributor: Asriel Dreemurr <asriel.danctnix@gmail.com>
# Maintainer: Danct12 <danct12@disroot.org>
pkgname=bullet
-pkgver=2.88
+pkgver=2.89
pkgrel=0
pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
url="https://pybullet.org/Bullet/phpBB3/"
arch="all"
license="Zlib"
-makedepends="cmake doxygen graphviz-dev ttf-dejavu mesa-dev glu-dev python3-dev py-numpy-dev"
+makedepends="cmake doxygen graphviz-dev ttf-dejavu mesa-dev glu-dev python3-dev py3-numpy-dev"
options="!check" # cannot build tests
subpackages="$pkgname-dev $pkgname-doc"
source="bullet3-$pkgver.tar.gz::https://github.com/bulletphysics/bullet3/archive/$pkgver.tar.gz"
@@ -60,4 +60,4 @@ doc() {
}
-sha512sums="15face1940d496c96fd19a44139d11d2cbb629526c40432be4a0eef5fa9a532c842ec7318248c0359a080f2034111bf1a3c2d3a6fd789bec675bd368fac7bd93 bullet3-2.88.tar.gz"
+sha512sums="3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b bullet3-2.89.tar.gz"
diff --git a/testing/burp/APKBUILD b/testing/burp/APKBUILD
index 9f76652999..07f2ec7676 100644
--- a/testing/burp/APKBUILD
+++ b/testing/burp/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Bernhard J. M. Gruen <bernhard.gruen@googlemail.com>
pkgname=burp
-pkgver=2.3.14
+pkgver=2.3.16
pkgrel=0
pkgdesc="A network backup and restore program"
url="https://burp.grke.org"
@@ -86,5 +86,5 @@ server() {
done
}
-sha512sums="65307f5e7482eebadd65473d196f1a918b37a872aaa06a5e10bff987a093f4cd8dde47a2c20ed17245e413478db028c83ff7358437e5a980d320e5f27a30a56d 2.3.14.zip
+sha512sums="4502365065113f1903de57e265ebc4115ce831bf2cace4607ccbfb1d509671f59770970f75bd52446c4148694ba5c688171aaadacbc52abac982abcf0d94d858 2.3.16.zip
ef98c1fb938063fee35cc5ae5ff9179a759b89b3c2629320ff4dffb4c42395cac1ad6b4615c6c1f34cc4be3ce54397b00f583ba5f3cd2fe8498902d4d9445e8f burp.init"
diff --git a/testing/cage/APKBUILD b/testing/cage/APKBUILD
deleted file mode 100644
index d681f64321..0000000000
--- a/testing/cage/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Will Sinatra <wpsinatra@gmail.com>
-# Contributor: Will Sinatra <wpsinatra@gmail.com>
-pkgname=cage
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="A Wayland Kiosk"
-url="https://github.com/Hjdskes/cage"
-arch="all"
-license="MIT"
-depends="xorg-server-xwayland"
-makedepends="meson cmake wlroots-dev wayland-protocols"
-options="!check" #No checks
-source="$pkgname"-"$pkgver".tar.gz::https://github.com/Hjdskes/cage/archive/v"$pkgver".tar.gz
-
-prepare() {
- meson --buildtype=release -Dxwayland=true --prefix /usr "$srcdir/build"
-}
-
-build() {
- ninja -C "$srcdir/build"
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C "$srcdir/build" install
-}
-
-sha512sums="f071f04f1ff7d2b89ae72238ef1a28fd3fbc389803e4a4fe0c3d938c7a2a1cc962b63929d081d975f98131ff6dd9637762e8036bb320277e2580f0cbeb0c6201 cage-0.1.1.tar.gz"
diff --git a/testing/calendarsupport/APKBUILD b/testing/calendarsupport/APKBUILD
index 033c8f832d..4b20710272 100644
--- a/testing/calendarsupport/APKBUILD
+++ b/testing/calendarsupport/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=calendarsupport
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
pkgdesc="Library providing calendar support"
arch="all !ppc64le !s390x" # Limited by akonadi-calendar-dev -> kmailtransport -> libkgapi -> qt5-qtwebengine
url="https://kontact.kde.org"
license="GPL-2.0-or-later AND LGPL-2.0-or-later"
depends_dev="qt5-qtbase-dev akonadi-dev ki18n-dev kiconthemes-dev kguiaddons-dev kio-dev kmime-dev akonadi-mime-dev kcodecs-dev kcalutils-dev kcalendarcore-dev kidentitymanagement-dev kholidays-dev akonadi-calendar-dev pimcommon-dev kdepim-apps-libs-dev"
makedepends="$depends_dev extra-cmake-modules qt5-qttools-dev qt5-qttools-static"
-source="https://download.kde.org/stable/applications/$pkgver/src/calendarsupport-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/calendarsupport-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
prepare() {
@@ -36,4 +36,4 @@ package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
}
-sha512sums="122151188d8f0d7db0739ea63daf74ef429c3b7dfef7f6379e2336c23d4c3ecf42dfea9f549ebe53e37e06fbe187dd7d080a7b5d051ae538e28e95c737075f1e calendarsupport-19.08.2.tar.xz"
+sha512sums="79e22651a606feb9a3bc2e308d332107c6d783689c6cbe7c88a352f6452105eb526dcdeeb4f9c5a6bb8bf0f7a12a6eb9b94db3f5d5b087e71b8d2426eccb0f84 calendarsupport-19.12.0.tar.xz"
diff --git a/testing/calls/APKBUILD b/testing/calls/APKBUILD
new file mode 100644
index 0000000000..5e9157e220
--- /dev/null
+++ b/testing/calls/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=calls
+pkgver=0.1.1
+pkgrel=0
+pkgdesc="A phone dialer and call handler"
+arch="all !s390x" # Blocked by libhandy
+url="https://gitlab.gnome.org/Community/Purism/calls"
+license="GPL-3.0-or-later"
+depends="modemmanager"
+makedepends="meson ninja vala gettext-dev gobject-introspection-dev gtk+3.0-dev libhandy-dev gsound-dev libpeas-dev modemmanager-dev gom-dev evolution-data-server-dev folks-dev"
+source="https://source.puri.sm/Librem5/calls/-/archive/v$pkgver/calls-v$pkgver.tar.gz"
+options="!check" # Requires running Wayland compositor
+builddir="$srcdir/$pkgname-v$pkgver"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja test -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja install -C output
+}
+sha512sums="129611bd6d7ba44c1d7fbc06df426fba50450d18fdd246d9d9156472a9976213ee51e8ea43715c44d20dc7ce462f95c905df433343c677b00602fd017bfde793 calls-v0.1.1.tar.gz"
diff --git a/testing/cantor/APKBUILD b/testing/cantor/APKBUILD
index a8c6cd8a5a..b4b813eecc 100644
--- a/testing/cantor/APKBUILD
+++ b/testing/cantor/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=cantor
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
arch="all"
url="https://edu.kde.org/cantor/"
pkgdesc="KDE Frontend to Mathematical Software "
license="GPL-2.0-or-later"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev kconfig-dev kcrash-dev kcompletion-dev kdoctools-dev knewstuff-dev kiconthemes-dev ktexteditor-dev kcoreaddons-dev karchive-dev kparts-dev syntax-highlighting-dev ktextwidgets-dev kio-dev kxmlgui-dev ki18n-dev poppler-qt5-dev kpty-dev analitza-dev python3-dev discount-dev"
checkdepends="xvfb-run"
-source="https://download.kde.org/stable/applications/$pkgver/src/cantor-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
build() {
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="f9a089297c288bd4013da68b9388407f990aa20f508b759bd1839a85a714728fe2322daa198c522869285b64c02b84a587f605b4f1e8cc22b9c0aafc3138fd35 cantor-19.08.2.tar.xz"
+sha512sums="d8373c25ad4582938362d393498c96a2e82a15c0c492c6f403d096991950f608e71f2398217824783ee028665e042d755254aed4ed40135edd4f8464b918317d cantor-19.12.0.tar.xz"
diff --git a/testing/catatonit/APKBUILD b/testing/catatonit/APKBUILD
new file mode 100644
index 0000000000..cdf24ce789
--- /dev/null
+++ b/testing/catatonit/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=catatonit
+pkgver=0.1.4
+pkgrel=0
+pkgdesc="A container init that is so simple it's effectively brain-dead"
+url="https://github.com/openSUSE/catatonit"
+arch="all"
+license="GPL-3.0-or-later"
+makedepends="autoconf automake libtool"
+options="!check" # no test suite
+source="$pkgname-$pkgver.tar.xz::https://github.com/openSUSE/catatonit/releases/download/v$pkgver/catatonit.tar.xz
+ fix-undeclared-identifier.patch"
+
+prepare() {
+ default_prepare
+ autoreconf -fi
+}
+
+build() {
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="6f68d0743ccdb59597354d1dbabb85dd07f9432aa59e56982ccae1fd3d160630af14f58ba44c85c57b6f2f4324242105306382d4ba84d38a6621234c82951ac0 catatonit-0.1.4.tar.xz
+e1b77829cf76b49904ec51799b2b95ba94d482bc8038714c1363655e2e22dd1467cb906423873facf270ea6f64df0956a8e0ebad8a2892bebeacecdce9115fcf fix-undeclared-identifier.patch"
diff --git a/testing/catatonit/fix-undeclared-identifier.patch b/testing/catatonit/fix-undeclared-identifier.patch
new file mode 100644
index 0000000000..cbe2ae8eb1
--- /dev/null
+++ b/testing/catatonit/fix-undeclared-identifier.patch
@@ -0,0 +1,13 @@
+diff --git a/catatonit.c b/catatonit.c
+index db972d6..51d530b 100644
+--- a/catatonit.c
++++ b/catatonit.c
+@@ -34,6 +34,8 @@
+
+ #include "config.h"
+
++extern char **__environ;
++
+ static enum loglevel_t {
+ LOG_FATAL = 0,
+ LOG_ERROR = 1,
diff --git a/testing/cdist/APKBUILD b/testing/cdist/APKBUILD
index e07c29b882..6c8b5fc3f9 100644
--- a/testing/cdist/APKBUILD
+++ b/testing/cdist/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Lucas Ramage <ramage.lucas@protonmail.com>
# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
pkgname=cdist
-pkgver=5.1.1
+pkgver=6.0.3
pkgrel=1
pkgdesc="A Usable Configuration Management System"
arch="noarch"
@@ -9,7 +9,7 @@ url="https://www.cdi.st/"
options="!check"
license="GPL-3.0-or-later"
depends="python3"
-source="$pkgname-$pkgver.tar.gz::https://code.ungleich.ch/ungleich-public/$pkgname/uploads/5463b2c362325a54888f65ee774a0c9a/${pkgname}-${pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://code.ungleich.ch/ungleich-public/$pkgname/uploads/d7ea119847fbc79658ef574470a99512/${pkgname}-${pkgver}.tar.gz"
package() {
./bin/${pkgname} 2> /dev/null
@@ -18,4 +18,4 @@ package() {
find "$pkgdir" -type f -exec chmod a+r {} \;
}
-sha512sums="3a51ac87331b8ada03dc762f002801b00a1d407519d5571c54342f50dabf375305d7f367a08fbab3b9b6cc7ab1e11da638a8505534cfc9b09694f9a15ed4e724 cdist-5.1.1.tar.gz"
+sha512sums="0d386531db3f61bb2aa93a81dbb64c4fef3199b8b21cc11bafd6cf7b9955e71ad2488b16f8d4b6f55404e1cf506cf507d4453f67f7f2030855e0303ff4a30b26 cdist-6.0.3.tar.gz"
diff --git a/testing/cervisia/APKBUILD b/testing/cervisia/APKBUILD
index f5c45d22b0..522c94fe6d 100644
--- a/testing/cervisia/APKBUILD
+++ b/testing/cervisia/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=cervisia
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all"
url="https://kde.org/applications/development/org.kde.cervisia"
pkgdesc="A user friendly version control system front-end"
license="GPL-2.0-or-later AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev kparts-dev kdoctools-dev kinit-dev kiconthemes-dev knotifications-dev kwidgetsaddons-dev kitemviews-dev kdesu-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # No tests
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="0c7b1bcc03d969bb43476a1a42d8638f520a4952025a0c6e197cc700aab1779eb38db43aa7e39a3b498d0abcecde15b965029fae5a82d762a5daed65cdb1a6ba cervisia-19.08.2.tar.xz"
+sha512sums="1c342d1ffb1ffedf51279648287202ea7111d3ae7c12e9a7a0e1702d2e2f53921bcd3c70e79ee7364c4fd10424e8a49f86693259794e278a29dde4a40033a163 cervisia-19.12.0.tar.xz"
diff --git a/testing/cfssl/APKBUILD b/testing/cfssl/APKBUILD
index b54549c847..b510965305 100644
--- a/testing/cfssl/APKBUILD
+++ b/testing/cfssl/APKBUILD
@@ -1,7 +1,7 @@
# Contributor:
# Maintainer:
pkgname=cfssl
-pkgver=1.4.0
+pkgver=1.4.1
pkgrel=0
pkgdesc="Cloudflare PKI and TLS toolkit"
url="https://cfssl.org"
@@ -27,4 +27,4 @@ package() {
install -m755 "$srcdir"/bin/* "$pkgdir"/usr/bin/
}
-sha512sums="a54a0e0b7066ed4405adcb4a303f2bd818f73b43ca9c05d138ebe16891880e7a82399bb366c3c612fef27c51719652bd5617a0bd855a69e6148afd043c8c9265 cfssl-1.4.0.tar.gz"
+sha512sums="0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f cfssl-1.4.1.tar.gz"
diff --git a/testing/cgal/APKBUILD b/testing/cgal/APKBUILD
index e5dbe543b0..d4234bf7e2 100644
--- a/testing/cgal/APKBUILD
+++ b/testing/cgal/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=cgal
pkgver=4.14
-pkgrel=1
+pkgrel=2
pkgdesc="Efficient and reliable geometric algorithms as C++ library"
url="https://www.cgal.org/"
arch="all"
diff --git a/testing/charls/APKBUILD b/testing/charls/APKBUILD
index 83e70c89b5..c1cfdfeae9 100644
--- a/testing/charls/APKBUILD
+++ b/testing/charls/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Holger Jaekel <holger.jaekel@gmx.de>
# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
pkgname=charls
-pkgver=2.0.0
+pkgver=2.1.0
pkgrel=0
pkgdesc="An optimized implementation of the JPEG-LS standard for lossless and near-lossless image compression"
url="https://github.com/team-charls/charls"
@@ -19,8 +19,8 @@ build() {
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_TESTING=ON
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON
make
}
@@ -30,6 +30,6 @@ package() {
check() {
# The testprogram requires "Press any key + 'enter' to exit program"
- echo "end\n" | ./charlstest -unittest
+ echo "end\n" | ./test/charlstest -unittest
}
-sha512sums="0a2862fad6d65b941c81f5f838db1fdc6a4625887281ddbf27e21be9084f607d27c8a27d246d6252e08358b2ed4aa0c2b7407048ca559fb40e94313ca72487dd charls-2.0.0.tar.gz"
+sha512sums="456539243d984ebe6afe1bbb7c9422e642cf0346d25d220126ad8a6d04e945c6c340ab3c2b73a7db4ec390ed6a52236e5c6e9ad6d14e8b78b701937810fb327d charls-2.1.0.tar.gz"
diff --git a/testing/chatty/APKBUILD b/testing/chatty/APKBUILD
new file mode 100644
index 0000000000..0df2343726
--- /dev/null
+++ b/testing/chatty/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=chatty
+pkgver=0.1.4
+pkgrel=0
+pkgdesc="A phone dialer and call handler"
+arch="all !s390x" # Blocked by libhandy and evolution
+url="https://gitlab.gnome.org/Community/Purism/chatty"
+license="GPL-3.0-or-later"
+depends="purple-mm-sms"
+makedepends="meson ninja gtk+3.0-dev pidgin-dev libhandy-dev evolution-dev libgee-dev folks-dev"
+source="$pkgname-$pkgver.tar.gz::https://source.puri.sm/Librem5/chatty/-/archive/v$pkgver/chatty-v$pkgver.tar.gz"
+subpackages="$pkgname-lang"
+builddir="$srcdir/$pkgname-v$pkgver"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja test -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja install -C output
+}
+sha512sums="d69af6412e15147adfabf877fcb03ed38b28b08194ee33572f532690de23ca7d3d6fb3732ab52f4271544657e53c04f211a22185b54fcb1b03f2b197897ff2f8 chatty-0.1.4.tar.gz"
diff --git a/testing/clapf/APKBUILD b/testing/clapf/APKBUILD
deleted file mode 100644
index 60607ac52b..0000000000
--- a/testing/clapf/APKBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=clapf
-pkgver=0.4.7.4
-pkgrel=4
-pkgdesc="clapf is an open source email content filter application"
-url="http://clapf.org"
-arch="all"
-license="AS-IS"
-depends="clamav-db"
-depends_dev="gsl-dev mysql-dev clamav-dev zlib-dev bzip2-dev"
-makedepends="$depends_dev autoconf automake"
-install="$pkgname.pre-install"
-options="suid"
-CLAPF_USER="clapf"
-CLAPF_GROUP="clapf"
-pkgusers="$CLAPF_USER"
-pkggroups="$CLAPF_GROUP"
-subpackages="$pkgname-dev"
-# * 31d2ce87967e released 0.4.7.4
-COMMIT=31d2ce87967e
-source="$pkgname-$pkgver-g$COMMIT.tar.gz::https://bitbucket.org/jsuto/$pkgname/get/$COMMIT.tar.gz
- gsl-libs.patch
- def__user.patch
- ldflags.patch
- clapf.confd
- clapf.initd"
-
-builddir="$srcdir/jsuto-$pkgname-$COMMIT"
-
-prepare() {
- default_prepare || return 1
- aclocal && autoconf
-}
-
-build() {
- cd "$builddir"
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --enable-libclamav \
- --with-tokendb=mysql \
- --enable-lmtp \
- --with-store=fs \
- --enable-blackhole \
- --enable-rbl \
- --enable-policy \
- --enable-whitelist \
- --enable-blackhole \
- --with-clapf-user=$CLAPF_USER \
- --enable-language-detection \
- --enable-memcached \
- --enable-spamsum
-
- make || return 1
-}
-
-package() {
- cd "$builddir"
- make -j1 DESTDIR="$pkgdir" install \
- || return 1
- install -D -m 755 \
- "$srcdir"/clapf.initd \
- "$pkgdir"/etc/init.d/clapf \
- || return 1
- install -D -m 644 \
- "$srcdir"/clapf.confd \
- "$pkgdir"/etc/conf.d/clapf \
- || return 1
- install -d -o $CLAPF_USER -g $CLAPF_GROUP \
- "$pkgdir"/var/run/$pkgname \
- || return 1
- mkdir -p \
- "$pkgdir"/var/spool/clapf/tmp \
- || return 1
- chown -R $CLAPF_USER:$CLAPF_GROUP \
- "$pkgdir"/var/lib/clapf \
- "$pkgdir"/var/spool/clapf \
- || return 1
-}
-
-md5sums="0a38f56f717b170d8b6e5f780cd2281d clapf-0.4.7.4-g31d2ce87967e.tar.gz
-7f480d5a8d0da4863b682deddfe47eff gsl-libs.patch
-ba31f71c066f3f6159548808d2e26d8b def__user.patch
-967743d70cdf21dd929117865c7053c0 ldflags.patch
-1e3786f78bbdfaba1f2d414f9fa19907 clapf.confd
-3ab39ee86b80ba8e19e8f41686d35bc6 clapf.initd"
-sha256sums="84b1e15462985531e865b5700200d1f0fc09289e5cce00f3d8ab0fdefe4b51cc clapf-0.4.7.4-g31d2ce87967e.tar.gz
-4b4bb8530ac740a5279e0fdd959c6b706b3635792030f6b242e282f8d923202c gsl-libs.patch
-0523e889808f6aa3ec71a34846cbdfc9d1b185463583dcd7239673d098402346 def__user.patch
-d9b5fdbc6ca3118a3e382bcdca383ccca4cdac660303d39a7221bc6475f4eaac ldflags.patch
-429a4a6f832cb00f5fcfa0218656bcefa68d80f1f6d2f21ee4dfe1dceef15f69 clapf.confd
-bafcb80e5f142f9680a7b8a94c848d84a6940d6c807122d0ed10f004c035faf9 clapf.initd"
-sha512sums="f13428be93cd170e24c70e608d15ef7d6054fa1d57dc9dae4efc4b78c464a1ab3102d99114ddfa3fe011e0a6b6ae2076ee46d5d64561604d0b758fae947d22da clapf-0.4.7.4-g31d2ce87967e.tar.gz
-096ed4afe1b0fad569a172d6af952f1590d230dd38f6f0c4c0b1e7f29a1515fd887f1c099267aa926ce698864b75cb50626a9b7f49914549748d22ba7058a31d gsl-libs.patch
-18b8bf55f20e86e05958f2b4a8bdea8bedeb712bc91bb9a6a67faa2928b545707d3391671ab843415fe11703fef4683594571136cf9b2ec87aa41b0875d34588 def__user.patch
-f391663c74ce55b33446bbca9cde61201147d8704f514a266ea1371a43231e34800a8dc6e9f3843849ac000aa49ec2cffc023795696b6127bb404df83493f10f ldflags.patch
-f9d931f59710ca5ffae2d08d95d12d090dbbd932f8aa0ebb15e925704563834249e475e7ae8e845fb0f57396cdc11492b54efa0f5c228222f04a0e0c0e92caa5 clapf.confd
-c4dff1a3627f9de640dbe6c9a7c69f0e8357f9c63a3fb41f3c6c1e7ee6caec431be6f473002847f1fd2c6c41f7d2730ae134a5b04c9df77502b0905657f524e8 clapf.initd"
diff --git a/testing/clapf/clapf.confd b/testing/clapf/clapf.confd
deleted file mode 100644
index 8edf00cfb2..0000000000
--- a/testing/clapf/clapf.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/clapf: config file for /etc/init.d/clapf
-
-#CLAPF_USER=clapf
-#CLAPF_GROUP=clapf
-#CLAPF_CONF=/etc/clapf.conf
-#CLAPF_OPTS="-c $CLAPF_CONF"
diff --git a/testing/clapf/clapf.initd b/testing/clapf/clapf.initd
deleted file mode 100644
index b3e6c6dd90..0000000000
--- a/testing/clapf/clapf.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-
-description="Email content filter"
-extra_started_commands="reload"
-
-command="/usr/sbin/clapf"
-pidfile="/var/run/clapf/clapf.pid"
-CLAPF_CONF="${CLAPF_CONF:-/etc/clapf.conf}"
-CLAPF_USER="${CLAPF_USER:-clapf}"
-CLAPF_GROUP="${CLAPF_GROUP:-clapf}"
-command_user="$CLAPF_USER${CLAPF_GROUP:+:}$CLAPF_GROUP"
-command_args="${CLAPF_OPTS:--c $CLAPF_CONF}"
-command_background="YES"
-
-depend() {
- need net
- use logger
- before mta
-}
-
-reload() {
- ebegin "Reloading ${name:-$RC_SVCNAME}"
- start-stop-daemon --signal HUP \
- ${command:+--exec} $command \
- ${pidfile:+--pidfile} $pidfile
- eend $?
-}
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
deleted file mode 100644
index b2207408ad..0000000000
--- a/testing/clapf/clapf.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clapf 2>/dev/null
-adduser -S -D -H -h /var/lib/clapf -s /bin/false -G clapf -g clapf clapf 2>/dev/null
-
-exit 0
diff --git a/testing/clapf/def__user.patch b/testing/clapf/def__user.patch
deleted file mode 100644
index 825f7cd951..0000000000
--- a/testing/clapf/def__user.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/defs.h b/src/defs.h
-index 68cb80a..aae7905 100644
---- a/src/defs.h
-+++ b/src/defs.h
-@@ -156,6 +156,9 @@ struct session_data {
- int training_request;
- float spaminess;
- float Nham, Nspam;
-+#ifdef __user
-+#undef __user
-+#endif
- float __acquire, __parsed, __av, __user, __policy, __training, __minefield, __as, __update, __store, __inject;
- #ifdef HAVE_MAILBUF
- char mailbuf[MAILBUFSIZE], discard_mailbuf;
-diff --git a/webui/view/theme/default/templates/common/footer.tpl b/webui/view/theme/default/templates/common/footer.tpl
-index e2a23fe..0f681bb 100644
---- a/webui/view/theme/default/templates/common/footer.tpl
-+++ b/webui/view/theme/default/templates/common/footer.tpl
-@@ -1,3 +1,3 @@
-
-- <p>clapf web UI, VERSION_STRING</p>
-+ <p>clapf web UI, 0.4.7.4</p>
-
diff --git a/testing/clapf/gsl-libs.patch b/testing/clapf/gsl-libs.patch
deleted file mode 100644
index 7ee3b3bfb1..0000000000
--- a/testing/clapf/gsl-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./configure.in.orig 2013-04-16 08:57:38.886870643 +0000
-+++ ./configure.in 2013-04-16 09:00:49.735350727 +0000
-@@ -275,7 +275,10 @@
- defs="$defs -DHAVE_GSL"
- gsl_libs="-lgslcblas -lgsl"
- fi
--
-+ PKG_CHECK_MODULES(GSL, gsl, [
-+ defs="$defs -DHAVE_GSL $GSL_CFLAGS"
-+ gsl_libs="$GSL_LIBS"
-+ ])
-
- dnl the blackhole feature
-
diff --git a/testing/clapf/ldflags.patch b/testing/clapf/ldflags.patch
deleted file mode 100644
index 0dfd02de6a..0000000000
--- a/testing/clapf/ldflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 9512aca..6b4388e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -17,7 +17,7 @@
- CFLAGS = @CFLAGS@ @CPPFLAGS@
- DEFS = @defs@
- INCDIR = -I. -I.. @INCDIR@ @sql_includes@
--LIBDIR = -L. -L../contrib/spamsum @LIBDIR@ @LDFLAGS@
-+LIBDIR = -L. -L../contrib/spamsum @LIBDIR@
- LIBS = @LIBS@ @sql_libs@
- ##CLAMAV_EXTRA_LIBS = -lclamunrar_iface -lclamunrar
- OBJS = @OBJS@
-@@ -40,13 +40,12 @@ install: install-clapf install-includes install-splitmbox @parsembox_install@ @s
-
-
- clapf: clapf.c libclapf.a
-- $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ clapf.c -lclapf $(LIBS) $(LDAP_LIBS) $(LIBDIR) @LDFLAGS@ @libclamav_extra_libs@
-+ $(CC) $(CFLAGS) $(INCDIR) $(DEFS) @LDFLAGS@ -o $@ clapf.c -lclapf $(LIBS) $(LDAP_LIBS) $(LIBDIR) @libclamav_extra_libs@
-
- libclapf.a: $(OBJS) $(SQL_OBJS)
- ar cr libclapf.a $(OBJS) $(SQL_OBJS)
- ranlib libclapf.a
-- #$(CC) -shared -Wl,-soname,libclapf.so.$(CLAPF_VERSION) -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS) @LDFLAGS@
-- $(CC) -shared -Wl -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS) @LDFLAGS@
-+ $(CC) @LDFLAGS@ -shared -Wl,-soname,libclapf.so.$(CLAPF_VERSION) -o libclapf.so.$(LIBCLAPF_VERSION) $(OBJS) $(SQL_OBJS) $(LIBS) $(LDAP_LIBS)
- ln -sf libclapf.so.$(LIBCLAPF_VERSION) libclapf.so
- ln -sf libclapf.so.$(LIBCLAPF_VERSION) libclapf.so.$(CLAPF_VERSION)
-
-@@ -75,7 +75,7 @@
- $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $^ $(LIBS) $(LDAP_LIBS) $(LIBDIR) -ltre
-
- test:
-- $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o spamtest $(srcdir)/test.c -lclapf $(LIBS) $(LDAP_LIBS) @spamsum_libs@ $(LIBDIR) @LDFLAGS@
-+ $(CC) $(CFLAGS) $(INCDIR) $(DEFS) @LDFLAGS@ -o spamtest $(srcdir)/test.c -lclapf $(LIBS) $(LDAP_LIBS) @spamsum_libs@ $(LIBDIR)
-
- %.o: $(srcdir)/%.c
- $(CC) $(CFLAGS) -fPIC $(INCDIR) $(DEFS) -c $< -o $@
diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD
index 96f5e4269a..03c3ea1d9f 100644
--- a/testing/cloudfoundry-cli/APKBUILD
+++ b/testing/cloudfoundry-cli/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Thomas Boerger <thomas@webhippie.de>
# Maintainer: Thomas Boerger <thomas@webhippie.de>
pkgname=cloudfoundry-cli
-pkgver=6.47.2
+pkgver=6.49.0
pkgrel=0
pkgdesc="A CLI for Cloud Foundry written in Go"
url="https://github.com/cloudfoundry/cli"
@@ -25,4 +25,4 @@ package() {
"$pkgdir"/usr/bin
}
-sha512sums="0ab63e517ec0e43ae4c3e9436ed3bd8a7192de51d014c0c238fbc558cb392297c594f322047e80f660197243cf57b6d0c433ca9c54987a9447efc42c0bca7f45 cloudfoundry-cli-6.47.2.tar.gz"
+sha512sums="79195dd6b2de4e00f2edce6845bea006512d3eaa9e7e252f1e97c72482cb3232e6f999e16a9d9c60ece72badb61bab5daaa482035f1e9b8cdf2542b0f7f6b163 cloudfoundry-cli-6.49.0.tar.gz"
diff --git a/testing/cmatrix/APKBUILD b/testing/cmatrix/APKBUILD
new file mode 100644
index 0000000000..d7f4fded07
--- /dev/null
+++ b/testing/cmatrix/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: alpterry <alpterry@protonmail.com>
+# Maintainer: alpterry <alpterry@protonmail.com>
+pkgname=cmatrix
+pkgver=2.0
+pkgrel=0
+pkgdesc="Terminal based 'The Matrix' like implementation"
+url="https://github.com/abishekvashok/cmatrix"
+arch="all"
+license="GPL-3.0-or-later"
+makedepends="ncurses-dev kbd autoconf automake"
+subpackages="$pkgname-doc"
+options="!check" # no test suite
+source="$pkgname-$pkgver.tar.gz::https://github.com/abishekvashok/cmatrix/archive/v$pkgver.tar.gz"
+
+prepare() {
+ default_prepare
+ autoreconf -i
+}
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530 cmatrix-2.0.tar.gz"
diff --git a/testing/cni-plugins/APKBUILD b/testing/cni-plugins/APKBUILD
index 2680cef85a..872376eedd 100644
--- a/testing/cni-plugins/APKBUILD
+++ b/testing/cni-plugins/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cni-plugins
-pkgver=0.8.2
+pkgver=0.8.4
pkgrel=0
pkgdesc="Some standard networking plugins, maintained by the CNI team"
options="!check"
@@ -24,4 +24,4 @@ package() {
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
-sha512sums="383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9 cni-plugins-0.8.2.tar.gz"
+sha512sums="1a66a9d2cc3bad17201426905ed8349fa0c260ffef423338bc93c4ff191c4d38e6b9228ca3b5c44b148c854379f741f2dbd88ac9937dc1599f95f4df8b6f4346 cni-plugins-0.8.4.tar.gz"
diff --git a/testing/conmon/APKBUILD b/testing/conmon/APKBUILD
new file mode 100644
index 0000000000..af0658f849
--- /dev/null
+++ b/testing/conmon/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=conmon
+pkgver=2.0.9
+pkgrel=0
+pkgdesc="An OCI container runtime monitor"
+url="https://github.com/containers/conmon"
+arch="all"
+license="Apache-2.0"
+makedepends="glib-dev bash"
+source="$pkgname-$pkgver.tar.gz::https://github.com/containers/conmon/archive/v$pkgver.tar.gz"
+
+build() {
+ make
+}
+
+check() {
+ ./bin/conmon --version
+}
+
+package() {
+ make install PREFIX=/usr DESTDIR="$pkgdir"
+}
+
+
+sha512sums="904275d6e116c15e1c373c7ee5d7d9f2cdb671f86c364bab24eb688cd618afacfd63ca5076fd5a67869b97cdbb226df8fac15f390a384e125d9007c0052ed847 conmon-2.0.9.tar.gz"
diff --git a/testing/consolation/APKBUILD b/testing/consolation/APKBUILD
new file mode 100644
index 0000000000..961e3b3861
--- /dev/null
+++ b/testing/consolation/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Danct12 <danct12@disroot.org>
+# Maintainer: Danct12 <danct12@disroot.org>
+pkgname=consolation
+pkgver=0.0.7
+pkgrel=0
+pkgdesc="Libinput-based console pointer support for copy-paste"
+arch="all"
+url="https://salsa.debian.org/consolation-team/consolation"
+license="MIT GPL-2.0-only"
+source="https://deb.debian.org/debian/pool/main/c/consolation/${pkgname}_${pkgver}.orig.tar.xz
+ consolation.initd"
+makedepends="linux-headers libinput-dev eudev-dev libevdev-dev"
+subpackages="$pkgname-doc"
+builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+ ./configure --prefix=/usr --sbindir=/usr/sbin
+}
+
+build() {
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir/" install
+ install -Dm755 "${srcdir}/consolation.initd" \
+ "${pkgdir}/etc/init.d/consolation"
+}
+
+check() {
+ make check
+}
+sha512sums="d04cb6ff18de20c9c060ad96863c9871204ceb5be58fd1073bb11aff8c072cc78c1271678bb1d3b05578c5959f332ea14ac7634af0346a03ff5925ecd0f71305 consolation_0.0.7.orig.tar.xz
+7cdfcf71d4e8fa9ed4b9d42f3cd40fdd4fee68b268dda5a1e2743fe44eea7cbb46c947181c83fae070fbfe4fd3af6f040d409a1ee62f8ba972fb00f0de7ec726 consolation.initd"
diff --git a/testing/consolation/consolation.initd b/testing/consolation/consolation.initd
new file mode 100644
index 0000000000..66319a2b30
--- /dev/null
+++ b/testing/consolation/consolation.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+
+cmd=/usr/sbin/consolation
+cmd_args="--no-daemon"
+pid=/run/consolation.pid
+description="Linux Console Pointer Interface"
+
+depend() {
+ after bootmisc
+}
+
+start() {
+ ebegin "Starting Consolation"
+ start-stop-daemon --start --exec $cmd --background \
+ --pidfile $pid --make-pidfile -- $cmd_args
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Consolation"
+ start-stop-daemon --stop --exec $cmd
+ eend $?
+}
+
+restart() {
+ stop
+ start
+}
+
diff --git a/testing/console_bridge/APKBUILD b/testing/console_bridge/APKBUILD
index f0ef0be398..a0bbe142e4 100644
--- a/testing/console_bridge/APKBUILD
+++ b/testing/console_bridge/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Russ Webber <russ@rw.id.au>
# Maintainer: Russ Webber <russ@rw.id.au>
pkgname=console_bridge
-pkgver=0.4.3
+pkgver=0.4.4
pkgrel=0
pkgdesc="Logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages."
url="https://github.com/ros/console_bridge"
@@ -34,4 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="034f69dcfe0c56b93a5bc60095afaaaa275955ff58f0ddee1a0a325eff3981c41703c8b521b43cdca5f6317d6a5775e7caf221cf2d79b5d62045b0f4315cc577 console_bridge-0.4.3.tar.gz"
+sha512sums="9b8f165e3c2ea4a6c9ee5f551c78229aa57196d19c87a4393e9257bb65aed4dcfa0eb97a0b8c433347c71330659ca80ac6a3952775adb20312c51c31ef905184 console_bridge-0.4.4.tar.gz"
diff --git a/testing/consul-template/APKBUILD b/testing/consul-template/APKBUILD
deleted file mode 100644
index fdaf64e37c..0000000000
--- a/testing/consul-template/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Gennady Feldman <gena01@gmail.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=consul-template
-pkgver=0.22.1
-pkgrel=0
-pkgdesc="Generic template rendering and notifications with Consul"
-url="https://www.consul.io/"
-arch="all"
-license="MPL-2.0"
-makedepends="go"
-options="!check"
-subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/consul-template/archive/v$pkgver.tar.gz
- consul-template.hcl
- consul-template.initd
- "
-
-build() {
- CGO_ENABLED="0" go build -a -v -o bin/$pkgname \
- -ldflags "-s -w
- -X github.com/hashicorp/$pkgname/version.Name=$pkgname \
- -X github.com/hashicorp/$pkgname/version.GitCommit=$pkgver"
-}
-
-package() {
- # Main binary
- install -m750 -D bin/$pkgname "$pkgdir"/usr/sbin/$pkgname
- install -Dm644 "$srcdir"/consul-template.hcl "$pkgdir"/etc/"$pkgname"/"$pkgname".hcl
- install -Dm644 "$srcdir"/consul-template.initd "$pkgdir"/etc/init.d/"$pkgname"
-}
-
-sha512sums="7f4ab1b5b5c7a2a8c11cd4a5963d117d2feac19ba64ef0840edee15a17ea3f9bd3aea49d43b6b2de74fb9316713de147ac77279ee83a53b5bd51ce1607daf38d consul-template-0.22.1.tar.gz
-bfb5c7eed53cfe45d9e03eeb68eb454d2f47a47402a99b008895c261389160d611ab72903cdfb98e99a88749e0fd00733a9fad70b9def9af35657cba12987ea9 consul-template.hcl
-728f307cacd63abc35b4e6761cbebb9f4eb41e0b04e7969a1eac6585a65864d998654aee8ac8669ad3dfdc8115f9bf529dccf9396451b3ba7ab840a95a1f2a29 consul-template.initd"
diff --git a/testing/consul-template/consul-template.hcl b/testing/consul-template/consul-template.hcl
deleted file mode 100644
index 19fd1a65d7..0000000000
--- a/testing/consul-template/consul-template.hcl
+++ /dev/null
@@ -1,351 +0,0 @@
-# This denotes the start of the configuration section for Consul. All values
-# contained in this section pertain to Consul.
-consul {
- # This block specifies the basic authentication information to pass with the
- # request. For more information on authentication, please see the Consul
- # documentation.
- auth {
- enabled = true
- username = "test"
- password = "test"
- }
-
- # This is the address of the Consul agent. By default, this is
- # 127.0.0.1:8500, which is the default bind and port for a local Consul
- # agent. It is not recommended that you communicate directly with a Consul
- # server, and instead communicate with the local Consul agent. There are many
- # reasons for this, most importantly the Consul agent is able to multiplex
- # connections to the Consul server and reduce the number of open HTTP
- # connections. Additionally, it provides a "well-known" IP address for which
- # clients can connect.
- address = "127.0.0.1:8500"
-
- # This is the ACL token to use when connecting to Consul. If you did not
- # enable ACLs on your Consul cluster, you do not need to set this option.
- #
- # This option is also available via the environment variable CONSUL_TOKEN.
- token = "abcd1234"
-
- # This controls the retry behavior when an error is returned from Consul.
- # Consul Template is highly fault tolerant, meaning it does not exit in the
- # face of failure. Instead, it uses exponential back-off and retry functions
- # to wait for the cluster to become available, as is customary in distributed
- # systems.
- retry {
- # This enabled retries. Retries are enabled by default, so this is
- # redundant.
- enabled = true
-
- # This specifies the number of attempts to make before giving up. Each
- # attempt adds the exponential backoff sleep time. Setting this to
- # zero will implement an unlimited number of retries.
- attempts = 12
-
- # This is the base amount of time to sleep between retry attempts. Each
- # retry sleeps for an exponent of 2 longer than this base. For 5 retries,
- # the sleep times would be: 250ms, 500ms, 1s, 2s, then 4s.
- backoff = "250ms"
-
- # This is the maximum amount of time to sleep between retry attempts.
- # When max_backoff is set to zero, there is no upper limit to the
- # exponential sleep between retry attempts.
- # If max_backoff is set to 10s and backoff is set to 1s, sleep times
- # would be: 1s, 2s, 4s, 8s, 10s, 10s, ...
- max_backoff = "1m"
- }
-
- # This block configures the SSL options for connecting to the Consul server.
- ssl {
- # This enables SSL. Specifying any option for SSL will also enable it.
- enabled = true
-
- # This enables SSL peer verification. The default value is "true", which
- # will check the global CA chain to make sure the given certificates are
- # valid. If you are using a self-signed certificate that you have not added
- # to the CA chain, you may want to disable SSL verification. However, please
- # understand this is a potential security vulnerability.
- verify = false
-
- # This is the path to the certificate to use to authenticate. If just a
- # certificate is provided, it is assumed to contain both the certificate and
- # the key to convert to an X509 certificate. If both the certificate and
- # key are specified, Consul Template will automatically combine them into an
- # X509 certificate for you.
- cert = "/path/to/client/cert"
- key = "/path/to/client/key"
-
- # This is the path to the certificate authority to use as a CA. This is
- # useful for self-signed certificates or for organizations using their own
- # internal certificate authority.
- ca_cert = "/path/to/ca"
-
- # This is the path to a directory of PEM-encoded CA cert files. If both
- # `ca_cert` and `ca_path` is specified, `ca_cert` is preferred.
- ca_path = "path/to/certs/"
-
- # This sets the SNI server name to use for validation.
- server_name = "my-server.com"
- }
-}
-
-# This is the signal to listen for to trigger a reload event. The default
-# value is shown below. Setting this value to the empty string will cause CT
-# to not listen for any reload signals.
-reload_signal = "SIGHUP"
-
-# This is the signal to listen for to trigger a graceful stop. The default
-# value is shown below. Setting this value to the empty string will cause CT
-# to not listen for any graceful stop signals.
-kill_signal = "SIGINT"
-
-# This is the maximum interval to allow "stale" data. By default, only the
-# Consul leader will respond to queries; any requests to a follower will
-# forward to the leader. In large clusters with many requests, this is not as
-# scalable, so this option allows any follower to respond to a query, so long
-# as the last-replicated data is within these bounds. Higher values result in
-# less cluster load, but are more likely to have outdated data.
-max_stale = "10m"
-
-# This is the log level. If you find a bug in Consul Template, please enable
-# debug logs so we can help identify the issue. This is also available as a
-# command line flag.
-log_level = "warn"
-
-# This is the path to store a PID file which will contain the process ID of the
-# Consul Template process. This is useful if you plan to send custom signals
-# to the process.
-pid_file = "/path/to/pid"
-
-# This is the quiescence timers; it defines the minimum and maximum amount of
-# time to wait for the cluster to reach a consistent state before rendering a
-# template. This is useful to enable in systems that have a lot of flapping,
-# because it will reduce the the number of times a template is rendered.
-wait {
- min = "5s"
- max = "10s"
-}
-
-# This denotes the start of the configuration section for Vault. All values
-# contained in this section pertain to Vault.
-vault {
- # This is the address of the Vault leader. The protocol (http(s)) portion
- # of the address is required.
- address = "https://vault.service.consul:8200"
-
- # This is the grace period between lease renewal of periodic secrets and secret
- # re-acquisition. When renewing a secret, if the remaining lease is less than or
- # equal to the configured grace, Consul Template will request a new credential.
- # This prevents Vault from revoking the credential at expiration and Consul
- # Template having a stale credential.
- #
- # Note: If you set this to a value that is higher than your default TTL or
- # max TTL, Consul Template will always read a new secret!
- grace = "5m"
-
- # This is the token to use when communicating with the Vault server.
- # Like other tools that integrate with Vault, Consul Template makes the
- # assumption that you provide it with a Vault token; it does not have the
- # incorporated logic to generate tokens via Vault's auth methods.
- #
- # This value can also be specified via the environment variable VAULT_TOKEN.
- token = "abcd1234"
-
- # This tells Consul Template that the provided token is actually a wrapped
- # token that should be unwrapped using Vault's cubbyhole response wrapping
- # before being used. Please see Vault's cubbyhole response wrapping
- # documentation for more information.
- unwrap_token = true
-
- # This option tells Consul Template to automatically renew the Vault token
- # given. If you are unfamiliar with Vault's architecture, Vault requires
- # tokens be renewed at some regular interval or they will be revoked. Consul
- # Template will automatically renew the token at half the lease duration of
- # the token. The default value is true, but this option can be disabled if
- # you want to renew the Vault token using an out-of-band process.
- #
- # Note that secrets specified in a template (using {{secret}} for example)
- # are always renewed, even if this option is set to false. This option only
- # applies to the top-level Vault token itself.
- renew_token = true
-
- # This section details the retry options for connecting to Vault. Please see
- # the retry options in the Consul section for more information (they are the
- # same).
- retry {
- # ...
- }
-
- # This section details the SSL options for connecting to the Vault server.
- # Please see the SSL options in the Consul section for more information (they
- # are the same).
- ssl {
- # ...
- }
-}
-
-# This block defines the configuration for connecting to a syslog server for
-# logging.
-syslog {
- # This enables syslog logging. Specifying any other option also enables
- # syslog logging.
- enabled = true
-
- # This is the name of the syslog facility to log to.
- facility = "LOCAL5"
-}
-
-# This block defines the configuration for de-duplication mode. Please see the
-# de-duplication mode documentation later in the README for more information
-# on how de-duplication mode operates.
-deduplicate {
- # This enables de-duplication mode. Specifying any other options also enables
- # de-duplication mode.
- enabled = true
-
- # This is the prefix to the path in Consul's KV store where de-duplication
- # templates will be pre-rendered and stored.
- prefix = "consul-template/dedup/"
-}
-
-# This block defines the configuration for exec mode. Please see the exec mode
-# documentation at the bottom of this README for more information on how exec
-# mode operates and the caveats of this mode.
-exec {
- # This is the command to exec as a child process. There can be only one
- # command per Consul Template process.
- command = "/usr/bin/app"
-
- # This is a random splay to wait before killing the command. The default
- # value is 0 (no wait), but large clusters should consider setting a splay
- # value to prevent all child processes from reloading at the same time when
- # data changes occur. When this value is set to non-zero, Consul Template
- # will wait a random period of time up to the splay value before reloading
- # or killing the child process. This can be used to prevent the thundering
- # herd problem on applications that do not gracefully reload.
- splay = "5s"
-
- env {
- # This specifies if the child process should not inherit the parent
- # process's environment. By default, the child will have full access to the
- # environment variables of the parent. Setting this to true will send only
- # the values specified in `custom_env` to the child process.
- pristine = false
-
- # This specifies additional custom environment variables in the form shown
- # below to inject into the child's runtime environment. If a custom
- # environment variable shares its name with a system environment variable,
- # the custom environment variable takes precedence. Even if pristine,
- # whitelist, or blacklist is specified, all values in this option
- # are given to the child process.
- custom = ["PATH=$PATH:/etc/myapp/bin"]
-
- # This specifies a list of environment variables to exclusively include in
- # the list of environment variables exposed to the child process. If
- # specified, only those environment variables matching the given patterns
- # are exposed to the child process. These strings are matched using Go's
- # glob function, so wildcards are permitted.
- whitelist = ["CONSUL_*"]
-
- # This specifies a list of environment variables to exclusively prohibit in
- # the list of environment variables exposed to the child process. If
- # specified, any environment variables matching the given patterns will not
- # be exposed to the child process, even if they are whitelisted. The values
- # in this option take precedence over the values in the whitelist.
- # These strings are matched using Go's glob function, so wildcards are
- # permitted.
- blacklist = ["VAULT_*"]
- }
-
- # This defines the signal that will be sent to the child process when a
- # change occurs in a watched template. The signal will only be sent after the
- # process is started, and the process will only be started after all
- # dependent templates have been rendered at least once. The default value is
- # nil, which tells Consul Template to stop the child process and spawn a new
- # one instead of sending it a signal. This is useful for legacy applications
- # or applications that cannot properly reload their configuration without a
- # full reload.
- reload_signal = ""
-
- # This defines the signal sent to the child process when Consul Template is
- # gracefully shutting down. The application should begin a graceful cleanup.
- # If the application does not terminate before the `kill_timeout`, it will
- # be terminated (effectively "kill -9"). The default value is "SIGTERM".
- kill_signal = "SIGINT"
-
- # This defines the amount of time to wait for the child process to gracefully
- # terminate when Consul Template exits. After this specified time, the child
- # process will be force-killed (effectively "kill -9"). The default value is
- # "30s".
- kill_timeout = "2s"
-}
-
-# This block defines the configuration for a template. Unlike other blocks,
-# this block may be specified multiple times to configure multiple templates.
-# It is also possible to configure templates via the CLI directly.
-template {
- # This is the source file on disk to use as the input template. This is often
- # called the "Consul Template template". This option is required if not using
- # the `contents` option.
- source = "/path/on/disk/to/template.ctmpl"
-
- # This is the destination path on disk where the source template will render.
- # If the parent directories do not exist, Consul Template will attempt to
- # create them, unless create_dest_dirs is false.
- destination = "/path/on/disk/where/template/will/render.txt"
-
- # This options tells Consul Template to create the parent directories of the
- # destination path if they do not exist. The default value is true.
- create_dest_dirs = true
-
- # This option allows embedding the contents of a template in the configuration
- # file rather then supplying the `source` path to the template file. This is
- # useful for short templates. This option is mutually exclusive with the
- # `source` option.
- contents = "{{ keyOrDefault \"service/redis/maxconns@east-aws\" \"5\" }}"
-
- # This is the optional command to run when the template is rendered. The
- # command will only run if the resulting template changes. The command must
- # return within 30s (configurable), and it must have a successful exit code.
- # Consul Template is not a replacement for a process monitor or init system.
- command = "restart service foo"
-
- # This is the maximum amount of time to wait for the optional command to
- # return. Default is 30s.
- command_timeout = "60s"
-
- # Exit with an error when accessing a struct or map field/key that does not
- # exist. The default behavior will print "<no value>" when accessing a field
- # that does not exist. It is highly recommended you set this to "true" when
- # retrieving secrets from Vault.
- error_on_missing_key = false
-
- # This is the permission to render the file. If this option is left
- # unspecified, Consul Template will attempt to match the permissions of the
- # file that already exists at the destination path. If no file exists at that
- # path, the permissions are 0644.
- perms = 0600
-
- # This option backs up the previously rendered template at the destination
- # path before writing a new one. It keeps exactly one backup. This option is
- # useful for preventing accidental changes to the data without having a
- # rollback strategy.
- backup = true
-
- # These are the delimiters to use in the template. The default is "{{" and
- # "}}", but for some templates, it may be easier to use a different delimiter
- # that does not conflict with the output file itself.
- left_delimiter = "{{"
- right_delimiter = "}}"
-
- # This is the `minimum(:maximum)` to wait before rendering a new template to
- # disk and triggering a command, separated by a colon (`:`). If the optional
- # maximum value is omitted, it is assumed to be 4x the required minimum value.
- # This is a numeric time with a unit suffix ("5s"). There is no default value.
- # The wait value for a template takes precedence over any globally-configured
- # wait.
- wait {
- min = "2s"
- max = "10s"
- }
-}
-
diff --git a/testing/consul-template/consul-template.initd b/testing/consul-template/consul-template.initd
deleted file mode 100644
index d0f6b7ed7a..0000000000
--- a/testing/consul-template/consul-template.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-name="$RC_SVCNAME"
-
-description="template rendering, notifier, and supervisor for HashiCorp Consul and Vault data"
-description_reload="Reload configuration"
-
-daemon=/usr/sbin/"$RC_SVCNAME"
-command_args="$CONSUL_TEMPLATE_ARGS -config ${CONFIG:-/etc/$RV_SVCNAME/$RC_SVCNAME.hcl"
-
-depend() {
- after vault consul
-}
-
-reload() {
- ebegin "Reloading $RC_SVCNAME configuration"
- $supervisor "$RC_SVCNAME" --signal HUP
- eend $?
-}
diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD
index 5fe1219c5a..232b50821a 100644
--- a/testing/consul/APKBUILD
+++ b/testing/consul/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Olivier Mauras <olivier@mauras.ch>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=consul
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=0
pkgdesc="Tool for service discovery, monitoring and configuration"
url="https://www.consul.io"
@@ -12,7 +12,7 @@ install="$pkgname.pre-install"
pkgusers="consul"
pkggroups="consul"
subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/$pkgname/archive/v$pkgver.tar.gz
+source="consul-$pkgver.tar.gz::https://github.com/hashicorp/consul/archive/v$pkgver.tar.gz
consul.initd
consul.confd
acl.json.sample
@@ -28,20 +28,16 @@ prepare() {
}
build() {
- cd "$builddir"
-
GOPATH="$srcdir" go build -v -o bin/$pkgname \
-ldflags "-X github.com/hashicorp/consul/version.GitDescribe='$pkgver'" \
--tags consul
}
check() {
- cd "$builddir"
GOPATH="$srcdir" go test
}
package() {
- cd "$builddir"
# Consul init script
install -m755 -D "$srcdir"/$pkgname.initd \
"$pkgdir"/etc/init.d/$pkgname
@@ -62,7 +58,12 @@ package() {
done
}
-sha512sums="67e2032bd128288b0177f23fbacaa8c289682a88ad75a744e583619e9cf9426747f3e129be89080eb2f7c8d186a9c25899d3a4ac3c0cce73b9433bb29ba18ab2 consul-1.6.1.tar.gz
+cleanup_srcdir() {
+ [ -d src ] && chmod -R +w src
+ default_cleanup_srcdir
+}
+
+sha512sums="2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826 consul-1.6.2.tar.gz
74c2581bcafa119b4fc8ce72cf0c73584316a4bf3007130ae8864e97a91dcc4aab15f39faa423d90bfa667e26db11f7f581982f9fe7e1870df72e2dc0240676a consul.initd
f2c5af74dfcbca2fea8ebea31139d93f44455b93ef17ec611b880d7071af4125615dbbd23969d0d04ca636c26d7b4e7eb97f1266baa89252097f4cbc5173d817 consul.confd
d4310dde63d3b8fc4791124bd255bf2a1402b86d00f6b1732e18b0caedb75eae6c77382e1a48f12469828ef4bb363db4580fb1aafa63fcdc97b1431f6ea96d58 acl.json.sample
diff --git a/testing/copyq/APKBUILD b/testing/copyq/APKBUILD
index a5c983fadb..b47627dce4 100644
--- a/testing/copyq/APKBUILD
+++ b/testing/copyq/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=copyq
_pkgname=CopyQ
-pkgver=3.9.2
+pkgver=3.9.3
pkgrel=0
pkgdesc="Clipboard manager with searchable and editable history"
url="https://github.com/hluk/CopyQ"
@@ -13,7 +13,7 @@ makedepends="cmake libxfixes-dev libxtst-dev qt5-qtscript-dev
qt5-qtsvg-dev qt5-qttools-dev qt5-qtx11extras-dev"
options="!check" # upstream does not provide check
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hluk/${_pkgname}/archive/v${pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/hluk/$_pkgname/archive/v$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
prepare() {
@@ -32,7 +32,7 @@ build() {
package() {
cd "$builddir"/build
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="$pkgdir" install
}
-sha512sums="4c9066df2e02ca15a1c326bb588bd1ca5d23a45e696156b01d33427682edb3cef5d5c2bf091f7c02948802541454b6c011bf5a79c43283c18eb3d7bbb67c5dca copyq-3.9.2.tar.gz"
+sha512sums="9cbdf0017aee20459ec0061fb570184d1f0640f50602aaaaa8ad0ba0b1bdee5e9c350559882e50ef201a7cb66d19c4b394ed0a4627097a56f67f9b0d902a2000 copyq-3.9.3.tar.gz"
diff --git a/testing/corecollector/APKBUILD b/testing/corecollector/APKBUILD
new file mode 100644
index 0000000000..ae3ca59d1a
--- /dev/null
+++ b/testing/corecollector/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=corecollector
+pkgver=0.3.0
+pkgrel=0
+pkgdesc="A coredump collector written in D"
+url="https://github.com/Cogitri/corecollector"
+arch="all !ppc64le" # Missing gdc on ppc64le
+license="GPL-3.0-or-later"
+depends="gdb"
+makedepends="meson gcc-gdc scdoc"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+subpackages="$pkgname-doc"
+source="https://github.com/Cogitri/corecollector/archive/v$pkgver/corecollector-$pkgver.tar.gz"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja -C output test
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C output install
+}
+
+sha512sums="de094dc7556575bf953bd7e7222200338e6b15c35ed1d06de147e70ba8bc30cbb39da6c3c275ceefca447e9a7e177a72cccb4ccc9089024643e326620b1f15fb corecollector-0.3.0.tar.gz"
diff --git a/testing/corecollector/corecollector.pre-install b/testing/corecollector/corecollector.pre-install
new file mode 100644
index 0000000000..d61524ebd6
--- /dev/null
+++ b/testing/corecollector/corecollector.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S corecollector 2>/dev/null
+adduser -S -D -H -h /var/lib/corecollector -s /sbin/nologin -G corecollector -g corecollector corecollector 2>/dev/null
+
+exit 0
diff --git a/testing/corecollector/corecollector.pre-upgrade b/testing/corecollector/corecollector.pre-upgrade
new file mode 120000
index 0000000000..9b06931718
--- /dev/null
+++ b/testing/corecollector/corecollector.pre-upgrade
@@ -0,0 +1 @@
+corecollector.pre-install \ No newline at end of file
diff --git a/testing/coretoppings/APKBUILD b/testing/coretoppings/APKBUILD
new file mode 100644
index 0000000000..a6e4f2b6b1
--- /dev/null
+++ b/testing/coretoppings/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: rahmanshaber <rahmanshaber@yahoo.com>
+# Maintainer: rahmanshaber <rahmanshaber@yahoo.com>
+pkgname=coretoppings
+pkgver=2.8.0
+pkgrel=0
+pkgdesc="An activity viewer from the CoreApps family."
+arch="all"
+url="https://gitlab.com/cubocore"
+license="GPL-3.0-or-later"
+depends="qt5-qtsvg"
+makedepends="qt5-qtbase-dev libcprime-dev qt5-qtx11extras-dev qt5-qtconnectivity-dev qt5-qtlocation-dev libcsys-dev libxcomposite-dev xcb-util-dev libxrender-dev xcb-util-wm-dev"
+source="$pkgname-$pkgver.tar.gz::https://gitlab.com/cubocore/coretoppings/-/archive/v$pkgver/coretoppings-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
+options="!check" # No test suite
+
+build() {
+ qmake-qt5
+ make
+}
+
+package() {
+ INSTALL_ROOT="$pkgdir" make install
+}
+
+sha512sums="569d84a58beb8483792cd9526bb150ed603db15ffaa65efdee1ec1f8413c2c26593b22aba545b2fc428eb14392b9254e57641aae8bb6dca310af6ed01c12a29f coretoppings-2.8.0.tar.gz"
diff --git a/testing/cppzmq/APKBUILD b/testing/cppzmq/APKBUILD
index cc9cf13560..f0a1649407 100644
--- a/testing/cppzmq/APKBUILD
+++ b/testing/cppzmq/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Andreas Laghamn <andreas.laghamn@gmail.com>
# Maintainer: Andreas Laghamn <andreas.laghamn@gmail.com>
pkgname=cppzmq
-pkgver=4.5.0
+pkgver=4.6.0
pkgrel=0
pkgdesc="High-level C++ binding for ZeroMQ"
url="https://github.com/zeromq/cppzmq"
@@ -26,4 +26,4 @@ check() {
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="88646e2b96a5fde558422bf0fa3c8f359165c7521ad85ee7e4e9965aad5b1da28cd32913e89346420701d3eabeeb9f2eebac1a303a68c5f0a5ca503709120bc5 cppzmq-4.5.0.tar.gz"
+sha512sums="f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027 cppzmq-4.6.0.tar.gz"
diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index 2a90961c00..ffdff3e984 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -1,8 +1,8 @@
# Contributor:
# Maintainer: Paul Morgan <jumanjiman@gmail.com>
pkgname=createrepo_c
-pkgver=0.15.1
-pkgrel=1
+pkgver=0.15.6
+pkgrel=0
pkgdesc="C implementation of createrepo"
url="https://github.com/rpm-software-management/createrepo_c/"
arch="all"
@@ -91,4 +91,4 @@ bashcomp() {
mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share/
}
-sha512sums="d7a601f2ee766cd56ea5b72a4b30c0b855c50fb490070e471dc7bdac84e33ef17ecc2facf3a733a89c0b3586c9b39bd66c684f5e82050ac9d4b285325c7fd854 createrepo_c-0.15.1.tar.gz"
+sha512sums="54f29b309c99ff66a92579b69b6e303e1e88f66dc1184167c13d4c541ea98cf16da33c1088f23cb71bf8b581dc0c35ab77ab9802e6ad0756acbfc62408704555 createrepo_c-0.15.6.tar.gz"
diff --git a/testing/criu/APKBUILD b/testing/criu/APKBUILD
index 8126e815ef..268573a468 100644
--- a/testing/criu/APKBUILD
+++ b/testing/criu/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=criu
-pkgver=3.12
-pkgrel=1
+pkgver=3.13
+pkgrel=0
pkgdesc="Process tree checkpoint/restore utility"
url="https://criu.org"
arch="x86_64"
@@ -12,7 +12,7 @@ makedepends="xmlto asciidoc python3 protobuf-c-dev libnet-dev libnl3-dev
checkdepends="py3-yaml"
options="!check" # https://github.com/checkpoint-restore/criu/issues/434
subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py:noarch"
-source="$pkgname-$pkgver.tar.gz::https://github.com/xemul/criu/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/checkpoint-restore/criu/archive/v$pkgver.tar.gz"
build() {
# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed
@@ -40,4 +40,4 @@ _py() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="a938f739c09470e24950b94a6b1afe2b1e20c132e101836cb5efe15d1787ae655aadb3e7511167758c1e09eae031a098e71818fbfa567b79ae2e66de2c035512 criu-3.12.tar.gz"
+sha512sums="7af0c00751154fe1ad52d3f9da6fb70ff98da30b927002b329a6e7bfa757b28fadaa3db8d504bc685324d2aa276c450f4375d9563509602315c2246119411ad3 criu-3.13.tar.gz"
diff --git a/testing/crun/APKBUILD b/testing/crun/APKBUILD
new file mode 100644
index 0000000000..bb95ad754f
--- /dev/null
+++ b/testing/crun/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: kohnish <kohnish@gmx.com>
+# Maintainer: kohnish <kohnish@gmx.com>
+pkgname="crun"
+pkgver="0.11"
+pkgrel=0
+pkgdesc="crun is a command line utility that performs various operations on container images and image repositories."
+url="https://github.com/containers/crun"
+arch="all"
+license="GPL-3.0-only"
+makedepends="libcap-dev libseccomp-dev yajl-dev argp-standalone python3 go-md2man"
+subpackages="$pkgname-doc $pkgname-static"
+source="https://github.com/containers/crun/releases/download/$pkgver/crun-$pkgver.tar.xz"
+
+build() {
+ ./configure --disable-systemd --prefix=/usr
+ make
+}
+
+check() {
+ make tests/tests_libcrun_errors.log
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="170fe5148af06862c02f070c351f18446097e939e19320585078cd9a5e075c6ef06c2e5e64d394b784b9c3f2fae68d72b2a3dcf78041cc8899bb64045dc72cff crun-0.11.tar.xz"
diff --git a/testing/cwm/APKBUILD b/testing/cwm/APKBUILD
index 235761826e..d6d8925814 100644
--- a/testing/cwm/APKBUILD
+++ b/testing/cwm/APKBUILD
@@ -1,29 +1,22 @@
# Contributor: Cág <ca6c@bitmessage.ch>
# Maintainer
pkgname=cwm
-pkgver=6.3
+pkgver=6.6
pkgrel=0
pkgdesc="A lightweight and efficient window manager for X11"
url="https://github.com/chneukirchen/cwm"
arch="all"
license="ISC"
-depends=""
makedepends="libx11-dev libxft-dev libxrandr-dev byacc bsd-compat-headers"
-install=""
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/chneukirchen/$pkgname/archive/v$pkgver.tar.gz
- menu-border.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+source="cwm-$pkgver.tar.gz::https://github.com/chneukirchen/cwm/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir/" PREFIX=/usr install
}
-sha512sums="12f5c28ce2fa8e5310c49dd6d4fb58140a514943a93b8cab1c0c604bb50535a5e6b00b10f21c8d4500440f7ae7b14d2cb23c65eb201578fc01ab09f2bbc1e91f cwm-6.3.tar.gz
-d83c250af671de4d3ba9fcec6b1f72dfa9c36962e392521315987088f04c76830aef49a91f8e63f7be3e3895e3bf8ef0cc874c8ebb9e6e541accd2fae70fe2b8 menu-border.patch"
+sha512sums="ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042 cwm-6.6.tar.gz"
diff --git a/testing/cwm/menu-border.patch b/testing/cwm/menu-border.patch
deleted file mode 100644
index 290b60576a..0000000000
--- a/testing/cwm/menu-border.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/conf.c b/conf.c
-index d750c42..20a2da5 100644
---- a/conf.c
-+++ b/conf.c
-@@ -478,7 +478,7 @@ conf_screen(struct screen_ctx *sc)
-
- sc->menu.win = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
- Conf.bwidth,
-- sc->xftcolor[CWM_COLOR_MENU_FG].pixel,
-+ sc->xftcolor[CWM_COLOR_BORDER_ACTIVE].pixel,
- sc->xftcolor[CWM_COLOR_MENU_BG].pixel);
-
- sc->menu.xftdraw = XftDrawCreate(X_Dpy, sc->menu.win, visual, colormap);
diff --git a/testing/dav1d/APKBUILD b/testing/dav1d/APKBUILD
index 59f5ab7211..4d15157cf0 100644
--- a/testing/dav1d/APKBUILD
+++ b/testing/dav1d/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=dav1d
-pkgver=0.5.1
+pkgver=0.5.2
pkgrel=0
pkgdesc="small and fast AV1 Decoder"
url="https://code.videolan.org/videolan/dav1d"
@@ -36,4 +36,4 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="2d1e7888fa9c138903b4209647e907803d2444fc2afb219b9a45dcc4c75098128b299950750bd68970004ea413ad88933d4d651a3e4e0e1557506598a15cee3b dav1d-0.5.1.tar.bz2"
+sha512sums="37da9138a1dba68b9e723ba48b23eab567f839308132fc5a28727c131280f2eca3e160b074982f5265c914dcad0e4029af9ce23909b32bb9ec60f235c623e384 dav1d-0.5.2.tar.bz2"
diff --git a/testing/deluge/APKBUILD b/testing/deluge/APKBUILD
index 051eeb029f..fda4e4c16a 100644
--- a/testing/deluge/APKBUILD
+++ b/testing/deluge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=deluge
pkgver=2.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="A lightweight, Free Software, cross-platform BitTorrent client"
url="https://deluge-torrent.org/"
arch="noarch"
@@ -26,6 +26,7 @@ depends="
py3-hyperlink
py3-libtorrent-rasterbar
py3-gobject3
+ py3-cairo
"
subpackages="$pkgname-doc"
source="http://download.deluge-torrent.org/source/${pkgver%.*}/deluge-$pkgver.tar.xz"
diff --git a/testing/deutex/APKBUILD b/testing/deutex/APKBUILD
new file mode 100644
index 0000000000..22190bb951
--- /dev/null
+++ b/testing/deutex/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
+# Maintainer: Antoine Fontaine <antoine.fontaine@epfl.ch>
+pkgname="deutex"
+pkgver="5.2.1"
+pkgrel=0
+pkgdesc="WAD composer for Doom, Heretic, Hexen, and Strife"
+url="https://github.com/Doom-Utils/deutex"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="autoconf automake"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Doom-Utils/deutex/archive/v$pkgver.tar.gz"
+
+prepare() {
+ default_prepare
+
+ aclocal
+ autoheader
+ automake --add-missing
+ autoconf
+}
+
+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="976ba8ac3d3fef9cfec77272ed9b492abe1bae559633f4460c1a1f52ba373c0d2953831a18956afde0935ab7759c3bcb3274a8dec910c78af10044d0f568ba92 deutex-5.2.1.tar.gz"
diff --git a/testing/dfc/APKBUILD b/testing/dfc/APKBUILD
deleted file mode 100644
index 350c2d5c28..0000000000
--- a/testing/dfc/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=dfc
-pkgver=3.1.1
-pkgrel=0
-arch="all"
-url="https://projects.gw-computing.net/projects/dfc"
-pkgdesc="Report file system space usage information with style"
-license="BSD-3-Clause"
-makedepends="cmake"
-source="https://projects.gw-computing.net/attachments/download/615/$pkgname-$pkgver.tar.gz"
-subpackages="$pkgname-doc"
-options="!check" # No tests available
-
-build() {
- cmake \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- DESTDIR="$pkgdir" make install
-}
-
-sha512sums="eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701 dfc-3.1.1.tar.gz"
diff --git a/testing/diffstat/APKBUILD b/testing/diffstat/APKBUILD
index ae487be998..a75b506792 100644
--- a/testing/diffstat/APKBUILD
+++ b/testing/diffstat/APKBUILD
@@ -1,15 +1,14 @@
# Contributor: Leszek Cimała <ernierasta@zori.cz>
# Maintainer:
pkgname=diffstat
-pkgver=1.62
+pkgver=1.63
pkgrel=0
pkgdesc="diffstat reads the output of diff and displays a histogram of the insertions, deletions, and modifications per-file."
url="https://invisible-island.net/diffstat"
arch="all"
license="MIT"
subpackages="$pkgname-doc"
-source="https://invisible-island.net/datafiles/release/${pkgname}.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://invisible-island.net/datafiles/release/diffstat.tar.gz"
build() {
./configure \
@@ -30,4 +29,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a8088ac0c0e38458504da37249c1d51ae9d839044e4cb8a60a1424eca883e1ec4815c1b1a8d9dae60e909b5495e60a9eda88e0a4572392ed8019d27b171688ff diffstat.tar.gz"
+sha512sums="e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16 diffstat.tar.gz"
diff --git a/testing/dino/APKBUILD b/testing/dino/APKBUILD
new file mode 100644
index 0000000000..b1bc3aa30d
--- /dev/null
+++ b/testing/dino/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Galen Abell <galen@galenabell.com>
+# Maintainer: Galen Abell <galen@galenabell.com>
+pkgname="dino"
+pkgver="0_git20200109"
+_pkgsha="3fc9bdab053e23ab8e97afadfee0a05afad8d890"
+pkgrel=0
+pkgdesc="Modern Jabber/XMPP client"
+url="https://dino.im"
+arch="all"
+license="GPL-3.0-only"
+makedepends="
+ glib-dev
+ glib-networking
+ gtk+3.0-dev
+ gpgme-dev
+ libgee-dev
+ libgcrypt-dev
+ libsoup-dev
+ sqlite-dev
+ libqrencode-dev
+ cmake
+ vala
+ ninja
+"
+subpackages="$pkgname-lang"
+source="$pkgname-$_pkgsha.tar.gz::https://github.com/dino/dino/archive/$_pkgsha.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgsha"
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --with-tests
+ make
+}
+
+check() {
+ build/xmpp-vala-test
+ build/signal-protocol-vala-test
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+sha512sums="14efd2b0ced59f750a3a64b175cd94afa821f5a102469d117a3e592730875baea14b2b84dcde50ad7fa2b9d0b9522b1d4b2876be287b0286751b421c2443ce4d dino-3fc9bdab053e23ab8e97afadfee0a05afad8d890.tar.gz"
diff --git a/testing/distrobuilder/APKBUILD b/testing/distrobuilder/APKBUILD
index 796d60c883..ef1c94e916 100644
--- a/testing/distrobuilder/APKBUILD
+++ b/testing/distrobuilder/APKBUILD
@@ -3,12 +3,12 @@
pkgname=distrobuilder
pkgver=0_git20181004
_commit=d2329be9569d45028a38836186d2353b8ddfe1ca
-pkgrel=1
+pkgrel=2
pkgdesc="System container image builder"
url="https://linuxcontainers.org/"
-arch="all"
+arch="" # Build fails on the builders
license="Apache-2.0"
-depends="xz gnupg1"
+depends="gnupg1"
makedepends="go linux-headers glide"
subpackages="$pkgname-lxc::noarch $pkgname-lxd::noarch"
options="!check" # has no check
@@ -20,8 +20,7 @@ builddir="$srcdir/src/github.com/lxc/$pkgname"
prepare() {
mkdir -p ${builddir%/*}
- mv "$srcdir"/$pkgname-$_commit "$builddir"/
- cd "$builddir"
+ mv "$srcdir"/$pkgname-$_commit "$builddir"/
cp "$srcdir"/glide-$pkgver.yaml glide.yaml
cp "$srcdir"/glide-$pkgver.lock glide.lock
export GLIDE_HOME="$srcdir/.glide"
@@ -44,13 +43,11 @@ glide_init() {
}
build() {
- cd "$builddir"
export GOPATH="$srcdir"
go build -o bin/$pkgname ./$pkgname
}
package() {
- cd "$builddir"
install -Dm755 bin/$pkgname "$pkgdir"/usr/bin/$pkgname
}
diff --git a/testing/dlib/APKBUILD b/testing/dlib/APKBUILD
new file mode 100644
index 0000000000..e97aec025a
--- /dev/null
+++ b/testing/dlib/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Davis E. King <davis@dlib.net>
+# Maintainer: Adriaan Groenenboom <agboom@pm.me>
+pkgname=dlib
+pkgver=19.18
+pkgrel=0
+pkgdesc="A toolkit for making real world machine learning and data analysis applications in C++"
+url="http://dlib.net"
+arch="all"
+license="BSL-1.0"
+makedepends="cmake openblas-dev libx11-dev pkgconf libjpeg-turbo-dev libpng-dev"
+source="dlib-$pkgver.tar.bz2::https://downloads.sourceforge.net/project/dclib/dlib/v$pkgver/dlib-$pkgver.tar.bz2"
+sha512sums="0b65c35b6f351da948b2fe193b83ba22627dc259fc4adf3540abdca1febe87ec83d68ba64ea37f15c05173b92915cc5d2fa687d8f342ca203eac8a5c1e79ca8d dlib-19.18.tar.bz2"
+
+build() {
+ cd "$srcdir"
+ mkdir -p build && cd build
+ cmake \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ "../$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR=${pkgdir} install
+ install -Dm644 "../$pkgname-$pkgver/dlib/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/testing/dolphin-emu/APKBUILD b/testing/dolphin-emu/APKBUILD
index 7c3bdf7b78..4e9a07b1c1 100644
--- a/testing/dolphin-emu/APKBUILD
+++ b/testing/dolphin-emu/APKBUILD
@@ -1,10 +1,9 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=dolphin-emu
-_pkgname=dolphin
-pkgver=5.0_git20190915
+pkgver=5.0_git20200115
pkgrel=0
-_commit="82fd7f576e1dff6b616ff088955c18aa76ed45d5"
+_commit="1cc7ef356b9a33814efb290368150a1cceb0a3ed"
# Upstream doesn't actively support non 64-bit platforms and they're too slow
# to emulate any games anyway
arch="x86_64 aarch64"
@@ -42,7 +41,7 @@ makedepends="
# minizip-dev xxhash-dev soundtouch-dev gtest-dev
source="$pkgname-$_commit.tar.gz::https://github.com/dolphin-emu/dolphin/archive/$_commit.tar.gz"
subpackages="$pkgname-doc $pkgname-lang"
-builddir="$srcdir/$_pkgname-$_commit"
+builddir="$srcdir/dolphin-$_commit"
prepare() {
default_prepare
@@ -105,4 +104,4 @@ package() {
install -Dm 644 Data/51-usb-device.rules -t "$pkgdir"/usr/lib/udev/rules.d/
}
-sha512sums="b14ea3d1c0d939a9a02ab8021155f30fd1bc36cc0cf55917f33ae5f230972527c8e5e0ab6fbbd1ee8aba11d15ed9433e0cca9ee165baea268e615f055918a083 dolphin-emu-82fd7f576e1dff6b616ff088955c18aa76ed45d5.tar.gz"
+sha512sums="519daec2fd22d042a4247337dafdd04d3df46cb654aba7d84101931e44c94aee39699bb5a119384785aff6da7cd5568baab000a863527cc4a445f05c7d30abf2 dolphin-emu-1cc7ef356b9a33814efb290368150a1cceb0a3ed.tar.gz"
diff --git a/testing/dolphin-plugins/APKBUILD b/testing/dolphin-plugins/APKBUILD
index 8a0cac9113..7c61fff826 100644
--- a/testing/dolphin-plugins/APKBUILD
+++ b/testing/dolphin-plugins/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=dolphin-plugins
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all"
url="https://www.kde.org/applications/system/dolphin/"
pkgdesc="Extra Dolphin plugins"
license="GPL-2.0-or-later"
makedepends="extra-cmake-modules qt5-qtbase-dev kxmlgui-dev ki18n-dev kio-dev ktextwidgets-dev ktexteditor-dev dolphin-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-lang"
build() {
@@ -27,4 +27,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0 dolphin-plugins-19.08.2.tar.xz"
+sha512sums="2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f dolphin-plugins-19.12.0.tar.xz"
diff --git a/testing/dragon/APKBUILD b/testing/dragon/APKBUILD
index cc9b33ba15..b23385d980 100644
--- a/testing/dragon/APKBUILD
+++ b/testing/dragon/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=dragon
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
arch="all"
url="https://kde.org/applications/multimedia/org.kde.dragonplayer"
pkgdesc="A multimedia player where the focus is on simplicity, instead of features"
license="GPL-2.0-only OR GPL-3.0-only"
depends="phonon-backend-gstreamer"
makedepends="extra-cmake-modules qt5-qtbase-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kjobwidgets-dev kio-dev kparts-dev solid-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev phonon-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/dragon-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/dragon-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # No tests
@@ -38,4 +38,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="d40019da9e6d4bcad52bcac5e7adaaacca140276e9fd8e4e24bff3a22d12fb00e259b7d3e88fda0620a6b46bcccb648a680631c053a253a1d71df99b85695c3d dragon-19.08.2.tar.xz"
+sha512sums="a8516a87a7efbf53f8e73478ed053bed34b529c098e47dfb1fc4dc1535a0beb66bb5afe9862c53fadb8928972452fa7bad09bcbe31177c72d14fc03658bd2bf6 dragon-19.12.0.tar.xz"
diff --git a/testing/drone/APKBUILD b/testing/drone/APKBUILD
index 5c0f1031e8..f2eb6c8166 100644
--- a/testing/drone/APKBUILD
+++ b/testing/drone/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer:
pkgname=drone
-pkgver=1.6.2
+pkgver=1.6.4
pkgrel=0
pkgdesc="Container-Native, Continuous Delivery Platform"
url="https://drone.io/"
@@ -45,4 +45,4 @@ cleanup_srcdir() {
default_cleanup_srcdir
}
-sha512sums="4c6e43edceb402c90c9c3d294926bd0a6c2756a844f936b93849a6aa8d5053a495a73a9b4a9f2ebbd516089e781cc681342ad12be991911c6884e3bcd8657c0d drone-1.6.2.tar.gz"
+sha512sums="e80980175686481e0a55c44df28a03caaca3ce85159d0265d005602e8ba85418b3ff4b5910049f0431af87d1071848e0834bee84f1da7acc0d6313d15e64d91a drone-1.6.4.tar.gz"
diff --git a/testing/dub/APKBUILD b/testing/dub/APKBUILD
index 35d389fb6a..7d4362a559 100644
--- a/testing/dub/APKBUILD
+++ b/testing/dub/APKBUILD
@@ -1,18 +1,18 @@
# Contributor: Mathias LANG <pro.mathias.lang@gmail.com>
# Maintainer: Mathias LANG <pro.mathias.lang@gmail.com>
pkgname=dub
-pkgver=1.18.0
+pkgver=1.19.0
pkgrel=0
pkgdesc="Package and build management system for D"
url="http://code.dlang.org/"
-arch="x86_64"
+arch="all !ppc64le" # GDC does not support PPC64le
license="MIT"
depends="libcurl"
-makedepends="ldc ldc-static bash curl-dev"
+makedepends="gcc-gdc gdmd bash curl-dev"
source="$pkgname-$pkgver.zip::https://github.com/dlang/dub/archive/v$pkgver.zip"
build() {
- DMD=ldmd2 GITVER="v$pkgver" ./build.sh
+ DC=gdmd GITVER="v$pkgver" ./build.sh
}
check() {
@@ -23,4 +23,4 @@ package() {
install -s -D "$builddir/bin/dub" "$pkgdir/usr/bin/dub"
}
-sha512sums="454479867cce89d6a555505bb6b51b11192c18ae622239c01b0b9914d0c007cc6aa9b68274e80baa2eea068ae4c41c6838eef516c7ed57a947759cb37452dfa8 dub-1.18.0.zip"
+sha512sums="8cdeb1b2d07a003c02e47f43f56362aeac257110cc4a477f5fe2e83ff0b979f5e1b3aa553d75d97b16c22230ff823ac3cf9dec40c2c24211cac969bfe7deb522 dub-1.19.0.zip"
diff --git a/testing/dxvk/APKBUILD b/testing/dxvk/APKBUILD
index 1dfd710bd1..c85f532060 100644
--- a/testing/dxvk/APKBUILD
+++ b/testing/dxvk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=dxvk
-pkgver=1.4.4
+pkgver=1.5.1
pkgrel=0
pkgdesc="Vulkan-based compatibility layer for Direct3D 10/11"
options="!strip !check"
@@ -49,4 +49,4 @@ package() {
ln -s /usr/share/dxvk/setup_dxvk.sh "$pkgdir"/usr/bin/setup_dxvk
chmod +x "$pkgdir"/usr/share/dxvk/setup_dxvk.sh
}
-sha512sums="5b17924d685a525ecd46a24f9a3be2418e45549a1356e73522a856a536dbd1ae48e72d4e9a74e3e34f722991be1fc2a97823caf5fb26008abea812885a952636 dxvk-1.4.4.tar.gz"
+sha512sums="a7c4947fca56d81185971c47a804c5d9863d71dce84a5252800ff5d592c86aeb2114ac163f2dc2c2ee6cc08857504c8dbf75a26df1224c2a19c6f7874e19107a dxvk-1.5.1.tar.gz"
diff --git a/testing/dzonegit/APKBUILD b/testing/dzonegit/APKBUILD
new file mode 100644
index 0000000000..60bb90330e
--- /dev/null
+++ b/testing/dzonegit/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=dzonegit
+pkgver=0.11
+pkgrel=0
+pkgdesc="Git hooks to manage a repository of DNS zones"
+url="https://github.com/oskar456/dzonegit"
+arch="noarch !x86" # Testsuite fails
+license="MIT"
+depends="bind-tools git python3"
+checkdepends="py3-pytest py3-pytest-runner"
+source="https://github.com/oskar456/dzonegit/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+ python3 setup.py build
+}
+
+check() {
+ python3 setup.py test
+}
+
+package() {
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="a7841d66366882c1e85d7e9b2f1d33cb562baad0e8b988335116a8d86b60aff78362eb051f97bf4d38f9f93511a54f7ca1b9a1ed8b773798931e81cf54565d18 dzonegit-0.11.tar.gz"
diff --git a/testing/easytag/APKBUILD b/testing/easytag/APKBUILD
new file mode 100644
index 0000000000..ad45afc21b
--- /dev/null
+++ b/testing/easytag/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: David Demelier <markand@malikania.fr>
+# Maintainer: David Demelier <markand@malikania.fr>
+pkgname="easytag"
+pkgver=2.4.3
+pkgrel=0
+pkgdesc="audio file metadata editor"
+url="https://wiki.gnome.org/Apps/EasyTAG"
+arch="all"
+license="GPL-2.0-only AND GPL-3.0-only"
+makedepends="
+ flac-dev
+ desktop-file-utils
+ gtk+3.0-dev
+ intltool
+ itstool
+ id3lib-dev
+ libid3tag-dev
+ libogg-dev
+ libvorbis-dev
+ speex-dev
+ opus-dev
+ opusfile-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.gnome.org/sources/easytag/${pkgver%.*}/easytag-$pkgver.tar.xz"
+
+build() {
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087 easytag-2.4.3.tar.xz"
diff --git a/testing/ecasound/APKBUILD b/testing/ecasound/APKBUILD
index 431b6085e4..b270ecc735 100644
--- a/testing/ecasound/APKBUILD
+++ b/testing/ecasound/APKBUILD
@@ -1,11 +1,11 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Jean-Louis Fuchs <ganwell@fangorn.ch>
pkgname=ecasound
-pkgver=2.9.2
+pkgver=2.9.3
pkgrel=0
pkgdesc="Textmode multitrack audio processing"
url="https://ecasound.seul.org/ecasound/"
-arch="all"
+arch="all !s390x" # Testsuite fails
license="GPL-2.0-or-later"
makedepends="alsa-lib-dev readline-dev ncurses-dev
mpg123-dev lame-dev libsndfile-dev libsamplerate-dev"
@@ -30,4 +30,4 @@ check() {
make check
}
-sha512sums="fca6b37b5f669ba8616e48afe24fbfd53da3cb4987d2d6a2d6167843de34371a4c2cdceb6faf677462d6efb4069dd1d27ffafc1ceb19de56f4a051f077ada07b ecasound-2.9.2.tar.gz"
+sha512sums="4f70e6f54cd05194a4ffe80905e7488d16d32d684c87736dfdac7b3aebf3d20cbf417964d75e00e781f6f0614b8b699061c69fcbf7e1761d66ce1abfcd5f1140 ecasound-2.9.3.tar.gz"
diff --git a/testing/editline/APKBUILD b/testing/editline/APKBUILD
index 9ecc7a417b..77989b3f72 100644
--- a/testing/editline/APKBUILD
+++ b/testing/editline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
pkgname=editline
-pkgver=1.16.1
+pkgver=1.17.0
pkgrel=0
pkgdesc="A readline() replacement for UNIX without termcap (ncurses)"
url="https://troglobit.com/projects/editline/"
@@ -30,4 +30,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4c4e96c9218ab29c559dc8f0c2ca4015c149c70af1696cd43e7ddb38aba7eb68452a22718932bf40a83d3377ad73d26734109db13ecd4470170ef6fbcab6a9fc editline-1.16.1.tar.xz"
+sha512sums="e8a519d5380a84913e1438ac0cd52400078457be5dcfa4eadc7112d7c2c4ff6601b8e3da4eef55296b42c6e9b5ed5fb269698dd62c4542eef824b6dd262ddd5c editline-1.17.0.tar.xz"
diff --git a/testing/efl/APKBUILD b/testing/efl/APKBUILD
index 8d57baa6ea..a398ea0635 100644
--- a/testing/efl/APKBUILD
+++ b/testing/efl/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Boris Faure <boris@fau.re>
# Maintainer: Boris Faure <boris@fau.re>
pkgname=efl
-pkgver=1.23.1
-pkgrel=0
+pkgver=1.23.3
+pkgrel=1
pkgdesc="Enlightenment Foundation Libraries"
url="https://www.enlightenment.org"
arch="all !s390x" #luajit not available
@@ -45,7 +45,7 @@ build() {
meson \
--prefix=/usr \
--libdir /usr/lib \
- --buildtype=release \
+ --buildtype=debugoptimized \
--default-library=shared \
-Dnls=false \
-Dopengl=es-egl \
@@ -76,4 +76,4 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="9c81f28bb0d87e1a3e5d2204c0e2401d9b3f6dcc34f47cb2b41711ef033b3134f4cd283e87a216a0ce4ee903f721a1f8c2f003577444c5781e7f47ce827201e6 efl-1.23.1.tar.xz"
+sha512sums="47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297 efl-1.23.3.tar.xz"
diff --git a/testing/elektra/APKBUILD b/testing/elektra/APKBUILD
index 336535c90f..11882f7bf4 100644
--- a/testing/elektra/APKBUILD
+++ b/testing/elektra/APKBUILD
@@ -6,10 +6,10 @@
pkgname=elektra
_pkgname=libelektra
pkgver=0.8.21
-pkgrel=8
+pkgrel=9
pkgdesc="A universal and secure framework to access configuration parameters"
url="https://www.libelektra.org"
-arch="all"
+arch="all !armhf" # armhf blocked by qt5-qtdeclarative
license="BSD-3-Clause"
_luaver=5.3
# kdb doesn't work correctly without these plugins.
@@ -56,7 +56,7 @@ subpackages="
$pkgname-zsh-completion:zshcomp:noarch
$pkgname-plugins-all:_all:noarch
"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/ElektraInitiative/$_pkgname/archive/$pkgver.tar.gz
+source="$_pkgname-$pkgver.tar.gz::https://github.com/ElektraInitiative/libelektra/archive/$pkgver.tar.gz
fix-bash-shebang.patch
fix-augeas-internal-inconsistency.patch
cmake-allow-override-rpath.patch
@@ -183,14 +183,14 @@ build() {
-DENABLE_DEBUG=OFF \
-DENABLE_LOGGER=OFF \
-DINSTALL_TESTING=OFF \
- -DBINDINGS=$(printf '%s;' $_bindings) \
- -DPLUGINS=$(printf '%s;' $_plugins) \
+ -DBINDINGS="$(printf '%s;' $_bindings)" \
+ -DPLUGINS="$(printf '%s;' $_plugins)" \
-DTOOLS='kdb;qt-gui' \
\
-DLUA_LIBRARIES="/usr/lib/liblua-$_luaver.so.0" \
- -DLUA_INCLUDE_DIR=$(pkg-config --variable=includedir lua$_luaver ) \
- -DTARGET_LUA_CMOD_FOLDER=$(pkg-config --variable=INSTALL_LMOD lua$_luaver) \
- -DTARGET_LUA_CMOD_FOLDER=$(pkg-config --variable=INSTALL_CMOD lua$_luaver)
+ -DLUA_INCLUDE_DIR="$(pkg-config --variable=includedir lua$_luaver )" \
+ -DTARGET_LUA_CMOD_FOLDER="$(pkg-config --variable=INSTALL_LMOD lua$_luaver)" \
+ -DTARGET_LUA_CMOD_FOLDER="$(pkg-config --variable=INSTALL_CMOD lua$_luaver)"
make
}
@@ -311,14 +311,14 @@ _plugin() {
[ -f "$readme" ] || die "$readme doesn't exist!"
pkgdesc="Elektra plugin - $(_getinfo description "$readme")"
- depends=$(_to_pkgnames $(_getinfo needs "$readme" '') | xargs)
+ depends=$(_to_pkgnames "$(_getinfo needs \"$readme\" '')" | xargs)
if provides=$(_getinfo provides "$readme"); then
# Convert plugin names to package names.
provides=$(_to_pkgnames $provides)
# Remove pkgnames clashing with subpackages.
- : ${_plugins_pkgname:="$(printf "$pkgname-%s\n" $_plugins dev doc libs)"}
+ : "${_plugins_pkgname:=$(printf \"$pkgname-%s\\n\" $_plugins dev doc libs)}"
provides=$(_set_difference "$provides" "$_plugins_pkgname" | xargs)
fi
@@ -363,7 +363,7 @@ _getinfo() {
local value
value=$(sed -n "s|^- infos/$name = *\(.*\) *|\1|p" "$file")
- [ "$value$default" ] || return 1
+ [ "$value$default" ]
printf '%s\n' "${value:-$default}"
}
diff --git a/testing/elisa/APKBUILD b/testing/elisa/APKBUILD
new file mode 100644
index 0000000000..011454bd23
--- /dev/null
+++ b/testing/elisa/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=elisa
+pkgver=19.12.0
+pkgrel=1
+arch="all !s390x" # missing vlc-dev
+url="https://kde.org/applications/multimedia/org.kde.elisa"
+pkgdesc="A simple music player aiming to provide a nice experience for its users"
+license="LGPL-3.0-or-later"
+depends="kirigami2"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev kirigami2-dev ki18n-dev kdeclarative-dev kcoreaddons-dev baloo-dev kfilemetadata-dev kdoctools-dev kxmlgui-dev kconfig-dev kconfigwidgets-dev kcrash-dev kdbusaddons-dev kcmutils-dev kpackage-dev kio-dev vlc-dev"
+checkdepends="xvfb-run"
+source="https://download.kde.org/stable/release-service/$pkgver/src/elisa-$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-lang"
+
+prepare() {
+ default_prepare
+
+ mkdir "$builddir"/build
+}
+
+build() {
+ cd "$builddir"/build
+ cmake "$builddir" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+check() {
+ cd "$builddir"/build
+ CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest
+}
+
+package() {
+ cd "$builddir"/build
+ DESTDIR="$pkgdir" make install
+}
+
+sha512sums="bac5693e10d0db4389aeb7fcf555914d5613ec29549b5de6dbcc16b4d2d07d513157c819525f2fad61864adf7da37ad1b0ee1294e09eda79a2953e199767b14f elisa-19.12.0.tar.xz"
diff --git a/testing/elvish/APKBUILD b/testing/elvish/APKBUILD
index 312aded165..86fa577b42 100644
--- a/testing/elvish/APKBUILD
+++ b/testing/elvish/APKBUILD
@@ -1,15 +1,14 @@
# Maintainer: Daniel Isaksen <d@duniel.no>
pkgname=elvish
-pkgver=0.12
-pkgrel=1
+pkgver=0.13
+pkgrel=0
pkgdesc="A friendly and expressive shell for Linux, macOS and BSDs"
url="https://elvish.io/"
arch="all"
license="BSD-2-Clause"
-depends=""
makedepends="go"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/elves/$pkgname/archive/v$pkgver.tar.gz"
+options="!check chmod-clean"
+source="$pkgname-$pkgver.tar.gz::https://github.com/elves/elvish/archive/v$pkgver.tar.gz"
builddir="$srcdir/src/github.com/elves/$pkgname"
prepare() {
@@ -19,7 +18,6 @@ prepare() {
}
build() {
- cd "$builddir"
export GOPATH="$srcdir"
go build -o bin/$pkgname
}
@@ -28,4 +26,4 @@ package() {
install -Dm755 "$builddir"/bin/elvish "$pkgdir"/usr/bin
}
-sha512sums="21e31caf997d23412c8a9d2ed9b3bcfb60763e17af4ec4ee09db9027e10ebab4fd331a4be7d5b60ba0aa5ff1a7c5709762e5375f61cac0cbf18bf3d4e73d46fa elvish-0.12.tar.gz"
+sha512sums="7cafed0c1b82a8042b5b403b8aa44182a248d99e819108187163356ae6e3945c35cae9065eac6f0c98722b056d1db6a210c07966ff8aef9c44c9b11b3f6a1475 elvish-0.13.tar.gz"
diff --git a/testing/emulationstation/APKBUILD b/testing/emulationstation/APKBUILD
index a11d08dea3..abec02d580 100644
--- a/testing/emulationstation/APKBUILD
+++ b/testing/emulationstation/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: Taner Tas <taner76@gmail.com>
pkgname=emulationstation
_pkgname="EmulationStation"
-pkgver=2.7.1
-pkgrel=3
+pkgver=2.7.6
+pkgrel=1
pkgdesc="EmulationStation is a cross-platform graphical front-end for emulators with controller navigation."
url="https://github.com/RetroPie/EmulationStation"
arch="all !s390x" # vlc-dev disabled on s390x
@@ -24,7 +24,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/RetroPie/$_pkgname/archive/v
builddir="$srcdir"/$_pkgname-$pkgver
prepare() {
- cd "$builddir"
if [ ! -d external/pugixml.dist ]; then
mv -f external/pugixml external/pugixml.dist
cp -aP "$srcdir"/pugixml-$_pugixml_commit external/pugixml
@@ -33,14 +32,12 @@ prepare() {
}
build() {
- cd "$builddir"
cmake .
make
}
package() {
depends="$pkgname-theme-default"
- cd "$builddir"
mkdir -p "$pkgdir"/usr/bin
mkdir -p "$pkgdir"/usr/share/pixmaps
mkdir -p "$pkgdir"/usr/share/applications
@@ -61,7 +58,7 @@ theme() {
cp -r "$srcdir"/es-theme-$_theme_name-$_theme_commit \
"$subpkgdir"/usr/share/$pkgname/themes/$_theme_name
}
-sha512sums="a9501a2f69d5f828316bde9660638beed402535796bf63179bdabffac86da6ef4a280ea35993270fd932db918d80cd961bfe6522af72b61387e913b092d696b6 emulationstation-2.7.1.tar.gz
+sha512sums="9df1573d172b8a77a478283fad040d4ed535ba5ca90cf1d215e2d2eb0d258247e57c732a99034dc58d4b12afba2892d34f9f6c36c47a1b155b6328d4246e7cd9 emulationstation-2.7.6.tar.gz
012beb7511e54786911de21b092b6c271aef44ac196b6c3a1e6be3eb6dad5cedef41ed1ae2652befc9486c851eca75dc025da42e0c59e5656adf5c02b3148d95 emulationstation-theme-gbz35-49176c4b3dbe103da84bd29ef474fd3c9f60a8de.tar.gz
bc6ab2f39c7414e5baca2917710a7e5e280aef2562afeec93adcb01424512fba6682531e8fd9b9e5e6e08841433e5e390e832560400bafafd3b45ff9355f43ad pugixml-f3139f4c0487a7455d66d4dcd3b0aab3d54c63d1.tar.gz
3c0fe93a76fe2f702cdc1870ebfe12b3305ba24a75e90ea6dde6d479c654f662d210e5b35ce3451f3f03902ebbaeb27d117e8ca94f5b117748bcd286f37bae39 default-paths.patch
diff --git a/testing/enscript/APKBUILD b/testing/enscript/APKBUILD
index ac79e342e1..e357371e5a 100644
--- a/testing/enscript/APKBUILD
+++ b/testing/enscript/APKBUILD
@@ -7,7 +7,7 @@ url="https://www.gnu.org/software/enscript/"
arch="all"
license="GPL-3.0-only"
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/enscript/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/enscript/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
options="!check"
diff --git a/testing/envconsul/APKBUILD b/testing/envconsul/APKBUILD
index 967183c71f..9b23edf51d 100644
--- a/testing/envconsul/APKBUILD
+++ b/testing/envconsul/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Gennady Feldman <gena01@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=envconsul
-pkgver=0.9.1
+pkgver=0.9.2
pkgrel=0
pkgdesc="Read and set environmental variables for processes from Consul."
url="https://www.consul.io/"
@@ -25,4 +25,4 @@ package() {
install -m755 -D pkg/linux-$CARCH/$pkgname "$pkgdir"/usr/bin/$pkgname
}
-sha512sums="beee7dc47c2d063da23d37b0c6772249e759dd93453c626b6a2afcca39e903153044fea22f255a45416e628bca9719e7f4e40364889f42a5264a373df1d7f7db envconsul-0.9.1.tar.gz"
+sha512sums="4cac32a3131aebbc7b34aff5fbcba35960d5af5de0b58cffcb73f2faedcc769bb00580cb7500c93d196bc30ac0a69aca93297971548fd4b1e824a48da0152893 envconsul-0.9.2.tar.gz"
diff --git a/testing/eolie/APKBUILD b/testing/eolie/APKBUILD
index 9cc2cf15cc..3b0c3f1a5c 100644
--- a/testing/eolie/APKBUILD
+++ b/testing/eolie/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=eolie
pkgver=0.9.63
-pkgrel=1
+pkgrel=2
pkgdesc="Web browser for GNOME"
url="https://gitlab.gnome.org/World/eolie"
arch="all"
@@ -23,7 +23,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --buildtype=release \
+ --buildtype=debugoptimized \
. output
ninja -C output
}
diff --git a/testing/eventviews/APKBUILD b/testing/eventviews/APKBUILD
index a30369faed..f62f0d2cbf 100644
--- a/testing/eventviews/APKBUILD
+++ b/testing/eventviews/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=eventviews
-pkgver=19.08.2
-pkgrel=1
+pkgver=19.12.0
+pkgrel=0
pkgdesc="Library for creating events"
arch="all !ppc64le !s390x" # Limited by akonadi-calendar -> kmailtransport -> libkgapi -> qt5-qtwebengine
url="https://kontact.kde.org/"
@@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev qt5-qttools-static akonadi-dev ki18n-dev kcodecs-dev
libkdepim-dev kcalutils-dev kcalendarcore-dev calendarsupport-dev
akonadi-calendar-dev kmime-dev"
makedepends="$depends_dev extra-cmake-modules"
-source="https://download.kde.org/stable/applications/$pkgver/src/eventviews-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/eventviews-$pkgver.tar.xz"
subpackages="$pkgname-dev $pkgname-lang"
prepare() {
@@ -39,4 +39,4 @@ package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
}
-sha512sums="093bd8acf912226f5963cd74e600b46170d5f7bc78a3f91f197b159e424dc65ab14b7f00cbb5fd97dd5cd8fdcdbae5658f3a6e359e012188a9d5e9c407f75251 eventviews-19.08.2.tar.xz"
+sha512sums="fc00833529079ce10c916cc98809af4b04a9d8d88fef3088b51ba041da33dc5cb24f4875b124147a94a3b4bd3a80b7c2f9f4bc8077bbf407647e404d765509a6 eventviews-19.12.0.tar.xz"
diff --git a/testing/f3/APKBUILD b/testing/f3/APKBUILD
new file mode 100644
index 0000000000..c466843314
--- /dev/null
+++ b/testing/f3/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname="f3"
+pkgver="7.2"
+pkgrel=0
+pkgdesc="F3 - Fight Flash Fraud "
+url="http://oss.digirati.com.br/f3/"
+arch="all"
+license="GPL-3.0"
+options="!check" # no test provided
+makedepends="argp-standalone eudev-dev parted-dev linux-headers"
+subpackages="$pkgname-doc $pkgname-extra"
+source="$pkgname-$pkgver.tar.gz::https://github.com/AltraMayor/f3/archive/v$pkgver.tar.gz"
+
+prepare() {
+ default_prepare
+ sed -i -e 's/\/usr\/local/\/usr/' Makefile
+}
+
+build() {
+ LDFLAGS="$LDFLAGS -largp" make
+ LDFLAGS="$LDFLAGS -largp" make extra
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install-extra
+}
+
+extra() {
+ pkgdesc="Extra tools for $pkgname"
+ mkdir -p "$subpkgdir"/usr/bin
+ for pkg in probe fix brew; do
+ mv "$pkgdir"/usr/bin/$pkgname$pkg "$subpkgdir"/usr/bin/$pkgname$pkg
+ done
+}
+
+sha512sums="4e41fca8b02dbd6bfaae01237a47573916aefe47f5aafc864618d708568e32ec122390c03af24d89caaf03de692fa374e87747b07a8546eaf8cafd57887a61ac f3-7.2.tar.gz"
diff --git a/testing/fennel/APKBUILD b/testing/fennel/APKBUILD
new file mode 100755
index 0000000000..ee323adb3d
--- /dev/null
+++ b/testing/fennel/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
+pkgname=fennel
+pkgver=0.3.2
+pkgrel=0
+pkgdesc="A Lua Lisp Language"
+url="https://fennel-lang.org"
+arch="noarch !s390x" #did not build on s390x CI
+license="MIT"
+source="fennel-$pkgver.tar.gz::https://github.com/bakpakin/Fennel/archive/$pkgver.tar.gz
+ lua5.3-fennel.patch"
+_lua_version=5.3
+depends="lua$_lua_version"
+builddir="$srcdir"/Fennel-$pkgver
+
+check() {
+ make test LUA="lua$_lua_version"
+}
+
+build() {
+ ./fennel --compile fennelview.fnl > fennelview.lua
+}
+
+package() {
+ install -Dm644 "fennelview.lua" \
+ -t "$pkgdir/usr/share/lua/$_lua_version/"
+
+ install -Dm644 "fennel.lua" \
+ -t "$pkgdir/usr/bin/"
+
+ install -Dm755 "fennel" \
+ "$pkgdir/usr/bin/fennel"
+}
+
+sha512sums="14fe3e2530d7d733c39a457067669ec21e2aa071bdc4de5b787051ebe7af3d276715666ffded3f90cfcb8bd6a19b777130d2b8159ae6991dcdc4bbe4b62b269b fennel-0.3.2.tar.gz
+c9f45147b5eae695108557d19714c7013409451f68e8a55cc92340d80d222f2d7b7069d9b25bc32111580f0dd432b17bb349b40f02f28c3c7ebb89494c2cf788 lua5.3-fennel.patch"
diff --git a/testing/fennel/lua5.3-fennel.patch b/testing/fennel/lua5.3-fennel.patch
new file mode 100644
index 0000000000..f2144e9b27
--- /dev/null
+++ b/testing/fennel/lua5.3-fennel.patch
@@ -0,0 +1,8 @@
+--- Fennel-0.3.1/fennel
++++ Fennel-0.3.1/fennel
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!/usr/bin/env lua5.3
+
+ local fennel_dir = arg[0]:match("(.-)[^\\/]+$")
+ package.path = fennel_dir .. "?.lua;" .. package.path
diff --git a/testing/ffmpegthumbs/APKBUILD b/testing/ffmpegthumbs/APKBUILD
deleted file mode 100644
index f9f4b25901..0000000000
--- a/testing/ffmpegthumbs/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=ffmpegthumbs
-pkgver=19.08.2
-pkgrel=0
-arch="all"
-url="https://www.kde.org/applications/multimedia/"
-pkgdesc="FFmpeg-based thumbnail creator for video files"
-license="GPL-2.0-or-later"
-makedepends="extra-cmake-modules qt5-qtbase-dev kio-dev ki18n-dev kconfig-dev ffmpeg-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
-subpackages="$pkgname-lang"
-options="!check" # No tests
-
-build() {
- cmake \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib
- make
-}
-
-check() {
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
-}
-
-package() {
- DESTDIR="$pkgdir" make install
-}
-
-sha512sums="b708034ac4b8541f84ce6b806f8e914f656fde260c24b5a4e1d957fe01ec145e62a41545e535821122b1b26e590caba74bd192b309fe295fb0b7fb423f3550b9 ffmpegthumbs-19.08.2.tar.xz"
diff --git a/testing/ffsend/APKBUILD b/testing/ffsend/APKBUILD
index 2703e66724..581ba4b37a 100644
--- a/testing/ffsend/APKBUILD
+++ b/testing/ffsend/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=ffsend
-pkgver=0.2.55
+pkgver=0.2.58
pkgrel=0
-pkgdesc=" A fully featured Firefox Send client"
+pkgdesc="A fully featured Firefox Send client"
url="https://gitlab.com/timvisee/ffsend"
arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by cargo
license="GPL-3.0-only"
@@ -62,4 +62,4 @@ fishcomp() {
"$subpkgdir"/usr/share/fish/completions/ffsend.fish
}
-sha512sums="09b4c33eb6601b3b647e8f3967353575b82d41c944ab960c4a04a7afb16e2ab2ec35cd518c63ecda1fafce9456cec47dc854e2769ee0348e9044fa2f4fd05202 ffsend-v0.2.55.tar.gz"
+sha512sums="fce033654d639c0d187fda72a2e737299ede758ee363719b495872dc0f826cc11524d1b33a7793668997781b624a001789b0f48f485b29829172c82713facd40 ffsend-v0.2.58.tar.gz"
diff --git a/testing/filebeat/APKBUILD b/testing/filebeat/APKBUILD
index 87bcabe4cb..71ac392e79 100644
--- a/testing/filebeat/APKBUILD
+++ b/testing/filebeat/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Michael Pirogov <vbnet.ru@gmail.com>
# Contributor: Ramanathan Sivagurunathan <ramzthecoder@gmail.com>
# Maintainer: Ramanathan Sivagurunathan <ramzthecoder@gmail.com>
pkgname=filebeat
-pkgver=7.4.2
+pkgver=7.5.1
pkgrel=0
pkgdesc="Lightweight Shipper for Logs"
pkgusers="root"
@@ -35,7 +36,7 @@ package() {
install -Dm755 "$builddir/filebeat" "$pkgdir/usr/bin/filebeat"
}
-sha512sums="cd6437fb0fc46cf4bd2630cc6b6a465851f7de693e6679d8a3e96f4577e68db64a7d9353281816ab3e6e7409d8775a5172580f1b05014721ce740e184a7aa179 beats-7.4.2.tar.gz
-ea49bc4da6f66e01ad2b563d9179a992c6dc07410c8ad107f7c5ce65426ee6010871b1cbf9634310765aa5d2da0261eb2aee2c93bbe11de5f0d6d7e903402d15 filebeat.initd
-25321037cd036f05186c21c73889e9b2716bbfa30597edcf90a110fca761396f30df20142e025d6175ae6ed743f08c574fa54e8df8577c1bf416bce17bec7170 filebeat.confd
+sha512sums="b1be054ba97b5bf491bffc3167efe66a698600956e1de358294af0853d36df9dc3612dd232d1e40e745d419426dc5b4c0effcfa8d738f78a2d6064519a5570a6 beats-7.5.1.tar.gz
+782ea2a2a5056e9e4d2e4ef6bb3f416b4ab0aba8486a7115e586b735478b53f75246af8ac5a6e10f93da6773854220dec7125396fa2fc24edeb1ddc0ea2f4ba1 filebeat.initd
+d39f6264d44d34958f005652cae6ffeed3bb66aea7694c5cd1c9d1e00befda946522d54d7138d7bafa30314588bc44b84f12b5bb1beac65553b69de3d91c34ad filebeat.confd
b0d5fa1d37041a4f1383451107abcdab1ce15ed537f702f55756f59c2110445dcddaf7c58f2a0561e18b83e3cab72fceb9d931bae9267f1acd9d35135555d6f7 filebeat.yml"
diff --git a/testing/filebeat/filebeat.confd b/testing/filebeat/filebeat.confd
index 0d16465e3d..f5c161f935 100644
--- a/testing/filebeat/filebeat.confd
+++ b/testing/filebeat/filebeat.confd
@@ -1,2 +1,2 @@
# FileBeat startup
-filebeat_opts="-c /etc/filebeat/filebeat.yml -e"
+filebeat_opts="run -c /etc/filebeat/filebeat.yml -e"
diff --git a/testing/filebeat/filebeat.initd b/testing/filebeat/filebeat.initd
index d41f84d45e..ff34fc0f02 100644
--- a/testing/filebeat/filebeat.initd
+++ b/testing/filebeat/filebeat.initd
@@ -18,7 +18,7 @@ depend() {
}
checkconfig() {
- filebeat -configtest -c /etc/filebeat/filebeat.yml
+ filebeat test config -c /etc/filebeat/filebeat.yml
}
start() {
diff --git a/testing/filelight/APKBUILD b/testing/filelight/APKBUILD
index 950eecea03..825c9f2fd9 100644
--- a/testing/filelight/APKBUILD
+++ b/testing/filelight/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=filelight
-pkgver=19.08.2
+pkgver=19.12.0
pkgrel=0
arch="all"
url="https://kde.org/applications/utilities/filelight"
pkgdesc="An application to visualize the disk usage on your computer"
license="(GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only"
makedepends="extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kio-dev ki18n-dev kdoctools-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # No tests
@@ -28,4 +28,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="eaa105f5bb9e15c8bfbe1852ec97758fba66e1c8948c95723cc169e21c471ec74987d28f7c1fe9b4ab4828ce390dc676fc8d2b5a9f64ae5134ba5841dc27644e filelight-19.08.2.tar.xz"
+sha512sums="781fbdd34c0ba612ce18218751118df6ed6b09dea237d313b6f70974992463dfba2fc4d4365fe266d909adcff4ee91824b28d4c399b5bc8a8971df38cddb1ea7 filelight-19.12.0.tar.xz"
diff --git a/testing/firefox/8e71fa07fe00.patch b/testing/firefox/8e71fa07fe00.patch
new file mode 100644
index 0000000000..17f274e564
--- /dev/null
+++ b/testing/firefox/8e71fa07fe00.patch
@@ -0,0 +1,83 @@
+
+# HG changeset patch
+# User Simon Giesecke <sgiesecke@mozilla.com>
+# Date 1576592608 0
+# Node ID 8e71fa07fe004c2e4d04db6b9e77cdfbc7810d6a
+# Parent 23dbcfafb3b73d6c1c26c5021199b6fa608150c4
+Bug 1601707 - Workaround for compilers that do not extend the lifetime of temporaries resulting from ?: expressions. r=janv, a=RyanVM
+
+Differential Revision: https://phabricator.services.mozilla.com/D56873
+
+diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
+--- a/dom/indexedDB/ActorsParent.cpp
++++ b/dom/indexedDB/ActorsParent.cpp
+@@ -24578,19 +24578,19 @@ nsresult ObjectStoreAddOrPutRequestOp::D
+ }
+ }
+
+ // The "|| keyUnset" here is mostly a debugging tool. If a key isn't
+ // specified we should never have a collision and so it shouldn't matter
+ // if we allow overwrite or not. By not allowing overwrite we raise
+ // detectable errors rather than corrupting data.
+ DatabaseConnection::CachedStatement stmt;
+- const auto& optReplaceDirective = (!mOverwrite || keyUnset)
+- ? NS_LITERAL_CSTRING("")
+- : NS_LITERAL_CSTRING("OR REPLACE ");
++ const auto optReplaceDirective = (!mOverwrite || keyUnset)
++ ? NS_LITERAL_CSTRING("")
++ : NS_LITERAL_CSTRING("OR REPLACE ");
+ rv = aConnection->GetCachedStatement(
+ NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective +
+ NS_LITERAL_CSTRING("INTO object_data "
+ "(object_store_id, key, file_ids, data) "
+ "VALUES (:") +
+ kStmtParamNameObjectStoreId + NS_LITERAL_CSTRING(", :") +
+ kStmtParamNameKey + NS_LITERAL_CSTRING(", :") +
+ kStmtParamNameFileIds + NS_LITERAL_CSTRING(", :") +
+@@ -26422,19 +26422,19 @@ nsresult Cursor::OpenOp::DoIndexDatabase
+ MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenCursorParams);
+ MOZ_ASSERT(mCursor->mObjectStoreId);
+ MOZ_ASSERT(mCursor->mIndexId);
+
+ AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexDatabaseWork", DOM);
+
+ const bool usingKeyRange = mOptionalKeyRange.isSome();
+
+- const auto& indexTable = mCursor->mUniqueIndex
+- ? NS_LITERAL_CSTRING("unique_index_data")
+- : NS_LITERAL_CSTRING("index_data");
++ const auto indexTable = mCursor->mUniqueIndex
++ ? NS_LITERAL_CSTRING("unique_index_data")
++ : NS_LITERAL_CSTRING("index_data");
+
+ // The result of MakeColumnPairSelectionList is stored in a local variable,
+ // since inlining it into the next statement causes a crash on some Mac OS X
+ // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110).
+ const auto columnPairSelectionList = MakeColumnPairSelectionList(
+ NS_LITERAL_CSTRING("index_table.value"),
+ NS_LITERAL_CSTRING("index_table.value_locale"), kColumnNameAliasSortKey,
+ mCursor->IsLocaleAware());
+@@ -26528,19 +26528,19 @@ nsresult Cursor::OpenOp::DoIndexKeyDatab
+ MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenKeyCursorParams);
+ MOZ_ASSERT(mCursor->mObjectStoreId);
+ MOZ_ASSERT(mCursor->mIndexId);
+
+ AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexKeyDatabaseWork", DOM);
+
+ const bool usingKeyRange = mOptionalKeyRange.isSome();
+
+- const auto& table = mCursor->mUniqueIndex
+- ? NS_LITERAL_CSTRING("unique_index_data")
+- : NS_LITERAL_CSTRING("index_data");
++ const auto table = mCursor->mUniqueIndex
++ ? NS_LITERAL_CSTRING("unique_index_data")
++ : NS_LITERAL_CSTRING("index_data");
+
+ // The result of MakeColumnPairSelectionList is stored in a local variable,
+ // since inlining it into the next statement causes a crash on some Mac OS X
+ // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110).
+ const auto columnPairSelectionList = MakeColumnPairSelectionList(
+ NS_LITERAL_CSTRING("value"), NS_LITERAL_CSTRING("value_locale"),
+ kColumnNameAliasSortKey, mCursor->IsLocaleAware());
+ const nsCString sortColumnAlias = NS_LITERAL_CSTRING("SELECT ") +
+
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index de7e1d181f..65d38bbacc 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,12 +1,11 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox
-pkgver=70.0.1
+pkgver=72.0.1
pkgrel=0
pkgdesc="Firefox web browser"
url="https://www.firefox.com/"
-# limited by rust and cargo
-arch="x86_64 aarch64"
+arch="all !s390x !armhf" # limited by rust and cargo, build failure on armhf due to wasm
license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
makedepends="
alsa-lib-dev
@@ -40,7 +39,7 @@ makedepends="
nspr-dev
nss-dev>=3.44.1
nss-static
- python2-dev
+ python2
sqlite-dev
sed
startup-notification-dev
@@ -61,9 +60,11 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
disable-moz-stackwalk.patch
fix-rust-target.patch
fix-webrtc-glibcisms.patch
- fix-sandbox-membarrier.patch
- fix-third_party.patch
+ 8e71fa07fe00.patch
+ rust_audio-thread-priority.patch
+ fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+ x86_64-alpine-linux-musl.json
firefox.desktop
firefox-safe.desktop"
@@ -74,6 +75,15 @@ _mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
# secfixes:
+# 71.0.1-r0:
+# - CVE-2019-17016
+# - CVE-2019-17017
+# - CVE-2019-17020
+# - CVE-2019-17022
+# - CVE-2019-17023
+# - CVE-2019-17024
+# - CVE-2019-17025
+# - CVE-2019-17026
# 70.0-r0:
# - CVE-2018-6156
# - CVE-2019-15903
@@ -102,6 +112,10 @@ prepare() {
default_prepare
cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
+ # Firefox needs to know how our custom triplet on x86_64 behaves.
+ mkdir rust_targets
+ cp "$srcdir"/x86_64-alpine-linux-musl.json rust_targets/.
+
_clear_vendor_checksums audio_thread_priority
}
@@ -115,11 +129,18 @@ build() {
export USE_SHORT_LIBNAME=1
# gcc 6
export CXXFLAGS="-fno-delete-null-pointer-checks -fno-schedule-insns2"
+ # Find our triplet JSON
+ export RUST_TARGET_PATH="$builddir/rust_targets"
# set rpath so linker finds the libs
export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
case "$CARCH" in
+ x86)
+ # disable-elf-hack: exists only on arm, x86, x86_64
+ _arch_config="--disable-elf-hack"
+ export RUST_TARGET="i686-unknown-linux-musl"
+ ;;
x86_64)
# disable-elf-hack: exists only on arm, x86, x86_64
_arch_config="--disable-elf-hack"
@@ -128,6 +149,33 @@ build() {
aarch64)
export RUST_TARGET="aarch64-unknown-linux-musl"
;;
+ armv7)
+ # disable-elf-hack: exists only on arm, x86, x86_64
+ _arch_config="--disable-elf-hack"
+ export RUST_TARGET="armv7-unknown-linux-musleabihf"
+ ;;
+ armhf)
+ # disable-elf-hack: exists only on arm, x86, x86_64
+ _arch_config="--disable-elf-hack"
+ export RUST_TARGET="arm-unknown-linux-musleabihf"
+ ;;
+ ppc64le)
+ export RUST_TARGET="powerpc64le-unknown-linux-musl"
+ ;;
+ esac
+
+ # FF doesn't have SIMD available on these arches.
+ case "$CARCH" in
+ armhf|armv7)
+ _rust_simd="--disable-rust-simd"
+ _low_mem_flags="--disable-debug-symbols --disable-debug"
+ export RUSTFLAGS="$RUSTFLAGS -C debuginfo=0"
+ ;;
+ x86)
+ _low_mem_flags="--disable-debug-symbols --disable-debug"
+ export RUSTFLAGS="$RUSTFLAGS -C debuginfo=0"
+ ;;
+ *) _rust_simd="--enable-rust-simd" ;;
esac
../configure \
@@ -150,8 +198,9 @@ build() {
--enable-system-ffi \
--enable-system-sqlite \
--enable-ffmpeg \
+ $_rust_simd \
+ $_low_mem_flags \
--enable-hardening \
- --enable-rust-simd \
--with-system-bz2 \
--with-system-icu \
--with-system-libevent \
@@ -220,7 +269,7 @@ __EOF__
rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
}
-sha512sums="798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725 firefox-70.0.1.source.tar.xz
+sha512sums="8df6a64cde4bdb879c3cb9df7f8b43c7d67c47502e2dce1d3ee82de433931435963b3e51c99035a78f0a997bc934a838d198f2a1cd6a624441769d37b1469fcf firefox-72.0.1.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4 fix-seccomp-bpf.patch
@@ -230,7 +279,9 @@ a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12
454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
089c97e6011e86a9b9d9e7b0c8ba3af0519d1ce4e2b1e9ab7719762d6968388bfa47dad3bf23a6d41c3d66fdcc6c15e2c926e3ff9500bfd4fbf1b53e6d19dc57 fix-rust-target.patch
d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch
-f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2 fix-sandbox-membarrier.patch
-eef94b3dd4cd04ea2ffab71764f15cc7cbb3cfe68175aef37805ffd660f6dff3de97d736cf3c76d19633406b84efdac7bfe8d68cce6da2528e74f313bef05943 fix-third_party.patch
+0518e66c58cbf0615af396ab962104780995eadb748254cc3a0864155e65d6132d4d6d872501f791aec552a8fc6aac8d478efc03e2203012fc1dab228b329088 8e71fa07fe00.patch
+18098bae18ce9ead6bca0d93d28e634495fa08a4c0707057f72a9e34205a64a0ce5ab98a4cfc2d492412725b14447eb9553b2976d9620c3d71eba2135c6ba211 rust_audio-thread-priority.patch
+60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1 fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+0dfa633abf3f411c90a030c46ee7f8fdde6fdd9f3a0c493599a58633e09b183d6c04590fc1984256e514c1da4f72f43dde3f5dbceef888b08262952b4f894919 x86_64-alpine-linux-musl.json
f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop"
diff --git a/testing/firefox/fd6847c9416f9eebde636e21d794d25d1be8791d.patch b/testing/firefox/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
new file mode 100644
index 0000000000..1af68d93c6
--- /dev/null
+++ b/testing/firefox/fd6847c9416f9eebde636e21d794d25d1be8791d.patch
@@ -0,0 +1,37 @@
+See https://bugzilla.mozilla.org/show_bug.cgi?id=1539739
+
+From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 1 Jun 2019 09:06:01 +0900
+Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
+ user_vfp_exc.
+
+---
+ js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f8478..383c380f04c 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
+ #endif
+
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-# include <sys/user.h>
++struct user_vfp {
++ unsigned long long fpregs[32];
++ unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++ unsigned long fpexc;
++ unsigned long fpinst;
++ unsigned long fpinst2;
++};
+ #endif
+
+ #if defined(ANDROID)
+--
+2.20.1
+
diff --git a/testing/firefox/fix-sandbox-membarrier.patch b/testing/firefox/fix-sandbox-membarrier.patch
deleted file mode 100644
index 4bd3b80d2a..0000000000
--- a/testing/firefox/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
-Taken from voidlinux: https://github.com/void-linux/void-packages/commit/4198411ac3b9e2620e171c662df82008da0faebb
-
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -572,6 +572,8 @@
- case __NR_set_tid_address:
- return Allow();
- #endif
-+ case __NR_membarrier:
-+ return Allow();
-
- // prctl
- case __NR_prctl: {
-
---- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
-
---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
-
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
-
diff --git a/testing/firefox/fix-third_party.patch b/testing/firefox/fix-third_party.patch
deleted file mode 100644
index 7cba6e0c90..0000000000
--- a/testing/firefox/fix-third_party.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/third_party/rust/audio_thread_priority/src/rt_linux.rs.orig 2019-10-24 07:52:22.690223829 +0200
-+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-10-24 07:53:24.586418407 +0200
-@@ -100,7 +100,7 @@
- let mut policy = 0;
-
- if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
-- error!("pthread_getschedparam error {}", pthread_id);
-+ error!("pthread_getschedparam error");
- return Err(());
- }
-
-@@ -127,7 +127,7 @@
- if unsafe { libc::pthread_setschedparam(rt_priority_handle.pthread_id,
- rt_priority_handle.policy,
- &rt_priority_handle.param) } < 0 {
-- warn!("could not demote thread {}", rt_priority_handle.pthread_id);
-+ warn!("could not demote thread");
- return Err(());
- }
- return Ok(());
diff --git a/testing/firefox/rust_audio-thread-priority.patch b/testing/firefox/rust_audio-thread-priority.patch
new file mode 100644
index 0000000000..e3c64ddbbe
--- /dev/null
+++ b/testing/firefox/rust_audio-thread-priority.patch
@@ -0,0 +1,39 @@
+backport of https://github.com/padenot/audio_thread_priority/commit/b5b86285d3c0cae2cb731730460f386ffa30cb03.patch
+avoids problems with serialization of RtPriorityThreadInfo in media/audioipc on musl
+
+--- a/third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-12-02 13:24:01.000000000 +0100
++++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-12-02 13:24:01.000000000 +0100
+@@ -31,9 +31,7 @@
+ /// process.
+ pthread_id: libc::pthread_t,
+ /// ...
+- policy: libc::c_int,
+- /// ...
+- param: libc::sched_param,
++ policy: libc::c_int
+ }
+
+ impl RtPriorityThreadInfoInternal {
+@@ -141,9 +139,11 @@
+ -> Result<(), ()> {
+ assert!(unsafe { libc::pthread_self() } == rt_priority_handle.thread_info.pthread_id);
+
++ let param = unsafe { std::mem::zeroed::<libc::sched_param>() };
++
+ if unsafe { libc::pthread_setschedparam(rt_priority_handle.thread_info.pthread_id,
+ rt_priority_handle.thread_info.policy,
+- &rt_priority_handle.thread_info.param) } < 0 {
++ &param) } < 0 {
+ error!("could not demote thread {}", OSError::last_os_error().raw_os_error().unwrap());
+ return Err(());
+ }
+@@ -187,8 +187,7 @@
+ pid,
+ thread_id,
+ pthread_id,
+- policy,
+- param
++ policy
+ })
+ }
+
diff --git a/testing/firefox/x86_64-alpine-linux-musl.json b/testing/firefox/x86_64-alpine-linux-musl.json
new file mode 100644
index 0000000000..5062c38e7e
--- /dev/null
+++ b/testing/firefox/x86_64-alpine-linux-musl.json
@@ -0,0 +1,35 @@
+{
+ "arch": "x86_64",
+ "cpu": "x86-64",
+ "crt-static-default": false,
+ "crt-static-respected": true,
+ "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+ "dynamic-linking": true,
+ "env": "musl",
+ "executables": true,
+ "has-elf-tls": true,
+ "has-rpath": true,
+ "is-builtin": true,
+ "linker-flavor": "gcc",
+ "linker-is-gnu": true,
+ "llvm-target": "x86_64-unknown-linux-musl",
+ "max-atomic-width": 64,
+ "os": "linux",
+ "position-independent-executables": true,
+ "pre-link-args": {
+ "gcc": [
+ "-Wl,--as-needed",
+ "-Wl,-z,noexecstack",
+ "-Wl,--eh-frame-hdr",
+ "-m64"
+ ]
+ },
+ "relro-level": "full",
+ "stack-probes": true,
+ "target-c-int-width": "32",
+ "target-endian": "little",
+ "target-family": "unix",
+ "target-pointer-width": "64",
+ "vendor": "alpine"
+}
+
diff --git a/testing/flightgear/APKBUILD b/testing/flightgear/APKBUILD
index baeaba5057..adaf4391dc 100644
--- a/testing/flightgear/APKBUILD
+++ b/testing/flightgear/APKBUILD
@@ -1,27 +1,24 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer:
pkgname=flightgear
-pkgver=2018.3.2
+pkgver=2019.1.1
pkgrel=0
pkgdesc="Sophisticated flight simulator"
url="http://flightgear.org"
-arch="x86 x86_64" # openscenegraph availability
+arch="x86_64" # openscenegraph availability
license="GPL"
makedepends="$depends_dev boost-dev cmake curl-dev dbus-dev eudev-dev
freeglut-dev glew-dev libx11-dev libxi-dev libxmu-dev mesa-dev
openal-soft-dev openscenegraph-dev plib qt5-qtbase-dev
- qt5-qtdeclarative-dev qt5-qtsvg-dev simgear zlib-dev"
+ qt5-qtdeclarative-dev qt5-qtsvg-dev simgear-dev zlib-dev"
install="$pkgname.post-install"
subpackages="$pkgname-doc $pkgname-dbg"
options="!check" # FIXME test suite does not get built
-source="https://downloads.sourceforge.net/project/$pkgname/release-${pkgver%.[1-9]*}/$pkgname-$pkgver.tar.bz2
+source="https://downloads.sourceforge.net/project/flightgear/release-${pkgver%.[1-9]*}/flightgear-$pkgver.tar.bz2
musl-fixes.patch
"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
- mkdir _build.tmp && cd _build.tmp
cmake \
-D BUILD_TESTING=ON \
-D CMAKE_BUILD_TYPE="Release" \
@@ -29,19 +26,17 @@ build() {
-D CMAKE_INSTALL_SYSCONFDIR=/etc/$pkgname \
-D FG_DATA_DIR=/var/lib/$pkgname \
-D SimGear_DIR=/usr/lib/cmake/SimGear \
- ..
+ .
make
}
check() {
- cd "$builddir/_build.tmp"
make test
}
package() {
- cd "$builddir/_build.tmp"
make DESTDIR="$pkgdir" install
}
-sha512sums="76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d flightgear-2018.3.2.tar.bz2
+sha512sums="edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c flightgear-2019.1.1.tar.bz2
3350de9e465dc4f865d2a94d96b2f79b4c98c994fc4713cfa296c20ed12129f310779171b89639f69d1e4f5f0103fca6cc01df5a9e25d77f93a0b4e76f6b973a musl-fixes.patch"
diff --git a/testing/fluidsynth/APKBUILD b/testing/fluidsynth/APKBUILD
index 4788ad151e..75594fb17a 100644
--- a/testing/fluidsynth/APKBUILD
+++ b/testing/fluidsynth/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=fluidsynth
-pkgver=2.0.7
+pkgver=2.1.0
pkgrel=0
arch="all"
url="http://www.fluidsynth.org"
@@ -29,4 +29,4 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e fluidsynth-2.0.7.tar.gz"
+sha512sums="d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d fluidsynth-2.1.0.tar.gz"
diff --git a/testing/font-comfortaa/APKBUILD b/testing/font-comfortaa/APKBUILD
deleted file mode 100644
index 0899ba9290..0000000000
--- a/testing/font-comfortaa/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
-pkgname=font-comfortaa
-pkgver=3.100
-pkgrel=0
-_commit=4e6d978a7432514a9918b07863bb5280e7cc8815
-pkgdesc="Rounded geometric sans-serif typeface from Google by Johan Aakerlund"
-url="https://fonts.google.com/specimen/Comfortaa"
-options="!check" # No testsuite
-arch="noarch"
-license="OFL-1.1"
-depends="fontconfig"
-source="
- Comfortaa-Bold-$pkgver.ttf::https://github.com/google/fonts/raw/$_commit/ofl/comfortaa/Comfortaa-Bold.ttf
- Comfortaa-Light-$pkgver.ttf::https://github.com/google/fonts/raw/$_commit/ofl/comfortaa/Comfortaa-Light.ttf
- Comfortaa-Regular-$pkgver.ttf::https://github.com/google/fonts/raw/$_commit/ofl/comfortaa/Comfortaa-Regular.ttf
- "
-builddir="$srcdir/"
-
-package() {
- install -dm 755 "$pkgdir/usr/share/fonts/TTF"
- install -m 644 Comfortaa-Bold-$pkgver.ttf "$pkgdir/usr/share/fonts/TTF/Comfortaa-Bold.ttf"
- install -m 644 Comfortaa-Light-$pkgver.ttf "$pkgdir/usr/share/fonts/TTF/Comfortaa-Light.ttf"
- install -m 644 Comfortaa-Regular-$pkgver.ttf "$pkgdir/usr/share/fonts/TTF/Comfortaa-Regular.ttf"
-}
-
-sha512sums="49120e6e917cd7e190d31d4bfa6e141a045f739f0747b8d8de70c7c19f7f08f12b701c83d2a863f3bf7b9a96d8a703664d8999cf30fcc8074330a9ac6e35397f Comfortaa-Bold-3.100.ttf
-6365f37fef657b0e57afafe5e4b7a2fc4fe0635c8c63f39a8b3100ae27e7e5b9e6557461a48f6ac09386eddad4493dde917eaef962160ecc8c2527c883e1dfb8 Comfortaa-Light-3.100.ttf
-f7318ff0eb0766c75784383438fba2246cb307e4268e1b25d0e1f951d2920fbfad1c9c0f3684839fcd263de5fe05b7dc7176387af061f6806593edf2990f3040 Comfortaa-Regular-3.100.ttf"
diff --git a/testing/font-fantasque-sans/APKBUILD b/testing/font-fantasque-sans/APKBUILD
index eb08985bd4..c6fe90e145 100644
--- a/testing/font-fantasque-sans/APKBUILD
+++ b/testing/font-fantasque-sans/APKBUILD
@@ -3,7 +3,7 @@
pkgname=font-fantasque-sans
_pkgname=fantasque-sans
-pkgver=1.7.2
+pkgver=1.8.0
pkgrel=0
pkgdesc="A font family with a great monospaced variant for programmers."
url="https://github.com/belluzj/fantasque-sans"
@@ -71,7 +71,7 @@ largelineheightnoloopk() {
_variantgenerator "largelineheightnoloopk" "LargeLineHeight-NoLoopK"
}
-sha512sums="f854de5a5e0464d7f69b484c4ae0f59cfdcaa65d357b9935eda1df8cb90781f78c6b6ab0a96ac5099a6464a52de14cf26630d3db5dad8228e86e44033b32c228 fantasque-sans-1.7.2-normal.tar.gz
-07fdb568b25f8d8d8b34c1d9573a37821b301de3733dd72664c9c04c61499d72fb5bf6be3afeb4fbd40c81b6b9cddfaaa2efc2a29d61ff57804e9ccda86d1828 fantasque-sans-1.7.2-noloopk.tar.gz
-eca787c4d6436ccfae10da8cb7894a6ea9ada4013334914c3419fd81c26cac249ac7ae05b6be945ad67ce8aae131de4bc7af33de9dff0dde716206997bf8086f fantasque-sans-1.7.2-largelineheight.tar.gz
-4c6e5238e8b84cf3f2164191416557718b6bb60d650efa8a13039ef90a39a685fb4417ca5901a87f17182ec23105ea5928d123d2a413120146d69a564d92a168 fantasque-sans-1.7.2-largelineheightnoloopk.tar.gz"
+sha512sums="3afbd441d192769ea44fd7730e728844d13c15b0dd52e3968e6e1659ffa11a173d21891c09ceb7465b83a0b8c923129df2554e159620c9611ee9bb6ff35c90c6 fantasque-sans-1.8.0-normal.tar.gz
+4f11e03f55dc0cf0fde6ad1774b7e8426abcb15410d8ff2a1a1d0de0a2a52c8cd9015653ec1ec8efb55297ea9ffad59db453a57f8416e1aab2ec2a93777ab34f fantasque-sans-1.8.0-noloopk.tar.gz
+e9a0d22893923d86036e76ce91c614ae0af6c040d2c7b0e37748bd9ae89157377c42a989bf550dc7a7ff1cb987a60691ebc7dd506e6467ddb131061d01f13a71 fantasque-sans-1.8.0-largelineheight.tar.gz
+ceda26e13b76f763e18ccd1437692f51f16fea3df9cf7bab356a9770fd012f2a56a0e0bbbe4cae5d76c9126bce5453e3c9d721e1880529d08c9c764abe08140d fantasque-sans-1.8.0-largelineheightnoloopk.tar.gz"
diff --git a/testing/font-iosevka-nerd/APKBUILD b/testing/font-iosevka-nerd/APKBUILD
deleted file mode 100644
index b373e13f3e..0000000000
--- a/testing/font-iosevka-nerd/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
-pkgname=font-iosevka-nerd
-pkgver=2.0.0
-pkgrel=0
-pkgdesc="Iconic font aggregator, collection and patcher"
-url="https://nerdfonts.com"
-arch="noarch"
-options="!check" # No testsuite provided
-license="MIT"
-depends="fontconfig"
-source="$pkgname-$pkgver.tar.xz::https://gitlab.com/devopsdeluxe/nerd-fonts-aur/raw/v${pkgver}/release/NerdFonts.tar.xz"
-builddir="$srcdir/NerdFonts"
-
-package() {
- find . -iname 'Iosevka*.ttf' | while read -r ttf; do
- install -Dm644 "$ttf" "$pkgdir"/usr/share/fonts/TTF/"$ttf"
- done
-}
-
-sha512sums="5445a72d9096ef81e2e34592df3f69dd5a033c0265073e59273a7a18cc37b484a89d41d85bc1fd8d8244c2f144c1c0fd853fd1a2cb0cb48e6a56970a7d30d0d4 font-iosevka-nerd-2.0.0.tar.xz"
diff --git a/testing/font-ipa/APKBUILD b/testing/font-ipa/APKBUILD
index 31926370b3..1d5e966b94 100644
--- a/testing/font-ipa/APKBUILD
+++ b/testing/font-ipa/APKBUILD
@@ -9,7 +9,7 @@ license="IPA"
depends="encodings font-alias mkfontscale mkfontdir fontconfig"
makedepends=""
filever=${pkgver/./}
-source="http://dl.ipafont.ipa.go.jp/IPAfont/IPAfont$filever.zip"
+source="https://ipafont.ipa.go.jp/IPAfont/IPAfont$filever.zip"
builddir="$srcdir/IPAfont$filever"
package() {
@@ -22,6 +22,4 @@ package() {
install -m644 IPA_Font_License_Agreement_v1.0.txt "${pkgdir}/usr/share/licenses/font-ipa/"
}
-md5sums="39a828acf27790adbe4944dfb4d94bb1 IPAfont00303.zip"
-sha256sums="f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5 IPAfont00303.zip"
sha512sums="d3e4a1f189356b7a8b0cba9c706987413c8107f9e43ab2ccf52be6d0483efad8c97b68e075a35c5d04603c460dac7f282c4645ddc8318e993368ec47407f894e IPAfont00303.zip"
diff --git a/testing/font-overpass/APKBUILD b/testing/font-overpass/APKBUILD
deleted file mode 100644
index e9e1ba614e..0000000000
--- a/testing/font-overpass/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Sascha Paunovic <azarus@posteo.net>
-pkgname=font-overpass
-pkgver=3.0.3
-pkgrel=0
-pkgdesc="Overpass open source web font family"
-url="http://overpassfont.org/"
-arch="noarch"
-license="OFL-1.1"
-depends="fontconfig"
-options="!check" # no test suite
-source="Overpass-$pkgver.tar.gz::https://github.com/RedHatBrand/Overpass/archive/$pkgver.tar.gz"
-builddir="$srcdir/Overpass-$pkgver"
-
-build() {
- return 0
-}
-
-package() {
- cd "$builddir"
- mkdir -p "$pkgdir"/usr/share/fonts/OTF
- install -Dm644 desktop-fonts/overpass/*.otf \
- "$pkgdir"/usr/share/fonts/OTF
- install -Dm644 desktop-fonts/overpass-mono/*.otf \
- "$pkgdir"/usr/share/fonts/OTF
-}
-
-sha512sums="d2a3284f6f82e80e46af23064a374da2926a3563ee668683aa1a8db7a9163cc80c4fa8a3077876dc552a36e9d621c45218df44485b7b6a6adc3fc6df62c448d0 Overpass-3.0.3.tar.gz"
diff --git a/testing/font-tamzen/APKBUILD b/testing/font-tamzen/APKBUILD
new file mode 100644
index 0000000000..1508707e3b
--- /dev/null
+++ b/testing/font-tamzen/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
+# Contributor: Simon Zeni <simon@bl4ckb0ne.ca>
+pkgname=font-tamzen
+pkgver=1.11.4
+pkgrel=0
+pkgdesc="Bitmapped programming font, based on Tamsyn"
+arch="noarch"
+url="https://github.com/sunaku/tamzen-font"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sunaku/tamzen-font/archive/Tamzen-1.11.4.tar.gz"
+options="!check" # no tests
+builddir="$srcdir/tamzen-font-Tamzen-$pkgver"
+
+package() {
+ install -d "$pkgdir/usr/share/fonts/local"
+ install -m644 bdf/*.bdf "$pkgdir/usr/share/fonts/local/"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+sha512sums="72ab31975384e789dfdf7ac694cbd62b5c64c9c232023202c8e5c2f3bb287f60cb3a027fd6c1daf0c158becef4ab530edc574fc2630f806b91f8ad21045d078c font-tamzen-1.11.4.tar.gz"
diff --git a/testing/font-tewi/APKBUILD b/testing/font-tewi/APKBUILD
deleted file mode 100644
index 77cc361440..0000000000
--- a/testing/font-tewi/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Adrian Siekierka <kontakt@asie.pl>
-pkgname=font-tewi
-pkgver=2.0.2
-pkgrel=1
-pkgdesc="tewi bitmap font"
-url="https://github.com/lucy/tewi-font"
-arch="noarch"
-license="MIT"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev python3 bdftopcf"
-source="tewi-font-$pkgver.tar.gz::https://github.com/lucy/tewi-font/archive/$pkgver.tar.gz"
-options="!check" # no test suite
-builddir="$srcdir/tewi-font-$pkgver"
-
-build() {
- make
-}
-
-package() {
- mkdir -p "$pkgdir/usr/share/fonts/misc"
- install -Dm644 out/*.pcf.gz "$pkgdir/usr/share/fonts/misc"
- install -Dm644 *.bdf "$pkgdir/usr/share/fonts/misc"
-}
-
-sha512sums="823b4c399a64ff66280323ae09f7f3c1dc51a7e2506acfcc9e8f509d600e7bc193e523755f0921921ceb09763e16babc5258467485d3a5260b37055bcfad9123 tewi-font-2.0.2.tar.gz"
diff --git a/testing/fontforge/APKBUILD b/testing/fontforge/APKBUILD
index 54bd02c05b..81673f6cc6 100644
--- a/testing/fontforge/APKBUILD
+++ b/testing/fontforge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Ed Robinson <ed@reevoo.com>
pkgname=fontforge
pkgver=20190801
-pkgrel=0
+pkgrel=1
pkgdesc="FontForge is a free (libre) font editor for Windows, Mac OS X and GNU+Linux."
url="https://github.com/fontforge/fontforge"
arch="all !s390x"
diff --git a/testing/freedoom/APKBUILD b/testing/freedoom/APKBUILD
new file mode 100644
index 0000000000..1febeedc78
--- /dev/null
+++ b/testing/freedoom/APKBUILD
@@ -0,0 +1,24 @@
+# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
+# Maintainer: Antoine Fontaine <antoine.fontaine@epfl.ch>
+pkgname="freedoom"
+pkgver="0.12.1"
+pkgrel=0
+pkgdesc="an entirely free software game running on a Doom engine."
+url="https://freedoom.github.io"
+arch="noarch !s390x"
+license="BSD-3-Clause-Clear"
+makedepends="python3 py3-pillow make deutex asciidoc asciidoctor"
+options="!check"
+subpackages="$pkgname-doc"
+source="https://github.com/freedoom/freedoom/releases/download/v$pkgver/freedoom-$pkgver.tar.xz"
+
+build() {
+ make
+ make -C manual
+}
+
+package() {
+ make DESTDIR="$pkgdir" prefix=/usr install
+}
+
+sha512sums="08a8489e1bbd9418262bfefaa9afe67a281b6f3fd38f77ac822438da434229bb034077e53658c06fa93cbf3ba3c5c25dab5fe1844fe23043e310d21866e12810 freedoom-0.12.1.tar.xz"
diff --git a/testing/frei0r-plugins/APKBUILD b/testing/frei0r-plugins/APKBUILD
index 8446d91d8a..bc9a9dcdab 100644
--- a/testing/frei0r-plugins/APKBUILD
+++ b/testing/frei0r-plugins/APKBUILD
@@ -1,27 +1,34 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=frei0r-plugins
-pkgver=1.6.1
+pkgver=1.7.0
pkgrel=0
pkgdesc="A minimalistic plugin API for video sources and filters"
url="https://frei0r.dyne.org/"
arch="all"
options="!check" # No test suite.
license="GPL-2.0-or-later"
-makedepends="gavl-dev file cairo-dev doxygen"
-subpackages="$pkgname-dev $pkgname-doc"
+makedepends="cmake gavl-dev cairo-dev"
+subpackages="$pkgname-dev"
source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ mkdir build && cd build
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} ..
make
}
package() {
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}
-sha512sums="843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac frei0r-plugins-1.6.1.tar.gz"
+sha512sums="8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce frei0r-plugins-1.7.0.tar.gz"
diff --git a/testing/frr/APKBUILD b/testing/frr/APKBUILD
index 1ed1f67a44..9d46b539c8 100644
--- a/testing/frr/APKBUILD
+++ b/testing/frr/APKBUILD
@@ -1,14 +1,14 @@
-# Maintainer: Christian Franke <nobody@nowhere.ws>
+# Maintainer: Daniel Corbe <daniel@corbe.net>
pkgname=frr
-pkgver=7.1
-pkgrel=1
+pkgver=7.2
+pkgrel=0
pkgdesc="Free Range Routing is a fork of Quagga"
pkgusers="frr"
pkggroups="frr frrvty"
url="https://frrouting.org/"
-arch="all"
+arch="all !s390x" # failing tests
license="GPL-2.0-or-later"
-depends="iproute2 bash"
+depends="iproute2 bash libcap"
makedepends="autoconf automake libtool
bsd-compat-headers
c-ares-dev
@@ -22,6 +22,7 @@ makedepends="autoconf automake libtool
readline-dev
rtrlib-dev
texinfo
+ libcap-dev
"
checkdepends="py3-pytest"
install="$pkgname.pre-install"
@@ -34,7 +35,6 @@ subpackages="$pkgname-dbg
"
source="https://github.com/FRRouting/frr/archive/frr-$pkgver.tar.gz
frr.initd
- py3.patch
"
builddir="$srcdir"/$pkgname-$pkgname-$pkgver
@@ -125,6 +125,5 @@ snmp() {
mv "$pkgdir"/usr/lib/frr/libfrrsnmp.* "$subpkgdir/usr/lib/frr"
}
-sha512sums="d1020607c4c142cc2895c514dcee232a6711a01e63e35a4005249fba9a2b491ebede6dfcfc8d1e885d9d93aff34c99aaced987141040f437eba6779007d06817 frr-7.1.tar.gz
-b495b2be9f2cbb065104ccc0c3474471e870b53ac62ed4fba40020c8d50866e637a99ef3d7af5de1018ff659c4757baac4f40d7648a9de99ed14db33c8992b54 frr.initd
-56153758bb543229e54343f15abdb18661317d42f2d244300c298a8ea5b6cd21d573a7379d184541f9c6110028c2049d9911849a14ae3febcc299e5a5050b2ae py3.patch"
+sha512sums="5a5852964e2b62dad74a516b9ee53377feebacfa2ce1860a82e6a6ee6dfaf8055a0dbb53b39550fa9098e352c96b434a3d41ea36963f6370e41265fb96d61150 frr-7.2.tar.gz
+b495b2be9f2cbb065104ccc0c3474471e870b53ac62ed4fba40020c8d50866e637a99ef3d7af5de1018ff659c4757baac4f40d7648a9de99ed14db33c8992b54 frr.initd"
diff --git a/testing/frr/py3.patch b/testing/frr/py3.patch
deleted file mode 100644
index cc9654adfc..0000000000
--- a/testing/frr/py3.patch
+++ /dev/null
@@ -1,1001 +0,0 @@
-diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
-index 239de55..3e7fc07 100755
---- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
-+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_all_protocol_startup.py
-diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.py b/tests/topotests/bfd-topo1/test_bfd_topo1.py
-index 4fd4f97..192f44c 100644
---- a/tests/topotests/bfd-topo1/test_bfd_topo1.py
-+++ b/tests/topotests/bfd-topo1/test_bfd_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bfd_topo1.py
-diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.py b/tests/topotests/bfd-topo2/test_bfd_topo2.py
-index 773db12..140ceee 100644
---- a/tests/topotests/bfd-topo2/test_bfd_topo2.py
-+++ b/tests/topotests/bfd-topo2/test_bfd_topo2.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bfd_topo2.py
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py b/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py b/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py
-index 647c254..dd2e43c 100755
---- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py
-+++ b/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
-index d806226..9e3167c 100755
---- a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
-+++ b/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp_ecmp_topo1.py
-diff --git a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py b/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py
-index b0d6040..695c15c 100755
---- a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py
-+++ b/tests/topotests/bgp-vrf-route-leak-basic/test_bgp.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp.py
-diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py
-index b464905..e14cc8d 100644
---- a/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py
-+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/customize.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
-index f710c84..3cc7a1f 100755
---- a/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
-+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/test_bgp_l3vpn_to_bgp_direct.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
-index ce54241..7ad82e1 100644
---- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
-+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
-index 1da1066..7c35892 100755
---- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
-+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/test_bgp_l3vpn_to_bgp_vrf.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py b/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py
-index da4b67b..b06515a 100644
---- a/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py
-+++ b/tests/topotests/bgp_local_as_private_remove/test_bgp_local_as_private_remove.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # bgp_local_as_private_remove.py
-diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py b/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py
-index 69b8c7c..1955176 100644
---- a/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py
-+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/test_bgp_maximum_prefix_invalid_update.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # bgp_local_as_private_remove.py
-diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer1/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer1/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer2/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer2/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer3/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer3/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer4/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer4/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer5/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer5/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer6/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer6/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer7/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer7/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py b/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer8/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py b/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py
-index 2de2bce..797da15 100755
---- a/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py
-+++ b/tests/topotests/bgp_multiview_topo1/peer8/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
-index 7607fe9..0030954 100755
---- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
-+++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp_multiview_topo1.py
-diff --git a/tests/topotests/bgp_rfapi_basic_sanity/customize.py b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
-index a125c65..c385fc3 100644
---- a/tests/topotests/bgp_rfapi_basic_sanity/customize.py
-+++ b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
-index 0e1f236..7ec7dbb 100755
---- a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
-+++ b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py b/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py
-index 59ffd36..2628be9 100644
---- a/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py
-+++ b/tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp_show_ip_bgp_fqdn.py
-diff --git a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py b/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py
-index 5334ea5..f310eee 100755
---- a/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py
-+++ b/tests/topotests/bgp_vrf_netns/peer1/exa-receive.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-receive.py: Save received routes form ExaBGP into file
-diff --git a/tests/topotests/bgp_vrf_netns/peer1/exa-send.py b/tests/topotests/bgp_vrf_netns/peer1/exa-send.py
-index 9a2a201..5c2b5c1 100755
---- a/tests/topotests/bgp_vrf_netns/peer1/exa-send.py
-+++ b/tests/topotests/bgp_vrf_netns/peer1/exa-send.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- """
- exa-send.py: Send a few testroutes with ExaBGP
-diff --git a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
-index a5590bc..3c69dca 100755
---- a/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
-+++ b/tests/topotests/bgp_vrf_netns/test_bgp_vrf_netns_topo.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp_vrf_netns_topo1.py
-diff --git a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py
-index 1c00fac..adc1731 100755
---- a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py
-+++ b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_eigrp_topo1.py
-diff --git a/tests/topotests/example-test/test_example.py b/tests/topotests/example-test/test_example.py
-index 8e37ad1..9637eb3 100755
---- a/tests/topotests/example-test/test_example.py
-+++ b/tests/topotests/example-test/test_example.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- import subprocess
- import sys
-diff --git a/tests/topotests/example-test/test_template.py b/tests/topotests/example-test/test_template.py
-index 4e35ce8..6a0d298 100755
---- a/tests/topotests/example-test/test_template.py
-+++ b/tests/topotests/example-test/test_template.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # <template>.py
-diff --git a/tests/topotests/isis-topo1/test_isis_topo1.py b/tests/topotests/isis-topo1/test_isis_topo1.py
-index 941f917..ac46ca9 100644
---- a/tests/topotests/isis-topo1/test_isis_topo1.py
-+++ b/tests/topotests/isis-topo1/test_isis_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_isis_topo1.py
-diff --git a/tests/topotests/ldp-topo1/test_ldp_topo1.py b/tests/topotests/ldp-topo1/test_ldp_topo1.py
-index 409a5f5..05ff950 100755
---- a/tests/topotests/ldp-topo1/test_ldp_topo1.py
-+++ b/tests/topotests/ldp-topo1/test_ldp_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_bgp_multiview_topo1.py
-diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
-index 0948c2e..7ad5f53 100755
---- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
-+++ b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ldp_vpls_topo1.py
-diff --git a/tests/topotests/lib/bgprib.py b/tests/topotests/lib/bgprib.py
-index 5a81036..ac88978 100644
---- a/tests/topotests/lib/bgprib.py
-+++ b/tests/topotests/lib/bgprib.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Copyright 2018, LabN Consulting, L.L.C.
- #
-diff --git a/tests/topotests/lib/ltemplate.py b/tests/topotests/lib/ltemplate.py
-index 31eaec7..2ac6247 100644
---- a/tests/topotests/lib/ltemplate.py
-+++ b/tests/topotests/lib/ltemplate.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # Part of NetDEF Topology Tests
-diff --git a/tests/topotests/lib/lutil.py b/tests/topotests/lib/lutil.py
-index 3ae1801..ad8a943 100755
---- a/tests/topotests/lib/lutil.py
-+++ b/tests/topotests/lib/lutil.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Copyright 2017, LabN Consulting, L.L.C.
- #
-diff --git a/tests/topotests/lib/test/test_json.py b/tests/topotests/lib/test/test_json.py
-index 3927ba0..5f0cc00 100755
---- a/tests/topotests/lib/test/test_json.py
-+++ b/tests/topotests/lib/test/test_json.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_json.py
-diff --git a/tests/topotests/lib/test/test_version.py b/tests/topotests/lib/test/test_version.py
-index 9204ac2..96f8d64 100755
---- a/tests/topotests/lib/test/test_version.py
-+++ b/tests/topotests/lib/test/test_version.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_version.py
-diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
-index e0da20e..5ea270e 100644
---- a/tests/topotests/lib/topotest.py
-+++ b/tests/topotests/lib/topotest.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # topotest.py
-diff --git a/tests/topotests/lm-proxy-topo1/test_lm-proxy-topo1.py b/tests/topotests/lm-proxy-topo1/test_lm-proxy-topo1.py
-index 7acbb1e..10c1e9b 100644
---- a/tests/topotests/lm-proxy-topo1/test_lm-proxy-topo1.py
-+++ b/tests/topotests/lm-proxy-topo1/test_lm-proxy-topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_lm-proxy-topo1.py
-diff --git a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
-index 56cd42e..ebc5513 100755
---- a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
-+++ b/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ospf_sr_topo1.py
-diff --git a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
-index fc48544..18237a8 100755
---- a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
-+++ b/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ospf_topo1.py
-diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.py b/tests/topotests/ospf-topo1/test_ospf_topo1.py
-index 638e394..1a422a2 100755
---- a/tests/topotests/ospf-topo1/test_ospf_topo1.py
-+++ b/tests/topotests/ospf-topo1/test_ospf_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ospf_topo1.py
-diff --git a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py
-index 5da04b6..3dc7468 100755
---- a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py
-+++ b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ospf6_topo1.py
-diff --git a/tests/topotests/pim-basic/mcast-rx.py b/tests/topotests/pim-basic/mcast-rx.py
-index 9e3484e..0abd493 100755
---- a/tests/topotests/pim-basic/mcast-rx.py
-+++ b/tests/topotests/pim-basic/mcast-rx.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # mcast-rx.py
- #
-diff --git a/tests/topotests/pim-basic/mcast-tx.py b/tests/topotests/pim-basic/mcast-tx.py
-index c469e47..a7c4b8b 100755
---- a/tests/topotests/pim-basic/mcast-tx.py
-+++ b/tests/topotests/pim-basic/mcast-tx.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # mcast-tx.py
- #
-diff --git a/tests/topotests/pim-basic/test_pim.py b/tests/topotests/pim-basic/test_pim.py
-index 6d54b8f..73d36e9 100644
---- a/tests/topotests/pim-basic/test_pim.py
-+++ b/tests/topotests/pim-basic/test_pim.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_pim.py
-diff --git a/tests/topotests/rip-topo1/test_rip_topo1.py b/tests/topotests/rip-topo1/test_rip_topo1.py
-index 7aaaaca..a6d6175 100755
---- a/tests/topotests/rip-topo1/test_rip_topo1.py
-+++ b/tests/topotests/rip-topo1/test_rip_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_rip_topo1.py
-diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.py b/tests/topotests/ripng-topo1/test_ripng_topo1.py
-index 145b1a7..a19f047 100755
---- a/tests/topotests/ripng-topo1/test_ripng_topo1.py
-+++ b/tests/topotests/ripng-topo1/test_ripng_topo1.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- #
- # test_ripng_topo1.py
-diff --git a/tools/fixup-deprecated.py b/tools/fixup-deprecated.py
-index 3895848..7b104c2 100755
---- a/tools/fixup-deprecated.py
-+++ b/tools/fixup-deprecated.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- #
- # Script used to replace deprecated quagga/frr mactors/types/etc.
-diff --git a/tools/git-reindent-branch.py b/tools/git-reindent-branch.py
-index c207f59..202cdfa 100644
---- a/tools/git-reindent-branch.py
-+++ b/tools/git-reindent-branch.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
-
- import sys, os
-diff --git a/tools/indent.py b/tools/indent.py
-index d2c41e1..d4fc2be 100755
---- a/tools/indent.py
-+++ b/tools/indent.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # 2017 by David Lamparter, placed in public domain
-
-diff --git a/tools/render_md.py b/tools/render_md.py
-index 16c4bbe..28b6aa7 100644
---- a/tools/render_md.py
-+++ b/tools/render_md.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # written 2016 by David Lamparter, placed in Public Domain.
- import sys, markdown
-
-
diff --git a/testing/gajim-plugin-omemo/APKBUILD b/testing/gajim-plugin-omemo/APKBUILD
deleted file mode 100644
index b3c5daab62..0000000000
--- a/testing/gajim-plugin-omemo/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-pkgname=gajim-plugin-omemo
-_pkgname="${pkgname#gajim-plugin-}"
-pkgver=2.6.59
-pkgrel=1
-pkgdesc="Gajim plugin for Multi-End Message and Object Encryption (OMEMO)"
-url="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
-arch="noarch"
-license="GPL-3.0-only"
-depends="gajim py3-qrcode py3-axolotl"
-makedepends="py-setuptools python3-dev"
-source="$pkgname-$pkgver.zip::https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip"
-builddir="$srcdir"/$_pkgname
-options="!check"
-
-build() {
- return 0
-}
-
-package() {
- cd "$builddir"
- rm -f CHANGELOG COPYING
- site_pkgs="$(python3 -c 'import site; print(site.getsitepackages()[0])')"
- mkdir -p "$pkgdir/$site_pkgs/gajim/data/plugins/$_pkgname"
- cp -r ./* "$pkgdir/$site_pkgs/gajim/data/plugins/$_pkgname/"
-}
-
-sha512sums="fcd7e8322e8ec56408e0ed07ea5ee56475c3d1e94864b57954d1fccbb8cfba1f9189fb2c5bd46c71a64f4286a10274af23852b5b1fd133b91d59cef7bb2707b9 gajim-plugin-omemo-2.6.59.zip"
diff --git a/testing/gajim/APKBUILD b/testing/gajim/APKBUILD
deleted file mode 100644
index 57b95f6627..0000000000
--- a/testing/gajim/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-pkgname=gajim
-pkgver=1.1.3
-pkgrel=2
-pkgdesc="A full featured and easy to use XMPP client"
-url="https://gajim.org/"
-arch="noarch"
-license="GPL-3.0-only"
-depends="
- py3-cairo py3-gobject3 py3-asn1 py3-nbxmpp py3-openssl
- py3-precis-i18n py3-keyring py3-cssutils gtk+3.0
- "
-makedepends="py-setuptools python3-dev gettext-dev"
-checkdepends="xvfb dbus"
-source="
- https://$pkgname.org/downloads/${pkgver:0:3}/$pkgname-$pkgver.tar.bz2
- "
-subpackages="$pkgname-doc $pkgname-lang"
-
-build() {
- python3 setup.py build
-}
-
-check() {
- local xvfb_pid
- Xvfb :4242 &
- xvfb_pid=$!
- if env DISPLAY=:4242 python3 setup.py test; then
- kill $xvfb_pid
- return 0
- else
- kill $xvfb_pid
- return 1
- fi
-}
-
-package() {
- python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-
-sha512sums="18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac gajim-1.1.3.tar.bz2"
diff --git a/testing/gammaray/APKBUILD b/testing/gammaray/APKBUILD
new file mode 100644
index 0000000000..c5992cd7c4
--- /dev/null
+++ b/testing/gammaray/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+pkgname=gammaray
+pkgver=2.11.0
+pkgrel=0
+pkgdesc="A tool for examining the internals of a Qt application and to some extent also manipulate it"
+url="https://www.kdab.com/development-resources/qt-tools/gammaray/"
+arch="all !ppc64le !s390x !armhf" # Limited by qt5-qtwebengine
+license="GPL-2.0-or-later"
+makedepends="cmake qt5-qtbase-dev qt5-qtwebengine-dev qt5-qtlocation-dev
+ qt5-qtwayland-dev qt5-qttools-dev qt5-qtsvg-dev qt5-qtdeclarative-dev
+ qt5-qtscript-dev qt5-qtconnectivity-dev syntax-highlighting-dev
+ kcoreaddons-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://github.com/KDAB/GammaRay/releases/download/v$pkgver/gammaray-$pkgver.tar.gz
+ f50f74f.patch"
+options="!check" # No tests
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} .
+ make
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+ gzip "$pkgdir"/usr/share/man/man1/gammaray.1
+}
+
+sha512sums="22280bc1915211d6d818162a7d19f1f10cbd3da2b610e5f09c946a54689ef5f08af0700a65d3d7838a6669aabddb745b94a13faaaaaa54ec1fda7febf3ace174 gammaray-2.11.0.tar.gz
+26b8277f88d4c4dc7abed8481910c9bb6741b49488af51158cef450d033b8cdb097f474d150fc02b1ec12d8a14a5edcacf6157b98912ae2e837985107f5232c9 f50f74f.patch"
diff --git a/testing/gammaray/f50f74f.patch b/testing/gammaray/f50f74f.patch
new file mode 100644
index 0000000000..f69a9fbb52
--- /dev/null
+++ b/testing/gammaray/f50f74f.patch
@@ -0,0 +1,26 @@
+From f50f74f2bba6aca59e2688a4b5229c27aad50c28 Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo@amarulasolutions.com>
+Date: Mon, 11 Nov 2019 16:27:10 +0100
+Subject: [PATCH] core/execution: use USE_BACKWARD_CPP only when HAVE_BACKTRACE
+
+If any backtrace support is available, like on uclibc, USE_BACKWARD_CPP
+is not available either, thus disabling it.
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+---
+ core/execution.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/execution.cpp b/core/execution.cpp
+index 6e7c6eaee..9551a2887 100644
+--- a/core/execution.cpp
++++ b/core/execution.cpp
+@@ -31,7 +31,7 @@
+
+ #include <QtGlobal>
+
+-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
++#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(HAVE_BACKTRACE)
+ #include <backward.hpp>
+ #define USE_BACKWARD_CPP
+ #else
diff --git a/testing/gcc-cross-embedded/APKBUILD b/testing/gcc-cross-embedded/APKBUILD
index 1237e2b3d0..71bbcc94bf 100644
--- a/testing/gcc-cross-embedded/APKBUILD
+++ b/testing/gcc-cross-embedded/APKBUILD
@@ -12,30 +12,30 @@ _targets="
msp430-elf
"
pkgname="$_pkgbase-cross-embedded"
-pkgver=8.3.0
+pkgver=9.2.0
pkgrel=0
pkgdesc="The GNU Compiler Collection for embedded targets"
url="http://gcc.gnu.org"
depends="gcc"
makedepends="bash linux-headers gmp-dev mpfr-dev mpc1-dev zlib-dev"
-arch="all"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0"
+arch="all !s390x" # fails on s390x with error message:
+# 'internal compiler error: Segmentation fault'
+license="GPL-3.0-or-later"
for target in $_targets; do
targetnorm="${target//-/_}"
- subpackages="${_pkgbase}-${target}:${targetnorm} ${subpackages}"
+ subpackages="$_pkgbase-$target:$targetnorm $subpackages"
makedepends="$makedepends binutils-$target newlib-$target-stage1"
done
_islver=0.20
source="https://mirrors.kernel.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
- http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2"
+ http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
options="!check"
builddir="$srcdir/$_pkgbase-$pkgver"
prepare() {
- cd "$builddir"
# link isl for in-tree build
ln -s "$srcdir"/isl-"$_islver" isl
@@ -91,7 +91,7 @@ _build_gcc() {
build() {
for target in $_targets; do
# Build "regular" variant
- workingdir="${srcdir}/build-${target}"
+ workingdir="$srcdir/build-$target"
mkdir "$workingdir"
cd "$workingdir"
export CFLAGS_FOR_TARGET='-pipe -Os -ffunction-sections -fdata-sections'
@@ -99,7 +99,7 @@ build() {
_build_gcc
# Rebuild without exceptions to generate nano variant of libstc++
- workingdir="${srcdir}/build-${target}-nano"
+ workingdir="$srcdir/build-$target-nano"
mkdir "$workingdir"
cd "$workingdir"
export CFLAGS_FOR_TARGET='-pipe -Os -ffunction-sections -fdata-sections -fno-exceptions'
@@ -112,19 +112,19 @@ package() {
for target in $_targets; do
depends="$depends $_pkgbase-$target"
done
- mkdir -p "${pkgdir}"
+ mkdir -p "$pkgdir"
}
_install_subpkg() {
- target="${subpkgname#${_pkgbase}-}"
+ target="${subpkgname#$_pkgbase-}"
pkgdesc="The GNU Compiler Collection for $target targets"
depends="$depends binutils-$target"
- workingdir="${srcdir}/build-${target}"
+ workingdir="$srcdir/build-$target"
cd "$workingdir"
make install DESTDIR="$subpkgdir" -j1
# install nano-variant into temporary folder to obtain libstdc++ from there
- workingdir="${srcdir}/build-${target}-nano"
+ workingdir="$srcdir/build-$target-nano"
cd "$workingdir"
make install DESTDIR="$subpkgdir-nano" -j1
@@ -162,5 +162,5 @@ msp430_elf() {
_install_subpkg
}
-sha512sums="1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
+sha512sums="a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040 gcc-9.2.0.tar.xz
afe2e159b74646a26449268637403d271f9e3f6410d8cc1c9cffca41370c4357b165dea844db0c2a654591f954e54710dda650c8088abd4711406aa6302da950 isl-0.20.tar.bz2"
diff --git a/testing/gdal/APKBUILD b/testing/gdal/APKBUILD
deleted file mode 100644
index 826b9de28d..0000000000
--- a/testing/gdal/APKBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Contributor: Trevor R.H. Clarke <trevor@notcows.com>
-# Maintainer: Trevor R.H. Clarke <trevor@notcows.com>
-pkgname=gdal
-pkgver=2.4.2
-pkgrel=0
-pkgdesc="A translator library for raster and vector geospatial data formats"
-url="https://gdal.org"
-arch="all"
-license="MIT"
-depends_dev="gdal"
-makedepends="
- curl-dev
- geos-dev
- giflib-dev
- jpeg-dev
- libjpeg-turbo-dev
- libpng-dev
- linux-headers
- postgresql-dev
- python3-dev
- sqlite-dev
- swig
- tiff-dev
- zlib-dev
- expat-dev
- "
-subpackages="
- $pkgname-dev
- py3-$pkgname:py3
- "
-
-source="http://download.osgeo.org/gdal/$pkgver/gdal-$pkgver.tar.xz"
-
-build() {
- ./configure --prefix=/usr \
- --with-curl=/usr/bin/curl-config
- make
-
- cd swig/python
- python3 setup.py build
-}
-
-package() {
- make DESTDIR="$pkgdir" install
- chmod -x "$pkgdir"/usr/include/*.h
-}
-
-py3() {
- pkgdesc="$pkgname (python3 bindings)"
-
- replaces="py-$pkgname" # Backwards compatibility
- provides="py-$pkgname=$pkgver-r$pkgrel" # Backwards compatibility
-
- cd "$builddir"/swig/python
- python3 setup.py install --prefix=/usr --root="$subpkgdir"
-
- chmod a+x scripts/*
- install -d "$subpkgdir"/usr/bin
- install -m755 scripts/*.py "$subpkgdir"/usr/bin/
-}
-
-check() {
- # TODO: https://trac.osgeo.org/gdal/wiki/TestingNotes
-
- apps/gdal-config --version | grep "$pkgver"
-
- # confirms MBTiles support
- apps/gdal_translate --formats | grep "MBTiles -raster,vector- (rw+v): MBTiles"
-
- # confirms PostgreSQL/PostGIS support
- apps/ogr2ogr --formats | grep "PostgreSQL -vector- (rw+): PostgreSQL/PostGIS"
-}
-sha512sums="70abcbd7aa5878ff51efb830cef53cb0ee9a4ce88d11b34563da3af9143dd0d46e4e1461164aa9277bb0f578a3b2bc9bfd7650905f0f184f2c4f146df72f6b4e gdal-2.4.2.tar.xz"
diff --git a/testing/gdb-embedded/APKBUILD b/testing/gdb-embedded/APKBUILD
deleted file mode 100644
index 5749470e5e..0000000000
--- a/testing/gdb-embedded/APKBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-_pkgbase=gdb
-_targets="
- arm-none-eabi
- avr
- mips-mti-elf
- msp430-elf
- "
-pkgname="$_pkgbase-embedded"
-pkgver=8.3.1
-pkgrel=0
-pkgdesc="The GNU Debugger for embedded targets"
-url="https://www.sourceware.org/gdb/"
-arch="all"
-license="GPL-2.0-only GPL-2.0-or-later GPL-3.0-only GPL-3.0-or-later LGPL-2.1-only"
-depends="gdb"
-makedepends="
- autoconf
- automake
- expat-dev
- libtool
- linux-headers
- ncurses-dev
- perl
- python3-dev
- readline-dev
- texinfo
- zlib-dev
- "
-options="!check"
-source="https://ftp.gnu.org/gnu/$_pkgbase/$_pkgbase-$pkgver.tar.xz"
-for target in $_targets; do
- targetnorm="${target//-/_}"
- subpackages="$_pkgbase-$target:$targetnorm $subpackages"
-done
-builddir="$srcdir"/$_pkgbase-$pkgver
-
-build() {
- for target in $_targets; do
- mkdir -p "$srcdir/build/$target"
- cd "$srcdir/build/$target"
-
- "$builddir/configure" \
- --target=$target \
- --prefix=/usr \
- --mandir=/deleteme/man \
- --infodir=/deleteme/info \
- --pdfdir=/deleteme/pdf \
- --htmldir=/deleteme/html \
- --disable-nls \
- --disable-werror \
- --enable-interwork \
- --enable-languages=c,c++ \
- --enable-multilib \
- --with-python=/usr/bin/python3 \
- --with-system-gdbinit=/etc/gdb/gdbinit \
- --with-system-readline \
- --with-system-zlib
- make
- done
-}
-
-package() {
- for target in $_targets; do
- depends="$depends $_pkgbase-$target"
- done
- mkdir -p "$pkgdir"
-}
-
-_install_subpkg() {
- target="${subpkgname#$_pkgbase-}"
- pkgdesc="The GNU Debugger for $target"
- cd "$srcdir/build/$target"
- make DESTDIR="$subpkgdir" install
-
- rm -rf "$subpkgdir"/deleteme
-
- # those are provided by gdb
- rm -rf "${subpkgdir:?}"/usr/share
- # those are provided by binutils
- rm -rf "${subpkgdir:?}"/usr/include
- rm -rf "${subpkgdir:?}"/usr/lib
-}
-
-arm_none_eabi() {
- _install_subpkg
-}
-
-avr() {
- _install_subpkg
-}
-
-mips_mti_elf() {
- _install_subpkg
-}
-
-msp430_elf() {
- _install_subpkg
-}
-
-
-sha512sums="9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz"
diff --git a/testing/gdmd/APKBUILD b/testing/gdmd/APKBUILD
new file mode 100644
index 0000000000..11ce75f8a6
--- /dev/null
+++ b/testing/gdmd/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Mathias LANG <pro.mathias.lang@gmail.com>
+# Maintainer: Mathias LANG <pro.mathias.lang@gmail.com>
+pkgname=gdmd
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="Wrapper providing DMD-like CLI interface to gdc"
+url="https://github.com/D-Programming-GDC/gdmd"
+# GDC does not support PPC64le
+arch="all !ppc64le"
+license="GPL-3.0-or-later"
+depends="perl gcc-gdc"
+# It's a script, and needs to be installed to be tested
+# Additionally, there's no test suite for it, however
+options="!check"
+source="$pkgname-$pkgver.zip::https://github.com/D-Programming-GDC/gdmd/archive/script-$pkgver.zip"
+builddir="$srcdir/gdmd-script-$pkgver/"
+
+package() {
+ # gdmd needs to be in the same directory as GDC
+ install -D "dmd-script" "$pkgdir/usr/bin/gdmd"
+}
+
+sha512sums="bbba4f2de7acd19d366eafd382b59fb3384b3d65562ffb1309626b1184b7cbfd882a06200eb583ad28df7fcb370f819acf4b9b195f47f33939356f2839bb8020 gdmd-0.1.0.zip"
diff --git a/testing/gearmand/APKBUILD b/testing/gearmand/APKBUILD
index 595b37af2f..d747aec902 100644
--- a/testing/gearmand/APKBUILD
+++ b/testing/gearmand/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Aaron Hurt <ahurt@ena.com>
pkgname=gearmand
pkgver=1.1.18
-pkgrel=8
+pkgrel=9
pkgdesc="A distributed job queue"
url="http://gearman.org"
arch="all"
diff --git a/testing/geos/10-configure-python3.patch b/testing/geos/10-configure-python3.patch
deleted file mode 100644
index 417d13d492..0000000000
--- a/testing/geos/10-configure-python3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-Summary: Patch configure script for python3
-----
-
---- a/configure
-+++ b/configure
-@@ -19209,8 +19209,9 @@ $as_echo "$python_path" >&6; }
- # Check for Python library path
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library path" >&5
- $as_echo_n "checking for Python library path... " >&6; }
-+ PYTHON_MAJOR=`echo $PYTHON_VERSION | cut -d. -f1`
- for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do
-- python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"`
-+ python_path=`find $i -name libpython$PYTHON_MAJOR.* -print 2> /dev/null | sed "1q"`
- if test -n "$python_path" ; then
- break
- fi
-@@ -19221,7 +19222,7 @@ $as_echo "$python_path" >&6; }
- if test -z "$python_path" ; then
- as_fn_error $? "cannot find Python library path" "$LINENO" 5
- fi
-- PYTHON_LDFLAGS="-L$python_path -lpython$PYTHON_VERSION"
-+ PYTHON_LDFLAGS="-L$python_path -lpython$PYTHON_MAJOR"
-
- #
- python_site=`echo $base_python_path | sed "s/config/site-packages/"`
-@@ -19234,7 +19235,7 @@ $as_echo "$python_path" >&6; }
- $as_echo_n "checking python extra libraries... " >&6; }
- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
- conf = distutils.sysconfig.get_config_var; \
-- print (conf('LOCALMODLIBS') or '')+' '+(conf('LIBS') or '')"
-+ print ((conf('LOCALMODLIBS') or '')+' '+(conf('LIBS') or ''))"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
- $as_echo "$PYTHON_EXTRA_LIBS" >&6; }`
-
diff --git a/testing/geos/APKBUILD b/testing/geos/APKBUILD
deleted file mode 100644
index db09714406..0000000000
--- a/testing/geos/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Eric Kidd <git@randomhacks.net>
-# Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
-pkgname=geos
-pkgver=3.7.2
-pkgrel=3
-pkgdesc="GEOS is a library providing OpenGIS and JTS spatial operations in C++."
-url="https://trac.osgeo.org/geos/"
-arch="all"
-license="LGPL-2.1-or-later"
-makedepends="
- swig
- python3-dev
- ruby-dev
- "
-subpackages="
- py3-$pkgname:py3
- ruby-$pkgname:ruby
- $pkgname-dev
- "
-source="
- http://download.osgeo.org/geos/geos-$pkgver.tar.bz2
- 10-configure-python3.patch
- "
-
-build() {
- local CXXFLAGS=
- case "$CARCH" in
- aarch64*) CXXFLAGS=-ffp-contract=off ;;
- esac
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --enable-python \
- --enable-ruby
- make
-}
-
-check() {
- case "$CARCH" in
- ppc64le|s390x) return 0 ;;
- esac
- make check
-}
-
-package() {
- make DESTDIR="$pkgdir" install
- find $pkgdir -name "*.a" -type f -delete
-}
-
-py3() {
- pkgdesc="$pkgname Python3 bindings"
-
- install -d "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
-}
-
-ruby() {
- pkgdesc="$pkgname Ruby bindings"
-
- install -d "$subpkgdir"/usr/lib/ruby/vendor_ruby
- mv "$pkgdir"/usr/local/lib/site_ruby/* "$subpkgdir"/usr/lib/ruby/vendor_ruby
- rm -rf "$pkgdir"/usr/local
-}
-sha512sums="ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38 geos-3.7.2.tar.bz2
-a76aceadb30c6a078ef9c671d8335647bd6b94094bd4bdda5958f0d50271552e8f1f7b4e9d4295986f4371a446071c3cc3a446ef520543e820bde83833fea18e 10-configure-python3.patch"
diff --git a/testing/getssl/APKBUILD b/testing/getssl/APKBUILD
index 1fc4a03c35..4f520258c6 100644
--- a/testing/getssl/APKBUILD
+++ b/testing/getssl/APKBUILD
@@ -1,16 +1,16 @@
# Maintainer: Leo Unglaub <leo@unglaub.at>
pkgname=getssl
-pkgver=2.11
+pkgver=2.14
pkgrel=0
pkgdesc="A pure shell implementation of the LetsEncrypt ACME protocol."
url="https://github.com/srvrco/getssl"
arch="noarch"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
depends="curl bash"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/srvrco/$pkgname/archive/v$pkgver.tar.gz"
+options="!check" # No testsuite
+source="$pkgname-$pkgver.tar.gz::https://github.com/srvrco/getssl/archive/v$pkgver.tar.gz"
-package () {
+package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c6a74b9bc4a8ab22975c3d75354978fb96dd31fc3fe4de2712b47150e183afc1de015e3756fa8c82bc5255a19202e4799f4454f17963de538cfd4b409095cae7 getssl-2.11.tar.gz"
+sha512sums="8d81ede16ab9a1021a51b125d63542ebd8b9312ef7bcc137d43e4dddc9058c3241731a9499734d0ec5ba2a23f1ad936f4e840d2e0af7e00681d3b05d969a7976 getssl-2.14.tar.gz"
diff --git a/testing/gforth/APKBUILD b/testing/gforth/APKBUILD
index 4854545db7..b6cff3e362 100644
--- a/testing/gforth/APKBUILD
+++ b/testing/gforth/APKBUILD
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
options="!check" # Hangs
makedepends="libffi-dev libtool m4"
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/gforth/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/gforth/$pkgname-$pkgver.tar.gz"
prepare() {
default_prepare
diff --git a/testing/git-cola/APKBUILD b/testing/git-cola/APKBUILD
index 4b368a01ac..07844d0518 100644
--- a/testing/git-cola/APKBUILD
+++ b/testing/git-cola/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
pkgname=git-cola
-pkgver=3.5
-pkgrel=0
+pkgver=3.6
+pkgrel=1
pkgdesc="A GUI application for git built on Python & Qt5"
url="https://git-cola.github.io"
-arch="noarch"
+arch="noarch !armhf" # qtdeclarative
license="GPL-2.0-or-later"
-depends="python3 py3-qtpy"
+depends="python3 py3-qt5"
checkdepends="py3-nose"
makedepends="py3-setuptools"
subpackages="$pkgname-doc"
@@ -26,4 +26,4 @@ package() {
make PYTHON=python3 prefix=/usr DESTDIR="$pkgdir" install
}
-sha512sums="532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793 git-cola-3.5.tar.gz"
+sha512sums="3d429bcc9c3449125e10ed4caaa3484c9f21af7c7d5ab0b525bed8f0178ba15b416463461d5f999eb264a15e104496d528883a3db575ecd3f0561581f1a0258f git-cola-3.6.tar.gz"
diff --git a/testing/gnome-2048/APKBUILD b/testing/gnome-2048/APKBUILD
new file mode 100644
index 0000000000..4ba6d07876
--- /dev/null
+++ b/testing/gnome-2048/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=gnome-2048
+pkgver=3.34.4
+pkgrel=1
+arch="all"
+url="https://wiki.gnome.org/Apps/2048"
+pkgdesc="Obtain the 2048 tile"
+license="GPL-3.0-or-later"
+makedepends="meson ninja itstool vala gtk+3.0-dev clutter-dev clutter-gtk-dev libgee-dev libgnome-games-support-dev"
+source="https://download.gnome.org/sources/gnome-2048/${pkgver%.*}/gnome-2048-$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-lang"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=debugoptimized \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja test -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja install -C output
+}
+
+sha512sums="a085c77acef29241ddeab1c00f91dab3a6c51e3c1dc5baaafd25515a23dd5461e60b1423a96cb0830d844e96b1fd9ec81e9451cf8201329b59c31ad83b84fe27 gnome-2048-3.34.4.tar.xz"
diff --git a/testing/gnome-chess/APKBUILD b/testing/gnome-chess/APKBUILD
new file mode 100644
index 0000000000..1c065c3317
--- /dev/null
+++ b/testing/gnome-chess/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=gnome-chess
+pkgver=3.34.0
+pkgrel=1
+arch="all !s390x" # Blocked by librsvg -> rust
+url="https://wiki.gnome.org/Apps/Chess"
+pkgdesc="Play the classic two-player boardgame of chess"
+license="GPL-3.0-or-later"
+makedepends="meson ninja itstool vala gtk+3.0-dev librsvg-dev"
+source="https://download.gnome.org/sources/gnome-chess/${pkgver%.*}/gnome-chess-$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-lang"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=debugoptimized \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja test -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja install -C output
+}
+
+sha512sums="dcd4c2cfb0ebb5d3481bb6f722ac847cb8976e31352286a245457a62291445f50ad86ce26a37c222112801dc807bb567ed4d71d2d6ccb1628c2cab0767445012 gnome-chess-3.34.0.tar.xz"
diff --git a/testing/gnome-podcasts/APKBUILD b/testing/gnome-podcasts/APKBUILD
deleted file mode 100644
index 70df8d89a1..0000000000
--- a/testing/gnome-podcasts/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=gnome-podcasts
-pkgver=0.4.7
-pkgrel=0
-pkgdesc="Podcast app for GNOME"
-url="https://wiki.gnome.org/Apps/Podcasts"
-arch="all !s390x !x86" # rust crashing on x86, missing deps on s390x
-license="GPL-3.0-or-later"
-makedepends="meson gtk+3.0-dev gstreamer-dev libhandy-dev sqlite-dev openssl-dev
- dbus-dev gst-plugins-base-dev gst-plugins-bad-dev cargo bash"
-checkdepends="desktop-file-utils appstream-glib xvfb-run"
-subpackages="$pkgname-lang"
-source="https://gitlab.gnome.org/World/podcasts/uploads/90c4f40f529ff91dabac5d7cbbc0f5ed/gnome-podcasts-$pkgver.tar.xz"
-
-prepare() {
- default_prepare
-
- sed 's| /usr/bin/sh|/bin/sh|' -i scripts/test.sh
-}
-
-build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=release \
- . output
- ninja -C output
-}
-
-check() {
- xvfb-run ninja -C output test
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C output install
-}
-
-sha512sums="050eaf96a7d36fa97d4e593d4741cbeb6413b7a7346a31831cf2baeaebaff25959cefbd4bb3f656601a61802a25ddf7c1f5eac2a814fb29b464552861716387e gnome-podcasts-0.4.7.tar.xz"
diff --git a/testing/gnome-taquin/APKBUILD b/testing/gnome-taquin/APKBUILD
new file mode 100644
index 0000000000..030db16c12
--- /dev/null
+++ b/testing/gnome-taquin/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=gnome-taquin
+pkgver=3.34.3
+pkgrel=0
+arch="all !s390x" # Blocked by librsvg -> rust
+url="https://wiki.gnome.org/Apps/Taquin"
+pkgdesc="Move tiles so that they reach their places"
+license="GPL-3.0-or-later AND CC-BY-SA-3.0"
+makedepends="meson ninja itstool vala gtk+3.0-dev librsvg-dev gsound-dev"
+source="https://download.gnome.org/sources/gnome-taquin/${pkgver%.*}/gnome-taquin-$pkgver.tar.xz"
+subpackages="$pkgname-doc $pkgname-lang"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=debugoptimized \
+ . output
+ ninja -C output
+}
+
+check() {
+ ninja test -C output
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja install -C output
+}
+
+sha512sums="7e7713e1cd143ff69df8dd81b76aa754c51e0c296562a001e2a39dde25230a0e03b40dad9cbf2f52c37346cb6c1eb9f782d28d518d6833aab6fcffce1537de41 gnome-taquin-3.34.3.tar.xz"
diff --git a/testing/gnome-weather/APKBUILD b/testing/gnome-weather/APKBUILD
deleted file mode 100644
index 56798c9d84..0000000000
--- a/testing/gnome-weather/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=gnome-weather
-pkgver=3.34.0
-pkgrel=0
-pkgdesc="GNOME Weather application"
-url="https://wiki.gnome.org/Apps/Weather"
-arch="noarch !s390x" # missing gjs
-license="GPL-2.0-only"
-makedepends="meson glib-dev gobject-introspection-dev gtk+3.0-dev gjs-dev
- geoclue-dev libgweather-dev"
-checkdepends="appstream-glib desktop-file-utils"
-subpackages="$pkgname-lang"
-source="https://download.gnome.org/sources/gnome-weather/${pkgver%.*}/gnome-weather-$pkgver.tar.xz"
-
-build() {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=release \
- . output
- ninja -C output
-}
-
-check() {
- ninja -C output test
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C output install
-}
-
-sha512sums="f8fd91deef1516b4a18a599415d54a04413a5771916a5c7105e22876e239fe22c325f2e3196f7bff23293893c85fe886fa3a8b4b380aecab62b5b02de58c7185 gnome-weather-3.34.0.tar.xz"
diff --git a/testing/gnurl/APKBUILD b/testing/gnurl/APKBUILD
new file mode 100644
index 0000000000..f206d98809
--- /dev/null
+++ b/testing/gnurl/APKBUILD
@@ -0,0 +1,80 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer:
+pkgname=gnurl
+pkgver=7.65.3
+pkgrel=0
+pkgdesc="A micro fork of libcurl"
+url="https://gnunet.org/en/gnurl.html"
+arch="all"
+license="MIT"
+depends="ca-certificates"
+depends_dev="gnutls-dev libidn2-dev zlib-dev"
+checkdepends="python3"
+makedepends="$depends_dev perl"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://mirror.kumi.systems/gnu/gnunet/gnurl-$pkgver.tar.gz"
+builddir="$srcdir/gnurl-$pkgver"
+
+build() {
+ # Note: The second group of options is based on
+ # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/gnurl/Makefile?rev=1.9&content-type=text/x-cvsweb-markup.
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --enable-ipv6 \
+ --enable-static \
+ --enable-unix-sockets \
+ --with-ca-path=/etc/ssl/certs \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+ --with-pic \
+ \
+ --without-libssh2 \
+ --without-libmetalink \
+ --without-winidn \
+ --without-librtmp \
+ --without-nghttp2 \
+ --without-nss \
+ --without-cyassl \
+ --without-ssl \
+ --without-winssl \
+ --without-darwinssl \
+ --disable-sspi \
+ --disable-ldap \
+ --without-libpsl \
+ --disable-rtsp \
+ --disable-dict \
+ --disable-telnet \
+ --disable-tftp \
+ --disable-pop3 \
+ --disable-imap \
+ --disable-smtp \
+ --disable-gopher \
+ --disable-file \
+ --disable-ftp \
+ --disable-smb \
+ --disable-ntlm-wb \
+ --with-gnutls \
+ --with-libidn2 \
+ --with-libz \
+ --without-ca-fallback \
+ --without-gssapi \
+ --disable-valgrind \
+ --without-ngtcp2 \
+ --without-nghttp2 \
+ --without-nghttp3 \
+ --without-quiche
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="51aa71352dfe2e65dbcf542cb616af1eaa7e80fbc4ddb455a338e74eea245724ac1fa7ff226c418101e8ba298a8f85c2be9e7d9190a57c66e2e8c65d0c5186f8 gnurl-7.65.3.tar.gz"
diff --git a/testing/googler/APKBUILD b/testing/googler/APKBUILD
index 84cb051efe..2a2e265f99 100644
--- a/testing/googler/APKBUILD
+++ b/testing/googler/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ivan Tham <pickfire@riseup.net>
# Maintainer: Ivan Tham <pickfire@riseup.net>
pkgname=googler
-pkgver=3.9
+pkgver=4.0
pkgrel=0
pkgdesc="Google Search, Google Site Search, Google News from the terminal"
url="https://github.com/jarun/googler"
@@ -50,4 +50,4 @@ zshcomp() {
"$subpkgdir"/usr/share/zsh/site-functions/
}
-sha512sums="b11bcc87951fef8b1719d5fd8b2406c1a4f03fd2431eaaed1ce1dcc8451162e1b5f14b779858a9fa494e641f5ee92892878ae29fff2b4af0f09270a0076dff11 googler-3.9.tar.gz"
+sha512sums="3422e9d7c9321554d755bdf0d6c03cce82489770b48bf9523aba8b79ef3985fda2c388c97e90ce5be312be18c94fed7186d03973e1406f5d16fd9ff2028b0620 googler-4.0.tar.gz"
diff --git a/testing/gpg-remailer/APKBUILD b/testing/gpg-remailer/APKBUILD
index 7e0ba84cf4..f9d99ca6b9 100644
--- a/testing/gpg-remailer/APKBUILD
+++ b/testing/gpg-remailer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Shiz <hi@shiz.me>
# Maintainer: Shiz <hi@shiz.me>
pkgname=gpg-remailer
-pkgver=3.04.04
+pkgver=3.04.05
pkgrel=0
pkgdesc="Decrypt GPG messages and re-encrypt them to a well-defined group"
url="https://gitlab.com/fbb-git/gpg-remailer"
@@ -28,4 +28,4 @@ package() {
rm -rf "$pkgdir"/usr/share/doc
}
-sha512sums="e61781a44e917350e3f5016b346d0153ae41bdb5382f1b3b65a9d4e8111ccb6dfd95c9c8443abc7bb52d9a0aff4e1accbae8357b950e2989c6e8c5eff33c24c6 gpg-remailer-3.04.04.tar.gz"
+sha512sums="c3bffe98077131599484c3ea847aeecad4e3e057d69979134bf62347f792473ad8ac1b39076abc5e981745f47b03090172213942ef2de71b365cf780d42601c7 gpg-remailer-3.04.05.tar.gz"
diff --git a/testing/gpm/APKBUILD b/testing/gpm/APKBUILD
index ab8faf268b..9f5f7f0eab 100644
--- a/testing/gpm/APKBUILD
+++ b/testing/gpm/APKBUILD
@@ -21,6 +21,7 @@ source="http://www.nico.schottelius.org/software/gpm/archives/$pkgname-$pkgver.t
install-unversioned-solibrary.patch
musl-fixes.patch
constify-format-strings.patch
+ gpm-include-sysmacros.patch
$pkgname.initd
$pkgname.confd
@@ -41,6 +42,7 @@ build() {
--infodir=/usr/share/info \
--localstatedir=/var \
--disable-static
+ export CPPFLAGS="$CPPFLAGS -I$builddir/src/headers"
make
}
@@ -70,4 +72,5 @@ ec21b7029e0880b342bca5a70522e33d5cabbf77c44c1dd23b16d829d8fcc6cadcdf77b01724a91a
45d3a20a8f9f00f78b21c10143e138add17d414e9b5ecc28d9efee9c2190450c79dca00b13a8247ee7753ff778b09bc88fe8c512366d5b1622981bb5d612f933 musl-fixes.patch
36a5059c6336010b504ec6fc53c2d3df0811b1f1249c0e04c13066db06667119377a21e58121aaa8d4b620be2a5c21da0b018f168e36a44f85802cc50c936ba5 constify-format-strings.patch
d268504bd0cf83706863a8af5c5719b0d192c34ae6a78ff0378521841eca242b39a6e6891080a5fc5512732f84e7439697ba92bfda3ecc1aaebd36b16e946477 gpm.initd
-0e7c96f29222d33301fc9c5c8cf409b7dbe6cbb1e79d76444ae5724e8b793679d3ea597a8ad64187e85680799847632095e469445ae56f893616cb0235a29f3a gpm.confd"
+0e7c96f29222d33301fc9c5c8cf409b7dbe6cbb1e79d76444ae5724e8b793679d3ea597a8ad64187e85680799847632095e469445ae56f893616cb0235a29f3a gpm.confd
+62d294f900ba1922119ebc87f97e86b1653647e03576c982011bf4f629332cc703f3994d5cc4b9bf2dac3c18636a61e420000d16cfdc7c284185c9442cce5b64 gpm-include-sysmacros.patch"
diff --git a/testing/gpm/gpm-include-sysmacros.patch b/testing/gpm/gpm-include-sysmacros.patch
new file mode 100644
index 0000000000..0a18976e94
--- /dev/null
+++ b/testing/gpm/gpm-include-sysmacros.patch
@@ -0,0 +1,10 @@
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h> /* open and co. */
+ #include <sys/stat.h> /* stat() */
+ #include <sys/types.h> /* major() */
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h> /* ioctl */
+
+ /* Linux specific (to be outsourced in gpm2 */
diff --git a/testing/gradio/APKBUILD b/testing/gradio/APKBUILD
index 8b880ee42c..a532997621 100644
--- a/testing/gradio/APKBUILD
+++ b/testing/gradio/APKBUILD
@@ -2,10 +2,10 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=gradio
pkgver=7.3
-pkgrel=0
+pkgrel=1
pkgdesc="A GTK3 app for finding and listening to internet radio stations"
url="https://github.com/haecker-felix/Gradio"
-arch="all"
+arch="all !armhf" # gst-plugins-good missing, which depends on qt5-declarative
license="GPL-3.0-or-later"
depends="gst-plugins-good"
makedepends="meson vala gtk+3.0-dev libsoup-dev json-glib-dev gstreamer-dev gst-plugins-base-dev"
@@ -18,7 +18,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --buildtype=release \
+ --buildtype=debugoptimized \
. output
ninja -C output
}
diff --git a/testing/grafana-image-renderer/10-host-param.patch b/testing/grafana-image-renderer/10-host-param.patch
index b4d3b7abbc..4ff04d31b0 100644
--- a/testing/grafana-image-renderer/10-host-param.patch
+++ b/testing/grafana-image-renderer/10-host-param.patch
@@ -5,14 +5,15 @@ index fffcd3d..b5b58f6 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -22,7 +22,7 @@ async function main() {
+ }
- const logger = new ConsoleLogger();
- const browser = new Browser(logger);
-- const server = new HttpServer({port: argv.port}, logger, browser);
-+ const server = new HttpServer({port: argv.port, host: argv.host}, logger, browser);
+ const browser = newServerBrowser(logger);
+- const server = new HttpServer({ port: argv.port }, logger, browser);
++ const server = new HttpServer({ port: argv.port, host: argv.host }, logger, browser);
server.start();
-
+ } else {
+
diff --git a/src/http-server.ts b/src/http-server.ts
index 1aa875d..018bf6c 100644
--- a/src/http-server.ts
diff --git a/testing/grafana-image-renderer/APKBUILD b/testing/grafana-image-renderer/APKBUILD
index 16e7ed1440..297c9a1d2c 100644
--- a/testing/grafana-image-renderer/APKBUILD
+++ b/testing/grafana-image-renderer/APKBUILD
@@ -1,7 +1,8 @@
# Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=grafana-image-renderer
-pkgver=1.0.5
+pkgver=1.0.8b2
+_pkgver=1.0.8-beta2
pkgrel=0
pkgdesc="Grafana Backend Plugin that handles rendering of panels & dashboards to PNGs using headless chrome"
url="https://github.com/grafana/grafana-image-renderer"
@@ -12,8 +13,9 @@ depends="nodejs ttf-opensans chromium ca-certificates"
options="!check" # Has no test suite.
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana-image-renderer/archive/v$pkgver.tar.gz
+source="$pkgname-$_pkgver.tar.gz::https://github.com/grafana/grafana-image-renderer/archive/v$_pkgver.tar.gz
$pkgname.initd $pkgname.confd 10-host-param.patch"
+builddir="$srcdir/$pkgname-$_pkgver"
build() {
export CHROME_BIN="/usr/bin/chromium-browser"
@@ -33,7 +35,7 @@ package() {
cp -r "$builddir/node_modules" "$builddir/build" "$builddir/proto" "$pkgdir/usr/share/$pkgname/"
}
-sha512sums="44460e19b4225c27166d0f88a7bd73b12d85a38ff6057b82c66b0874d33ad436f6ea0245f138583efb72d3aa9073362907f873d3df06650cf6e21a4e07daaad8 grafana-image-renderer-1.0.5.tar.gz
-2b2b7952153419d8593b058cb9994f88e4191fcc58893c33d15592b0cac02d2859c9ebbdeb34e6365bd0633eee19393a274535679d32ffa220e375114f4915fc grafana-image-renderer.initd
+sha512sums="01e8dbb779c16053ca117169eaa922521fbff3b36df76711ca89e7ad82fc4a2a39e108d6c882010beb27d548629dde4cd696147d1c46aa7f501dcb77e89fc84e grafana-image-renderer-1.0.8-beta2.tar.gz
+79d28359b873ecc584dae7cc590137e4b380606e494e4614e3d1da307e6616dcdc86181bd5d09f97f6df13d7863bf90f9393336df437a97a9124dc6c1ba15762 grafana-image-renderer.initd
ee4fd884d39eb556ffebeb3bc8fc66295d660e94f0a1d58dea57745da967f62216096e481e417cecaf8a51c4181dff4f4586b70cfc2ee7dbad622a6b28735ad0 grafana-image-renderer.confd
-824b41f1a86ea97fdf4c9c34e8171a948ec07c03fa030f37614464f8d4b96984d3d49bf5579584216a5a86b7fa321e281b35d67ffdbfc4c83ee943af35d96dc1 10-host-param.patch"
+04cc3b837c6c12d600c84b98d68e098147ff041b1e64de44f3a9da0c0fa1adca8ddc58aa3991354e9d48a137603a4bc5a284ae2c2a7997af4460bc14d4c3bf71 10-host-param.patch"
diff --git a/testing/grafana-image-renderer/grafana-image-renderer.initd b/testing/grafana-image-renderer/grafana-image-renderer.initd
index 76bec4e19e..08e15e2b0f 100644
--- a/testing/grafana-image-renderer/grafana-image-renderer.initd
+++ b/testing/grafana-image-renderer/grafana-image-renderer.initd
@@ -1,15 +1,14 @@
#!/sbin/openrc-run
-supervisor=supervise-daemon
-
name="Grafana image renderer"
description="Grafana Backend Plugin that handles rendering of panels & dashboards to PNGs using headless chrome"
-
+supervisor=supervise-daemon
command="/usr/bin/node"
command_args="build/app.js server $GRAFANA_IR_OPTS"
command_user=grafanair:grafanair
directory=/usr/share/grafana-image-renderer
-supervise_daemon_args="-e CHROME_BIN=/usr/bin/chromium-browser"
+
+export CHROME_BIN=/usr/bin/chromium-browser
depend() {
need net
diff --git a/testing/grafana/APKBUILD b/testing/grafana/APKBUILD
index 8bf98ad415..be5e1f28c1 100644
--- a/testing/grafana/APKBUILD
+++ b/testing/grafana/APKBUILD
@@ -1,21 +1,20 @@
# Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
pkgname=grafana
-pkgver=6.4.3
+pkgver=6.5.3
pkgrel=0
-_commit=3a2bfb7e38 # git rev-parse --short HEAD
-_stamp=1571218329 # git --no-pager show -s --format=%ct
+_commit=05025c5495 # git rev-parse --short HEAD
+_stamp=1579080999 # git --no-pager show -s --format=%ct
pkgdesc="Open source, feature rich metrics dashboard and graph editor"
url="https://grafana.com"
-arch="x86_64" # Builds are slow on arm archs, x86 requires python2.
+arch="all"
license="Apache-2.0"
-makedepends="go nodejs yarn"
-options="chmod-clean" # Can be replaced with -modcacherw in go1.14
+makedepends="go nodejs yarn python3"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana/archive/v$pkgver.tar.gz
- go.mod go.sum apk.go $pkgname.initd $pkgname.confd"
-builddir=$srcdir
+ $pkgname.initd $pkgname.confd
+ iltorb.patch"
export GOPATH=${GOPATH:-$srcdir/go}
export GOCACHE=${GOCACHE:-$srcdir/go-build}
@@ -27,23 +26,21 @@ export GOTMPDIR=${GOTMPDIR:-$srcdir}
build() {
local ldflags="-X main.version=$pkgver -X main.commit=$_commit -X main.buildstamp=$_stamp"
- for pkg in $(go list -f '{{ join .Imports " " }}'); do
- go build -ldflags "$ldflags" -mod=readonly -v $pkg
- done
-
- cd $builddir/$pkgname-$pkgver
+ go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-server
+ go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-cli
# Don't pollute our git repo with grafanas commit hooks.
# Also don't try to install phantomjs since it depends on glibc.
# This command also acts as "yarn install".
- yarn remove husky phantomjs-prebuilt --pure-lockfile -W
+ # ignore-engines is needed because grafana specifies max node version 11
+ # but alpine ships 12, quick test shows that it works fine.
+ yarn remove --pure-lockfile -W --ignore-engines husky phantomjs-prebuilt
- yarn build --force
+ yarn --ignore-engines build --force
}
check() {
- # Skipped tests do not work in module mode.
- go test $(go list github.com/grafana/grafana/pkg/... | grep -Ev '(provisioning/dashboards)|(infra/log)|(grafana-cli/commands)')
+ go test -mod=vendor ./...
}
package() {
@@ -51,14 +48,12 @@ package() {
install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
install -Dm755 "$builddir/$pkgname-server" "$pkgdir/usr/sbin/$pkgname-server"
install -Dm755 "$builddir/$pkgname-cli" "$pkgdir/usr/bin/$pkgname-cli"
- install -Dm644 "$builddir/$pkgname-$pkgver/conf/sample.ini" "$pkgdir/etc/grafana.ini"
+ install -Dm644 "$builddir/conf/sample.ini" "$pkgdir/etc/grafana.ini"
install -dm755 "$pkgdir/usr/share/grafana"
- cp -r "$builddir/$pkgname-$pkgver/conf" "$builddir/$pkgname-$pkgver/public" "$pkgdir/usr/share/$pkgname/"
+ cp -r "$builddir/conf" "$builddir/public" "$pkgdir/usr/share/$pkgname/"
}
-sha512sums="50eb98fd7144db0648dbe7bc03fa18a95afb88e5655235922c590a4e092edf19071cbe45e810db8b54647217aa51afd0b66650f13d8036212e8347fb347fcb2f grafana-6.4.3.tar.gz
-02ae5ee6e7b349aaeefc3c794f9b78704352785c8bea54fdce3c02c62150003bb734d963fb564548bf70d300597084b50ef42b2dc97ae19238e57ab23cf65f06 go.mod
-7c7c02726688590d3a4140acb261c463500e5a07f23f839af2886204afe11e4ff0039e32cf9a73ebe40772c2cee8baadb97498e3ce9b552353e4618804371d50 go.sum
-8fff794134b497c1d272ac69972bb468849007cb32b9255d792b74a58aea7be739d3db348da686a26fb092244c614a300dfffafb74c58a34a7c7505138158b19 apk.go
+sha512sums="ac0363c9120c961d25a9c154deb974a394bf4b8b911d8e5f913aab29cc4361778cf62122d32e6a24542b5800299fd7063c1ec1d6f5d191b65ce3e044fc050554 grafana-6.5.3.tar.gz
b0a781e1b1e33741a97e231c761b1200239c6f1235ffbe82311fe883387eb23bef262ad68256ebd6cf87d74298041b53b947ea7a493cfa5aa814b2a1c5181e13 grafana.initd
-c2afa7f6baf8f468fbd781b0522cbff173bb0c3964eb08fc4a0951d034e8a1f3f9c14798e2ac487b3c20db834110883db8162039b18195e97bb9f4bc5baffc33 grafana.confd"
+c2afa7f6baf8f468fbd781b0522cbff173bb0c3964eb08fc4a0951d034e8a1f3f9c14798e2ac487b3c20db834110883db8162039b18195e97bb9f4bc5baffc33 grafana.confd
+1fb96e13d337fed497bbd21ab217650bfdc4a2cc340434b26895e94c76033a4ec9d497200d96b17a7a1c867da68cc79b77da49e4fd53222b764f7ccc855cf7de iltorb.patch"
diff --git a/testing/grafana/apk.go b/testing/grafana/apk.go
deleted file mode 100644
index 6fc452196b..0000000000
--- a/testing/grafana/apk.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package apk
-
-import (
- _ "github.com/grafana/grafana/pkg/cmd/grafana-server"
- _ "github.com/grafana/grafana/pkg/cmd/grafana-cli"
-)
diff --git a/testing/grafana/go.mod b/testing/grafana/go.mod
deleted file mode 100644
index d04cee1cd6..0000000000
--- a/testing/grafana/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module apk
-
-go 1.13
-
-require (
- github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809
- golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
-)
diff --git a/testing/grafana/go.sum b/testing/grafana/go.sum
deleted file mode 100644
index 18af5eb8d9..0000000000
--- a/testing/grafana/go.sum
+++ /dev/null
@@ -1,335 +0,0 @@
-cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
-github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/aws/aws-sdk-go v1.18.5 h1:S6j4o4AoJpq98DRc7wQrQsPZg73NyntGtUj6K6NPnuY=
-github.com/aws/aws-sdk-go v1.18.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
-github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
-github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 h1:wOysYcIdqv3WnvwqFFzrYCFALPED7qkUGaLXu359GSc=
-github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3/go.mod h1:UMqtWQTnOe4byzwe7Zhwh8f8s+36uszN51sJrSIZlTE=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA=
-github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNTw=
-github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
-github.com/couchbase/gomemcached v0.0.0-20190515232915-c4b4ca0eb21d/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
-github.com/couchbase/goutils v0.0.0-20190315194238-f9d42b11473b/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
-github.com/couchbaselabs/go-couchbase v0.0.0-20190708161019-23e7ca2ce2b7/go.mod h1:mby/05p8HE5yHEAKiIH/555NoblMs7PtW6NrYshDruc=
-github.com/crewjam/saml v0.0.0-20190521120225-344d075952c9 h1:+cz/lCIhz+eg8+jC8cWk5LBLbbpH39IKyHliN6GZyUE=
-github.com/crewjam/saml v0.0.0-20190521120225-344d075952c9/go.mod h1:w5eu+HNtubx+kRpQL6QFT2F3yIFfYVe6+EzOFVU7Hko=
-github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
-github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853 h1:tTngnoO/B6HQnJ+pK8tN7kEAhmhIfaJOutqq/A4/JTM=
-github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
-github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
-github.com/facebookgo/inject v0.0.0-20180706035515-f23751cae28b h1:V6c4/dSTNhSaNn4c5ulbakfv277qCvs7byFYv7P83iQ=
-github.com/facebookgo/inject v0.0.0-20180706035515-f23751cae28b/go.mod h1:oO8UHw+fDHjDsk4CTy/E96WDzFUYozAtBAaGNoVL0+c=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
-github.com/facebookgo/structtag v0.0.0-20150214074306-217e25fb9691 h1:KnnwHN59Jxec0htA2pe/i0/WI9vxXLQifdhBrP3lqcQ=
-github.com/facebookgo/structtag v0.0.0-20150214074306-217e25fb9691/go.mod h1:sKLL1iua/0etWfo/nPCmyz+v2XDMXy+Ho53W7RAuZNY=
-github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y=
-github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
-github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-macaron/binding v0.0.0-20190806013118-0b4f37bab25b h1:U65wj9SF7qUBTGrnt6VxbHCT0Dw8dz4uch52G+5SdfA=
-github.com/go-macaron/binding v0.0.0-20190806013118-0b4f37bab25b/go.mod h1:AG8Z6qkQM8s47aUDJOco/SNwJ8Czif2hMm7rc0abDog=
-github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07 h1:YSIA98PevNf1NtCa/J6cz7gjzpz99WVAOa9Eg0klKps=
-github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07/go.mod h1://cJFfDp/70L0oTNAMB+M8Jd0rpuIx/55iARuJ6StwE=
-github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191 h1:NjHlg70DuOkcAMqgt0+XA+NHwtu66MkTVVgR4fFWbcI=
-github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191/go.mod h1:VFI2o2q9kYsC4o7VP1HrEVosiZZTd+MVT3YZx4gqvJw=
-github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659 h1:YXDFNK98PgKeBd+xM2Babdd6gyABG8H+SSAh5+hr0os=
-github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659/go.mod h1:tLd0QEudXocQckwcpCq5pCuTCuYc24I0bRJDuRe9OuQ=
-github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-xorm/builder v0.3.2 h1:pSsZQRRzJNapKEAEhigw3xLmiLPeAYv5GFlpYZ8+a5I=
-github.com/go-xorm/builder v0.3.2/go.mod h1:v8mE3MFBgtL+RGFNfUnAMUqqfk/Y4W5KuwCFQIEpQLk=
-github.com/go-xorm/core v0.6.0/go.mod h1:d8FJ9Br8OGyQl12MCclmYBuBqqxsyeedpXciV5Myih8=
-github.com/go-xorm/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
-github.com/go-xorm/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
-github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
-github.com/go-xorm/xorm v0.7.1 h1:Kj7mfuqctPdX60zuxP6EoEut0f3E6K66H6hcoxiHUMc=
-github.com/go-xorm/xorm v0.7.1/go.mod h1:EHS1htMQFptzMaIHKyzqpHGw6C9Rtug75nsq6DA9unI=
-github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
-github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4=
-github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gosimple/slug v1.4.2 h1:jDmprx3q/9Lfk4FkGZtvzDQ9Cj9eAmsjzeQGp24PeiQ=
-github.com/gosimple/slug v1.4.2/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0=
-github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809 h1:RBwo7NE/vsWtLYJnnpYk34GlP5HnC5ZJX+tcRWwBwOU=
-github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809/go.mod h1:16UfS8qT/ztbeCALwOgEhOelXO9RacezFzbVGQcFPWA=
-github.com/grafana/grafana-plugin-model v0.0.0-20180518082423-84176c64269d h1:J3XXvgaMHzZ+gC/pStYNc6k+LjPuhPeAevwgN0AqTeM=
-github.com/grafana/grafana-plugin-model v0.0.0-20180518082423-84176c64269d/go.mod h1:26i1retIKRnMtFVuSmJe6N6D1d1ifdzOMi507YjCYm4=
-github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
-github.com/hashicorp/go-hclog v0.8.0 h1:z3ollgGRg8RjfJH6UVBaG54R70GFd++QOkvnJH3VSBY=
-github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-plugin v0.0.0-20190220160451-3f118e8ee104 h1:9iQ/zrTOJqzP+kH37s6xNb6T1RysiT7fnDD3DJbspVw=
-github.com/hashicorp/go-plugin v0.0.0-20190220160451-3f118e8ee104/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
-github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
-github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec h1:CGkYB1Q7DSsH/ku+to+foV4agt2F2miquaLUgF6L178=
-github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
-github.com/jackc/pgx v3.2.0+incompatible h1:0Vihzu20St42/UDsvZGdNE6jak7oi/UOeMzwMPHkgFY=
-github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
-github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.10.1 h1:mbprTswkr0n86clAmJ4NGCFC4fdGySCAshWzrYb3xbE=
-github.com/jung-kurt/gofpdf v1.10.1/go.mod h1:s/VXv+TdctEOx2wCEguezYaR7f0OwUAd6H9VGfRkcSs=
-github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
-github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/klauspost/compress v1.4.1 h1:8VMb5+0wMgdBykOV96DwNwKFQ+WTI4pzYURP99CcB9E=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ=
-github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af/go.mod h1:Cqz6pqow14VObJ7peltM+2n3PWOz7yTrfUuGbVFkzN0=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
-github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q=
-github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
-github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
-github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
-github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967 h1:x7xEyJDP7Hv3LVgvWhzioQqbC/KtuUhTigKlH/8ehhE=
-github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
-github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7 h1:J4AOUcOh/t1XbQcJfkEqhzgvMJ2tDxdCVvmHxW5QXao=
-github.com/russellhaering/goxmldsig v0.0.0-20180430223755-7acd5e4a6ef7/go.mod h1:Oz4y6ImuOQZxynhbSXk7btjEfNBtGlj2dcaOvXl2FSM=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
-github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d/go.mod h1:vq0tzqLRu6TS7Id0wMo2N5QzJoKedVeovOpHjnykSzY=
-github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg=
-github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
-github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
-github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf h1:Z2X3Os7oRzpdJ75iPqWZc0HeJWFYNCvKsfpQwFpRNTA=
-github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
-github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329 h1:VBsKFh4W1JEMz3eLCmM9zOJKZdDkP5W4b3Y4hc7SbZc=
-github.com/ua-parser/uap-go v0.0.0-20190826212731-daf92ba38329/go.mod h1:OBcG9bn7sHtXgarhUEb3OfCnNsgtGnkVf41ilSZ3K3E=
-github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
-github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/uber/jaeger-client-go v2.16.0+incompatible h1:Q2Pp6v3QYiocMxomCaJuwQGFt7E53bPYqEgug/AoBtY=
-github.com/uber/jaeger-client-go v2.16.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtGoHJNe9ebLu/pw=
-github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
-github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-github.com/unknwon/com v1.0.1 h1:3d1LTxD+Lnf3soQiD4Cp/0BRB+Rsa/+RTvz8GMMzIXs=
-github.com/unknwon/com v1.0.1/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
-github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
-github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
-github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
-golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/image v0.0.0-20190507092727-e4e5bf290fec/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 h1:jIOcLT9BZzyJ9ce+IwwZ+aF9yeCqzrR+NrD68a/SHKw=
-golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M=
-golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190802220118-1d1727260058/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
-gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
-gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e/go.mod h1:xsQCaysVCudhrYTfzYWe577fCe7Ceci+6qjO2Rdc0Z4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.46.0 h1:VeDZbLYGaupuvIrsYCEOe/L/2Pcs5n7hdO1ZTjporag=
-gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ldap.v3 v3.0.2 h1:R6RBtabK6e1GO0eQKtkyOFbAHO73QesLzI2w2DZ6b9w=
-gopkg.in/ldap.v3 v3.0.2/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
-gopkg.in/macaron.v1 v1.3.4 h1:HvIscOwxhFhx3swWM/979wh2QMYyuXrNmrF9l+j3HZs=
-gopkg.in/macaron.v1 v1.3.4/go.mod h1:/RoHTdC8ALpyJ3+QR36mKjwnT1F1dyYtsGM9Ate6ZFI=
-gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
-gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
-gopkg.in/redis.v2 v2.3.2/go.mod h1:4wl9PJ/CqzeHk3LVq1hNLHH8krm3+AXEgut4jVc++LU=
-gopkg.in/redis.v5 v5.2.9 h1:MNZYOLPomQzZMfpN3ZtD1uyJ2IDonTTlxYiV/pEApiw=
-gopkg.in/redis.v5 v5.2.9/go.mod h1:6gtv0/+A4iM08kdRfocWYB3bLX2tebpNtfKlFT6H4mY=
-gopkg.in/square/go-jose.v2 v2.3.0 h1:nLzhkFyl5bkblqYBoiWJUt5JkWOzmiaBtCxdJAqJd3U=
-gopkg.in/square/go-jose.v2 v2.3.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/testing/grafana/iltorb.patch b/testing/grafana/iltorb.patch
new file mode 100644
index 0000000000..21c93990eb
--- /dev/null
+++ b/testing/grafana/iltorb.patch
@@ -0,0 +1,379 @@
+Contains:
+ - Backport of https://github.com/grafana/grafana/pull/21096
+ - Drop of legacy node-gyp versions to avoid using python2
+--- grafana-6.5.2.orig/package.json
++++ grafana-6.5.2/package.json
+@@ -82,7 +82,7 @@
+ "grunt-angular-templates": "1.1.0",
+ "grunt-cli": "1.2.0",
+ "grunt-contrib-clean": "1.0.0",
+- "grunt-contrib-compress": "1.4.3",
++ "grunt-contrib-compress": "1.6.0",
+ "grunt-contrib-copy": "1.0.0",
+ "grunt-exec": "1.0.1",
+ "grunt-newer": "1.3.0",
+--- grafana-6.5.2.orig/yarn.lock
++++ grafana-6.5.2/yarn.lock
+@@ -6012,7 +6012,7 @@
+ optionalDependencies:
+ fsevents "^1.2.7"
+
+-chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
++chownr@^1.1.1, chownr@^1.1.2:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+ integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+@@ -7823,12 +7823,12 @@
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+ integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+-decompress-response@^3.3.0:
+- version "3.3.0"
+- resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+- integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
++decompress-response@^4.2.0:
++ version "4.2.1"
++ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
++ integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
+ dependencies:
+- mimic-response "^1.0.0"
++ mimic-response "^2.0.0"
+
+ dedent@^0.7.0:
+ version "0.7.0"
+@@ -8008,11 +8008,6 @@
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+ integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
+
+-detect-libc@^0.2.0:
+- version "0.2.0"
+- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-0.2.0.tgz#47fdf567348a17ec25fcbf0b9e446348a76f9fb5"
+- integrity sha1-R/31ZzSKF+wl/L8LnkRjSKdvn7U=
+-
+ detect-libc@^1.0.2, detect-libc@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+@@ -8446,7 +8441,7 @@
+ dependencies:
+ iconv-lite "~0.4.13"
+
+-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
++end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+ integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+@@ -8964,10 +8959,10 @@
+ dependencies:
+ fill-range "^2.1.0"
+
+-expand-template@^1.0.2:
+- version "1.1.1"
+- resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd"
+- integrity sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg==
++expand-template@^2.0.3:
++ version "2.0.3"
++ resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
++ integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
+ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+ version "2.0.2"
+@@ -10237,10 +10232,10 @@
+ async "^1.5.2"
+ rimraf "^2.5.1"
+
+-grunt-contrib-compress@1.4.3:
+- version "1.4.3"
+- resolved "https://registry.yarnpkg.com/grunt-contrib-compress/-/grunt-contrib-compress-1.4.3.tgz#01ceffb9c637f52e7081f463750983d0a3b0fa73"
+- integrity sha1-Ac7/ucY39S5wgfRjdQmD0KOw+nM=
++grunt-contrib-compress@1.6.0:
++ version "1.6.0"
++ resolved "https://registry.yarnpkg.com/grunt-contrib-compress/-/grunt-contrib-compress-1.6.0.tgz#9708885c738a97a12c5f3072dc97dbc31b4121db"
++ integrity sha512-wIFuvk+/Ny4E+OgEfJYFZgoH7KcU/nnNFbYasB7gRvrcRyW6vmTp3Pj8a4rFSR3tbFMjrGvTUszdO6fgLajgZQ==
+ dependencies:
+ archiver "^1.3.0"
+ chalk "^1.1.1"
+@@ -10248,7 +10243,7 @@
+ pretty-bytes "^4.0.2"
+ stream-buffers "^2.1.0"
+ optionalDependencies:
+- iltorb "^1.0.13"
++ iltorb "^2.4.3"
+
+ grunt-contrib-copy@1.0.0:
+ version "1.0.0"
+@@ -10965,15 +10960,16 @@
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+-iltorb@^1.0.13:
+- version "1.3.10"
+- resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-1.3.10.tgz#a0d9e4e7d52bf510741442236cbe0cc4230fc9f8"
+- integrity sha512-nyB4+ru1u8CQqQ6w7YjasboKN3NQTN8GH/V/eEssNRKhW6UbdxdWhB9fJ5EEdjJfezKY0qPrcwLyIcgjL8hHxA==
++iltorb@^2.4.3:
++ version "2.4.4"
++ resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-2.4.4.tgz#7ec303bbbd8c0cd4d44a847eb6c6d8490f9c7433"
++ integrity sha512-7Qk6O7TK3rSWVRVRkPehcNTSN+P2i7MsG9pWmw6iVw/W6NcoNj0rFKOuBDM6fbZV6NNGuUW3JBRem6Ozn4KXhg==
+ dependencies:
+- detect-libc "^0.2.0"
+- nan "^2.6.2"
+- node-gyp "^3.6.2"
+- prebuild-install "^2.3.0"
++ detect-libc "^1.0.3"
++ nan "^2.14.0"
++ npmlog "^4.1.2"
++ prebuild-install "^5.3.2"
++ which-pm-runs "^1.0.0"
+
+ immer@1.10.0:
+ version "1.10.0"
+@@ -13699,10 +13695,10 @@
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+-mimic-response@^1.0.0:
+- version "1.0.1"
+- resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+- integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
++mimic-response@^2.0.0:
++ version "2.0.0"
++ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.0.0.tgz#996a51c60adf12cb8a87d7fb8ef24c2f3d5ebb46"
++ integrity sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==
+
+ min-document@^2.19.0:
+ version "2.19.0"
+@@ -13978,7 +13974,7 @@
+ object-assign "^4.0.1"
+ thenify-all "^1.0.0"
+
+-nan@^2.12.1, nan@^2.13.2, nan@^2.6.2:
++nan@^2.12.1, nan@^2.13.2, nan@^2.14.0:
+ version "2.14.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+ integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+@@ -14014,6 +14010,11 @@
+ snapdragon "^0.8.1"
+ to-regex "^3.0.1"
+
++napi-build-utils@^1.0.1:
++ version "1.0.1"
++ resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
++ integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
++
+ natural-compare@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+@@ -14141,10 +14142,10 @@
+ dependencies:
+ lower-case "^1.1.1"
+
+-node-abi@^2.2.0:
+- version "2.11.0"
+- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59"
+- integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==
++node-abi@^2.7.0:
++ version "2.13.0"
++ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.13.0.tgz#e2f2ec444d0aca3ea1b3874b6de41d1665828f63"
++ integrity sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==
+ dependencies:
+ semver "^5.4.1"
+
+@@ -14182,45 +14183,10 @@
+ resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
+ integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
+
+-node-gyp@^3.6.2, node-gyp@^3.8.0:
+- version "3.8.0"
+- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+- integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+- dependencies:
+- fstream "^1.0.0"
+- glob "^7.0.3"
+- graceful-fs "^4.1.2"
+- mkdirp "^0.5.0"
+- nopt "2 || 3"
+- npmlog "0 || 1 || 2 || 3 || 4"
+- osenv "0"
+- request "^2.87.0"
+- rimraf "2"
+- semver "~5.3.0"
+- tar "^2.0.0"
+- which "1"
+-
+-node-gyp@^4.0.0:
+- version "4.0.0"
+- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45"
+- integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==
+- dependencies:
+- glob "^7.0.3"
+- graceful-fs "^4.1.2"
+- mkdirp "^0.5.0"
+- nopt "2 || 3"
+- npmlog "0 || 1 || 2 || 3 || 4"
+- osenv "0"
+- request "^2.87.0"
+- rimraf "2"
+- semver "~5.3.0"
+- tar "^4.4.8"
+- which "1"
+-
+ node-gyp@^5.0.2:
+- version "5.0.5"
+- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.5.tgz#f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af"
+- integrity sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw==
++ version "5.0.7"
++ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.7.tgz#dd4225e735e840cf2870e4037c2ed9c28a31719e"
++ integrity sha512-K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw==
+ dependencies:
+ env-paths "^1.0.0"
+ glob "^7.0.3"
+@@ -14323,7 +14289,7 @@
+ meow "^3.7.0"
+ mkdirp "^0.5.1"
+ nan "^2.13.2"
+- node-gyp "^3.8.0"
++ node-gyp "^5.0.2"
+ npmlog "^4.0.0"
+ request "^2.88.0"
+ sass-graph "^2.2.4"
+@@ -14452,7 +14418,7 @@
+ dependencies:
+ byline "^5.0.0"
+ graceful-fs "^4.1.15"
+- node-gyp "^4.0.0"
++ node-gyp "^5.0.2"
+ resolve-from "^4.0.0"
+ slide "^1.1.6"
+ uid-number "0.0.6"
+@@ -14636,7 +14602,7 @@
+ mississippi "^3.0.0"
+ mkdirp "~0.5.1"
+ move-concurrently "^1.0.1"
+- node-gyp "^3.8.0"
++ node-gyp "^5.0.2"
+ nopt "~4.0.1"
+ normalize-package-data "^2.5.0"
+ npm-audit-report "^1.3.2"
+@@ -16338,24 +16304,24 @@
+ universal-deep-strict-equal "^1.2.1"
+ xtend "^4.0.0"
+
+-prebuild-install@^2.3.0:
+- version "2.5.3"
+- resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
+- integrity sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==
++prebuild-install@^5.3.2:
++ version "5.3.3"
++ resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e"
++ integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==
+ dependencies:
+ detect-libc "^1.0.3"
+- expand-template "^1.0.2"
++ expand-template "^2.0.3"
+ github-from-package "0.0.0"
+ minimist "^1.2.0"
+ mkdirp "^0.5.1"
+- node-abi "^2.2.0"
++ napi-build-utils "^1.0.1"
++ node-abi "^2.7.0"
+ noop-logger "^0.1.1"
+ npmlog "^4.0.1"
+- os-homedir "^1.0.1"
+- pump "^2.0.1"
+- rc "^1.1.6"
+- simple-get "^2.7.0"
+- tar-fs "^1.13.0"
++ pump "^3.0.0"
++ rc "^1.2.7"
++ simple-get "^3.0.3"
++ tar-fs "^2.0.0"
+ tunnel-agent "^0.6.0"
+ which-pm-runs "^1.0.0"
+
+@@ -16609,15 +16575,7 @@
+ randombytes "^2.0.1"
+ safe-buffer "^5.1.2"
+
+-pump@^1.0.0:
+- version "1.0.3"
+- resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+- integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
+- dependencies:
+- end-of-stream "^1.1.0"
+- once "^1.3.1"
+-
+-pump@^2.0.0, pump@^2.0.1:
++pump@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+ integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+@@ -17553,7 +17511,7 @@
+ string_decoder "~1.1.1"
+ util-deprecate "~1.0.1"
+
+-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
++"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+ integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+@@ -18786,12 +18744,12 @@
+ resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
+ integrity sha1-GRv1ZqWeZTBILLJatTtKjchcOms=
+
+-simple-get@^2.7.0:
+- version "2.8.1"
+- resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
+- integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
++simple-get@^3.0.3:
++ version "3.1.0"
++ resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
++ integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
+ dependencies:
+- decompress-response "^3.3.0"
++ decompress-response "^4.2.0"
+ once "^1.3.1"
+ simple-concat "^1.0.0"
+
+@@ -19782,17 +19740,17 @@
+ string.prototype.trim "~1.1.2"
+ through "~2.3.8"
+
+-tar-fs@^1.13.0:
+- version "1.16.3"
+- resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
+- integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
++tar-fs@^2.0.0:
++ version "2.0.0"
++ resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
++ integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
+ dependencies:
+- chownr "^1.0.1"
++ chownr "^1.1.1"
+ mkdirp "^0.5.1"
+- pump "^1.0.0"
+- tar-stream "^1.1.2"
++ pump "^3.0.0"
++ tar-stream "^2.0.0"
+
+-tar-stream@^1.1.2, tar-stream@^1.5.0:
++tar-stream@^1.5.0:
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+ integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+@@ -19804,6 +19762,17 @@
+ readable-stream "^