Merge git://dev.alpinelinux.org/aports

20 files changed, 581 insertions, 464 deletions

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 988dace899..d5151f2585 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache2
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
@@ -12,9 +12,10 @@ pkggroups="apache"
 makedepends="openssl-dev zlib-dev apr-util-dev apr-dev pcre-dev sed lua-dev
         autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-ssl
-        $pkgname-ldap $pkgname-webdav"
-# see http://lists.err.no/pipermail/mpm-itk/2011-August/000432.html for
-# the 03-add-mpm-to-build-system.patch
+        $pkgname-ldap $pkgname-webdav
+        $pkgname-proxy-html:proxy_html
+        $pkgname-proxy
+        $pkgname-lua:_lua"
 source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
         apache2.confd
         apache2.logrotate
@@ -22,6 +23,9 @@ source="http://archive.apache.org/dist/httpd/httpd-$pkgver.tar.bz2
         httpd.conf
         ssl.conf
         ldap.conf
+        proxy-html.conf
+        proxy.conf
+        lua.conf
         alpine.layout
         "
 _builddir="$srcdir"/httpd-$pkgver
@@ -153,19 +157,57 @@ ldap() {
 webdav() {
         pkgdesc="WebDAV support for the Apache HTTP Server"
         depends="apache2"
+        replaces="apache2"
 
         install -d "$subpkgdir"/usr/lib/apache2 || return 1
         mv "$pkgdir"/usr/lib/apache2/mod_*dav.so \
+                "$pkgdir"/usr/lib/apache2/mod_dav_*.so \
                 "$subpkgdir"/usr/lib/apache2/ || return 1
         install -D -m644 "$_builddir"/docs/conf/extra/httpd-dav.conf \
                 "$subpkgdir"/etc/apache2/conf.d/http-dav.conf || return 1
 }
 
+proxy_html() {
+        pkgdesc="HTML and XML content filters for the Apache HTTP Server"
+        depends="apache2"
+        install -d "$subpkgdir"/usr/lib/apache2 || return 1
+        mv "$pkgdir"/usr/lib/apache2/*_proxy_html.so \
+                "$pkgdir"/usr/lib/apache2/*xml2enc*.so \
+                "$subpkgdir"/usr/lib/apache2/ || return 1
+        install -D -m644 "$srcdir"/proxy-html.conf \
+                "$subpkgdir"/etc/apache2/conf.d/proxy-html.conf || return 1
+}
+
+proxy() {
+        pkgdesc="Proxy modules for the Apache HTTP Server"
+        depends="apache2"
+        install -d "$subpkgdir"/usr/lib/apache2 || return 1
+        mv "$pkgdir"/usr/lib/apache2/*_proxy*.so \
+                "$pkgdir"/usr/lib/apache2/*_lbmethod*.so \
+                "$subpkgdir"/usr/lib/apache2/ || return 1
+        install -D -m644 "$srcdir"/proxy.conf \
+                "$subpkgdir"/etc/apache2/conf.d/proxy.conf || return 1
+}
+
+_lua() {
+        pkgdesc="Lua support for the Apache HTTP server"
+        depends="apache2"
+        install -d "$subpkgdir"/usr/lib/apache2 || return 1
+        mv "$pkgdir"/usr/lib/apache2/*_lua.so \
+                "$subpkgdir"/usr/lib/apache2/ || return 1
+        install -D -m644 "$srcdir"/lua.conf \
+                "$subpkgdir"/etc/apache2/conf.d/lua.conf || return 1
+}
+
+
 md5sums="87aaf7bc7e8715f0455997bb8c6791aa  httpd-2.4.3.tar.bz2
 e322b5211e49511cac6e40c86af1b1da  apache2.confd
 75fe4138b98fcffd01b8c8c077b944f3  apache2.logrotate
 7105fc70298b24bfca6dba517f7486d7  apache2.initd
-749faf0b2916d85d1240bc34f700e5d9  httpd.conf
+cceb6f5c3949326b48e0fcf196a2495d  httpd.conf
 5d0d024ca43571b863874ab871b2c109  ssl.conf
 b70fe826486043e3953cfe21f9e6fa16  ldap.conf
+fe26a0a70f572eb256a3c6c183a62223  proxy-html.conf
+96eddccfca1ec0349f844e2460cf655b  proxy.conf
+449a4aea60473ac4a16f025fca4463e3  lua.conf
 c66ff5f70260d5266e6803a59b39bd7f  alpine.layout"
diff --git a/main/apache2/httpd.conf b/main/apache2/httpd.conf
index 087f3fb8c2..dd1258808d 100644
--- a/main/apache2/httpd.conf
+++ b/main/apache2/httpd.conf
@@ -1,9 +1,9 @@
 #
 # This is the main Apache server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
 # In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 #
@@ -49,7 +49,7 @@ ServerTokens OS
 #
 # NOTE!  If you intend to place this on an NFS (or otherwise network)
 # mounted filesystem then please read the LockFile documentation
-# (available at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
+# (available at <URL:http://httpd.apache.org/docs/2.4/mod/mpm_common.html#lockfile>);
 # you will save yourself a lot of trouble.
 #
 # Do NOT add a slash at the end of the directory path.
@@ -167,36 +167,58 @@ Listen 80
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule auth_digest_module modules/mod_auth_digest.so
 LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_alias_module modules/mod_authn_alias.so
 LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
+LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_form_module modules/mod_auth_form.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule asis_module modules/mod_asis.so
+LoadModule allowmethods_module modules/mod_allowmethods.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule cache_disk_module modules/mod_cache_disk.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+LoadModule socache_memcache_module modules/mod_socache_memcache.so
+LoadModule echo_module modules/mod_echo.so
+LoadModule buffer_module modules/mod_buffer.so
+LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule ext_filter_module modules/mod_ext_filter.so
+LoadModule request_module modules/mod_request.so
 LoadModule include_module modules/mod_include.so
+LoadModule substitute_module modules/mod_substitute.so
+LoadModule sed_module modules/mod_sed.so
+LoadModule charset_lite_module modules/mod_charset_lite.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule mime_module modules/mod_mime.so
 LoadModule log_config_module modules/mod_log_config.so
+LoadModule log_debug_module modules/mod_log_debug.so
 LoadModule logio_module modules/mod_logio.so
 LoadModule env_module modules/mod_env.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
 LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule expires_module modules/mod_expires.so
-LoadModule deflate_module modules/mod_deflate.so
 LoadModule headers_module modules/mod_headers.so
 LoadModule usertrack_module modules/mod_usertrack.so
 LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule dav_module modules/mod_dav.so
+LoadModule version_module modules/mod_version.so
+LoadModule remoteip_module modules/mod_remoteip.so
+LoadModule session_module modules/mod_session.so
+LoadModule session_cookie_module modules/mod_session_cookie.so
+LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+LoadModule unixd_module modules/mod_unixd.so
 LoadModule status_module modules/mod_status.so
 LoadModule autoindex_module modules/mod_autoindex.so
 LoadModule info_module modules/mod_info.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule suexec_module modules/mod_suexec.so
+LoadModule cgi_module modules/mod_cgi.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
 LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule dir_module modules/mod_dir.so
@@ -204,33 +226,44 @@ LoadModule actions_module modules/mod_actions.so
 LoadModule speling_module modules/mod_speling.so
 LoadModule userdir_module modules/mod_userdir.so
 LoadModule alias_module modules/mod_alias.so
-LoadModule substitute_module modules/mod_substitute.so
 LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule suexec_module modules/mod_suexec.so
-LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule version_module modules/mod_version.so
+
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule dav_module modules/mod_dav.so
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
 
 #
 # The following modules are not loaded by default:
 #
-#LoadModule asis_module modules/mod_asis.so
 #LoadModule authn_dbd_module modules/mod_authn_dbd.so
-#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
 #LoadModule cgid_module modules/mod_cgid.so
+#LoadModule data_module modules/mod_data.so
 #LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dialup_module modules/mod_dialup.so
 #LoadModule dumpio_module modules/mod_dumpio.so
 #LoadModule filter_module modules/mod_filter.so
-#LoadModule ident_module modules/mod_ident.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+#LoadModule ldap_module modules/mod_ldap.so
 #LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule mpm_event_module modules/mod_mpm_event.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule ssl_module modules/mod_ssl.so
 #LoadModule unique_id_module modules/mod_unique_id.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
 #
 
 #
@@ -245,6 +278,7 @@ Include /etc/apache2/conf.d/*.conf
 #
 #ExtendedStatus On
 
+<IfModule unixd_module>
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -259,6 +293,7 @@ Include /etc/apache2/conf.d/*.conf
 #
 User apache
 Group apache
+</IfModule>
 
 ### Section 2: 'Main' server configuration
 #
@@ -319,7 +354,10 @@ DocumentRoot "/var/www/localhost/htdocs"
 #
 <Directory />
     Options FollowSymLinks
-    AllowOverride None
+    AllowOverride none
+#    Require all denied
+#    Order allow,deny
+#    Deny from all
 </Directory>
 
 #
@@ -343,7 +381,7 @@ DocumentRoot "/var/www/localhost/htdocs"
 # doesn't give it to you.
 #
 # The Options directive is both complicated and important.  Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#options
+# http://httpd.apache.org/docs/2.4/mod/core.html#options
 # for more information.
 #
     Options Indexes FollowSymLinks
@@ -353,11 +391,12 @@ DocumentRoot "/var/www/localhost/htdocs"
 # It can be "All", "None", or any combination of the keywords:
 #   Options FileInfo AuthConfig Limit
 #
-    AllowOverride None
+    AllowOverride All
 
 #
 # Controls who can get stuff from this server.
 #
+#    Require all granted
     Order allow,deny
     Allow from all
 
@@ -443,17 +482,6 @@ AccessFileName .htaccess
 TypesConfig /etc/apache2/mime.types
 
 #
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
 # The mod_mime_magic module allows the server to use various hints from the
 # contents of the file itself to determine its type.  The MIMEMagicFile
 # directive tells the module where the hint definitions are located.
@@ -478,7 +506,7 @@ HostnameLookups Off
 # The default is on; turn this off if you serve from NFS-mounted 
 # filesystems.  On some systems, turning it off (regardless of
 # filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap
+# http://httpd.apache.org/docs/2.4/mod/core.html#enablemmap
 #
 #EnableMMAP off
 
@@ -487,7 +515,7 @@ HostnameLookups Off
 # used to deliver files (assuming that the OS supports it). 
 # The default is on; turn this off if you serve from NFS-mounted 
 # filesystems.  Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
+# http://httpd.apache.org/docs/2.4/mod/core.html#enablesendfile
 #
 #EnableSendfile off
 
@@ -570,6 +598,7 @@ Alias /icons/ "/usr/share/apache2/icons/"
 <Directory "/usr/share/apache2/icons">
     Options Indexes MultiViews FollowSymLinks
     AllowOverride None
+#    Require all granted
     Order allow,deny
     Allow from all
 </Directory>
@@ -599,6 +628,7 @@ ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
 <Directory "/var/www/cgi-bin">
     AllowOverride None
     Options None
+#    Require all granted
     Order allow,deny
     Allow from all
 </Directory>
@@ -878,6 +908,7 @@ Alias /error/ "/usr/share/apache2/error/"
         Options IncludesNoExec
         AddOutputFilter Includes html
         AddHandler type-map var
+        #Require all granted
         Order allow,deny
         Allow from all
         LanguagePriority en es de fr
@@ -976,7 +1007,7 @@ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 
 #
 # To enable a cache of proxied content, uncomment the following lines.
-# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details.
+# See http://httpd.apache.org/docs/2.4/mod/mod_cache.html for more details.
 #
 #<IfModule mod_disk_cache.c>
 #   CacheEnable disk /
@@ -995,7 +1026,7 @@ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 # IP addresses. This is indicated by the asterisks in the directives below.
 #
 # Please see the documentation at 
-# <URL:http://httpd.apache.org/docs/2.2/vhosts/>
+# <URL:http://httpd.apache.org/docs/2.4/vhosts/>
 # for further details before you try to setup virtual hosts.
 #
 # You may use the command line option '-S' to verify your virtual host
diff --git a/main/apache2/lua.conf b/main/apache2/lua.conf
new file mode 100644
index 0000000000..9e0d0db6e1
--- /dev/null
+++ b/main/apache2/lua.conf
@@ -0,0 +1 @@
+LoadModule lua_module modules/mod_lua.so
diff --git a/main/apache2/proxy-html.conf b/main/apache2/proxy-html.conf
new file mode 100644
index 0000000000..90cbf71e66
--- /dev/null
+++ b/main/apache2/proxy-html.conf
@@ -0,0 +1 @@
+LoadModule proxy_module modules/mod_proxy.so
diff --git a/main/apache2/proxy.conf b/main/apache2/proxy.conf
new file mode 100644
index 0000000000..a446822916
--- /dev/null
+++ b/main/apache2/proxy.conf
@@ -0,0 +1,15 @@
+# This file configures all the proxy modules:
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+LoadModule proxy_connect_module modules/mod_proxy_connect.so
+LoadModule proxy_express_module modules/mod_proxy_express.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index f5cee1245f..360b01cd9b 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=freeradius
 pkgver=2.2.0
-pkgrel=2
+pkgrel=4
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 arch="all"
@@ -174,4 +174,4 @@ pam() {
 }
 md5sums="2e45d3c0d22ab14c560c7c3029893a8a  freeradius-server-2.2.0.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius.confd
-c46f34d7ddf695dfe53e5fb7f60afa59  freeradius.initd"
+5d83f40bd5c3a5d4e4a5f43c29e7f0da  freeradius.initd"
diff --git a/main/freeradius/freeradius.initd b/main/freeradius/freeradius.initd
index fe44715179..8f9bbaa33b 100644
--- a/main/freeradius/freeradius.initd
+++ b/main/freeradius/freeradius.initd
@@ -15,8 +15,8 @@ checkconfig() {
                 return 1
         fi
 
-        if [ ! -d /var/run/radiusd ] && ! mkdir /var/run/radiusd ; then
-                eerror "Failed to create /var/run/radiusd"
+        if [ ! -d /var/run/radius ] && ! mkdir /var/run/radius ; then
+                eerror "Failed to create /var/run/radius"
                 return 1
         fi
         
@@ -45,7 +45,7 @@ checkconfig() {
         [ -f radius.log ] || touch radius.log || return 1
 
         chown -R "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" . /var/run/radiusd && \
-                chmod -R u+rwX,g+rX . /var/run/radiusd || return 1
+                chmod -R u+rwX,g+rX . /var/run/radius || return 1
 }
 
 start() {
@@ -58,13 +58,13 @@ start() {
 
 stop () {
         ebegin "Stopping radiusd"
-        start-stop-daemon --stop --quiet --pidfile /var/run/radiusd/radiusd.pid
+        start-stop-daemon --stop --quiet --pidfile /var/run/radius/radiusd.pid
         eend $?
 }
 
 reload () {
         ebegin "Reloading radiusd"
-        kill -HUP `</var/run/radiusd/radiusd.pid`
+        kill -HUP `cat /var/run/radius/radiusd.pid`
         eend $?
 }
 
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 88fa0bf64f..714e795983 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -4,7 +4,7 @@ pkgname=libc$_abiver
 _gitver=
 pkgver=0.9.33.2
 _ver=${pkgver/_/-}
-pkgrel=13
+pkgrel=14
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
@@ -55,6 +55,7 @@ librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal-in-helper-thread.patch
         0001-libc-sysdeps-get-make-set-swap-context-for-i386.patch
         0002-libc-sysdeps-add-get-make-set-swap-context-for-x86_6.patch
         uclibc-dlclose-fix.patch
+        uclibc-rtld_next-fix.patch
 
         uclibcconfig.x86
         uclibcconfig.x86_64
@@ -193,6 +194,7 @@ f41ab6cf22545d2e629d4c7107ac6f85  0009-sys-quota.h-sync-with-glibc.patch
 e5aceb82bf4ffd5328113af5380fcdb6  0001-libc-sysdeps-get-make-set-swap-context-for-i386.patch
 da043a65003ac29ca8b96f416e7752ee  0002-libc-sysdeps-add-get-make-set-swap-context-for-x86_6.patch
 8374c98e769e603af4adad12e01cf358  uclibc-dlclose-fix.patch
+ffe7564afe846026a278dd8c0251ace9  uclibc-rtld_next-fix.patch
 ce8a33a31f5a53031fbad8b1d1b66d44  uclibcconfig.x86
 e861a17baa541accf4d4d39a98d74c32  uclibcconfig.x86_64
 ce8a33a31f5a53031fbad8b1d1b66d44  uclibcconfig.i486
diff --git a/main/libc0.9.32/STATUS b/main/libc0.9.32/STATUS
index c457f2fef0..155df167fb 100644
--- a/main/libc0.9.32/STATUS
+++ b/main/libc0.9.32/STATUS
@@ -49,4 +49,22 @@
 
         Needs to be upstreamed
 
+uclibc-dlclose-fix.patch
+        Origin: Alpine
+        Author: Timo Teräs
+
+        Fix dlclose() to not try to free static TLS symbols. This seems
+        to happen on x86_64 with certain .so's. They probably link against
+        TLS symbol defined in the main binary (or the loader has additional
+        bug on this).
+
+        Needs to be upstreamed
 
+uclibc-rtld_next-fix.patch
+        Origin: Alpine
+        Author: Timo Teräs
+
+        Fix dlsym(RTLD_NEXT) lookups to search all linked-in modules
+        instead of just the first one of them.
+
+        Needs to be upstreamed
diff --git a/main/libc0.9.32/uclibc-rtld_next-fix.patch b/main/libc0.9.32/uclibc-rtld_next-fix.patch
new file mode 100644
index 0000000000..f952641f47
--- /dev/null
+++ b/main/libc0.9.32/uclibc-rtld_next-fix.patch
@@ -0,0 +1,27 @@
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -671,7 +671,7 @@
+ {
+        struct elf_resolve *tpnt, *tfrom;
+        struct dyn_elf *handle;
+-       ElfW(Addr) from;
++       ElfW(Addr) from = 0;
+        struct dyn_elf *rpnt;
+        void *ret;
+        struct symbol_ref sym_ref = { NULL, NULL };
+@@ -729,7 +729,13 @@
+        tpnt = NULL;
+        if (handle == _dl_symbol_tables)
+                tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+-       ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++
++       do {
++               ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++               if (ret != NULL)
++                       break;
++               handle = handle->next;
++       } while (from && handle);
+ 
+ #if defined(USE_TLS) && USE_TLS && defined SHARED
+        if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
+
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index ca4937306e..d4778aaf9d 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=libvirt
 vmajor="1.0.0"
-vminor="rc3"
-pkgver="${vmajor}_${vminor}"
+vminor=""
+pkgver="${vmajor}"
 _ver="${pkgver/_rc/-rc}"
 pkgrel=0
 pkgdesc="A virtualization API for several hypervisor and container systems"
@@ -18,11 +18,10 @@ makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper
 install=
 subpackages="$pkgname-client $pkgname-daemon $pkgname-dev $pkgname-doc $pkgname-lang
         $pkgname-lxc $pkgname-qemu $pkgname-xen $pkgname-uml"
-source="http://libvirt.org/sources/$pkgname-$_ver.tar.gz
+source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz
         libvirt.confd
         libvirt.initd
         uclibc-physmem.patch
-        libvirt-1.0.0-uclibc-mkostemp.patch
         "
 
 _builddir="$srcdir"/$pkgname-$vmajor
@@ -125,8 +124,7 @@ uml() {
         _mv_driver uml
 }
 
-md5sums="f2d89d0d13c3704887134a51a09b85e8  libvirt-1.0.0-rc3.tar.gz
+md5sums="7c8b006de7338e30866bb56738803b21  libvirt-1.0.0.tar.gz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
 d897df38c7e7fa1a297aa551108633c9  libvirt.initd
-df9cbfaf8a6e520a4822914a300add4d  uclibc-physmem.patch
-39d0534c4e24baace260ceb6d8271ab7  libvirt-1.0.0-uclibc-mkostemp.patch"
+df9cbfaf8a6e520a4822914a300add4d  uclibc-physmem.patch"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 7c31766c11..0da46a37d6 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=libxml2
-pkgver=2.8.0
-pkgrel=1
+pkgver=2.9.0
+pkgrel=0
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/"
 arch="all"
@@ -12,9 +12,6 @@ depends_dev="zlib-dev python-dev"
 makedepends="zlib-dev python-dev"
 subpackages="$pkgname-doc $pkgname-dev py-$pkgname:py $pkgname-utils"
 source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        libxml2-entities-local-buffers-size.patch
-        libxml2-entities-local-buffers-size2.patch
-        libxml2-parser-local-buffers-size.patch
         "
 
 options="!strip"
@@ -62,7 +59,4 @@ utils() {
         mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="c62106f02ee00b6437f0fb9d370c1093  libxml2-2.8.0.tar.gz
-c8c789a4fbdae599a47ecbfa32b889d7  libxml2-entities-local-buffers-size.patch
-cba1201e77dc0f3e337d9ff146a2666e  libxml2-entities-local-buffers-size2.patch
-6c5c7a125dddb616feb1b2f4254bf467  libxml2-parser-local-buffers-size.patch"
+md5sums="5b9bebf4f5d2200ae2c4efe8fa6103f7  libxml2-2.9.0.tar.gz"
diff --git a/main/libxml2/libxml2-entities-local-buffers-size.patch b/main/libxml2/libxml2-entities-local-buffers-size.patch
deleted file mode 100644
index 89817d8168..0000000000
--- a/main/libxml2/libxml2-entities-local-buffers-size.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 4f9fdc709c4861c390cd84e2ed1fd878b3442e28 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 18 Jul 2012 03:38:17 +0000
-Subject: Fix entities local buffers size problems
-
----
-diff --git a/entities.c b/entities.c
-index 6aef49f..859ec3b 100644
---- a/entities.c
-+++ b/entities.c
-@@ -528,13 +528,13 @@ xmlGetDocEntity(xmlDocPtr doc, const xmlChar *name) {
-  * Macro used to grow the current buffer.
-  */
- #define growBufferReentrant() {                                                \
--    buffer_size *= 2;                                                  \
--    buffer = (xmlChar *)                                               \
--               xmlRealloc(buffer, buffer_size * sizeof(xmlChar));      \
--    if (buffer == NULL) {                                              \
--        xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");\
--       return(NULL);                                                   \
--    }                                                                  \
-+    xmlChar *tmp;                                                       \
-+    size_t new_size = buffer_size *= 2;                                 \
-+    if (new_size < buffer_size) goto mem_error;                         \
-+    tmp = (xmlChar *) xmlRealloc(buffer, new_size);                    \
-+    if (tmp == NULL) goto mem_error;                                    \
-+    buffer = tmp;                                                      \
-+    buffer_size = new_size;                                            \
- }
- 
- 
-@@ -555,7 +555,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
-     const xmlChar *cur = input;
-     xmlChar *buffer = NULL;
-     xmlChar *out = NULL;
--    int buffer_size = 0;
-+    size_t buffer_size = 0;
-     int html = 0;
- 
-     if (input == NULL) return(NULL);
-@@ -574,8 +574,8 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
-     out = buffer;
- 
-     while (*cur != '\0') {
--        if (out - buffer > buffer_size - 100) {
--           int indx = out - buffer;
-+        size_t indx = out - buffer;
-+        if (indx + 100 > buffer_size) {
- 
-            growBufferReentrant();
-            out = &buffer[indx];
-@@ -692,6 +692,11 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
-     }
-     *out = 0;
-     return(buffer);
-+
-+mem_error:
-+    xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");
-+    xmlFree(buffer);
-+    return(NULL);
- }
- 
- /**
-@@ -709,7 +714,7 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED, const xmlChar *input) {
-     const xmlChar *cur = input;
-     xmlChar *buffer = NULL;
-     xmlChar *out = NULL;
--    int buffer_size = 0;
-+    size_t buffer_size = 0;
-     if (input == NULL) return(NULL);
- 
-     /*
-@@ -724,8 +729,8 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED, const xmlChar *input) {
-     out = buffer;
- 
-     while (*cur != '\0') {
--        if (out - buffer > buffer_size - 10) {
--           int indx = out - buffer;
-+        size_t indx = out - buffer;
-+        if (indx + 10 > buffer_size) {
- 
-            growBufferReentrant();
-            out = &buffer[indx];
-@@ -774,6 +779,11 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED, const xmlChar *input) {
-     }
-     *out = 0;
-     return(buffer);
-+
-+mem_error:
-+    xmlEntitiesErrMemory("xmlEncodeSpecialChars: realloc failed");
-+    xmlFree(buffer);
-+    return(NULL);
- }
- 
- /**
---
-cgit v0.9.0.2
diff --git a/main/libxml2/libxml2-entities-local-buffers-size2.patch b/main/libxml2/libxml2-entities-local-buffers-size2.patch
deleted file mode 100644
index f3cc8b65e4..0000000000
--- a/main/libxml2/libxml2-entities-local-buffers-size2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From baaf03f80f817bb34c421421e6cb4d68c353ac9a Mon Sep 17 00:00:00 2001
-From: Aron Xu <happyaron.xu@gmail.com>
-Date: Fri, 20 Jul 2012 07:41:34 +0000
-Subject: Fix an error in previous commit
-
----
-diff --git a/entities.c b/entities.c
-index 859ec3b..7d06820 100644
---- a/entities.c
-+++ b/entities.c
-@@ -529,7 +529,7 @@ xmlGetDocEntity(xmlDocPtr doc, const xmlChar *name) {
-  */
- #define growBufferReentrant() {                                                \
-     xmlChar *tmp;                                                       \
--    size_t new_size = buffer_size *= 2;                                 \
-+    size_t new_size = buffer_size * 2;                                  \
-     if (new_size < buffer_size) goto mem_error;                         \
-     tmp = (xmlChar *) xmlRealloc(buffer, new_size);                    \
-     if (tmp == NULL) goto mem_error;                                    \
---
-cgit v0.9.0.2
diff --git a/main/libxml2/libxml2-parser-local-buffers-size.patch b/main/libxml2/libxml2-parser-local-buffers-size.patch
deleted file mode 100644
index 5b9adabac7..0000000000
--- a/main/libxml2/libxml2-parser-local-buffers-size.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From 459eeb9dc752d5185f57ff6b135027f11981a626 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 17 Jul 2012 08:19:17 +0000
-Subject: Fix parser local buffers size problems
-
----
-diff --git a/parser.c b/parser.c
-index 2c38fae..9863275 100644
---- a/parser.c
-+++ b/parser.c
-@@ -40,6 +40,7 @@
- #endif
- 
- #include <stdlib.h>
-+#include <limits.h>
- #include <string.h>
- #include <stdarg.h>
- #include <libxml/xmlmemory.h>
-@@ -117,10 +118,10 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID,
-  * parser option.
-  */
- static int
--xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size,
-+xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-                      xmlEntityPtr ent)
- {
--    unsigned long consumed = 0;
-+    size_t consumed = 0;
- 
-     if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE))
-         return (0);
-@@ -2589,15 +2590,17 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- 
- /*
-  * Macro used to grow the current buffer.
-+ * buffer##_size is expected to be a size_t
-+ * mem_error: is expected to handle memory allocation failures
-  */
- #define growBuffer(buffer, n) {                                                \
-     xmlChar *tmp;                                                      \
--    buffer##_size *= 2;                                                        \
--    buffer##_size += n;                                                        \
--    tmp = (xmlChar *)                                                  \
--               xmlRealloc(buffer, buffer##_size * sizeof(xmlChar));    \
-+    size_t new_size = buffer##_size * 2 + n;                            \
-+    if (new_size < buffer##_size) goto mem_error;                       \
-+    tmp = (xmlChar *) xmlRealloc(buffer, new_size);                     \
-     if (tmp == NULL) goto mem_error;                                   \
-     buffer = tmp;                                                      \
-+    buffer##_size = new_size;                                           \
- }
- 
- /**
-@@ -2623,14 +2626,14 @@ xmlChar *
- xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-                      int what, xmlChar end, xmlChar  end2, xmlChar end3) {
-     xmlChar *buffer = NULL;
--    int buffer_size = 0;
-+    size_t buffer_size = 0;
-+    size_t nbchars = 0;
- 
-     xmlChar *current = NULL;
-     xmlChar *rep = NULL;
-     const xmlChar *last;
-     xmlEntityPtr ent;
-     int c,l;
--    int nbchars = 0;
- 
-     if ((ctxt == NULL) || (str == NULL) || (len < 0))
-        return(NULL);
-@@ -2647,7 +2650,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-      * allocate a translation buffer.
-      */
-     buffer_size = XML_PARSER_BIG_BUFFER_SIZE;
--    buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar));
-+    buffer = (xmlChar *) xmlMallocAtomic(buffer_size);
-     if (buffer == NULL) goto mem_error;
- 
-     /*
-@@ -2667,7 +2670,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-            if (val != 0) {
-                COPY_BUF(0,buffer,nbchars,val);
-            }
--           if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
-+           if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-                growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-            }
-        } else if ((c == '&') && (what & XML_SUBSTITUTE_REF)) {
-@@ -2685,7 +2688,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-                (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
-                if (ent->content != NULL) {
-                    COPY_BUF(0,buffer,nbchars,ent->content[0]);
--                   if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
-+                   if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-                        growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-                    }
-                } else {
-@@ -2702,8 +2705,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-                    current = rep;
-                    while (*current != 0) { /* non input consuming loop */
-                        buffer[nbchars++] = *current++;
--                       if (nbchars >
--                           buffer_size - XML_PARSER_BUFFER_SIZE) {
-+                       if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-                            if (xmlParserEntityCheck(ctxt, nbchars, ent))
-                                goto int_error;
-                            growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-@@ -2717,7 +2719,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-                const xmlChar *cur = ent->name;
- 
-                buffer[nbchars++] = '&';
--               if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-+               if (nbchars + i + XML_PARSER_BUFFER_SIZE > buffer_size) {
-                    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
-                }
-                for (;i > 0;i--)
-@@ -2745,8 +2747,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-                    current = rep;
-                    while (*current != 0) { /* non input consuming loop */
-                        buffer[nbchars++] = *current++;
--                       if (nbchars >
--                           buffer_size - XML_PARSER_BUFFER_SIZE) {
-+                       if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-                            if (xmlParserEntityCheck(ctxt, nbchars, ent))
-                                goto int_error;
-                            growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-@@ -2759,8 +2760,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-        } else {
-            COPY_BUF(l,buffer,nbchars,c);
-            str += l;
--           if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
--             growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+           if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-+               growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-            }
-        }
-        if (str < last)
-@@ -3764,8 +3765,8 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-     xmlChar limit = 0;
-     xmlChar *buf = NULL;
-     xmlChar *rep = NULL;
--    int len = 0;
--    int buf_size = 0;
-+    size_t len = 0;
-+    size_t buf_size = 0;
-     int c, l, in_space = 0;
-     xmlChar *current = NULL;
-     xmlEntityPtr ent;
-@@ -3787,7 +3788,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-      * allocate a translation buffer.
-      */
-     buf_size = XML_PARSER_BUFFER_SIZE;
--    buf = (xmlChar *) xmlMallocAtomic(buf_size * sizeof(xmlChar));
-+    buf = (xmlChar *) xmlMallocAtomic(buf_size);
-     if (buf == NULL) goto mem_error;
- 
-     /*
-@@ -3804,7 +3805,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
- 
-                if (val == '&') {
-                    if (ctxt->replaceEntities) {
--                       if (len > buf_size - 10) {
-+                       if (len + 10 > buf_size) {
-                            growBuffer(buf, 10);
-                        }
-                        buf[len++] = '&';
-@@ -3813,7 +3814,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                         * The reparsing will be done in xmlStringGetNodeList()
-                         * called by the attribute() function in SAX.c
-                         */
--                       if (len > buf_size - 10) {
-+                       if (len + 10 > buf_size) {
-                            growBuffer(buf, 10);
-                        }
-                        buf[len++] = '&';
-@@ -3823,7 +3824,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                        buf[len++] = ';';
-                    }
-                } else if (val != 0) {
--                   if (len > buf_size - 10) {
-+                   if (len + 10 > buf_size) {
-                        growBuffer(buf, 10);
-                    }
-                    len += xmlCopyChar(0, &buf[len], val);
-@@ -3835,7 +3836,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                    ctxt->nbentities += ent->owner;
-                if ((ent != NULL) &&
-                    (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
--                   if (len > buf_size - 10) {
-+                   if (len + 10 > buf_size) {
-                        growBuffer(buf, 10);
-                    }
-                    if ((ctxt->replaceEntities == 0) &&
-@@ -3863,7 +3864,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                                     current++;
-                                 } else
-                                     buf[len++] = *current++;
--                               if (len > buf_size - 10) {
-+                               if (len + 10 > buf_size) {
-                                    growBuffer(buf, 10);
-                                }
-                            }
-@@ -3871,7 +3872,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                            rep = NULL;
-                        }
-                    } else {
--                       if (len > buf_size - 10) {
-+                       if (len + 10 > buf_size) {
-                            growBuffer(buf, 10);
-                        }
-                        if (ent->content != NULL)
-@@ -3899,7 +3900,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                     * Just output the reference
-                     */
-                    buf[len++] = '&';
--                   while (len > buf_size - i - 10) {
-+                   while (len + i + 10 > buf_size) {
-                        growBuffer(buf, i + 10);
-                    }
-                    for (;i > 0;i--)
-@@ -3912,7 +3913,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-                if ((len != 0) || (!normalize)) {
-                    if ((!normalize) || (!in_space)) {
-                        COPY_BUF(l,buf,len,0x20);
--                       while (len > buf_size - 10) {
-+                       while (len + 10 > buf_size) {
-                            growBuffer(buf, 10);
-                        }
-                    }
-@@ -3921,7 +3922,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-            } else {
-                in_space = 0;
-                COPY_BUF(l,buf,len,c);
--               if (len > buf_size - 10) {
-+               if (len + 10 > buf_size) {
-                    growBuffer(buf, 10);
-                }
-            }
-@@ -3946,7 +3947,18 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
-         }
-     } else
-        NEXT;
--    if (attlen != NULL) *attlen = len;
-+
-+    /*
-+     * There we potentially risk an overflow, don't allow attribute value of
-+     * lenght more than INT_MAX it is a very reasonnable assumption !
-+     */
-+    if (len >= INT_MAX) {
-+        xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
-+                       "AttValue lenght too long\n");
-+        goto mem_error;
-+    }
-+
-+    if (attlen != NULL) *attlen = (int) len;
-     return(buf);
- 
- mem_error:
---
-cgit v0.9.0.2
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 01e9cc4549..b5a615dbdf 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxslt
-pkgver=1.1.26
-pkgrel=9
+pkgver=1.1.27
+pkgrel=0
 pkgdesc="XML stylesheet transformation library"
 url="http://xmlsoft.org/XSLT/"
 arch="all"
@@ -30,4 +30,4 @@ py() {
         install -d "$subpkgdir"/usr/lib
         mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
-md5sums="e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz"
+md5sums="4d01ff464b9ea7236925a1adf147c7f8  libxslt-1.1.27.tar.gz"
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 9a70a260c1..94a7c10ed3 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86 x86_64"
@@ -19,6 +19,7 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
         librt.patch
         make_stubdoms.patch
         qemu-xen_paths.patch
+        xsa25-4.2.patch
 
         xenstored.initd
         xenstored.confd
@@ -133,11 +134,12 @@ md5sums="f4f217969afc38f09251039966d91a87  xen-4.2.0.tar.gz
 2dc5ddf47c53ea168729975046c3c1f9  librt.patch
 41ad48fdc269749776fa6aa04f6778c2  make_stubdoms.patch
 1ccde6b36a6f9542a16d998204dc9a22  qemu-xen_paths.patch
-6e5739dad7e2bd1b625e55ddc6c782b7  xenstored.initd
+9fc7097ed2e5e756c4ae91145c143433  xsa25-4.2.patch
+4ee9bf0c09269995569c9f05d4e8c779  xenstored.initd
 b017ccdd5e1c27bbf1513e3569d4ff07  xenstored.confd
 ed262f15fb880badb53575539468646c  xenconsoled.initd
 ec2252c72050d7d5870a3a629b873ba6  xenconsoled.confd
-89c936ddf327a3a78eaee33835880517  xend.initd
+1803ddf6877bdf254082365389a4efa9  xend.initd
 9261ad0f285836c1b0ea07f306e4586e  xend.confd
 35448ff063f8123ec4bba2e001f39c6c  xendomains.initd
 9b20e056d475b50586cf9e1fc94e13c4  xendomains.confd
diff --git a/main/xen/xend.initd b/main/xen/xend.initd
index 1c667e8312..bd5550bd14 100644
--- a/main/xen/xend.initd
+++ b/main/xen/xend.initd
@@ -4,7 +4,7 @@
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.2 2011/09/10 17:22:46 alexxy Exp $
 
 depend() {
-        need net xenconsoled xenstored
+        need xenconsoled xenstored
         after firewall
         before xendomains sshd
 }
diff --git a/main/xen/xenstored.initd b/main/xen/xenstored.initd
index f2c22cc705..6187c02cc2 100644
--- a/main/xen/xenstored.initd
+++ b/main/xen/xenstored.initd
@@ -4,7 +4,6 @@
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xenstored.initd,v 1.2 2011/04/05 21:25:03 alexxy Exp $
 
 depend() {
-        need net
         before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp 
 }
 
diff --git a/main/xen/xsa25-4.2.patch b/main/xen/xsa25-4.2.patch
new file mode 100644
index 0000000000..088d787e59
--- /dev/null
+++ b/main/xen/xsa25-4.2.patch
@@ -0,0 +1,365 @@
+libxc: builder: limit maximum size of kernel/ramdisk.
+
+Allowing user supplied kernels of arbitrary sizes, especially during
+decompression, can swallow up dom0 memory leading to either virtual
+address space exhaustion in the builder process or allocation
+failures/OOM killing of both toolstack and unrelated processes.
+
+We disable these checks when building in a stub domain for pvgrub
+since this uses the guest's own memory and is isolated.
+
+Decompression of gzip compressed kernels and ramdisks has been safe
+since 14954:58205257517d (Xen 3.1.0 onwards).
+
+This is XSA-25 / CVE-2012-4544.
+
+Also make explicit checks for buffer overflows in various
+decompression routines. These were already ruled out due to other
+properties of the code but check them as a belt-and-braces measure.
+
+Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
+Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
+
+diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
+index 06bef52..b21c91a 100644
+--- a/stubdom/grub/kexec.c
++++ b/stubdom/grub/kexec.c
+@@ -137,6 +137,10 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char
+     dom = xc_dom_allocate(xc_handle, cmdline, features);
+     dom->allocate = kexec_allocate;
+ 
++    /* We are using guest owned memory, therefore no limits. */
++    xc_dom_kernel_max_size(dom, 0);
++    xc_dom_ramdisk_max_size(dom, 0);
++
+     dom->kernel_blob = kernel;
+     dom->kernel_size = kernel_size;
+ 
+diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
+index 2aef64a..6a72aa9 100644
+--- a/tools/libxc/xc_dom.h
++++ b/tools/libxc/xc_dom.h
+@@ -55,6 +55,9 @@ struct xc_dom_image {
+     void *ramdisk_blob;
+     size_t ramdisk_size;
+ 
++    size_t max_kernel_size;
++    size_t max_ramdisk_size;
++
+     /* arguments and parameters */
+     char *cmdline;
+     uint32_t f_requested[XENFEAT_NR_SUBMAPS];
+@@ -180,6 +183,23 @@ void xc_dom_release_phys(struct xc_dom_image *dom);
+ void xc_dom_release(struct xc_dom_image *dom);
+ int xc_dom_mem_init(struct xc_dom_image *dom, unsigned int mem_mb);
+ 
++/* Set this larger if you have enormous ramdisks/kernels. Note that
++ * you should trust all kernels not to be maliciously large (e.g. to
++ * exhaust all dom0 memory) if you do this (see CVE-2012-4544 /
++ * XSA-25). You can also set the default independently for
++ * ramdisks/kernels in xc_dom_allocate() or call
++ * xc_dom_{kernel,ramdisk}_max_size.
++ */
++#ifndef XC_DOM_DECOMPRESS_MAX
++#define XC_DOM_DECOMPRESS_MAX (1024*1024*1024) /* 1GB */
++#endif
++
++int xc_dom_kernel_check_size(struct xc_dom_image *dom, size_t sz);
++int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz);
++
++int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz);
++int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz);
++
+ size_t xc_dom_check_gzip(xc_interface *xch,
+                      void *blob, size_t ziplen);
+ int xc_dom_do_gunzip(xc_interface *xch,
+@@ -240,7 +260,8 @@ void xc_dom_log_memory_footprint(struct xc_dom_image *dom);
+ void *xc_dom_malloc(struct xc_dom_image *dom, size_t size);
+ void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size);
+ void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
+-                            const char *filename, size_t * size);
++                            const char *filename, size_t * size,
++                            const size_t max_size);
+ char *xc_dom_strdup(struct xc_dom_image *dom, const char *str);
+ 
+ /* --- alloc memory pool ------------------------------------------- */
+diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c
+index 113d40f..b1b2eb0 100644
+--- a/tools/libxc/xc_dom_bzimageloader.c
++++ b/tools/libxc/xc_dom_bzimageloader.c
+@@ -47,13 +47,19 @@ static int xc_try_bzip2_decode(
+     char *out_buf;
+     char *tmp_buf;
+     int retval = -1;
+-    int outsize;
++    unsigned int outsize;
+     uint64_t total;
+ 
+     stream.bzalloc = NULL;
+     stream.bzfree = NULL;
+     stream.opaque = NULL;
+ 
++    if ( dom->kernel_size == 0)
++    {
++        DOMPRINTF("BZIP2: Input is 0 size");
++        return -1;
++    }
++
+     ret = BZ2_bzDecompressInit(&stream, 0, 0);
+     if ( ret != BZ_OK )
+     {
+@@ -66,6 +72,17 @@ static int xc_try_bzip2_decode(
+      * the input buffer to start, and we'll realloc as needed.
+      */
+     outsize = dom->kernel_size;
++
++    /*
++     * stream.avail_in and outsize are unsigned int, while kernel_size
++     * is a size_t. Check we aren't overflowing.
++     */
++    if ( outsize != dom->kernel_size )
++    {
++        DOMPRINTF("BZIP2: Input too large");
++        goto bzip2_cleanup;
++    }
++
+     out_buf = malloc(outsize);
+     if ( out_buf == NULL )
+     {
+@@ -98,13 +115,20 @@ static int xc_try_bzip2_decode(
+         if ( stream.avail_out == 0 )
+         {
+             /* Protect against output buffer overflow */
+-            if ( outsize > INT_MAX / 2 )
++            if ( outsize > UINT_MAX / 2 )
+             {
+                 DOMPRINTF("BZIP2: output buffer overflow");
+                 free(out_buf);
+                 goto bzip2_cleanup;
+             }
+ 
++            if ( xc_dom_kernel_check_size(dom, outsize * 2) )
++            {
++                DOMPRINTF("BZIP2: output too large");
++                free(out_buf);
++                goto bzip2_cleanup;
++            }
++
+             tmp_buf = realloc(out_buf, outsize * 2);
+             if ( tmp_buf == NULL )
+             {
+@@ -172,9 +196,15 @@ static int _xc_try_lzma_decode(
+     unsigned char *out_buf;
+     unsigned char *tmp_buf;
+     int retval = -1;
+-    int outsize;
++    size_t outsize;
+     const char *msg;
+ 
++    if ( dom->kernel_size == 0)
++    {
++        DOMPRINTF("%s: Input is 0 size", what);
++        return -1;
++    }
++
+     /* sigh.  We don't know up-front how much memory we are going to need
+      * for the output buffer.  Allocate the output buffer to be equal
+      * the input buffer to start, and we'll realloc as needed.
+@@ -244,13 +274,20 @@ static int _xc_try_lzma_decode(
+         if ( stream->avail_out == 0 )
+         {
+             /* Protect against output buffer overflow */
+-            if ( outsize > INT_MAX / 2 )
++            if ( outsize > SIZE_MAX / 2 )
+             {
+                 DOMPRINTF("%s: output buffer overflow", what);
+                 free(out_buf);
+                 goto lzma_cleanup;
+             }
+ 
++            if ( xc_dom_kernel_check_size(dom, outsize * 2) )
++            {
++                DOMPRINTF("%s: output too large", what);
++                free(out_buf);
++                goto lzma_cleanup;
++            }
++
+             tmp_buf = realloc(out_buf, outsize * 2);
+             if ( tmp_buf == NULL )
+             {
+@@ -359,6 +396,12 @@ static int xc_try_lzo1x_decode(
+         0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a
+     };
+ 
++    /*
++     * lzo_uint should match size_t. Check that this is the case to be
++     * sure we won't overflow various lzo_uint fields.
++     */
++    XC_BUILD_BUG_ON(sizeof(lzo_uint) != sizeof(size_t));
++
+     ret = lzo_init();
+     if ( ret != LZO_E_OK )
+     {
+@@ -438,6 +481,14 @@ static int xc_try_lzo1x_decode(
+         if ( src_len <= 0 || src_len > dst_len || src_len > left )
+             break;
+ 
++        msg = "Output buffer overflow";
++        if ( *size > SIZE_MAX - dst_len )
++            break;
++
++        msg = "Decompressed image too large";
++        if ( xc_dom_kernel_check_size(dom, *size + dst_len) )
++            break;
++
+         msg = "Failed to (re)alloc memory";
+         tmp_buf = realloc(out_buf, *size + dst_len);
+         if ( tmp_buf == NULL )
+diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
+index fea9de5..2a01d7c 100644
+--- a/tools/libxc/xc_dom_core.c
++++ b/tools/libxc/xc_dom_core.c
+@@ -159,7 +159,8 @@ void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size)
+ }
+ 
+ void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
+-                            const char *filename, size_t * size)
++                            const char *filename, size_t * size,
++                            const size_t max_size)
+ {
+     struct xc_dom_mem *block = NULL;
+     int fd = -1;
+@@ -171,6 +172,13 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom,
+     lseek(fd, 0, SEEK_SET);
+     *size = lseek(fd, 0, SEEK_END);
+ 
++    if ( max_size && *size > max_size )
++    {
++        xc_dom_panic(dom->xch, XC_OUT_OF_MEMORY,
++                     "tried to map file which is too large");
++        goto err;
++    }
++
+     block = malloc(sizeof(*block));
+     if ( block == NULL )
+         goto err;
+@@ -222,6 +230,40 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const char *str)
+ }
+ 
+ /* ------------------------------------------------------------------------ */
++/* decompression buffer sizing                                              */
++int xc_dom_kernel_check_size(struct xc_dom_image *dom, size_t sz)
++{
++    /* No limit */
++    if ( !dom->max_kernel_size )
++        return 0;
++
++    if ( sz > dom->max_kernel_size )
++    {
++        xc_dom_panic(dom->xch, XC_INVALID_KERNEL,
++                     "kernel image too large");
++        return 1;
++    }
++
++    return 0;
++}
++
++int xc_dom_ramdisk_check_size(struct xc_dom_image *dom, size_t sz)
++{
++    /* No limit */
++    if ( !dom->max_ramdisk_size )
++        return 0;
++
++    if ( sz > dom->max_ramdisk_size )
++    {
++        xc_dom_panic(dom->xch, XC_INVALID_KERNEL,
++                     "ramdisk image too large");
++        return 1;
++    }
++
++    return 0;
++}
++
++/* ------------------------------------------------------------------------ */
+ /* read files, copy memory blocks, with transparent gunzip                  */
+ 
+ size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen)
+@@ -235,7 +277,7 @@ size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen)
+ 
+     gzlen = blob + ziplen - 4;
+     unziplen = gzlen[3] << 24 | gzlen[2] << 16 | gzlen[1] << 8 | gzlen[0];
+-    if ( (unziplen < 0) || (unziplen > (1024*1024*1024)) ) /* 1GB limit */
++    if ( (unziplen < 0) || (unziplen > XC_DOM_DECOMPRESS_MAX) )
+     {
+         xc_dom_printf
+             (xch,
+@@ -288,6 +330,9 @@ int xc_dom_try_gunzip(struct xc_dom_image *dom, void **blob, size_t * size)
+     if ( unziplen == 0 )
+         return 0;
+ 
++    if ( xc_dom_kernel_check_size(dom, unziplen) )
++        return 0;
++
+     unzip = xc_dom_malloc(dom, unziplen);
+     if ( unzip == NULL )
+         return -1;
+@@ -588,6 +633,9 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,
+     memset(dom, 0, sizeof(*dom));
+     dom->xch = xch;
+ 
++    dom->max_kernel_size = XC_DOM_DECOMPRESS_MAX;
++    dom->max_ramdisk_size = XC_DOM_DECOMPRESS_MAX;
++
+     if ( cmdline )
+         dom->cmdline = xc_dom_strdup(dom, cmdline);
+     if ( features )
+@@ -608,10 +656,25 @@ struct xc_dom_image *xc_dom_allocate(xc_interface *xch,
+     return NULL;
+ }
+ 
++int xc_dom_kernel_max_size(struct xc_dom_image *dom, size_t sz)
++{
++    DOMPRINTF("%s: kernel_max_size=%zx", __FUNCTION__, sz);
++    dom->max_kernel_size = sz;
++    return 0;
++}
++
++int xc_dom_ramdisk_max_size(struct xc_dom_image *dom, size_t sz)
++{
++    DOMPRINTF("%s: ramdisk_max_size=%zx", __FUNCTION__, sz);
++    dom->max_ramdisk_size = sz;
++    return 0;
++}
++
+ int xc_dom_kernel_file(struct xc_dom_image *dom, const char *filename)
+ {
+     DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename);
+-    dom->kernel_blob = xc_dom_malloc_filemap(dom, filename, &dom->kernel_size);
++    dom->kernel_blob = xc_dom_malloc_filemap(dom, filename, &dom->kernel_size,
++                                             dom->max_kernel_size);
+     if ( dom->kernel_blob == NULL )
+         return -1;
+     return xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
+@@ -621,7 +684,9 @@ int xc_dom_ramdisk_file(struct xc_dom_image *dom, const char *filename)
+ {
+     DOMPRINTF("%s: filename=\"%s\"", __FUNCTION__, filename);
+     dom->ramdisk_blob =
+-        xc_dom_malloc_filemap(dom, filename, &dom->ramdisk_size);
++        xc_dom_malloc_filemap(dom, filename, &dom->ramdisk_size,
++                              dom->max_ramdisk_size);
++
+     if ( dom->ramdisk_blob == NULL )
+         return -1;
+ //    return xc_dom_try_gunzip(dom, &dom->ramdisk_blob, &dom->ramdisk_size);
+@@ -781,7 +846,11 @@ int xc_dom_build_image(struct xc_dom_image *dom)
+         void *ramdiskmap;
+ 
+         unziplen = xc_dom_check_gzip(dom->xch, dom->ramdisk_blob, dom->ramdisk_size);
++        if ( xc_dom_ramdisk_check_size(dom, unziplen) != 0 )
++            unziplen = 0;
++
+         ramdisklen = unziplen ? unziplen : dom->ramdisk_size;
++
+         if ( xc_dom_alloc_segment(dom, &dom->ramdisk_seg, "ramdisk", 0,
+                                   ramdisklen) != 0 )
+             goto err;