Merge branch 'master' into check

2017-06-05 14:58:57 +02:00 · 2017-06-05 14:58:57 +02:00 · 33c1040159
parent 5a11957d14 d962928e92
commit 33c1040159
1073 changed files with 80740 additions and 22476 deletions
--- a/common/shlibs
+++ b/common/shlibs
@ -63,7 +63,6 @@ libgo.so.9 libgo-6.2.1_1
 libmpx.so.2 libmpx-6.2.1_1
 libmpxwrappers.so.2 libmpx-6.2.1_1
 libperl.so.5.24 perl-5.24.0_1
-libmp.so.3 gmp-5.0.1_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
 libmpfr.so.4 mpfr-3.0.0_1
@ -114,8 +113,6 @@ libX11.so.6 libX11-1.2_1
 libexpat.so.1 expat-2.0.0_1
 libjpeg.so.8 libjpeg-turbo-1.3.0_2
 libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
-libpng14.so.14 libpng-1.4.2_1
-libpng15.so.15 libpng-1.5.10_1
 libpng16.so.16 libpng-1.6.2_1
 libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
@ -142,7 +139,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.378.13 nvidia-libs-378.13_1 ignore
+libnvidia-fatbinaryloader.so.381.22 nvidia-libs-381.22_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1
@ -151,6 +148,7 @@ libdbus-glib-1.so.2 dbus-glib-0.80_1
 libxml2.so.2 libxml2-2.7.0_1
 libfuse.so.2 fuse-2.8.1_1
 libXext.so.6 libXext-1.0.5_1
+libulockmgr.so.1 fuse-2.9.7_1
 libXcomposite.so.1 libXcomposite-0.4.0_1
 libXdamage.so.1 libXdamage-1.1.1_1
 libXfixes.so.3 libXfixes-4.0.3_1
@ -176,29 +174,6 @@ libxfconf-0.so.2 xfconf-4.9.1_1
 libxfce4util.so.7 libxfce4util-4.12.1_1
 libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1
 libxfce4panel-2.0.so.4 xfce4-panel-4.12.0_1
-libgstcheck-0.10.so.0 gstreamer-0.10.22_1
-libgstreamer-0.10.so.0 gstreamer-0.10.22_1
-libgstbase-0.10.so.0 gstreamer-0.10.22_1
-libgstdataprotocol-0.10.so.0 gstreamer-0.10.22_1
-libgstcontroller-0.10.so.0 gstreamer-0.10.22_1
-libgstnet-0.10.so.0 gstreamer-0.10.22_1
-libgstfft-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstaudio-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstapp-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstsdp-0.10.so.0 gst-plugins-base-0.10.22_1
-libgsttag-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstinterfaces-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstriff-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstcdda-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstnetbuffer-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstrtsp-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstvideo-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstpbutils-0.10.so.0 gst-plugins-base-0.10.22_1
-libgstrtp-0.10.so.0 gst-plugins-base-0.10.22_1
-libbfd-2.21.so binutils-2.22_1<2.23_1
-libopcodes-2.21.so binutils-2.22_1<2.23_1
-libdb-4.8.so libdb-4.8.24_1
-libdb_cxx-4.8.so libdb-cxx-4.8.24_1
 libgdbm.so.4 gdbm-1.10_1_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
@ -243,9 +218,6 @@ liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
 libgnutlsxx.so.28 gnutls-3.2.13_1
-libgnutls-openssl.so.27 gnutls-3.1.5_1
-libgnutls-xssl.so.0 gnutls-3.2.13_1
-libwrap.so.0 tcp_wrappers-libs-7.6_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1
@ -426,7 +398,6 @@ libcdio++.so.0 libcdio-0.83_1
 libcdio.so.16 libcdio-0.93_1
 libmpcdec.so.5 libmpcdec-1.2.6_1
 libproxy.so.1 libproxy-0.4.6_1
-libmodman.so.1 libproxy-0.4.6_1
 libmoar.so MoarVM-2015.11_1
 libFLAC.so.8 libflac-1.2.1_1
 libFLAC++.so.6 libflac-1.2.1_1
@ -482,20 +453,17 @@ libxenstore.so.3.0 xen-libs-4.2.2_2
 libvhd.so.1.0 xen-libs-4.2.2_2
 libxenstat.so.0 xen-libs-4.2.2_2
 libblktapctl.so.1.0 xen-libs-4.2.2_2
-libblktap.so.3.0 xen-libs-4.2.2_2
 libfsimage.so.1.0 xen-libs-4.2.2_2
 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libbabl-0.1.so.0 babl-0.1.10_1
 libbamf3.so.2 bamf-0.5.1_1
 libgegl-0.2.so.0 gegl-0.2.0_1
-libiculx.so.58 icu-libs-58.2_1
-libicule.so.58 icu-libs-58.2_1
-libicuio.so.58 icu-libs-58.2_1
-libicui18n.so.58 icu-libs-58.2_1
-libicudata.so.58 icu-libs-58.2_1
-libicutu.so.58 icu-libs-58.2_1
-libicuuc.so.58 icu-libs-58.2_1
-libicutest.so.58 icu-libs-58.2_1
+libicuio.so.59 icu-libs-59.1_1
+libicui18n.so.59 icu-libs-59.1_1
+libicudata.so.59 icu-libs-59.1_1
+libicutu.so.59 icu-libs-59.1_1
+libicuuc.so.59 icu-libs-59.1_1
+libicutest.so.59 icu-libs-59.1_1
 libaspell.so.15 aspell-0.60_1
 libpspell.so.15 aspell-0.60_1
 libenchant.so.1 enchant-1.4.2_1
@ -534,9 +502,9 @@ libmysqlclient.so.18 libmysqlclient-5.5.27_1
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
-libkadm5clnt_mit.so.10 mit-krb5-libs-1.14_1
+libkadm5clnt_mit.so.11 mit-krb5-libs-1.15.1_1
 libkadm5clnt.so mit-krb5-libs-1.8_1
-libkadm5srv_mit.so.10 mit-krb5-libs-1.14_1
+libkadm5srv_mit.so.11 mit-krb5-libs-1.15.1_1
 libkadm5srv.so mit-krb5-libs-1.8_1
 libkdb5.so.8 mit-krb5-libs-1.13.1_1
 libkrb5.so.3 mit-krb5-libs-1.8_1
@ -554,7 +522,6 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.10 libgtop-2.30.0_1
 librarian.so.0 rarian-0.8.1_1
-libmetacity-private.so.0 metacity-2.30.1_1
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
@ -672,7 +639,6 @@ libgtksourceview-3.0.so.1 gtksourceview-3.8.0_1
 libtalloc.so.2 talloc-2.0.1_1
 libmount.so.1 libmount-2.18_1
 libdconf.so.1 dconf-0.13.90_1
-libdconf-dbus-1.so.0 dconf-0.13.90_1
 libassuan.so.0 libassuan-2.0.1_1
 libgpgme.so.11 gpgme-1.3.0_1
 libgpgme-pthread.so.11 gpgme-1.3.0_1
@ -702,8 +668,6 @@ libgmime-2.6.so.0 gmime-2.6.4_1
 libtotem-plparser.so.18 totem-pl-parser-3.10.0_1
 libtotem-plparser-mini.so.18 totem-pl-parser-3.10.0_1
 libgladeui-2.so.6 libgladeui3-3.10.0_1
-libgstcodecparsers-0.10.so.23 gst-plugins-bad-0.10.23_1
-libgstbasevideo-0.10.so.23 gst-plugins-bad-0.10.23_1
 libtdb.so.1 libtdb-1.2.2_1
 libgssdp-1.0.so.3 gssdp-0.9.0_1
 libgupnp-1.0.so.4 gupnp-0.18.0_1
@ -718,11 +682,6 @@ libjasper.so.4 libjasper-1.900.27_1
 librecode.so.0 librecode-3.6_1
 libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
-libvala-0.24.so.0 libvala-0.24.0_1
-libvala-0.26.so.0 libvala-0.26.2_1
-libvala-0.28.so.0 libvala-0.28.0_1
-libvala-0.30.so.0 libvala-0.30.0_1
-libvala-0.34.so.0 libvala-0.34.0_1
 libvala-0.36.so.0 libvala-0.36.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
@ -757,7 +716,6 @@ libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 liblightdm-qt-3.so.0 liblightdm-qt-1.10.1_1
 liblightdm-qt5-3.so.0  liblightdm-qt5-1.12.2_3
-libcelt051.so.0 celt051-0.5.1.3_1
 libcelt0.so.2 celt-0.11.1_1
 libspice-server.so.1 spice-0.6.4_1
 libbrasero-burn3.so.1 brasero-2.91.90_1
@ -775,13 +733,11 @@ libgjs.so.0 gjs-0.7.11_1
 libgjs-gi.so gjs-0.7.11_1
 libgjs-dbus.so.0 gjs-0.7.11_1
 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
-libgedit-private.so.0 gedit-2.91.7_1
 libaccountsservice.so.0 accountsservice-0.6.4_1
 libgee.so.2 libgee-0.6.1_1
 libfolks.so.25 folks-0.9.5_1
 libfolks-telepathy.so.25 folks-0.9.5_1
 libfolks-eds.so.25 folks-0.9.5_1
-libfolks-tracker.so.25 folks-0.9.5_1
 libnice.so.10 libnice-0.1.0_1
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
@ -818,7 +774,6 @@ libgtkmm-2.4.so.1 gtkmm2-2.24.0_1
 libseed-gtk3.so.0 libseed-3.0.0_1
 libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.3 libgfortran-4.4.0_1
-libblktapctl.so.1 xen-4.1.2_1
 libmozjs185.so.1.0 js-1.8.5_1
 libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
@ -836,10 +791,8 @@ libv4lconvert.so.0 v4l-utils-0.8.5_1
 libv4l1.so.0 v4l-utils-0.8.5_1
 libv4l2rds.so.0 v4l-utils-1.2.1_1
 libdvbv5.so.0 v4l-utils-1.6.2_1
-libclutter-gst-1.0.so.0 clutter-gst-1.5.4_1
 libmx-1.0.so.2 mx-1.4.3_1_1
 libmx-gtk-1.0.so.0 mx-1.4.3_1_1
-libjson.so.0 json-c-0.9_1
 libjson-c.so.2 json-c-0.11_1
 libcogl.so.20 cogl-1.18.0_1
 libcogl-pango.so.20 cogl-1.18.0_1
@ -881,7 +834,6 @@ libfm-extra.so.4 libfm-extra-1.2.3_3
 libunique-1.0.so.0 libunique1-1.1.6_1
 libxnoise.so.0 libxnoise-0.1.29_1
 libdiscid.so.0 libdiscid-0.2.2_1
-libmusicbrainz3.so.6 libmusicbrainz-3.0.3_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
@ -925,9 +877,9 @@ libopenal.so.1 libopenal-1.13_1
 libalut.so.0 freealut-1.1.0_1
 liblilv-0.so.0 liblilv-0.14.4_1
 libsuil-0.so.0 suil-0.6.4_1
-libprotoc.so.9 protobuf-2.6.1_1
-libprotobuf.so.9 protobuf-2.6.1_1
-libprotobuf-lite.so.9 protobuf-lite-2.6.1_1
+libprotoc.so.13 protobuf-3.3.0_1
+libprotobuf.so.13 protobuf-3.3.0_1
+libprotobuf-lite.so.13 protobuf-lite-3.3.0_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libGlacier2.so.35 libIce-3.5.0_1
 libIce.so.35 libIce-3.5.0_1
@ -955,23 +907,14 @@ libyaml-0.so.2 libyaml-0.1.4_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.1 confuse-3.0_1
-libclang.so clang-3.4.2_1
-libclang.so.3.9 clang-3.9.1_2
-liblldb.so lldb-3.5.1_1
-libLLVM-3.5.so libllvm-3.5.0_1
-libLLVM-3.6.so libllvm3.6-3.6.0_1
-libLLVM-3.7.so libllvm3.7-3.7.0_1
-libLLVM-3.7.1.so libllvm3.7-3.7.1_1
+libclang.so.4 clang-4.0.0_1
 libLLVM-3.8.so libllvm3.8-3.8.0_1
 libLLVM-3.8.1.so libllvm3.8-3.8.1_1
 libLLVM-3.9.so libllvm3.9-3.9.0_1
+libLLVM-4.0.so libllvm4.0-4.0.0_1
 libisofs.so.6 libisofs-0.6.24_1
-libbfd-2.22.so binutils-2.22_1<2.23_1
-libopcodes-2.22.so binutils-2.22_1<2.23_1
 libv8.so.3.24 libv8-3.24.35.22_1
-libv8.so.3.16 libv8-3.16-3.16.8.1_2
 libGeoIP.so.1 libgeoip-1.4.8_1
-libGeoIPUpdate.so.0 libgeoip-1.4.8_1
 libcherokee-base.so.0 libcherokee-1.2.101_1
 libcherokee-client.so.0 libcherokee-1.2.101_1
 libcherokee-server.so.0 libcherokee-1.2.101_1
@ -992,10 +935,10 @@ libtirpc.so.1 libtirpc-0.2.2_1
 librpcsecgss.so.3 librpcsecgss-0.19_1
 libnfsidmap.so.0 libnfsidmap-0.24_1
 liblwres.so.141 bind-libs-9.10.2P3_2
-libdns.so.165 bind-libs-9.10.4P1_1
+libdns.so.170 bind-libs-9.10.5_1
 libbind9.so.140 bind-libs-9.10.2P3_2
-libisccfg.so.140 bind-libs-9.10.2P3_2
-libisc.so.160 bind-libs-9.10.3_1
+libisccfg.so.144 bind-libs-9.10.5_1
+libisc.so.170 bind-libs-9.10.5_1
 libisccc.so.140 bind-libs-9.10.2P3_2
 libirs.so.141 bind-libs-9.10.2P3_2
 libplist.so.3 libplist-1.12_1
@ -1016,7 +959,6 @@ libgcr-base-3.so.1 gcr-3.3.92_1
 libgck-1.so.0 gcr-3.8.0_1
 libgcr-ui-3.so.1 gcr-3.8.0_1
 libwacom.so.2 libwacom-0.3_1
-libfarstream-0.1.so.0 farstream-0.1.1_1
 libfarstream-0.2.so.5 farstream-0.2.7_1
 libass.so.9 libass-0.13.6_1
 libcryptui.so.0 libcryptui-3.4.0_1
@ -1029,7 +971,6 @@ libwebrtc_audio_processing.so.1 webrtc-audio-processing-0.3_1
 libcupsmime.so.1 libcups-1.5.3_1
 libcupsppdc.so.1 libcups-1.5.3_1
 libcupscgi.so.1 libcups-1.5.3_1
-libcupsdriver.so.1 libcups-1.5.3_1
 libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
@ -1091,7 +1032,6 @@ libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
 libmowgli-2.so.0 libmowgli-2.0.0_1
 libguess.so.1 libguess-1.1_1
-libaudclient.so.2 audacious-3.3.1_1
 libaudcore.so.4 audacious-3.8_1
 libaudgui.so.4 audacious-3.8_1
 libaudtag.so.3 audacious-3.8_1
@ -1127,7 +1067,6 @@ libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
 libgdm.so.1 libgdm-3.6.0_1
-libgdmsimplegreeter.so.1 gdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
 libcheese-gtk.so.25 libcheese-3.17.90_1
@ -1167,6 +1106,7 @@ libnettle.so.6 nettle-3.2_1
 libhogweed.so.4 nettle-3.2_1
 libmikmod.so.3 libmikmod-3.2.0_1
 libgtkspell.so.0 gtkspell-2.0.16_1
+libgtkspell3-3.so.0 gtkspell3-3.0.9_1
 libpurple.so.0 libpurple-2.10.6_1
 libpurple-client.so.0 libpurple-2.10.6_1
 libgnt.so.0 libgnt-2.10.6_1
@ -1205,8 +1145,12 @@ libmmal.so rpi-userland-0.0.0.0.20150907_1
 libmmal_core.so rpi-userland-0.0.0.0.20150907_1
 libmmal_util.so rpi-userland-0.0.0.0.20150907_1
 libOpenVG.so rpi-userland-0.0.0.0.20150907_1
+libmmal_vc_client.so rpi-userland-20170427_1
+libmmal_components.so rpi-userland-20170427_1
+libvcsm.so rpi-userland-20170427_1
+libcontainers.so rpi-userland-20170427_1
 liblockdev.so.1 lockdev-1.0.3_1
-libcec.so.3 libcec-3.1.0_1
+libcec.so.4 libcec-4.0.2_1
 librump.so.0 netbsd-rumpkernel-20130321_1
 librumpvfs.so.0 netbsd-rumpkernel-20130321_1
 librumpdev_disk.so.0 netbsd-rumpkernel-20130321_1
@ -1358,7 +1302,6 @@ libplasmaclock.so.4 kde-workspace-4.10.4_1
 libtaskmanager.so.4 kde-workspace-4.10.4_1
 libkworkspace.so.4 kde-workspace-4.10.4_1
 libprocessui.so.4 kde-workspace-4.10.4_1
-libkgapi.so.1 libkgapi-2.0.1_1
 libkgapi2.so.2 libkgapi-2.0.1_1
 libqoauth.so.1 qoauth-1.0.1_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
@ -1374,9 +1317,6 @@ libqmi-glib.so.5 libqmi-1.14.2_1
 libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
-libavcodec.so.53 libavcodec53-0.10.7_1
-libavutil.so.51 libavutil51-0.10.7_1
-libavformat.so.53 libavformat53-0.10.7_1
 libgdl-3.so.5 gdl-3.8.1_1
 libgda-5.0.so.4 libgda-5.1.2_1
 libgda-report-5.0.so.4 libgda-5.1.2_1
@ -1392,7 +1332,6 @@ libgmtk.so.1 gmtk-1.0.8_1
 liblrzip.so.0 liblrzip-0.614_3
 libsilcclient-1.1.so.4 silc-toolkit-1.1.11_1
 libsilc-1.1.so.4 silc-toolkit-1.1.11_1
-libobjfw.so.6 objfw-0.7.1_1
 libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
@ -1448,7 +1387,6 @@ libecore_input_evas.so.1 efl-1.12.0_1
 libecore_input.so.1 efl-1.12.0_1
 libecore_ipc.so.1 efl-1.12.0_1
 libecore.so.1 efl-1.12.0_1
-libecore_wayland.so.1 efl-1.12.0_1
 libecore_x.so.1 efl-1.12.0_1
 libedje.so.1 efl-1.12.0_1
 libeet.so.1 efl-1.12.0_1
@ -1466,14 +1404,12 @@ libethumb_client.so.1 efl-1.12.0_1
 libethumb.so.1 efl-1.12.0_1
 libevas.so.1 efl-1.12.0_1
 libefl.so.1 efl-1.12.0_1
-libecore_drm.so.1 efl-1.13.0_1
 libelua.so.1 efl-1.13.0_1
 libelocation.so.1 efl-1.13.0_1
 libelementary.so.1 efl-1.18.0_1
 libector.so.1 efl-1.18.1_1
 libemile.so.1 efl-1.18.1_1
 libcjs.so.0 cjs-2.0.0_1
-libcjs-dbus.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1
 libcinnamon-control-center.so.1 libcinnamon-control-center-2.4.2_1
@ -1551,8 +1487,6 @@ libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
 libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
-libgnote-3.12.so.0 gnote-3.12.0_1
-libgnote-3.22.so.0 gnote-3.22.0_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
 libdovecot.so.0 dovecot-2.2.11_2
 libdovecot-login.so.0 dovecot-2.2.11_2
@ -1673,8 +1607,6 @@ libBulletCollision.so.2.83 bullet-2.83.5_1
 libLinearMath.so.2.83 bullet-2.83.5_1
 libBulletSoftBody.so.2.83 bullet-2.83.5_1
 libinotifytools.so.0 libinotify-tools-3.14_2
-libgtest.so.0 gmock-1.7.0_1
-libgtest_main.so.0 gmock-1.7.0_1
 libgmock.so.0 gmock-1.7.0_1
 libgmock_main.so.0 gmock-1.7.0_1
 libopensc.so.4 libopensc-0.16.0_1
@ -1724,18 +1656,12 @@ libid3.so id3lib-3.8.3_1
 libid3-3.8.so.3 id3lib-3.8.3_1
 libgirara-gtk3.so.2 girara-0.2.4_1
 libjq.so.1 jq-devel-1.4_1
-libcrypto.so.34 libcrypto34-2.2.1_1
-libcrypto.so.35 libcrypto35-2.2.2_1
 libcrypto.so.37 libcrypto37-2.3.3_1
 libcrypto.so.38 libcrypto38-2.4.2_1
 libcrypto.so.41 libcrypto41-2.5.3_1
-libssl.so.33 libssl33-2.2.1_1
-libssl.so.35 libssl35-2.2.2_1
 libssl.so.38 libssl38-2.3.3_1
 libssl.so.39 libssl39-2.4.2_1
 libssl.so.43 libssl43-2.5.3_1
-libtls.so.4 libtls4-2.2.1_1
-libtls.so.6 libtls6-2.2.2_1
 libtls.so.10 libtls10-2.3.3_1
 libtls.so.11 libtls11-2.4.2_1
 libtls.so.15 libtls15-2.5.3_1
@ -1767,8 +1693,6 @@ libchm.so.0 libchmlib-0.40_1
 libokularcore.so.5 libokular-4.14.2_1
 libmnl.so.0 libmnl-1.0.3_1
 libnftnl.so.4 libnftnl-1.0.5_1
-libwld.so.0 wld-git-20140809_1
-libswc.so.0 swc-git-20140809_1
 libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
@ -1942,7 +1866,6 @@ libimobiledevice.so.6 libimobiledevice-1.2.0_1
 libstfl.so.0 stfl-0.23_1
 libenventor.so.1 enventor-1.0.0_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1
 libldns.so.2 libldns-1.7.0_1
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
@ -1990,19 +1913,15 @@ libfcitx-qt.so.0 libfcitx-qt-4.2.8_1
 liblastfm.so.1 liblastfm-1.0.9_1
 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
-libdruntime-ldc-debug.so.71 ldc-runtime-1.1.1_1
-libdruntime-ldc.so.71 ldc-runtime-1.1.1_1
-libphobos2-ldc.so.71 ldc-runtime-1.1.1_1
-libphobos2-ldc-debug.so.71 ldc-runtime-1.1.1_1
+libdruntime-ldc-debug.so.72 ldc-runtime-1.2.0_1
+libdruntime-ldc.so.72 ldc-runtime-1.2.0_1
+libphobos2-ldc.so.72 ldc-runtime-1.2.0_1
+libphobos2-ldc-debug.so.72 ldc-runtime-1.2.0_1
 libmarblewidget.so.19 marble-4.14.3_2
 libastro.so.1 marble-4.14.3_2
 libparrot.so.6.9.0 parrot-6.9.0_1
 libkipi.so.11 libkipi-4.14.3_1
 libasr.so.0 libasr-1.0.0_1
-libsystemd-daemon.so.0 LoginKit-git-20141226_1
-libsystemd-journal.so.0 LoginKit-git-20141226_1
-libsystemd-login.so.0 LoginKit-git-20141226_1
-libsystemd.so.0 LoginKit-git-20141226_1
 libssr-glinject.so ssr-0.3.1_1
 libgdict-1.0.so.10 gnome-dictionary-3.18.1_1
 libasignify.so.1 asignify-1.0_1
@ -2168,7 +2087,7 @@ libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas.so.3 goocanvas1-1.0.0_1
 libplatform.so.2.0 platform-2.0.1_1
-libp8-platform.so.2.0 p8-platform-2.0.1_1
+libp8-platform.so.2 p8-platform-2.1.0.1_1
 libfacter.so.3.6.2 facter-3.6.2_1
 libOIS-1.3.0.so ois-1.3_1
 libSILLY.so.1 silly-0.1.0_1
@ -2186,7 +2105,6 @@ libCEGUILuaScriptModule-0.7.9.so cegui07-0.7.9_1
 libCEGUISILLYImageCodec-0.7.9.so cegui07-0.7.9_1
 libCEGUISTBImageCodec-0.7.9.so cegui07-0.7.9_1
 libCEGUIFreeImageImageCodec-0.7.9.so cegui07-0.7.9_3
-libCEGUISampleHelper-0.7.9.so cegui07-0.7.9_1
 libCEGUITGAImageCodec-0.7.9.so cegui07-0.7.9_1
 libCEGUITinyXMLParser-0.7.9.so cegui07-0.7.9_1
 libCEGUItoluapp-0.7.9.so cegui07-0.7.9_1
@ -2381,7 +2299,6 @@ libax25.so.0 libax25-0.0.12rc4_1
 libax25io.so.0 libax25-0.0.12rc4_1
 libmill.so.18 libmill-1.14_1
 libges-1.0.so.0 gst1-editing-services-1.6.2_1
-libges-0.10.so.0 gst-editing-services-0.10.1_1
 libykneomgr.so.0 libykneomgr-0.1.8_1
 libopenshot-audio.so.3 libopenshot-audio-0.0.6_1
 libopenshot.so.9 libopenshot-0.1.2_1
@ -2440,6 +2357,7 @@ libOpenCOLLADAStreamWriter.so opencollada-0.0.20160223_1
 libUTF.so opencollada-0.0.20160223_1
 libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
+libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient-2.5.5.26952_1
 libfbembed.so.2 libfbclient-2.5.5.26952_1
 libfbembed.so.2.5 libfbclient-2.5.5.26952_1
@ -2453,11 +2371,10 @@ libfastjson.so.4 libfastjson-0.99.3_1
 libdcadec.so.0 dcadec-0.2.0_1
 libcmark.so.0 cmark-0.24.1_1
 libspotify.so.12 libspotify-12.1.51_1
-libwiredtiger-2.8.0.so wiredtiger-2.8.0_1
 libwiredtiger_lz4.so wiredtiger-2.9.0_1
 libwiredtiger_snappy.so wiredtiger-2.9.0_1
 libwiredtiger_zlib.so wiredtiger-2.9.0_1
-libwiredtiger-2.9.1.so wiredtiger-2.9.1_1
+libwiredtiger-2.9.2.so wiredtiger-2.9.2_1
 libvidstab.so.0.9 libvidstab-0.98b_1
 libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
@ -2736,11 +2653,14 @@ libite.so.3 libite-1.8.2_1
 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1
 libpng12.so.0 libpng12-1.2.56_2
 libpng.so.3 libpng12-1.2.56_2
-libcapnp-0.5.3.so capnproto-0.5.3_1
-libcapnp-rpc-0.5.3.so capnproto-0.5.3_1
-libcapnpc-0.5.3.so capnproto-0.5.3_1
-libkj-0.5.3.so capnproto-0.5.3_1
-libkj-async-0.5.3.so capnproto-0.5.3_1
+libcapnpc-0.6.0.so capnproto-0.6.0_1
+libcapnp-json-0.6.0.so capnproto-0.6.0_1
+libcapnp-rpc-0.6.0.so capnproto-0.6.0_1
+libcapnp-0.6.0.so capnproto-0.6.0_1
+libkj-http-0.6.0.so capnproto-0.6.0_1
+libkj-async-0.6.0.so capnproto-0.6.0_1
+libkj-test-0.6.0.so capnproto-0.6.0_1
+libkj-0.6.0.so capnproto-0.6.0_1
 libkea-log.so.2 libkea-1.1.0_1
 libkea-util.so.2 libkea-1.1.0_1
 libkea-exceptions.so.0 libkea-1.1.0_1
@ -2795,11 +2715,14 @@ libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.0.1.0 slop-5.3.37_1
 libbcunit.so.1 bcunit-3.0_1
-libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1 
-libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1 
-libomxaudio_effects.so.0 libomxil-bellagio-0.9.3_1 
-libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1 
-libomxvideosched.so.0 libomxil-bellagio-0.9.3_1 
+libzbar.so.0 libzbar-0.10_1
+libzbargtk.so.0 libzbar-0.10_1
+libzbarqt.so.0 libzbar-0.10_1
+libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1
+libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1
+libomxaudio_effects.so.0 libomxil-bellagio-0.9.3_1
+libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1
+libomxvideosched.so.0 libomxil-bellagio-0.9.3_1
 libnss_libvirt_guest.so.2 libvirt-3.1.0_1
 libvirt-admin.so.0 libvirt-3.1.0_1
 libnss_libvirt.so.2 libvirt-3.1.0_1
@ -2823,3 +2746,26 @@ libsigrok.so.3 libsigrok-0.4.0_1
 libsigrokcxx.so.3 libsigrok-0.4.0_1
 libsigrokdecode.so.3 libsigrokdecode-0.4.1_1
 libglyr.so.1 glyr-1.0.8_1
+libPocoJSON.so.48 poco-1.7.8p2_1
+libPocoMongoDB.so.48 poco-1.7.8p2_1
+libPocoZip.so.48 poco-1.7.8p2_1
+libPocoData.so.48 poco-1.7.8p2_1
+libPocoNet.so.48 poco-1.7.8p2_1
+libPocoDataSQLite.so.48 poco-1.7.8p2_1
+libPocoFoundation.so.48 poco-1.7.8p2_1
+libPocoXML.so.48 poco-1.7.8p2_1
+libPocoUtil.so.48 poco-1.7.8p2_1
+libopenblas.so.0 openblas-0.2.19_1
+librtmidi.so.3 rtmidi-2.1.1_1
+libbac-7.4.7.so bacula-common-7.4.7_1
+libbaccfg-7.4.7.so bacula-common-7.4.7_1
+libbacfind-7.4.7.so bacula-common-7.4.7_1
+libbacsql-7.4.7.so bacula-common-7.4.7_1
+libbaccats-7.4.7.so bacula-common-7.4.7_1
+libsuperlu.so.5 superlu-5.2.1_1
+libgosu.so.0 gosu-0.12.0_1
+libyara.so.3 libyara-3.5.0_1
+libgcab-1.0.so.0 gcab-0.7_1
+libappstream-glib.so.8 appstream-glib-0.6.13_1
+libappstream-builder.so.8 appstream-glib-0.6.13_1
+libflatpak.so.0 flatpak-0.9.3_2
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@ -35,7 +35,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"

 PATH=/void-packages:/usr/bin:/usr/sbin

-exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
+exec env -i -- SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
    @@CHECK@@ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
    PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
 _EOF
@ -153,11 +153,11 @@ chroot_sync_repos() {
    if [ -n "$XBPS_CROSS_BUILD" ]; then
        # Copy host keys to the target rootdir.
        mkdir -p $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys
-        cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
+        cp $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
            $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys
        # Make sure to sync index for remote repositories.
        if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
-            env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \
+            env -- XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \
                xbps-install -r $XBPS_MASTERDIR/$XBPS_CROSS_BASE -S
        fi
    fi
@ -205,7 +205,7 @@ chroot_handler() {
        [ -n "$XBPS_BINPKG_EXISTS" ] && arg="$arg -E"

        action="$arg $action"
-        env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \
+        env -i -- PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \
            HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
            SOURCE_DATE_EPOCH="$SOURCE_DATE_EPOCH" \
            $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
--- a/srcpkgs/Adapta/template
+++ b/srcpkgs/Adapta/template
@ -1,17 +1,17 @@
 # Template file for 'Adapta'
 pkgname=Adapta
-version=3.90.0.108
+version=3.90.1.21
 revision=1
 build_style=gnu-configure
 wrksrc="adapta-gtk-theme-$version"
 makedepends="gdk-pixbuf-devel glib-devel librsvg-devel"
-hostmakedepends="automake inkscape parallel pkg-config sassc glib-devel"
+hostmakedepends="automake inkscape parallel pkg-config sassc glib-devel procps-ng"
 short_desc="An adaptive Gtk+ theme based on Material Design Guidelines"
 maintainer="demiaster <marta.celeste.feriani@gmail.com>"
 license="GPL-2"
 homepage="https://github.com/tista500/$pkgname"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=d79d1790f6c2826920fdaebeb2d153a8b8eb246439a2678dfb51e949822b6a47
+checksum=01fb1a0c4255a0b4bd1a2c09f50b302a8f7bb78b4452bdf8027ab3d6827725e4

 noarch=y

--- a/srcpkgs/ConsoleKit2/patches/9999-musl.patch
+++ b/srcpkgs/ConsoleKit2/patches/9999-musl.patch
@ -1,12 +0,0 @@
--- pam-ck-connector/pam-ck-connector.c.orig	2015-05-14 06:36:12.217472340 +0200
-+++ pam-ck-connector/pam-ck-connector.c	2015-05-14 06:37:03.465067270 +0200
-@@ -197,7 +197,8 @@ _util_name_to_uid (const char *username,
- 
-         bufsize = sysconf (_SC_GETPW_R_SIZE_MAX);
-         if (bufsize == -1) {
-                return res;
-+		/* musl returns -1, so that use a considerable buffer size */
-+		bufsize = BUFSIZ;
-         }
-         buf = calloc (sizeof (char), bufsize);
-         rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp);
--- a/srcpkgs/ConsoleKit2/template
+++ b/srcpkgs/ConsoleKit2/template
@ -1,6 +1,6 @@
 # Template file for 'ConsoleKit2'
 pkgname=ConsoleKit2
-version=1.1.0.1
+version=1.1.1
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_file__sys_class_tty_tty0_active=yes
@ -13,11 +13,8 @@ short_desc="A framework for defining and tracking users, login sessions, and sea
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="http://consolekit2.github.io/ConsoleKit2/"
 license="GPL-2"
-#distfiles="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${version}/ConsoleKit2-${version}.tar.bz2"
-_gitcommit="8f1794996638dc3829cb1d2562a5601d055e0b91"
-wrksrc="${pkgname}-${_gitcommit}"
-distfiles="https://github.com/ConsoleKit2/ConsoleKit2/archive/${_gitcommit}.tar.gz"
-checksum=e74f5efe79a11da56a7bb4526ef92b6246006e0470f4591d94b24db9f6ed8659
+distfiles="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${version}/ConsoleKit2-${version}.tar.bz2"
+checksum=795b2cfb766bdffb9187ef7f8beb8d8298e4c38df4a69377115297a0dee3b0d0

 make_dirs="
 /etc/ConsoleKit/run-seat.d 0755 root root
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=3.0.0
+version=3.0.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-tools-devel"
@ -10,5 +10,5 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3"
 homepage="https://hluk.github.io/CopyQ/"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=10137a47e506cde74a76236ef5d040a2d31b824325a90c7b7b39d54a9a63611c
+checksum=fb0c1dfd4389e8184c589e916883b7b66dd16a01279c119064745486d2b58b1c
 configure_args="-DWITH_QT5=TRUE"
--- a/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch
+++ b/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch
@ -0,0 +1,21 @@
+https://github.com/jangernert/FeedReader/issues/410
+
+--- Constants.vala.in.orig
+++ Constants.vala.in
+@@ -43,11 +43,11 @@ namespace FeedReader {
+ 	}
+ 
+ 	public class MediaButton : GLib.Object {
+-		public const string PLAY = N_("Play");
+-		public const string PAUSE = N_("Pause");
+-		public const string MUTE = N_("Mute");
+-		public const string UNMUTE = N_("Unmute");
+-		public const string CLOSE = N_("Close");
+		public const string PLAY = "Play";
+		public const string PAUSE = "Pause";
+		public const string MUTE = "Mute";
+		public const string UNMUTE = "Unmute";
+		public const string CLOSE = "Close";
+ 	}
+ 
+ 	public class Constants : GLib.Object {
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@ -1,14 +1,14 @@
 # Template file for 'FeedReader'
 pkgname=FeedReader
 version=2.0.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config intltool itstool glib-devel vala
 $(vopt_if gir gobject-introspection)"
 makedepends="gtk+3-devel vala-devel json-glib-devel libgee08-devel libsoup-devel
 sqlite-devel libsecret-devel libnotify-devel libxml2-devel rest-devel
- webkit2gtk-devel gstreamer-devel libpeas-devel libcurl-devel
- gnome-online-accounts-devel gst-plugins-base1-devel"
+ webkit2gtk-devel libpeas-devel libcurl-devel gnome-online-accounts-devel
+ gst-plugins-base1-devel"
 short_desc="Modern desktop RSS desktop client"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3"
@ -17,6 +17,10 @@ distfiles="https://github.com/jangernert/$pkgname/archive/v$version.tar.gz"
 checksum=949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261
 make_build_args="VERBOSE=1"

+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2615/steps/shell_3/logs/stdio";;
+esac
+
 pre_build() {
 	: sed '/\/usr\/bin\/valac/s#--pkg=goa-#--pkg=Goa-#' \
 		-i $(find build -name build.make)
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=6.9.8
-_patchver=4
+_patchver=9
 version=${_majorver}.${_patchver}
 revision=1
 wrksrc=${pkgname}-${_majorver}-${_patchver}
@ -13,10 +13,10 @@ configure_args="--without-autotrace --with-wmf=yes
 --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static"
 short_desc="Package for display and interactive manipulation of images"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://www.imagemagick.org/"
+homepage="https://www.imagemagick.org/"
 license="ImageMagick"
-distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz"
-checksum=a6c24f6badc30ba624f1dda14e7927fa3109dea7dd6a7e4408e127f65107cb11
+distfiles="https://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz"
+checksum=f64f1a66d2a3ec4ff2c79527dd2a773c8c71abb4f8da37af71c270b52be32673

 subpackages="libmagick libmagick-devel"

--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@ -1,6 +1,6 @@
 # Template file for 'LuaJIT'
 pkgname=LuaJIT
-version=2.0.4
+version=2.0.5
 revision=2
 hostmakedepends="lua52-BitOp"
 short_desc="A Just-In-Time Compiler for Lua"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.luajit.org"
 license="MIT"
 distfiles="http://luajit.org/download/$pkgname-$version.tar.gz"
-checksum=620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d
+checksum=874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979

 case "$XBPS_TARGET_MACHINE" in
 	armv[67]l-musl) broken="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6757/steps/shell_3/logs/stdio";;
@ -42,7 +42,7 @@ do_install() {
 	make DPREFIX=${DESTDIR}/usr DESTDIR=${DESTDIR} \
 		INSTALL_SHARE=${DESTDIR}/usr/share PREFIX=/usr install

-	ln -fs libluajit-5.1.so.2.0.4 ${DESTDIR}/usr/lib/libluajit-5.1.so.2
+	ln -fs libluajit-5.1.so.${version} ${DESTDIR}/usr/lib/libluajit-5.1.so.2
 }

 LuaJIT-devel_package() {
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@ -1,6 +1,6 @@
 # Template build file for 'NetworkManager-openvpn'.
 pkgname=NetworkManager-openvpn
-version=1.2.8
+version=1.2.10
 revision=1
 lib32disabled=yes
 build_style=gnu-configure
@ -13,5 +13,4 @@ homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 license="GPL-2"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
-checksum=3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654
-LDFLAGS="-ldl"
+checksum=ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61
--- a/srcpkgs/NetworkManager/files/NetworkManager/run
+++ b/srcpkgs/NetworkManager/files/NetworkManager/run
@ -5,4 +5,4 @@ sv check dbus >/dev/null || exit 1
 [ ! -d /etc/NetworkManager/VPN ] && mkdir -m0755 -p /etc/NetworkManager/VPN
 [ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections
 [ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager
-exec NetworkManager -n
+exec NetworkManager -n > /dev/null 2>&1
--- a/srcpkgs/NetworkManager/patches/musl-basic.patch
+++ b/srcpkgs/NetworkManager/patches/musl-basic.patch
@ -25,17 +25,3 @@ Usual fix for musl libc
 size_t page_size(void) _pure_;
 #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
 
--- src/systemd/src/basic/parse-util.c.orig
-+++ src/systemd/src/basic/parse-util.c
-@@ -25,7 +25,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(__GLIBC__)
- #include <xlocale.h>
-+#else
-+#include <locale.h>
-+#endif
- 
- #include "alloc-util.h"
- #include "extract-word.h"
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.6.2
+version=1.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
@ -10,11 +10,12 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
 --with-kernel-firmware-dir=/usr/lib/firmware
 --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 --enable-modify-system
 --with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
- --with-session-tracking=consolekit --with-suspend-resume=upower
+ --with-session-tracking=$(vopt_if elogind logind consolekit)
+ --with-suspend-resume=upower
 --with-systemdsystemunitdir=no --enable-polkit-agent --enable-tests=no
 --with-systemd-journal=no --with-systemd-logind=no --disable-gtk-doc
 --with-dbus-sys-dir=/etc/dbus-1/system.d
- --sbindir=/usr/bin
+ --sbindir=/usr/bin --enable-concheck
 ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no
 ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no
 ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no"
@ -23,7 +24,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=b22b6f55cde37bec4982f9be4b1808a21101d807a05049c670116d95059a26f9
+checksum=fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e

 # gtk-doc generation is disabled but gtkdocisze is required by autogen.sh
 hostmakedepends="
@ -31,9 +32,9 @@ hostmakedepends="
 gettext-devel gtk-doc dbus iproute2 dhclient wpa_supplicant bluez iptables
 $(vopt_if gir gobject-introspection) $(vopt_if gir python-gobject)"
 makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
- libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel
+ libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
 ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
- $(vopt_if gir libgirepository-devel)"
+ $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"

 lib32disabled=yes
 depends="dbus iproute2 dhclient wpa_supplicant openresolv"
@ -49,7 +50,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac

 # Package build options
-build_options="gir"
+build_options="gir elogind"
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
@ -59,6 +60,8 @@ pre_configure() {

 	# Full switch to /run to not depend on /var/run being a symlink.
 	sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
+
+	sed -e "s/HAVE_LIBSYSTEMD/0/" -i src/devices/wwan/nm-modem-manager.c
 }

 post_install() {
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@ -1,17 +1,17 @@
 # Template file for 'R'
 pkgname=R
 version=3.4.0
-revision=1
+revision=3
 nocross=yes
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
- --with-lapack --with-blas --enable-R-shlib
+ --with-lapack --with-blas --enable-R-shlib --with-tcltk
 LIBnn=lib"
 hostmakedepends="gcc-fortran pkg-config perl less"
 makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
 libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel
 lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel
- libcurl-devel"
+ libcurl-devel tcl-devel tk-devel"
 depends="xdg-utils less"
 short_desc="System for statistical computation and graphics"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
--- a/srcpkgs/abcm2ps/template
+++ b/srcpkgs/abcm2ps/template
@ -1,7 +1,7 @@
 # Template file for 'abcm2ps'
 pkgname=abcm2ps
-version=8.12.9
-revision=3
+version=8.13.10
+revision=1
 build_style=configure
 hostmakedepends="pkg-config"
 makedepends="pango-devel"
@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2"
 homepage="http://moinejf.free.fr/"
 distfiles="${homepage}/abcm2ps-${version}.tar.gz"
-checksum=72b8f40964234edf2043bdc83527c37989bbb5fb3b4c108c2ef3cd1883399af4
+checksum=96a8133b587b8b8b92d485f52848134eb587379ff308b708a8e0bb64224bd90a

 pre_configure() {
 	echo CC=${CC} >> custom
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=4
+revision=5
 wrksrc="build-${version}"
 build_style=go
 go_import_path=github.com/appc/acbuild
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.0.59
-revision=2
+revision=3
 wrksrc="acme-${version}"
 build_style=go
 go_import_path=github.com/hlandau/acme
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20170303
+version=20170531
 revision=1
 wrksrc="acpica-unix-${version}"
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
@ -10,7 +10,7 @@ homepage="https://www.acpica.org/"
 license="GPL-2, 3-clause-BSD"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=c093c9eabd1f8c51d79364d829975c5335c8028c4816a7a80dfb8590f31889b5
+checksum=50155778cd1633dfca3443b8f8fd1ccc30e70e55ddece4d3c4fceafbbf1ab0e8

 do_build() {
 	sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config generate/unix/iasl/Makefile
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@ -1,6 +1,6 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=25.0.0.148
+version=25.0.0.171
 revision=1
 # The EULA file
 _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf"
@ -8,10 +8,10 @@ _eulacksum=91e504a9e99ebd988ffa95ce0d5feaf340410c03709348297301a22dc11df1a8
 _url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version}
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz"
-	_distcksum=72f93bf2d2f6b6e7ed34321de8324f14d9ddff8bc9f42717691b8904be50e758
+	_distcksum=60fe4a22278dda4e778f69bd063833fcce778cf21c88ebe4932095ae00c8cce4
 else
 	_disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz"
-	_distcksum=7d9ffcdca435429d8578adf348ff6e2c336787d2cfca4d28742c92adce8061b1
+	_distcksum=83395b43da1689104e569006c2a75d159d6b12f4c07d0d8e4e05e70b233662f4
 fi
 distfiles="${_eula} ${_disttarball}"
 checksum="${_eulacksum} ${_distcksum}"
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@ -1,7 +1,7 @@
 # Template file for 'afl'
 pkgname=afl
 version=2.41b
-revision=1
+revision=2
 build_style=gnu-makefile
 # x86 only currently
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.1
+version=3.22.2
 revision=1
 _pysol_cardsets=PySolFC-Cardsets
 _pysol_ver=2.0
@ -15,5 +15,5 @@ license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
 ${SOURCEFORGE_SITE}/pysolfc/${_pysol_cardsets}/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="52b11114205f901e63c8e1e8aacd317dd7fb50217061bc2cdabba339d3c0cd07
+checksum="bd312f15a2212851f0c80f997c6acbaaaa10f0f5ec544099d5c7c4b74f8e0c29
 c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
--- a/srcpkgs/albert/template
+++ b/srcpkgs/albert/template
@ -1,6 +1,6 @@
 # Template file for 'albert'
 pkgname=albert
-version=0.11.1
+version=0.11.2
 revision=1
 build_style=cmake
 makedepends="muparser-devel qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql
@ -11,7 +11,7 @@ maintainer="Nemh <nemh@protonmail.com>"
 license="GPL-3"
 homepage="https://github.com/ManuelSchneid3r/albert"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d214b73bf154bef59d36a4b128493b5dd9ecc7ba059a606f9b4659b57741f390
+checksum=991088cef2c4b7dc27b01e703bb7cb13f7f2dac928f0f9c235b2bd52d362a4e7

 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-x11extras-devel"
--- a/srcpkgs/alfred/template
+++ b/srcpkgs/alfred/template
@ -1,6 +1,6 @@
 # Template file for 'alfred'
 pkgname=alfred
-version=2017.0
+version=2017.1
 revision=1
 build_style=gnu-makefile
 short_desc="Daemon for distributing arbitrary information over a batman mesh"
@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2, ISC"
 homepage="http://www.open-mesh.org/projects/open-mesh/wiki/Alfred"
 distfiles="http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz"
-checksum=f8d6d83d2ce30b2238354ce12073285387c0f4ca1a28060390ff50b411b50fa8
+checksum=f8d3a8058d076f6b7686696f6117de1780a2905d827dfa7faa3c2c0b24c2dfb0
 hostmakedepends="pkg-config"
 makedepends="libcap-devel libnl3-devel"
 make_build_args="CONFIG_ALFRED_GPSD=n"
--- a/srcpkgs/alsa-lib/patches/musl.patch
+++ b/srcpkgs/alsa-lib/patches/musl.patch
@ -1,10 +0,0 @@
--- src/ucm/parser.c.orig	2016-12-20 14:43:20.000000000 +0000
-+++ src/ucm/parser.c	2016-12-21 20:59:58.460736188 +0000
-@@ -32,6 +32,7 @@
- 
- #include "ucm_local.h"
- #include <dirent.h>
-+#include <limits.h>
- 
- /** The name of the environment variable containing the UCM directory */
- #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@ -1,6 +1,6 @@
 # Template build file for 'alsa-lib'.
 pkgname=alsa-lib
-version=1.1.3
+version=1.1.4.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-pythonlibs=-lpython2.7 --with-pythonincludes=-I${XBPS_CROSS_BASE}/usr/include/python2.7"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2.1"
 homepage="http://www.alsa-project.org"
 distfiles="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$version.tar.bz2"
-checksum=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c
+checksum=91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@ -1,7 +1,7 @@
 # Template build file for 'alsa-plugins'.
 pkgname=alsa-plugins
-version=1.1.1
-revision=2
+version=1.1.4
+revision=1
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin"
 hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, LGPL-2.1"
 homepage="http://www.alsa-project.org"
 distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
-checksum=8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1
+checksum=530d1c3bdaeb058f2a03607a33b9e16ee5369bfd30a96bc09bd2c69b4ddd1a8a

 alsa-plugins-jack_package() {
 	short_desc+=" - Jack output plugin"
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@ -1,6 +1,6 @@
 # Template build file for 'alsa-utils'.
 pkgname=alsa-utils
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.alsa-project.org"
 license="GPL-2"
 distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2"
-checksum=127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c
+checksum=a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d

 post_install() {
 	# Install required udev rules file.
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=2.3.0.0
+version=2.3.1.0
 revision=1
 noarch=yes
 build_style=python2-module
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="https://www.ansible.com/"
 distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz"
-checksum=299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458
+checksum=cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5

 post_install() {
 	for f in examples/*; do
--- a/srcpkgs/apache-tomcat/template
+++ b/srcpkgs/apache-tomcat/template
@ -1,6 +1,6 @@
 # Template file for 'apache-tomcat'
 pkgname=apache-tomcat
-version=8.5.4
+version=8.5.15
 revision=1
 wrksrc=${pkgname}-${version}-src
 hostmakedepends="openjdk apache-ant"
@ -15,7 +15,7 @@ maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
 license="Apache-2.0"
 homepage="https://tomcat.apache.org"
 distfiles="http://mirrors.advancedhosters.com/apache/tomcat/tomcat-8/v${version}/src/apache-tomcat-${version}-src.tar.gz"
-checksum=bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d
+checksum=941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323

 do_build() {
 	ant
--- a/srcpkgs/apache-tomcat/update
+++ b/srcpkgs/apache-tomcat/update
@ -0,0 +1 @@
+pattern='Tomcat \K[\d.]+(?= Released)'
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.25
-revision=3
+revision=4
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@ -110,6 +110,10 @@ post_install() {
 		-e 's|#\(Include /etc/apache/extra/httpd-default.conf\)|\1|' \
 		-i "${DESTDIR}/etc/apache/httpd.conf"

+	# Remove references to hardening -specs.
+	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
+		${DESTDIR}/usr/share/apache/webroot/build/config{.nice,_vars.mk}
+
 	# Remove unused stuff.
 	vmkdir usr/share/apache/webroot
 	mv ${DESTDIR}/srv/www/$pkgname/cgi-bin ${DESTDIR}/usr/share/apache/webroot
--- a/srcpkgs/appstream-glib-devel
+++ b/srcpkgs/appstream-glib-devel
@ -0,0 +1 @@
+appstream-glib
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@ -0,0 +1,34 @@
+# Template file for 'appstream-glib'
+pkgname=appstream-glib
+version=0.6.13
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool gobject-introspection automake gperf gcab"
+# XXX: add libstemmer support
+makedepends="gtk+3-devel libyaml-devel gcab-devel libsoup-devel libarchive-devel
+ json-glib-devel"
+short_desc="Install and update applications"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="GPL-2"
+homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
+distfiles="$homepage/releases/$pkgname-$version.tar.xz"
+checksum=1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf
+
+pre_build() {
+	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/share/gtk-doc
+}
+
+appstream-glib-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libarchive-devel gcab-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
--- a/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch
+++ b/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch
@ -1,16 +0,0 @@
-The value 1.0 without f is a double constant and gcc6 complains
-about a not existing template for max(double,float).
-
--- libs/ardour/parameter_descriptor.cc	2016-10-04 09:19:13.780997674 +0200
-+++ libs/ardour/parameter_descriptor.cc	2016-10-04 09:19:45.237999989 +0200
-@@ -178,8 +178,8 @@
- 			largestep = largestep / logf(30.0f);
- 		} else if (integer_step) {
- 			smallstep = 1.0;
-			step      = std::max(1.0, rint(step));
-			largestep = std::max(1.0, rint(largestep));
-+			step      = std::max(1.0f, rint(step));
-+			largestep = std::max(1.0f, rint(largestep));
- 		}
- 	}
- }
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@ -1,17 +1,22 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=4.7
-revision=2
+version=5.9
+revision=1
 build_style=waf
 configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs"
 hostmakedepends="python git graphviz doxygen pkg-config clang perl"
-makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 sratom-devel gtkmm2-devel"
+makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
+ taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
+ vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
+ sratom-devel gtkmm2-devel libarchive-devel"
 short_desc="Professional-grade digital audio workstation"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://ardour.org"
 CXXFLAGS="-std=c++11"

+nocross="executes test binaries during configure"
+
 do_fetch() {
 	git clone --branch=$version https://github.com/Ardour/$pkgname $pkgname-$version
 }
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@ -1,7 +1,7 @@
 # Template file for 'aria2'
 pkgname=aria2
-version=1.31.0
-revision=2
+version=1.32.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
@ -14,4 +14,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="https://aria2.github.io/"
 distfiles="https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${pkgname}-${version}.tar.xz"
-checksum=7b85619048b23406f241e38a5b1b8b0bc2cae9e80fd117810c2a71ecca813f8c
+checksum=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50
--- a/srcpkgs/astyle/template
+++ b/srcpkgs/astyle/template
@ -1,6 +1,6 @@
 # Template file for 'astyle'
 pkgname=astyle
-version=3.0
+version=3.0.1
 revision=1
 wrksrc="$pkgname"
 build_wrksrc="build/gcc"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-3"
 homepage="http://astyle.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version}_linux.tar.gz"
-checksum=983e4fe87f20427ddf0d06fa5ba046b5ee95347f9ada33a681af3892426a4ff3
+checksum=6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd

 do_install() {
 	vbin bin/astyle
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@ -1,6 +1,6 @@
 # Template file for 'at-spi2-atk'
 pkgname=at-spi2-atk
-version=2.24.0
+version=2.24.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool glib-devel"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
 license="LGPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=022d68497c05cc65ba7cd2b166132de9a160c8d90e9200b5faa473ef7e784c61
+checksum=60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@ -1,6 +1,6 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.24.0
+version=2.24.1
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable gir introspection)"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6179f314fbd903b3cd3477a57b6b1fecca88b76ce769ce777fda0d3e5f61afcd
+checksum=1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b

 # Package build options
 build_options="gir"
--- a/srcpkgs/atom/patches/desktop.patch
+++ b/srcpkgs/atom/patches/desktop.patch
@ -13,7 +13,7 @@ index 1969e3f..71c19ca 100644
 -Exec=<%= installDir %>/share/<%= appFileName %>/atom %F
 -Icon=<%= iconPath %>
 +Exec=/usr/share/atom/atom %U
-+Icon=/usr/share/atom/resources/app.asar.unpacked/resources/atom.png
+Icon=/usr/share/atom/resources/app/resources/atom.png
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Utility;TextEditor;Development;
--- a/srcpkgs/atom/template
+++ b/srcpkgs/atom/template
@ -1,23 +1,28 @@
 # Template file for 'atom'
 pkgname=atom
-version=1.11.2
-revision=1
+version=1.17.2
+revision=2
 nocross=yes
 nostrip=yes
-hostmakedepends="git pkg-config python-devel nodejs git-perl"
-makedepends="python-devel GConf-devel libgnome-keyring-devel"
+hostmakedepends="git pkg-config python-devel nodejs curl"
+makedepends="python-devel GConf-devel libgnome-keyring-devel libX11-devel libxkbfile-devel"
 short_desc="Chrome-based text editor from Github"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://atom.io"
 distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=b7c09d03d950b0a6aca82225f072d9005d5681887e3a7c466b0504bf64d7c5cd
+checksum=bdde2b60e93f818976c28a0b6259d4636a695a2db9c832eeb186082744cd8f6b

 only_for_archs="i686 x86_64"

 pre_build() {
-	sed -i -e "/exception-reporting/d" \
-		-e "/metrics/d" package.json
+	local NVM_VERSION=0.33.2
+	local NODE_VERSION=6
+	curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash
+	source $HOME/.nvm/nvm.sh
+	nvm install $NODE_VERSION
+	nvm use $NODE_VERSION
+
 	sed -e "s/<%= description %>/$pkgdesc/" \
 		-e "s|<%= appName %>|Atom|"\
 		-e "s|<%= installDir %>/share/<%= appFileName %>|/usr/bin|"\
@ -44,7 +49,7 @@ do_install() {
 	ls -lah
 	vcopy out/atom-$version-$targetarch/* usr/share/atom
 	vlicense LICENSE.md
-	
+
 	ln -s /usr/share/atom/resources/app/apm/node_modules/.bin/apm "$DESTDIR/usr/bin/apm"

 	# remove useless static libs
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@ -1,6 +1,6 @@
 # Template file for 'autofs'
 pkgname=autofs
-version=5.1.2
+version=5.1.3
 revision=1
 build_style=gnu-configure
 conf_files="/etc/autofs/*"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="${KERNEL_SITE}/daemons/autofs"
 distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
-checksum=88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c
+checksum=e96eebfe3ed5fb1a30f4510f538198affde223e370c6dc2bed9780309272b1bf

 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"

--- a/srcpkgs/autojump/template
+++ b/srcpkgs/autojump/template
@ -1,6 +1,6 @@
 # Template file for 'autojump'
 pkgname=autojump
-version=22.3.4
+version=22.5.1
 revision=1
 wrksrc=${pkgname}-release-v${version}
 hostmakedepends="python"
@ -11,7 +11,7 @@ maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
 license="GPL-3"
 homepage="https://github.com/wting/autojump"
 distfiles="https://github.com/wting/autojump/archive/release-v${version}.tar.gz"
-checksum=3fbd83f19e60514887c7efa1ce1b9015179c55c381a8867417eed933f2657984
+checksum=765fabda130eb4df70d1c1e5bc172e1d18f8ec22c6b89ff98f1674335292e99f

 do_install() {
 	# The install script does some naive checks
--- a/srcpkgs/autojump/update
+++ b/srcpkgs/autojump/update
@ -1,2 +1,2 @@
 site=https://github.com/wting/autojump/releases
-pattern='release-\Kv?[0-9]+\.[0-9]+\.[0-9]+(?:\.[0-9]+)?'
+pattern='release-v\K[\d.]+(?=\.tar\.gz)'
--- a/srcpkgs/avr-binutils/template
+++ b/srcpkgs/avr-binutils/template
@ -1,13 +1,13 @@
 # Template file for 'avr-binutils'
 pkgname=avr-binutils
-version=2.27
+version=2.28
 revision=1
 short_desc="GNU binary utilities for AVR"
 maintainer="allan <mail@may.mooo.com>"
 homepage="http://www.gnu.org/software/binutils/"
 license="GPL-3"
 distfiles="$GNU_SITE/binutils/binutils-$version.tar.gz"
-checksum=26253bf0f360ceeba1d9ab6965c57c6a48a01a8343382130d1ed47c468a3094f
+checksum=cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf
 wrksrc="binutils-$version"

 makedepends="zlib-devel"
--- a/srcpkgs/azpainter/patches/cross.patch
+++ b/srcpkgs/azpainter/patches/cross.patch
@ -0,0 +1,11 @@
+--- configure.ac.orig
+++ configure.ac
+@@ -30,7 +30,7 @@
+ 	[AC_DEFINE([HAVE_PTHREAD_H], [1], [pthread.h])],
+ 	AC_MSG_ERROR(pthread.h not found))
+ 
+-AC_CHECK_FILE("$freetype_dir/ft2build.h",,AC_MSG_ERROR([(freetype) ft2build.h not found]))
+
+ AC_CHECK_HEADER([fontconfig/fontconfig.h],,AC_MSG_ERROR(fontconfig.h not found))
+ AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR(zlib.h not found))
+ AC_CHECK_HEADER([png.h],,AC_MSG_ERROR(png.h not found))
--- a/srcpkgs/azpainter/template
+++ b/srcpkgs/azpainter/template
@ -0,0 +1,19 @@
+# Template file for 'azpainter'
+pkgname=azpainter
+version=2.0.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake"
+makedepends="fontconfig-devel libjpeg-turbo-devel libXi-devel"
+short_desc="A full-color painting software for illustration drawing"
+maintainer="Alexander Mamay <alexander@mamay.su>"
+license="GPL-3"
+homepage="http://azsky2.html.xdomain.jp/linux/azpainter.html"
+distfiles="http://osdn.dl.osdn.net/azpainter/67713/azpainter-${version}.tar.bz2"
+checksum=7c3bc35fff51b3529911e5d6ce6ee2ce565694c17755fe1e6f52e6d9ad0ce839
+
+CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+
+pre_configure() {
+	autoreconf -fi
+}
--- a/srcpkgs/azpainter/update
+++ b/srcpkgs/azpainter/update
@ -0,0 +1 @@
+pattern='>ver\ \K[\d.]+'
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@ -1,6 +1,6 @@
 # Template build file for 'babl'.
 pkgname=babl
-version=0.1.24
+version=0.1.28
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config vala-devel"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gegl.org/babl/"
 license="LGPL-3"
 distfiles="https://ftp.gimp.org/pub/babl/${version%.*}/babl-$version.tar.bz2"
-checksum=472bf1acdde5bf076e6d86f3004eea4e9b007b1377ab305ebddec99994f29d0b
+checksum=63f3ed23e72a857a0e6df53d9d968a325024177b01edbe314a0c98b499eb8603

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/backupninja/template
+++ b/srcpkgs/backupninja/template
@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 depends="dialog"
 short_desc="A lightweight, extensible meta-backup system"
-maintainer="Michael Gehring <mg@ebfe.org>"
+maintainer="Orphaned <orphan@voidlinux.eu>"
 license="GPL-2"
 homepage="https://labs.riseup.net/code/projects/backupninja"
 distfiles="https://labs.riseup.net/code/attachments/download/275/backupninja-${version}.tar.gz"
--- a/srcpkgs/bacula-common-mariadb
+++ b/srcpkgs/bacula-common-mariadb
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/bacula-common-postgresql
+++ b/srcpkgs/bacula-common-postgresql
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/bacula-common/files/bacula-dir/run
+++ b/srcpkgs/bacula-common/files/bacula-dir/run
@ -0,0 +1,3 @@
+#!/bin/sh
+[ ! -d /run/bacula ] && mkdir /run/bacula
+exec bacula-dir -f -c /etc/bacula/bacula-dir.conf
--- a/srcpkgs/bacula-common/files/bacula-fd/run
+++ b/srcpkgs/bacula-common/files/bacula-fd/run
@ -0,0 +1,3 @@
+#!/bin/sh
+[ ! -d /run/bacula ] && mkdir /run/bacula
+exec bacula-fd -f -c /etc/bacula/bacula-fd.conf
--- a/srcpkgs/bacula-common/files/bacula-sd/run
+++ b/srcpkgs/bacula-common/files/bacula-sd/run
@ -0,0 +1,3 @@
+#!/bin/sh
+[ ! -d /run/bacula ] && mkdir /run/bacula
+exec bacula-sd -f -c /etc/bacula/bacula-sd.conf
--- a/srcpkgs/bacula-common/patches/fix-cross.patch
+++ b/srcpkgs/bacula-common/patches/fix-cross.patch
@ -0,0 +1,48 @@
+--- configure	2016-09-29 15:59:30.000000000 +0200
+++ configure	2017-02-14 01:48:10.874916913 +0100
+@@ -23873,6 +23873,14 @@
+                  POSTGRESQL_LIBDIR=/usr/lib/postgresql
+               fi
+               POSTGRESQL_BINDIR=/usr/bin
+          elif test -f ${XBPS_CROSS_BASE}/usr/include/libpq-fe.h; then
+              POSTGRESQL_INCDIR=${XBPS_CROSS_BASE}/usr/include
+              if test -d ${XBPS_CROSS_BASE}/usr/lib64; then
+                 POSTGRESQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64
+              else
+                 POSTGRESQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib
+              fi
+              POSTGRESQL_BINDIR=${XBPS_CROSS_BASE}/usr/bin
+           else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -24182,6 +24190,15 @@
+                  MYSQL_LIBDIR=/usr/local/lib
+               fi
+               MYSQL_BINDIR=/usr/local/bin
+           elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql.h; then
+              MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include
+              if test -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.a \
+                      -o -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.so; then
+                 MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64
+              else
+                 MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib
+              fi
+              MYSQL_BINDIR=${XBPS_CROSS_BASE}/usr/bin
+            else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -24587,6 +24604,14 @@
+               SQLITE_LIBDIR=$prefix/lib
+            fi
+            SQLITE_BINDIR=$prefix/bin
+        elif test -f ${XBPS_CROSS_BASE}/usr/include/sqlite3.h; then
+           SQLITE_INCDIR=${XBPS_CROSS_BASE}/usr/include
+           if test -d ${XBPS_CROSS_BASE}/usr/lib64; then
+              SQLITE_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64
+           else
+              SQLITE_LIBDIR=${XBPS_CROSS_BASE}/usr/lib
+           fi
+           SQLITE_BINDIR=${XBPS_CROSS_BASE}/usr/bin
+         else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
--- a/srcpkgs/bacula-common/patches/fix-musl.patch
+++ b/srcpkgs/bacula-common/patches/fix-musl.patch
@ -0,0 +1,12 @@
+--- src/findlib/fstype.c	2016-09-29 15:59:30.000000000 +0200
+++ src/findlib/fstype.c	2017-02-19 19:24:02.050639457 +0100
+@@ -162,6 +162,9 @@
+ 
+ #include <sys/vfs.h>
+ #include <mntent.h>
+#ifndef _PATH_MOUNTED
+#include <paths.h>
+#endif
+ 
+ /*
+  * Linux statfs() does not return the filesystem name type.  It
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@ -0,0 +1,119 @@
+# Template file for 'bacula-common'
+pkgname="bacula-common"
+version="7.4.7"
+revision=1
+build_style=gnu-configure
+_common_desc="Bacula - A Network Backup Tool "
+short_desc="${_common_desc} (common libs)"
+maintainer="Matthias Fulz <mfulz@olznet.de>"
+license="AGPL-3"
+homepage="http://www.bacula.org"
+distfiles="${SOURCEFORGE_SITE}/bacula/bacula-${version}.tar.gz"
+checksum="6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40"
+configure_args="
+ --with-openssl --with-sqlite3 --with-mysql --with-postgresql
+ --enable-smartalloc --sysconfdir=/etc/bacula
+ --with-scriptdir=/etc/bacula/scripts
+ --with-working-dir=/run/bacula"
+makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
+ libressl-devel ncurses-devel zlib-devel acl-devel"
+wrksrc="${pkgname%-*}-${version}"
+shlib_provides="libbaccats-${version}.so"
+alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so"
+
+post_install() {
+	rm "${DESTDIR}/usr/bin/bacula"
+	rm -rf "${DESTDIR}/usr/share/doc"
+	rm "${DESTDIR}/usr/share/man/man1/bat.1.gz"
+}
+
+bacula-console_package() {
+	short_desc="Bacula - A Network Backup Tool (management cli)"
+	conf_files="/etc/${pkgname%-*}/bconsole.conf"
+	depends="bacula-common"
+	pkg_install() {
+		vmove "etc/${pkgname%-*}/bconsole.conf"
+		vmove "etc/${pkgname%-*}/scripts/bconsole"
+		vmove "usr/bin/bconsole"
+		vmove "usr/share/man/man8/bconsole.8.gz"
+	}
+}
+
+bacula-fd_package() {
+	short_desc="Bacula - A Network Backup Tool (file daemon)"
+	conf_files="/etc/${pkgname%-*}/${pkgname}.conf"
+	depends="bacula-common"
+	pkg_install() {
+		vmove "etc/${pkgname%-*}/${pkgname}.conf"
+		vmove "usr/bin/${pkgname}"
+		vmove "usr/lib/bpipe-fd.so"
+		vmove "usr/share/man/man8/${pkgname}.8.gz"
+		vsv "${pkgname}"
+	}
+}
+
+bacula-sd_package() {
+	short_desc="Bacula - A Network Backup Tool (storage daemon)"
+	conf_files="/etc/${pkgname%-*}/${pkgname}.conf"
+	depends="bacula-common"
+	pkg_install() {
+		vmove "etc/${pkgname%-*}/${pkgname}.conf"
+		for x in ${pkgname} bextract bls bcopy bscan btape; do
+			vmove "usr/bin/$x"
+			vmove "usr/share/man/man8/$x.8.gz"
+		done
+		vsv "${pkgname}"
+	}
+}
+
+bacula-dir_package() {
+	short_desc="Bacula - A Network Backup Tool (director daemon)"
+	conf_files="/etc/${pkgname%-*}/${pkgname}.conf"
+	depends="bacula-common"
+	pkg_install() {
+		vmove "etc/${pkgname%-*}/${pkgname}.conf"
+		vmove "etc/${pkgname%-*}/scripts/query.sql"
+		vmove "etc/${pkgname%-*}/scripts/create_${pkgname%-*}_database"
+		vmove "etc/${pkgname%-*}/scripts/delete_catalog_backup"
+		vmove "etc/${pkgname%-*}/scripts/drop_${pkgname%-*}_database"
+		vmove "etc/${pkgname%-*}/scripts/drop_${pkgname%-*}_tables"
+		vmove "etc/${pkgname%-*}/scripts/grant_${pkgname%-*}_privileges"
+		vmove "etc/${pkgname%-*}/scripts/make_${pkgname%-*}_tables"
+		vmove "etc/${pkgname%-*}/scripts/make_catalog_backup.pl"
+		vmove "etc/${pkgname%-*}/scripts/make_catalog_backup"
+		vmove "etc/${pkgname%-*}/scripts/update_${pkgname%-*}_tables"
+		vmove "usr/bin/bsmtp"
+		vmove "usr/share/man/man1/bsmtp.1.gz"
+		for x in ${pkgname} bregex bwild dbcheck; do
+			vmove "usr/bin/$x"
+			vmove "usr/share/man/man8/$x.8.gz"
+		done
+		vsv "${pkgname}"
+	}
+}
+
+bacula-common-mariadb_package() {
+	short_desc="${_common_desc} (MariaDB support)"
+	depends="bacula-common"
+	alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-mysql-${version}.so"
+	pkg_install() {
+		vmove "usr/lib/libbaccats-mysql-${version}.so"
+		vmove "usr/lib/libbaccats-mysql.so"
+		for file in etc/bacula/scripts/*mysql*; do
+			vmove "$file"
+		done
+	}
+}
+
+bacula-common-postgresql_package() {
+	short_desc="${_common_desc} (PostgreSQL support)"
+	depends="bacula-common"
+	alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-postgresql-${version}.so"
+	pkg_install() {
+		vmove "usr/lib/libbaccats-postgresql-${version}.so"
+		vmove "usr/lib/libbaccats-postgresql.so"
+		for file in etc/bacula/scripts/*postgresql*; do
+			vmove "$file"
+		done
+	}
+}
--- a/srcpkgs/bacula-console
+++ b/srcpkgs/bacula-console
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/bacula-dir
+++ b/srcpkgs/bacula-dir
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/bacula-fd
+++ b/srcpkgs/bacula-fd
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/bacula-sd
+++ b/srcpkgs/bacula-sd
@ -0,0 +1 @@
+bacula-common
--- a/srcpkgs/base-devel/template
+++ b/srcpkgs/base-devel/template
@ -1,9 +1,8 @@
 # Template file for 'base-devel'
 pkgname=base-devel
-version=20161126
+version=20170527
 revision=1
 build_style=meta
-noarch=yes
 depends="autoconf automake bc binutils bison ed flex gcc gettext
 groff libtool m4 make patch pkg-config texinfo unzip xz"
 case "$XBPS_TARGET_MACHINE" in
@ -11,6 +10,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) depends+=" glibc-devel";;
 esac
 short_desc="Void Linux development tools meta package"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.eu/"
--- a/srcpkgs/bash-preexec/template
+++ b/srcpkgs/bash-preexec/template
@ -1,6 +1,6 @@
 # Template file for 'bash-preexec'
 pkgname=bash-preexec
-version=0.3.2
+version=0.3.3
 revision=1
 noarch=yes
 depends="bash"
@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/rcaloras/bash-preexec"
 distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz"
-checksum=bf35c21ffdb8a48a908f1503c681017399e62e5580852e3e598e303bb86fc24d
+checksum=019a556c5ec77a6c5b4c53c0afbe6596b0d8eac2ffde076af44b0a1d5793cc7b

 do_install() {
 	vbin bash-preexec.sh
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.3.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DREVISION=${version}"
 hostmakedepends="flex"
--- a/srcpkgs/bind/patches/libressl.patch
+++ b/srcpkgs/bind/patches/libressl.patch
@ -0,0 +1,148 @@
+--- lib/isc/sha2.c.orig
+++ lib/isc/sha2.c
+@@ -69,7 +69,7 @@
+ #endif
+ 
+ #ifdef ISC_PLATFORM_OPENSSLHASH
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define EVP_MD_CTX_new() &(context->_ctx)
+ #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
+ #define EVP_MD_CTX_reset(c) EVP_MD_CTX_cleanup(c)
+--- lib/isc/include/isc/sha2.h.orig
+++ lib/isc/include/isc/sha2.h
+@@ -84,7 +84,7 @@
+ 
+ typedef struct {
+ 	EVP_MD_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_MD_CTX _ctx;
+ #endif
+ } isc_sha2_t;
+--- lib/isc/include/isc/hmacmd5.h.orig
+++ lib/isc/include/isc/hmacmd5.h
+@@ -42,7 +42,7 @@
+ 
+ typedef struct {
+ 	HMAC_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	HMAC_CTX _ctx;
+ #endif
+ } isc_hmacmd5_t;
+--- lib/isc/hmacmd5.c.orig
+++ lib/isc/hmacmd5.c
+@@ -43,7 +43,7 @@
+ #endif
+ 
+ #ifdef ISC_PLATFORM_OPENSSLHASH
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx))
+ #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr)
+ #endif
+--- lib/isc/md5.c.orig
+++ lib/isc/md5.c
+@@ -54,7 +54,7 @@
+ #include <isc/util.h>
+ 
+ #ifdef ISC_PLATFORM_OPENSSLHASH
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define EVP_MD_CTX_new() &(ctx->_ctx)
+ #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
+ #endif
+--- lib/isc/hmacsha.c.orig
+++ lib/isc/hmacsha.c
+@@ -40,7 +40,7 @@
+ #endif
+ 
+ #ifdef ISC_PLATFORM_OPENSSLHASH
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx))
+ #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr)
+ #endif
+--- lib/isc/include/isc/hmacsha.h.orig
+++ lib/isc/include/isc/hmacsha.h
+@@ -42,7 +42,7 @@
+ 
+ typedef struct {
+ 	HMAC_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	HMAC_CTX _ctx;
+ #endif
+ } isc_hmacsha_t;
+--- lib/isc/include/isc/sha1.h.orig
+++ lib/isc/include/isc/sha1.h
+@@ -41,7 +41,7 @@
+ 
+ typedef struct {
+ 	EVP_MD_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_MD_CTX _ctx;
+ #endif
+ } isc_sha1_t;
+--- lib/isc/include/isc/md5.h.orig
+++ lib/isc/include/isc/md5.h
+@@ -60,7 +60,7 @@
+ 
+ typedef struct {
+ 	EVP_MD_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_MD_CTX _ctx;
+ #endif
+ } isc_md5_t;
+--- lib/isc/aes.c.orig
+++ lib/isc/aes.c
+@@ -33,7 +33,7 @@
+ #include <openssl/opensslv.h>
+ #include <openssl/evp.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context)
+ #define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1)
+ #endif
+@@ -42,7 +42,7 @@
+ isc_aes128_crypt(const unsigned char *key, const unsigned char *in,
+ 		 unsigned char *out)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_CIPHER_CTX _context;
+ #endif
+ 	EVP_CIPHER_CTX *c;
+@@ -62,7 +62,7 @@
+ isc_aes192_crypt(const unsigned char *key, const unsigned char *in,
+ 		 unsigned char *out)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_CIPHER_CTX _context;
+ #endif
+ 	EVP_CIPHER_CTX *c;
+@@ -82,7 +82,7 @@
+ isc_aes256_crypt(const unsigned char *key, const unsigned char *in,
+ 		 unsigned char *out)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 	EVP_CIPHER_CTX _context;
+ #endif
+ 	EVP_CIPHER_CTX *c;
+--- lib/isc/sha1.c.orig
+++ lib/isc/sha1.c
+@@ -50,7 +50,7 @@
+ #endif
+ 
+ #ifdef ISC_PLATFORM_OPENSSLHASH
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define EVP_MD_CTX_new() &(context->_ctx)
+ #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr)
+ #endif
--- a/srcpkgs/bind/patches/seccomp.patch
+++ b/srcpkgs/bind/patches/seccomp.patch
@ -1,38 +0,0 @@
--- bin/named/include/named/seccomp.h.orig
-+++ bin/named/include/named/seccomp.h
-@@ -57,6 +57,8 @@
- 	SCMP_SYS(rt_sigsuspend),
- 	SCMP_SYS(fstat),
- 	SCMP_SYS(epoll_ctl),
- 	SCMP_SYS(gettimeofday),
-+	SCMP_SYS(getpid),
-+	SCMP_SYS(getrandom),
- 	SCMP_SYS(unlink),
- 	SCMP_SYS(socket),
-@@ -121,6 +123,8 @@
- 	"fstat",
- 	"epoll_ctl",
- 	"gettimeofday",
-+	"getpid",
-+	"getrandom",
- 	"unlink",
- 	"socket",
- 	"sendto",
-@@ -190,6 +194,8 @@
- 	SCMP_SYS(fstat64),
- 	SCMP_SYS(epoll_ctl),
- 	SCMP_SYS(gettimeofday),
-+	SCMP_SYS(getpid),
-+	SCMP_SYS(getrandom),
- 	SCMP_SYS(unlink),
- #ifndef ISC_PLATFORM_USETHREADS
- 	SCMP_SYS(fcntl64),
-@@ -226,6 +232,8 @@
- 	"fstat64",
- 	"epoll_ctl",
- 	"gettimeofday",
-+	"getpid",
-+	"getrandom",
- 	"unlink",
- #ifndef ISC_PLATFORM_USETHREADS
- 	"fcntl64",
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@ -1,16 +1,14 @@
 # Template file for 'bind'
 pkgname=bind
-_distver=9.10.4
-_patchver=P6
-version="${_distver}${_patchver}"
-revision=4
-wrksrc="${pkgname}-${_distver}-${_patchver}"
+version=9.10.5
+revision=1
+wrksrc="${pkgname}-${version}"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="ISC"
 homepage="http://www.isc.org/software/bind/"
-distfiles="http://ftp.isc.org/isc/bind9/${_distver}-${_patchver}/bind-${_distver}-${_patchver}.tar.gz"
-checksum=a1dfbfd1d11cb52f2d9e5af0def25763798bda243841722dd0b319086a73ee65
+distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"
+checksum=71688d2e134e42205075eef93cc1b78b42a140a2d61bf8263afc9c92fc872b0e

 build_options="geoip seccomp"
 build_options_default="geoip"
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.13.1
-revision=4
+revision=5
 create_wrksrc=yes
 hostmakedepends="pkg-config yasm"
 makedepends="db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel"
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.78c
-revision=3
+revision=4
 build_style="cmake"
 makedepends="
 libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.44
+version=5.45
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.bluez.org/"
 license="GPL-2"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85
+checksum=4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa85364e9

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20170421
+version=20170510
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="BSD"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=763104954b566ae9f575ea682dc38ed5c73057336f5f6090fb7489a5399511c5
+checksum=ce5d73a8b5267495132bd00392a411178155dafecd66b50860419e9cf8683e3c

 do_configure() {
 	cd bmake
--- a/srcpkgs/bmon/template
+++ b/srcpkgs/bmon/template
@ -1,7 +1,7 @@
 # Template file for 'bmon'
 pkgname=bmon
 version=4.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="ncurses-devel libnl3-devel confuse-devel"
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.64.0
-revision=1
+revision=2
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="bzip2-devel icu-devel python-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel"
--- a/srcpkgs/brisk-menu/template
+++ b/srcpkgs/brisk-menu/template
@ -0,0 +1,14 @@
+# Template file for 'brisk-menu'
+pkgname=brisk-menu
+version=0.4.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="glib pkg-config intltool"
+makedepends="gtk+3-devel mate-menus-devel libmate-panel-devel"
+depends="mate-panel"
+short_desc="Modern, efficient menu for the MATE DE"
+maintainer="Jasu Koponen <jasu.koponen@hotmail.com>"
+license="GPL-2"
+homepage="https://github.com/solus-project/brisk-menu"
+distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
+checksum=8737113dc06b472c9f37d36056f0262ef1e76a0de7dbe281cd903b0f9fa26e77
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=5.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3-Cython python3 xproto"
 makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel dbus-devel glib-devel xproto icu-devel python3-devel libbluetooth-devel"
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch
@ -0,0 +1,52 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index a9671e2..da36405 100644
+--- src/wl/sys/wl_cfg80211_hybrid.c
+++ src/wl/sys/wl_cfg80211_hybrid.c
+@@ -30,6 +30,9 @@
+ #include <linux/kthread.h>
+ #include <linux/netdevice.h>
+ #include <linux/ieee80211.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	#include <linux/sched/signal.h>
+#endif
+ #include <net/cfg80211.h>
+ #include <linux/nl80211.h>
+ #include <net/rtnetlink.h>
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 489c9f5..f8278ad 100644
+--- src/wl/sys/wl_linux.c
+++ src/wl/sys/wl_linux.c
+@@ -117,6 +117,9 @@ int wl_found = 0;
+ 
+ typedef struct priv_link {
+ 	wl_if_t *wlif;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	unsigned long last_rx;
+#endif
+ } priv_link_t;
+ 
+ #define WL_DEV_IF(dev)          ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif)
+@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ {
+ 	struct sk_buff *oskb = (struct sk_buff *)p;
+ 	struct sk_buff *skb;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	priv_link_t *priv_link;
+#endif
+ 	uchar *pdata;
+ 	uint len;
+ 
+@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ 	if (skb == NULL) return;
+ 
+ 	skb->dev = wl->monitor_dev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+	priv_link = MALLOC(wl->osh, sizeof(priv_link_t));
+	priv_link = netdev_priv(skb->dev);
+	priv_link->last_rx = jiffies;
+#else
+ 	skb->dev->last_rx = jiffies;
+#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ 	skb_reset_mac_header(skb);
+ #else
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@ -2,7 +2,7 @@

 pkgname=broadcom-wl-dkms
 version=6.30.223.271
-revision=4
+revision=5
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary Broadcom license"
 homepage="http://broadcom.com"
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@ -0,0 +1,14 @@
+# Template file for 'btrbk'
+pkgname=btrbk
+version=0.25.0
+revision=3
+build_style=gnu-makefile
+depends="perl btrfs-progs openssh pv"
+short_desc="backup tool for btrfs subvolumes"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="GPL-3"
+homepage="http://digint.ch/btrbk"
+distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
+checksum=21b77473e033ee4886e48802cb92c4a958465534169aee4b7238826a89a63650
+make_install_args="BINDIR=/usr/bin"
+conf_files="/etc/btrbk/*"
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=4.10.2
+version=4.11
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=gnu-configure
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://btrfs.wiki.kernel.org/"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a
+checksum=e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e

 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@ -2,8 +2,8 @@
 _desc="A network-based backup and restore program"

 pkgname=burp2-server
-version=2.1.6
-revision=2
+version=2.1.8
+revision=1
 short_desc="${_desc} - Server"
 maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
 license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1"
@ -11,7 +11,7 @@ homepage="http://burp.grke.org/"
 wrksrc="burp-${version}"
 patch_args='-Np1'
 distfiles="https://github.com/grke/burp/archive/${version}.tar.gz"
-checksum=3917383e7313d59c5082c196eb4c509cc246db06105a19e02263b411818ff218
+checksum=d711a40838d5d5ace844cd68f7667c2dbf3995c81217837d4863941f172a9569

 hostmakedepends="automake libtool perl"
 makedepends="
--- a/srcpkgs/byobu/template
+++ b/srcpkgs/byobu/template
@ -1,6 +1,6 @@
 # Template file for 'byobu'
 pkgname=byobu
-version=5.117
+version=5.119
 revision=1
 build_style=gnu-configure
 short_desc="A text-based window manager and terminal multiplexer"
@ -8,4 +8,4 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3"
 homepage="http://byobu.co/"
 distfiles="https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"
-checksum=64b0deac161a1d979e656052e23b13496c2d262fd7a069abddd21afbc7d0fca2
+checksum=4b092ca12d3a33e89d84cc90c4a41af2ba8697d48e26080a45d64d6b7800ca77
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@ -1,8 +1,8 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20161130
+version=20161130+nmu1
 revision=1
-wrksrc="$pkgname"
+wrksrc="${pkgname}-${version%+*}"
 bootstrap=yes
 noarch="yes"
 hostmakedepends="libressl"
@ -10,10 +10,10 @@ depends="libressl>=2.2.4_2 run-parts"
 conf_files="/etc/ca-certificates.conf"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://packages.qa.debian.org/c/ca-certificates.html"
-license="GPL-2"
+homepage="https://tracker.debian.org/pkg/ca-certificates"
+license="GPL-2, MPL-2.0"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=04bca9e142a90a834aca0311f7ced237368d71fee7bd5c9f68ef7f4611aee471
+checksum=77f9aca431e3122bf04aa0ffd989b723d906db4d1c106e3290e463d73c177f0e

 post_extract() {
 	$BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@ -1,6 +1,6 @@
 # Template file for 'caja'
 pkgname=caja
-version=1.18.2
+version=1.18.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-packagekit --disable-schemas-compile
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="LGPL-2"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=117fbc320bf73e76b20eeef87c69e2b2245b50520cf33b51999abe53929686a6
+checksum=b562c544f907944b2e1ce426b5e1d1d02886ecfff8d44f0a3ae2a2793ac39256

 build_options="gir"
 if [ -z "$CROSS_BUILD" ]; then
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=2.83.0
+version=2.85.1
 revision=1
 hostmakedepends="qt5-qmake python-devel pkg-config
 python-dateutil python-lxml python-Pillow
@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://calibre-ebook.com"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab
+checksum=8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd

 nocross=yes
 pycompile_dirs="/usr/lib/calibre/"
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=2.9.11
-revision=11
+revision=12
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF -DBUILD_krita=OFF"
 hostmakedepends="automoc4 perl pkg-config eigen3.2"
--- a/srcpkgs/capnproto/patches/musl_fix.patch
+++ b/srcpkgs/capnproto/patches/musl_fix.patch
@ -1,20 +0,0 @@
--- src/kj/exception.c++.fix	2016-11-10 10:30:39.182645852 +0100
-+++ src/kj/exception.c++	2016-11-10 10:30:26.848646578 +0100
-@@ -28,7 +28,7 @@
- #include <exception>
- #include <new>
- 
-#if (__linux__ && !__ANDROID__) || __APPLE__
-+#if (__GLIBC__) || __APPLE__
- #define KJ_HAS_BACKTRACE 1
- #include <execinfo.h>
- #endif
-@@ -43,7 +43,7 @@
- namespace {
- 
- String getStackSymbols(ArrayPtr<void* const> trace) {
-#if (__linux__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG)
-+#if (__GLIBC__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG)
-   // We want to generate a human-readable stack trace.
- 
-   // TODO(someday):  It would be really great if we could avoid farming out to another process
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@ -1,6 +1,6 @@
 # Template file for 'capnproto'
 pkgname=capnproto
-version=0.5.3
+version=0.6.0
 revision=1
 wrksrc="${pkgname}-c++-${version}"
 build_style=gnu-configure
@ -9,7 +9,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum="cdb17c792493bdcd4a24bcd196eb09f70ee64c83a3eccb0bc6534ff560536afb"
+checksum=e50911191afc44d6ab03b8e0452cf8c00fd0edfcd34b39f169cea6a53b0bf73e
 nocross="Tries to execute compiled code during build"

 post_install() {
@ -22,11 +22,14 @@ capnproto-devel_package() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.la
-		vmove usr/lib/libcapnp-rpc.so
-		vmove usr/lib/libcapnp.so
-		vmove usr/lib/libcapnpc.so
-		vmove usr/lib/libkj-async.so
-		vmove usr/lib/libkj.so
+		vmove /usr/lib/libkj.so
+		vmove /usr/lib/libkj-test.so
+		vmove /usr/lib/libkj-http.so
+		vmove /usr/lib/libkj-async.so
+		vmove /usr/lib/libcapnpc.so
+		vmove /usr/lib/libcapnp.so
+		vmove /usr/lib/libcapnp-rpc.so
+		vmove /usr/lib/libcapnp-json.so
 		vmove usr/lib/pkgconfig
 	}
 }
--- a/srcpkgs/capnproto/update
+++ b/srcpkgs/capnproto/update
@ -0,0 +1,2 @@
+site='https://api.github.com/repos/sandstorm-io/capnproto/tags'
+pattern='v\K([\d\.]+)'
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
-version=0.17.0
-revision=3
+version=0.18.0
+revision=1
 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf
 patch_args="-Np1"
 build_style=gnu-configure
@ -10,33 +10,33 @@ hostmakedepends="rust python curl cmake pkg-config"
 makedepends="libcurl-devel http-parser-devel libgit2-devel"
 depends="rust"
 short_desc="Rust package manager"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"
 homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz
 https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz"
-checksum="fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8
+checksum="19b5c142c194fc2f940d93b4679850980ed077db0ff7c558122c7ef865e24983
 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae"
 nocross=yes

 case "$XBPS_MACHINE" in
 x86_64-musl)
 	distfiles+="
-	 https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz"
+	 https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz"
 	checksum+="
-	 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9"
+	 0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09"
 	;;
 x86_64)
 	distfiles+="
-	 https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
+	 https://static.rust-lang.org/dist/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2"
+	 3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd"
 	;;
 i686)
 	distfiles+="
-	 https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-i686-unknown-linux-gnu.tar.gz"
+	 https://static.rust-lang.org/dist/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz"
 	checksum+="
-	 b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425"
+	 fbc5a0614345dfb2b41e133bd821257906a839753a9aa4c4590cc9d658164e58"
 	;;
 esac

@ -45,8 +45,7 @@ post_extract() {
 	mv ../rust-installer-${_githash_installer} src/rust-installer
 	sed -i 's,/etc/bash_completion.d,/share/bash-completion/completions,g' Makefile.in
 	mkdir -p target/snapshot
-	cp ../cargo-nightly*/cargo/bin/cargo cargo
-	rm Cargo.lock  # unlock rust-openssl 0.9.4
+	cp ../cargo-*/cargo/bin/cargo cargo
 }
 pre_configure() {
 	configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-} --cargo=$wrksrc/cargo"
--- a/srcpkgs/ccnet/patches/libressl.patch
+++ b/srcpkgs/ccnet/patches/libressl.patch
@ -0,0 +1,11 @@
+--- lib/rsa.c.orig	2017-05-06 19:32:15.000000000 +0000
+++ lib/rsa.c	2017-05-06 19:32:23.971214589 +0000
+@@ -13,7 +13,7 @@
+ 
+ /* Forward compatibility functions if libssl < 1.1.0. */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
--- a/srcpkgs/ccnet/template
+++ b/srcpkgs/ccnet/template
@ -1,7 +1,7 @@
 # Template file for 'ccnet'
 pkgname=ccnet
-version=6.0.4
-revision=3
+version=6.0.6
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"

@ -13,7 +13,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-3"
 homepage="https://github.com/haiwen/${pkgname}"
 distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2156787fc9ae1e4293493f0ce398aa8b97d84b9f0201d2fd6986b736bd249b04
+checksum=6b3ac78f645929f6b8633fdd65c1e7b4066cf9038b4228c64f7f389c7c446f46

 pre_configure() {
 	./autogen.sh
--- a/srcpkgs/cdrdao/template
+++ b/srcpkgs/cdrdao/template
@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="lame-devel libmad-devel libvorbis-devel libao-devel"
 short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode"
-maintainer="Michael Gehring <mg@ebfe.org>"
+maintainer="Orphaned <orphan@voidlinux.eu>"
 license="GPL-2"
 homepage="http://cdrdao.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cdrdao/cdrdao/1.2.3/cdrdao-1.2.3.tar.bz2"
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@ -1,7 +1,7 @@
 # Template file for 'cgal'

 pkgname="cgal"
-version="4.9"
+version="4.9.1"
 revision=1
 build_style=cmake
 short_desc="Computational Geometry Algorithms Library"
@ -9,7 +9,7 @@ maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-3, LGPL-3"
 homepage="http://www.cgal.org"
 distfiles="https://github.com/CGAL/cgal/archive/releases/CGAL-${version}.tar.gz"
-checksum="472b6154a0d62a5e78cc51772a460ffe8e8faf1f0a9639ca0054a5a7c2310f3f"
+checksum="842a02a4abb5266894fe4e0ccbbed2d93cde13c02cb9a849b829a86aaa95166f"
 wrksrc="cgal-releases-CGAL-${version}"
 nocross=yes

--- a/srcpkgs/chessx/template
+++ b/srcpkgs/chessx/template
@ -1,19 +1,19 @@
 # Template file for 'chessx'
 pkgname=chessx
-version=1.4.4
+version=1.4.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
-makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel pulseaudio-devel"
+hostmakedepends="qt5-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel pulseaudio-devel"
 short_desc="An Open Source chess database"
 maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-2"
 homepage="http://chessx.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
-checksum=66f6cd9711d21b636caa213d8aeca06e13a13d225f2b163411535ae7956e3396
+checksum=ad951910a3bd53f5655f9e85101e7969b536078473e09a2a7dded6ef171a68ed

 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel qt5-multimedia-devel qt5-svg-devel"
+	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
 fi

 do_install() {
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@ -1,14 +1,14 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=58.0.3029.81
+version=58.0.3029.110
 revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.chromium.org/"
 license="BSD"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb
+checksum=f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff

 only_for_archs="i686 x86_64 x86_64-musl"
 lib32disabled=yes
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.14.1
+version=3.15.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin"
@ -14,7 +14,7 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3"
 homepage="http://claws-mail.org"
 distfiles="http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.gz"
-checksum=b195f87a3b6eca6ee60afb74b3253c18713c34315f133fc46171add80ccabf23
+checksum=662b64356d78083ac69cd7fe83f0cda27d60509bd45696689fda5774bea70761
 nocross=yes

 # TODO(dominikh): claws-mail is a mess. If we don't have python
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@ -1,7 +1,7 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.3.1
-revision=5
+revision=6
 patch_args="-Np1"
 build_style=cmake
 hostmakedepends="sparsehash pkg-config"
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@ -1,6 +1,6 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.6.4
+version=3.6.5
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="https://www.clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=bda87df48861341a5eb70574ab8b4b8ae35319b678b4db864191cf0c5d345680
+checksum=cc13512f2ca731b27d177d8f31780147d912ac8fc68a341748d53182811daade

 do_install() {
 	vbin clipgrab
--- a/Show More
+++ b/Show More