May 2016 - crux-commits - lists.crux.nu

ports/xorg (3.2): xorg-libxcb: updated to 1.12
by crux＠crux.nu 20 May '16

20 May '16

commit 2e2676b8539b10e2f2a845583eaa6804219158a5 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sat May 21 00:54:58 2016 +0200 xorg-libxcb: updated to 1.12 diff --git a/xorg-libxcb/.footprint b/xorg-libxcb/.footprint index 7893fcf..da90d6b 100644 --- a/xorg-libxcb/.footprint +++ b/xorg-libxcb/.footprint @@ -108,11 +108,6 @@ lrwxrwxrwx root/root usr/lib/libxcb-shm.so.0 -> libxcb-shm.so.0.0.0 lrwxrwxrwx root/root usr/lib/libxcb-sync.so -> libxcb-sync.so.1.0.0 lrwxrwxrwx root/root usr/lib/libxcb-sync.so.1 -> libxcb-sync.so.1.0.0 -rwxr-xr-x root/root usr/lib/libxcb-sync.so.1.0.0 --rw-r--r-- root/root usr/lib/libxcb-xevie.a --rwxr-xr-x root/root usr/lib/libxcb-xevie.la -lrwxrwxrwx root/root usr/lib/libxcb-xevie.so -> libxcb-xevie.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libxcb-xevie.so.0 -> libxcb-xevie.so.0.0.0 --rwxr-xr-x root/root usr/lib/libxcb-xevie.so.0.0.0 -rw-r--r-- root/root usr/lib/libxcb-xf86dri.a -rwxr-xr-x root/root usr/lib/libxcb-xf86dri.la lrwxrwxrwx root/root usr/lib/libxcb-xf86dri.so -> libxcb-xf86dri.so.0.0.0 @@ -133,11 +128,6 @@ lrwxrwxrwx root/root usr/lib/libxcb-xinerama.so.0 -> libxcb-xinerama.so.0.0.0 lrwxrwxrwx root/root usr/lib/libxcb-xkb.so -> libxcb-xkb.so.1.0.0 lrwxrwxrwx root/root usr/lib/libxcb-xkb.so.1 -> libxcb-xkb.so.1.0.0 -rwxr-xr-x root/root usr/lib/libxcb-xkb.so.1.0.0 --rw-r--r-- root/root usr/lib/libxcb-xprint.a --rwxr-xr-x root/root usr/lib/libxcb-xprint.la -lrwxrwxrwx root/root usr/lib/libxcb-xprint.so -> libxcb-xprint.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libxcb-xprint.so.0 -> libxcb-xprint.so.0.0.0 --rwxr-xr-x root/root usr/lib/libxcb-xprint.so.0.0.0 -rw-r--r-- root/root usr/lib/libxcb-xtest.a -rwxr-xr-x root/root usr/lib/libxcb-xtest.la lrwxrwxrwx root/root usr/lib/libxcb-xtest.so -> libxcb-xtest.so.0.0.0 @@ -174,12 +164,10 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/xcb-shape.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-shm.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-sync.pc --rw-r--r-- root/root usr/lib/pkgconfig/xcb-xevie.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xf86dri.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xfixes.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xinerama.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xkb.pc --rw-r--r-- root/root usr/lib/pkgconfig/xcb-xprint.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xtest.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xv.pc -rw-r--r-- root/root usr/lib/pkgconfig/xcb-xvmc.pc diff --git a/xorg-libxcb/.md5sum b/xorg-libxcb/.md5sum index c4efc3f..3030981 100644 --- a/xorg-libxcb/.md5sum +++ b/xorg-libxcb/.md5sum @@ -1 +1 @@ -f97a65e6158775de518ac391935634c2 libxcb-1.11.1.tar.bz2 +28e552bd78bc1050b6b26ca1db0e5bb6 libxcb-1.12.tar.bz2 diff --git a/xorg-libxcb/Pkgfile b/xorg-libxcb/Pkgfile index a773903..843de48 100644 --- a/xorg-libxcb/Pkgfile +++ b/xorg-libxcb/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-xcb-proto xorg-libxdmcp xorg-libxau libxslt libpthread-stubs name=xorg-libxcb -version=1.11.1 +version=1.12 release=1 source=(http://xcb.freedesktop.org/dist/libxcb-$version.tar.bz2)

1 0

ports/core (3.2): tar: update to 1.29
by crux＠crux.nu 20 May '16

20 May '16

commit 7e376f5a112236aa9f4488978210a211245d43c3 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:27:14 2016 +0200 tar: update to 1.29 diff --git a/tar/.md5sum b/tar/.md5sum index 010177c..ff4082a 100644 --- a/tar/.md5sum +++ b/tar/.md5sum @@ -1 +1 @@ -49b6306167724fe48f419a33a5beb857 tar-1.28.tar.xz +a1802fec550baaeecff6c381629653ef tar-1.29.tar.xz diff --git a/tar/Pkgfile b/tar/Pkgfile index 2f31f21..1172f59 100644 --- a/tar/Pkgfile +++ b/tar/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=tar -version=1.28 -release=3 +version=1.29 +release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz) build() {

1 0

ports/core (3.2): pciutils: update to 3.5.0
by crux＠crux.nu 20 May '16

20 May '16

commit 9ed6d2cd6c068f7d6d50f7c569d7e97861b87083 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:26:55 2016 +0200 pciutils: update to 3.5.0 diff --git a/pciutils/.footprint b/pciutils/.footprint index a19eabf..e5345d5 100644 --- a/pciutils/.footprint +++ b/pciutils/.footprint @@ -8,8 +8,8 @@ drwxr-xr-x root/root usr/include/pci/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libpci.a lrwxrwxrwx root/root usr/lib/libpci.so -> libpci.so.3 -lrwxrwxrwx root/root usr/lib/libpci.so.3 -> libpci.so.3.4.1 --rw-r--r-- root/root usr/lib/libpci.so.3.4.1 +lrwxrwxrwx root/root usr/lib/libpci.so.3 -> libpci.so.3.5.0 +-rw-r--r-- root/root usr/lib/libpci.so.3.5.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libpci.pc drwxr-xr-x root/root usr/sbin/ diff --git a/pciutils/.md5sum b/pciutils/.md5sum index 2d1072a..f4a08cd 100644 --- a/pciutils/.md5sum +++ b/pciutils/.md5sum @@ -1 +1 @@ -acc91d632dbc98f624a8e57b4e478160 pciutils-3.4.1.tar.gz +6eeea209e4eea9eb8ce3faaedb3a10d0 pciutils-3.5.0.tar.gz diff --git a/pciutils/Pkgfile b/pciutils/Pkgfile index 829e9b2..2090ce7 100644 --- a/pciutils/Pkgfile +++ b/pciutils/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eudev name=pciutils -version=3.4.1 +version=3.5.0 release=1 source=(ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$name-$version.tar.gz)

1 0

ports/core (3.2): iproute2: update to 4.6.0
by crux＠crux.nu 20 May '16

20 May '16

commit 7b2949befb74db8e93e29c96e781763128b99cbf Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:26:35 2016 +0200 iproute2: update to 4.6.0 diff --git a/iproute2/.footprint b/iproute2/.footprint index 5afb899..7a824dd 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -40,6 +40,9 @@ lrwxrwxrwx root/root usr/lib/tc/m_ipt.so -> m_xt.so -rw-r--r-- root/root usr/lib/tc/pareto.dist -rw-r--r-- root/root usr/lib/tc/paretonormal.dist drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/bash-completion/ +drwxr-xr-x root/root usr/share/bash-completion/completions/ +-rw-r--r-- root/root usr/share/bash-completion/completions/tc drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/libnetlink.3.gz diff --git a/iproute2/.md5sum b/iproute2/.md5sum index 442ae4b..adac37a 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1,3 +1,3 @@ -b9ee1cbba7e20e04dfdd4b3055181955 iproute2-4.5.0.tar.xz +d015e437e4f744d51d3a1a53341826d5 iproute2-4.6.0.tar.xz 7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2 826848debe693f2e2a3e235ce9abe601 net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 147c71b..6ddce9b 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db iptables name=iproute2 -version=4.5.0 +version=4.6.0 release=1 source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar… \ lo.iproute2 net.iproute2)

1 0

ports/core (3.2): gdbm: update to 1.12
by crux＠crux.nu 20 May '16

20 May '16

commit 5758d1bd77072f5694af6e4d08f51d3d3dda9148 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:26:18 2016 +0200 gdbm: update to 1.12 diff --git a/gdbm/.md5sum b/gdbm/.md5sum index bb11801..48775f4 100644 --- a/gdbm/.md5sum +++ b/gdbm/.md5sum @@ -1 +1 @@ -72c832680cf0999caedbe5b265c8c1bd gdbm-1.11.tar.gz +9ce96ff4c99e74295ea19040931c8fb9 gdbm-1.12.tar.gz diff --git a/gdbm/Pkgfile b/gdbm/Pkgfile index f7f9216..ab64d16 100644 --- a/gdbm/Pkgfile +++ b/gdbm/Pkgfile @@ -3,14 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=gdbm -version=1.11 -release=2 +version=1.12 +release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version - ./configure --prefix=/usr \ - --enable-libgdbm-compat + ./configure --prefix=/usr --enable-libgdbm-compat make make DESTDIR=$PKG install rm -r $PKG/usr/share/{info,locale}

1 0

ports/core (3.2): curl: update to 7.49.0
by crux＠crux.nu 20 May '16

20 May '16

commit d58779b97a5ad2cfc8daebb0b70b558882ab3500 Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:25:56 2016 +0200 curl: update to 7.49.0 diff --git a/curl/.footprint b/curl/.footprint index 41ebe04..0b356dc 100644 --- a/curl/.footprint +++ b/curl/.footprint @@ -106,6 +106,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONNECTTIMEOUT.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONNECTTIMEOUT_MS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONNECT_ONLY.3.gz +-rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONNECT_TO.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3.gz @@ -281,6 +282,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3.gz +-rw-r--r-- root/root usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3.gz -rw-r--r-- root/root usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3.gz @@ -368,6 +370,3 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/libcurl-thread.3.gz -rw-r--r-- root/root usr/share/man/man3/libcurl-tutorial.3.gz -rw-r--r-- root/root usr/share/man/man3/libcurl.3.gz -drwxr-xr-x root/root usr/share/zsh/ -drwxr-xr-x root/root usr/share/zsh/site-functions/ --rw-r--r-- root/root usr/share/zsh/site-functions/_curl diff --git a/curl/.md5sum b/curl/.md5sum index f4c14c8..bd6ebd2 100644 --- a/curl/.md5sum +++ b/curl/.md5sum @@ -1 +1 @@ -de75665721e3adb0a1d7e03b90c3d7a2 curl-7.48.0.tar.lzma +f14b50657174e3c91d955f7a3e064e8c curl-7.49.0.tar.lzma diff --git a/curl/Pkgfile b/curl/Pkgfile index da393d1..fba64fc 100644 --- a/curl/Pkgfile +++ b/curl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl, zlib name=curl -version=7.48.0 +version=7.49.0 release=1 source=(http://curl.haxx.se/download/$name-$version.tar.lzma)

1 0

ports/opt (3.2): sqlite3: update to 3.13.0
by crux＠crux.nu 20 May '16

20 May '16

commit f8d7bdb067660336f8742b2362fc789bb8cf633d Author: Juergen Daubert <jue(a)jue.li> Date: Thu May 19 19:19:25 2016 +0200 sqlite3: update to 3.13.0 diff --git a/sqlite3/.md5sum b/sqlite3/.md5sum index dba3cfd..f6d679a 100644 --- a/sqlite3/.md5sum +++ b/sqlite3/.md5sum @@ -1 +1 @@ -c552a133aca1ce1d647163d9e43bbcb1 sqlite-autoconf-3120200.tar.gz +4e83f39fa2ffb610ac5ecd36865da6a2 sqlite-autoconf-3130000.tar.gz diff --git a/sqlite3/Pkgfile b/sqlite3/Pkgfile index 4920bd7..8a4e3c1 100644 --- a/sqlite3/Pkgfile +++ b/sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses, readline name=sqlite3 -version=3.12.2 +version=3.13.0 release=1 _version=$(printf "%i%.2i%.2i%.2i" ${version//./ })

1 0

ports/opt (3.2): dnsmasq: update to 2.76
by crux＠crux.nu 20 May '16

20 May '16

commit e9bc98912be495f3340f0f820119a5aae59812e0 Author: Juergen Daubert <jue(a)jue.li> Date: Thu May 19 19:19:03 2016 +0200 dnsmasq: update to 2.76 diff --git a/dnsmasq/.footprint b/dnsmasq/.footprint index f9fb855..c268398 100644 --- a/dnsmasq/.footprint +++ b/dnsmasq/.footprint @@ -3,11 +3,12 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/dnsmasq drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/dnsmasq.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/dnsmasq +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/dnsmasq.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/dhcp/ diff --git a/dnsmasq/.md5sum b/dnsmasq/.md5sum index 9144c9a..39178c2 100644 --- a/dnsmasq/.md5sum +++ b/dnsmasq/.md5sum @@ -1,3 +1,3 @@ cf2b6cff8356ce9da3f6da7dfa0e588b dnsmasq -887236f1ddde6eb57cdb9d01916c9f72 dnsmasq-2.75.tar.xz -7e9e053cff450d0f6aeb71d42f3b5fa8 dnsmasq-config.patch +00f5ee66b4e4b7f14538bf62ae3c9461 dnsmasq-2.76.tar.xz +51193165dcaa9061f07f8b43eaf466d0 dnsmasq-config.patch diff --git a/dnsmasq/Pkgfile b/dnsmasq/Pkgfile index 03e778c..5ed22e8 100644 --- a/dnsmasq/Pkgfile +++ b/dnsmasq/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=dnsmasq -version=2.75 +version=2.76 release=1 source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \ $name-config.patch dnsmasq) diff --git a/dnsmasq/dnsmasq-config.patch b/dnsmasq/dnsmasq-config.patch index b915c0c..b45b614 100644 --- a/dnsmasq/dnsmasq-config.patch +++ b/dnsmasq/dnsmasq-config.patch @@ -1,12 +1,7 @@ -diff -Nru dnsmasq-2.74.orig/Makefile dnsmasq-2.74/Makefile ---- dnsmasq-2.74.orig/Makefile 2015-07-29 09:24:06.524601095 +0200 -+++ dnsmasq-2.74/Makefile 2015-07-29 09:24:43.299930250 +0200 -@@ -20,11 +20,11 @@ - - PREFIX = /usr/local - BINDIR = $(PREFIX)/sbin --MANDIR = $(PREFIX)/share/man -+MANDIR = $(PREFIX)/man +diff -Nru dnsmasq-2.76.orig/Makefile dnsmasq-2.76/Makefile +--- dnsmasq-2.76.orig/Makefile 2016-05-19 19:10:26.729305866 +0200 ++++ dnsmasq-2.76/Makefile 2016-05-19 19:11:06.601200120 +0200 +@@ -24,7 +24,7 @@ LOCALEDIR = $(PREFIX)/share/locale BUILDDIR = $(SRC) DESTDIR = @@ -15,9 +10,9 @@ diff -Nru dnsmasq-2.74.orig/Makefile dnsmasq-2.74/Makefile LDFLAGS = COPTS = RPM_OPT_FLAGS = -diff -Nru dnsmasq-2.74.orig/dnsmasq.conf.example dnsmasq-2.74/dnsmasq.conf.example ---- dnsmasq-2.74.orig/dnsmasq.conf.example 2015-07-29 09:24:06.524601095 +0200 -+++ dnsmasq-2.74/dnsmasq.conf.example 2015-07-29 09:24:43.299930250 +0200 +diff -Nru dnsmasq-2.76.orig/dnsmasq.conf.example dnsmasq-2.76/dnsmasq.conf.example +--- dnsmasq-2.76.orig/dnsmasq.conf.example 2016-05-19 19:10:26.732639080 +0200 ++++ dnsmasq-2.76/dnsmasq.conf.example 2016-05-19 19:10:39.865498646 +0200 @@ -96,8 +96,8 @@ # If you want dnsmasq to change uid and gid to something other @@ -38,10 +33,10 @@ diff -Nru dnsmasq-2.74.orig/dnsmasq.conf.example dnsmasq-2.74/dnsmasq.conf.examp # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, -diff -Nru dnsmasq-2.74.orig/src/config.h dnsmasq-2.74/src/config.h ---- dnsmasq-2.74.orig/src/config.h 2015-07-29 09:24:06.521267883 +0200 -+++ dnsmasq-2.74/src/config.h 2015-07-29 09:24:43.299930250 +0200 -@@ -40,7 +40,7 @@ +diff -Nru dnsmasq-2.76.orig/src/config.h dnsmasq-2.76/src/config.h +--- dnsmasq-2.76.orig/src/config.h 2016-05-19 19:10:26.732639080 +0200 ++++ dnsmasq-2.76/src/config.h 2016-05-19 19:10:39.865498646 +0200 +@@ -41,7 +41,7 @@ #define ETHERSFILE "/etc/ethers" #define DEFLEASE 3600 /* default lease time, 1 hour */ #define CHUSER "nobody" @@ -50,7 +45,7 @@ diff -Nru dnsmasq-2.74.orig/src/config.h dnsmasq-2.74/src/config.h #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */ #define LOG_MAX 5 /* log-queue length */ #define RANDFILE "/dev/urandom" -@@ -186,7 +186,7 @@ +@@ -187,7 +187,7 @@ # elif defined(__ANDROID__) # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases" # else

1 0

ports/opt (3.2): [notify] expat: fix for CVE-2016-0718, improved fix for CVE-2015-1283
by crux＠crux.nu 20 May '16

20 May '16

commit 784817e3e17dcf98a98c08fd920665af59466adb Author: Juergen Daubert <jue(a)jue.li> Date: Thu May 19 18:59:10 2016 +0200 [notify] expat: fix for CVE-2016-0718, improved fix for CVE-2015-1283 See http://seclists.org/oss-sec/2016/q2/360 diff --git a/expat/.md5sum b/expat/.md5sum index bf1f124..32b8ffd 100644 --- a/expat/.md5sum +++ b/expat/.md5sum @@ -1 +1,3 @@ +d54dd69a14bedb86fc6f6e0c0be5c4a4 CVE-2015-1283.patch +beb1b2dc1f0d988ed85a5dd30a3b322a CVE-2016-0718.patch 7380a64a8e3a9d66a9887b01d0d7ea81 expat-2.1.1.tar.bz2 diff --git a/expat/CVE-2015-1283.patch b/expat/CVE-2015-1283.patch new file mode 100644 index 0000000..ae868d4 --- /dev/null +++ b/expat/CVE-2015-1283.patch @@ -0,0 +1,38 @@ +From 29a11774d8ebbafe8418b4a5ffb4cc1160b194a1 Mon Sep 17 00:00:00 2001 +From: Pascal Cuoq <cuoq(a)trust-in-soft.com> +Date: Sun, 15 May 2016 09:05:46 +0200 +Subject: [PATCH] Avoid relying on undefined behavior in CVE-2015-1283 fix. It + does not really work: https://godbolt.org/g/Zl8gdF + +--- + expat/lib/xmlparse.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index 13e080d..cdb12ef 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -1693,7 +1693,8 @@ XML_GetBuffer(XML_Parser parser, int len) + } + + if (len > bufferLim - bufferEnd) { +- int neededSize = len + (int)(bufferEnd - bufferPtr); ++ /* Do not invoke signed arithmetic overflow: */ ++ int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr)); + if (neededSize < 0) { + errorCode = XML_ERROR_NO_MEMORY; + return NULL; +@@ -1725,7 +1726,8 @@ XML_GetBuffer(XML_Parser parser, int len) + if (bufferSize == 0) + bufferSize = INIT_BUFFER_SIZE; + do { +- bufferSize *= 2; ++ /* Do not invoke signed arithmetic overflow: */ ++ bufferSize = (int) (2U * (unsigned) bufferSize); + } while (bufferSize < neededSize && bufferSize > 0); + if (bufferSize <= 0) { + errorCode = XML_ERROR_NO_MEMORY; +-- +2.8.2 + + diff --git a/expat/CVE-2016-0718.patch b/expat/CVE-2016-0718.patch new file mode 100644 index 0000000..1675aec --- /dev/null +++ b/expat/CVE-2016-0718.patch @@ -0,0 +1,756 @@ +From cdfcb1b5c95e93b00ae9e9d25708b4a3bee72c15 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian(a)pipping.org> +Date: Mon, 2 May 2016 00:02:44 +0200 +Subject: [PATCH] Address CVE-2016-0718 (/patch/ version 2.2.1) + +* Out of bounds memory access when doing text conversion on malformed input +* Integer overflow related to memory allocation + +Reported by Gustavo Grieco + +Patch credits go to +* Christian Heimes +* Karl Waclawek +* Gustavo Grieco +* Sebastian Pipping +* Pascal Cuoq +--- + expat/lib/xmlparse.c | 34 +++++++++----- + expat/lib/xmltok.c | 115 +++++++++++++++++++++++++++++++++++------------- + expat/lib/xmltok.h | 10 ++++- + expat/lib/xmltok_impl.c | 62 +++++++++++++------------- + 4 files changed, 146 insertions(+), 75 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index e308c79..13e080d 100644 +--- a/expat/lib/xmlparse.c ++++ b/expat/lib/xmlparse.c +@@ -2426,11 +2426,11 @@ doContent(XML_Parser parser, + for (;;) { + int bufSize; + int convLen; +- XmlConvert(enc, ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, + &fromPtr, rawNameEnd, + (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); + convLen = (int)(toPtr - (XML_Char *)tag->buf); +- if (fromPtr == rawNameEnd) { ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { + tag->name.strLen = convLen; + break; + } +@@ -2651,11 +2651,11 @@ doContent(XML_Parser parser, + if (MUST_CONVERT(enc, s)) { + for (;;) { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = s; + charDataHandler(handlerArg, dataBuf, + (int)(dataPtr - (ICHAR *)dataBuf)); +- if (s == next) ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + *eventPP = s; + } +@@ -3261,11 +3261,11 @@ doCdataSection(XML_Parser parser, + if (MUST_CONVERT(enc, s)) { + for (;;) { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = next; + charDataHandler(handlerArg, dataBuf, + (int)(dataPtr - (ICHAR *)dataBuf)); +- if (s == next) ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + *eventPP = s; + } +@@ -5342,6 +5342,7 @@ reportDefault(XML_Parser parser, const ENCODING *enc, + const char *s, const char *end) + { + if (MUST_CONVERT(enc, s)) { ++ enum XML_Convert_Result convert_res; + const char **eventPP; + const char **eventEndPP; + if (enc == encoding) { +@@ -5354,11 +5355,11 @@ reportDefault(XML_Parser parser, const ENCODING *enc, + } + do { + ICHAR *dataPtr = (ICHAR *)dataBuf; +- XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); ++ convert_res = XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); + *eventEndPP = s; + defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); + *eventPP = s; +- } while (s != end); ++ } while ((convert_res != XML_CONVERT_COMPLETED) && (convert_res != XML_CONVERT_INPUT_INCOMPLETE)); + } + else + defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XML_Char *)s)); +@@ -6163,8 +6164,8 @@ poolAppend(STRING_POOL *pool, const ENCODING *enc, + if (!pool->ptr && !poolGrow(pool)) + return NULL; + for (;;) { +- XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); +- if (ptr == end) ++ const enum XML_Convert_Result convert_res = XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); ++ if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) + break; + if (!poolGrow(pool)) + return NULL; +@@ -6248,8 +6249,13 @@ poolGrow(STRING_POOL *pool) + } + } + if (pool->blocks && pool->start == pool->blocks->s) { +- int blockSize = (int)(pool->end - pool->start)*2; +- BLOCK *temp = (BLOCK *) ++ BLOCK *temp; ++ int blockSize = (int)((unsigned)(pool->end - pool->start)*2U); ++ ++ if (blockSize < 0) ++ return XML_FALSE; ++ ++ temp = (BLOCK *) + pool->mem->realloc_fcn(pool->blocks, + (offsetof(BLOCK, s) + + blockSize * sizeof(XML_Char))); +@@ -6264,6 +6270,10 @@ poolGrow(STRING_POOL *pool) + else { + BLOCK *tem; + int blockSize = (int)(pool->end - pool->start); ++ ++ if (blockSize < 0) ++ return XML_FALSE; ++ + if (blockSize < INIT_BLOCK_SIZE) + blockSize = INIT_BLOCK_SIZE; + else +diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c +index bf09dfc..cb98ce1 100644 +--- a/expat/lib/xmltok.c ++++ b/expat/lib/xmltok.c +@@ -318,39 +318,55 @@ enum { /* UTF8_cvalN is value of masked first byte of N byte sequence */ + UTF8_cval4 = 0xf0 + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + utf8_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) + { ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; + char *to; + const char *from; + if (fromLim - *fromP > toLim - *toP) { + /* Avoid copying partial characters. */ ++ res = XML_CONVERT_OUTPUT_EXHAUSTED; + for (fromLim = *fromP + (toLim - *toP); fromLim > *fromP; fromLim--) + if (((unsigned char)fromLim[-1] & 0xc0) != 0x80) + break; + } +- for (to = *toP, from = *fromP; from != fromLim; from++, to++) ++ for (to = *toP, from = *fromP; (from < fromLim) && (to < toLim); from++, to++) + *to = *from; + *fromP = from; + *toP = to; ++ ++ if ((to == toLim) && (from < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return res; + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + utf8_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; + unsigned short *to = *toP; + const char *from = *fromP; +- while (from != fromLim && to != toLim) { ++ while (from < fromLim && to < toLim) { + switch (((struct normal_encoding *)enc)->type[(unsigned char)*from]) { + case BT_LEAD2: ++ if (fromLim - from < 2) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ break; ++ } + *to++ = (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3f)); + from += 2; + break; + case BT_LEAD3: ++ if (fromLim - from < 3) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ break; ++ } + *to++ = (unsigned short)(((from[0] & 0xf) << 12) + | ((from[1] & 0x3f) << 6) | (from[2] & 0x3f)); + from += 3; +@@ -358,8 +374,14 @@ utf8_toUtf16(const ENCODING *enc, + case BT_LEAD4: + { + unsigned long n; +- if (to + 1 == toLim) ++ if (toLim - to < 2) { ++ res = XML_CONVERT_OUTPUT_EXHAUSTED; + goto after; ++ } ++ if (fromLim - from < 4) { ++ res = XML_CONVERT_INPUT_INCOMPLETE; ++ goto after; ++ } + n = ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) + | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f); + n -= 0x10000; +@@ -377,6 +399,7 @@ utf8_toUtf16(const ENCODING *enc, + after: + *fromP = from; + *toP = to; ++ return res; + } + + #ifdef XML_NS +@@ -425,7 +448,7 @@ static const struct normal_encoding internal_utf8_encoding = { + STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + latin1_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) +@@ -433,30 +456,35 @@ latin1_toUtf8(const ENCODING *enc, + for (;;) { + unsigned char c; + if (*fromP == fromLim) +- break; ++ return XML_CONVERT_COMPLETED; + c = (unsigned char)**fromP; + if (c & 0x80) { + if (toLim - *toP < 2) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + *(*toP)++ = (char)((c >> 6) | UTF8_cval2); + *(*toP)++ = (char)((c & 0x3f) | 0x80); + (*fromP)++; + } + else { + if (*toP == toLim) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + *(*toP)++ = *(*fromP)++; + } + } + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + latin1_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { +- while (*fromP != fromLim && *toP != toLim) ++ while (*fromP < fromLim && *toP < toLim) + *(*toP)++ = (unsigned char)*(*fromP)++; ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + #ifdef XML_NS +@@ -483,13 +511,18 @@ static const struct normal_encoding latin1_encoding = { + STANDARD_VTABLE(sb_) + }; + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + ascii_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) + { +- while (*fromP != fromLim && *toP != toLim) ++ while (*fromP < fromLim && *toP < toLim) + *(*toP)++ = *(*fromP)++; ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + #ifdef XML_NS +@@ -536,13 +569,14 @@ unicode_byte_type(char hi, char lo) + } + + #define DEFINE_UTF16_TO_UTF8(E) \ +-static void PTRCALL \ ++static enum XML_Convert_Result PTRCALL \ + E ## toUtf8(const ENCODING *enc, \ + const char **fromP, const char *fromLim, \ + char **toP, const char *toLim) \ + { \ +- const char *from; \ +- for (from = *fromP; from != fromLim; from += 2) { \ ++ const char *from = *fromP; \ ++ fromLim = from + (((fromLim - from) >> 1) << 1); /* shrink to even */ \ ++ for (; from < fromLim; from += 2) { \ + int plane; \ + unsigned char lo2; \ + unsigned char lo = GET_LO(from); \ +@@ -552,7 +586,7 @@ E ## toUtf8(const ENCODING *enc, \ + if (lo < 0x80) { \ + if (*toP == toLim) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + *(*toP)++ = lo; \ + break; \ +@@ -562,7 +596,7 @@ E ## toUtf8(const ENCODING *enc, \ + case 0x4: case 0x5: case 0x6: case 0x7: \ + if (toLim - *toP < 2) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + *(*toP)++ = ((lo >> 6) | (hi << 2) | UTF8_cval2); \ + *(*toP)++ = ((lo & 0x3f) | 0x80); \ +@@ -570,7 +604,7 @@ E ## toUtf8(const ENCODING *enc, \ + default: \ + if (toLim - *toP < 3) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ + } \ + /* 16 bits divided 4, 6, 6 amongst 3 bytes */ \ + *(*toP)++ = ((hi >> 4) | UTF8_cval3); \ +@@ -580,7 +614,11 @@ E ## toUtf8(const ENCODING *enc, \ + case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ + if (toLim - *toP < 4) { \ + *fromP = from; \ +- return; \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ ++ } \ ++ if (fromLim - from < 4) { \ ++ *fromP = from; \ ++ return XML_CONVERT_INPUT_INCOMPLETE; \ + } \ + plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \ + *(*toP)++ = ((plane >> 2) | UTF8_cval4); \ +@@ -596,20 +634,32 @@ E ## toUtf8(const ENCODING *enc, \ + } \ + } \ + *fromP = from; \ ++ if (from < fromLim) \ ++ return XML_CONVERT_INPUT_INCOMPLETE; \ ++ else \ ++ return XML_CONVERT_COMPLETED; \ + } + + #define DEFINE_UTF16_TO_UTF16(E) \ +-static void PTRCALL \ ++static enum XML_Convert_Result PTRCALL \ + E ## toUtf16(const ENCODING *enc, \ + const char **fromP, const char *fromLim, \ + unsigned short **toP, const unsigned short *toLim) \ + { \ ++ enum XML_Convert_Result res = XML_CONVERT_COMPLETED; \ ++ fromLim = *fromP + (((fromLim - *fromP) >> 1) << 1); /* shrink to even */ \ + /* Avoid copying first half only of surrogate */ \ + if (fromLim - *fromP > ((toLim - *toP) << 1) \ +- && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) \ ++ && (GET_HI(fromLim - 2) & 0xF8) == 0xD8) { \ + fromLim -= 2; \ +- for (; *fromP != fromLim && *toP != toLim; *fromP += 2) \ ++ res = XML_CONVERT_INPUT_INCOMPLETE; \ ++ } \ ++ for (; *fromP < fromLim && *toP < toLim; *fromP += 2) \ + *(*toP)++ = (GET_HI(*fromP) << 8) | GET_LO(*fromP); \ ++ if ((*toP == toLim) && (*fromP < fromLim)) \ ++ return XML_CONVERT_OUTPUT_EXHAUSTED; \ ++ else \ ++ return res; \ + } + + #define SET2(ptr, ch) \ +@@ -1288,7 +1338,7 @@ unknown_isInvalid(const ENCODING *enc, const char *p) + return (c & ~0xFFFF) || checkCharRefNumber(c) < 0; + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + unknown_toUtf8(const ENCODING *enc, + const char **fromP, const char *fromLim, + char **toP, const char *toLim) +@@ -1299,21 +1349,21 @@ unknown_toUtf8(const ENCODING *enc, + const char *utf8; + int n; + if (*fromP == fromLim) +- break; ++ return XML_CONVERT_COMPLETED; + utf8 = uenc->utf8[(unsigned char)**fromP]; + n = *utf8++; + if (n == 0) { + int c = uenc->convert(uenc->userData, *fromP); + n = XmlUtf8Encode(c, buf); + if (n > toLim - *toP) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + utf8 = buf; + *fromP += (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP] + - (BT_LEAD2 - 2)); + } + else { + if (n > toLim - *toP) +- break; ++ return XML_CONVERT_OUTPUT_EXHAUSTED; + (*fromP)++; + } + do { +@@ -1322,13 +1372,13 @@ unknown_toUtf8(const ENCODING *enc, + } + } + +-static void PTRCALL ++static enum XML_Convert_Result PTRCALL + unknown_toUtf16(const ENCODING *enc, + const char **fromP, const char *fromLim, + unsigned short **toP, const unsigned short *toLim) + { + const struct unknown_encoding *uenc = AS_UNKNOWN_ENCODING(enc); +- while (*fromP != fromLim && *toP != toLim) { ++ while (*fromP < fromLim && *toP < toLim) { + unsigned short c = uenc->utf16[(unsigned char)**fromP]; + if (c == 0) { + c = (unsigned short) +@@ -1340,6 +1390,11 @@ unknown_toUtf16(const ENCODING *enc, + (*fromP)++; + *(*toP)++ = c; + } ++ ++ if ((*toP == toLim) && (*fromP < fromLim)) ++ return XML_CONVERT_OUTPUT_EXHAUSTED; ++ else ++ return XML_CONVERT_COMPLETED; + } + + ENCODING * +@@ -1503,7 +1558,7 @@ initScan(const ENCODING * const *encodingTable, + { + const ENCODING **encPtr; + +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + encPtr = enc->encPtr; + if (ptr + 1 == end) { +diff --git a/expat/lib/xmltok.h b/expat/lib/xmltok.h +index ca867aa..752007e 100644 +--- a/expat/lib/xmltok.h ++++ b/expat/lib/xmltok.h +@@ -130,6 +130,12 @@ typedef int (PTRCALL *SCANNER)(const ENCODING *, + const char *, + const char **); + ++enum XML_Convert_Result { ++ XML_CONVERT_COMPLETED = 0, ++ XML_CONVERT_INPUT_INCOMPLETE = 1, ++ XML_CONVERT_OUTPUT_EXHAUSTED = 2 /* and therefore potentially input remaining as well */ ++}; ++ + struct encoding { + SCANNER scanners[XML_N_STATES]; + SCANNER literalScanners[XML_N_LITERAL_TYPES]; +@@ -158,12 +164,12 @@ struct encoding { + const char *ptr, + const char *end, + const char **badPtr); +- void (PTRCALL *utf8Convert)(const ENCODING *enc, ++ enum XML_Convert_Result (PTRCALL *utf8Convert)(const ENCODING *enc, + const char **fromP, + const char *fromLim, + char **toP, + const char *toLim); +- void (PTRCALL *utf16Convert)(const ENCODING *enc, ++ enum XML_Convert_Result (PTRCALL *utf16Convert)(const ENCODING *enc, + const char **fromP, + const char *fromLim, + unsigned short **toP, +diff --git a/expat/lib/xmltok_impl.c b/expat/lib/xmltok_impl.c +index 9c2895b..6c5a3ba 100644 +--- a/expat/lib/xmltok_impl.c ++++ b/expat/lib/xmltok_impl.c +@@ -93,13 +93,13 @@ static int PTRCALL + PREFIX(scanComment)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + if (!CHAR_MATCHES(enc, ptr, ASCII_MINUS)) { + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_MINUS: +@@ -147,7 +147,7 @@ PREFIX(scanDecl)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_PERCNT: + if (ptr + MINBPC(enc) == end) +@@ -233,7 +233,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_S: case BT_CR: case BT_LF: +@@ -242,7 +242,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, + return XML_TOK_INVALID; + } + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_QUEST: +@@ -305,7 +305,7 @@ static int PTRCALL + PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -348,7 +348,7 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, + ptr += MINBPC(enc); + break; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ +@@ -391,11 +391,11 @@ PREFIX(scanEndTag)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_S: case BT_CR: case BT_LF: +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_S: case BT_CR: case BT_LF: + break; +@@ -432,7 +432,7 @@ static int PTRCALL + PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -441,7 +441,7 @@ PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -464,7 +464,7 @@ static int PTRCALL + PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { +- if (ptr != end) { ++ if (ptr < end) { + if (CHAR_MATCHES(enc, ptr, ASCII_x)) + return PREFIX(scanHexCharRef)(enc, ptr + MINBPC(enc), end, nextTokPtr); + switch (BYTE_TYPE(enc, ptr)) { +@@ -474,7 +474,7 @@ PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- for (ptr += MINBPC(enc); ptr != end; ptr += MINBPC(enc)) { ++ for (ptr += MINBPC(enc); ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + break; +@@ -506,7 +506,7 @@ PREFIX(scanRef)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_SEMI: +@@ -529,7 +529,7 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr, const char *end, + #ifdef XML_NS + int hadColon = 0; + #endif +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + #ifdef XML_NS +@@ -716,7 +716,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, + hadColon = 0; + #endif + /* we have a start-tag */ +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + #ifdef XML_NS +@@ -740,7 +740,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, const char *end, + case BT_S: case BT_CR: case BT_LF: + { + ptr += MINBPC(enc); +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) + case BT_GT: +@@ -785,7 +785,7 @@ static int PTRCALL + PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) + { +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -832,7 +832,7 @@ PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, + ptr += MINBPC(enc); + break; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ +@@ -895,7 +895,7 @@ PREFIX(scanPercent)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_SEMI: +@@ -921,7 +921,7 @@ PREFIX(scanPoundName)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_CR: case BT_LF: case BT_S: +@@ -941,7 +941,7 @@ PREFIX(scanLit)(int open, const ENCODING *enc, + const char *ptr, const char *end, + const char **nextTokPtr) + { +- while (ptr != end) { ++ while (ptr < end) { + int t = BYTE_TYPE(enc, ptr); + switch (t) { + INVALID_CASES(ptr, nextTokPtr) +@@ -973,7 +973,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, + const char **nextTokPtr) + { + int tok; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + if (MINBPC(enc) > 1) { + size_t n = end - ptr; +@@ -1141,7 +1141,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr, const char *end, + *nextTokPtr = ptr; + return XML_TOK_INVALID; + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) + case BT_GT: case BT_RPAR: case BT_COMMA: +@@ -1204,10 +1204,10 @@ PREFIX(attributeValueTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { + const char *start; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + start = ptr; +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: ptr += n; break; +@@ -1262,10 +1262,10 @@ PREFIX(entityValueTok)(const ENCODING *enc, const char *ptr, + const char *end, const char **nextTokPtr) + { + const char *start; +- if (ptr == end) ++ if (ptr >= end) + return XML_TOK_NONE; + start = ptr; +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: ptr += n; break; +@@ -1326,7 +1326,7 @@ PREFIX(ignoreSectionTok)(const ENCODING *enc, const char *ptr, + end = ptr + n; + } + } +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + INVALID_CASES(ptr, nextTokPtr) + case BT_LT: +@@ -1373,7 +1373,7 @@ PREFIX(isPublicId)(const ENCODING *enc, const char *ptr, const char *end, + { + ptr += MINBPC(enc); + end -= MINBPC(enc); +- for (; ptr != end; ptr += MINBPC(enc)) { ++ for (; ptr < end; ptr += MINBPC(enc)) { + switch (BYTE_TYPE(enc, ptr)) { + case BT_DIGIT: + case BT_HEX: +@@ -1760,7 +1760,7 @@ PREFIX(updatePosition)(const ENCODING *enc, + case BT_CR: + pos->lineNumber++; + ptr += MINBPC(enc); +- if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) ++ if (ptr < end && BYTE_TYPE(enc, ptr) == BT_LF) + ptr += MINBPC(enc); + pos->columnNumber = (XML_Size)-1; + break; +-- +2.8.2 + + diff --git a/expat/Pkgfile b/expat/Pkgfile index 401622d..76e83d1 100644 --- a/expat/Pkgfile +++ b/expat/Pkgfile @@ -4,11 +4,16 @@ name=expat version=2.1.1 -release=1 -source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2) +release=2 +source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2 + CVE-2015-1283.patch CVE-2016-0718.patch) build() { cd $name-$version + + patch -p2 -i $SRC/CVE-2015-1283.patch + patch -p2 -i $SRC/CVE-2016-0718.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install

1 0

ports/opt (3.2): stunnel: update to 5.32
by crux＠crux.nu 20 May '16

20 May '16

commit 9337290baaa32d064d9df95478fa0caaa162358e Author: Juergen Daubert <jue(a)jue.li> Date: Fri May 20 12:23:18 2016 +0200 stunnel: update to 5.32 diff --git a/stunnel/.md5sum b/stunnel/.md5sum index b038ee6..e9f1362 100644 --- a/stunnel/.md5sum +++ b/stunnel/.md5sum @@ -1,3 +1,3 @@ 4d5387895f3a162d63a6ed76ebbafae8 stunnel -a39b89624984cefc6d229a54f34b33ec stunnel-5.31.tar.gz +60462f97b62e745288541089e8c0877c stunnel-5.32.tar.gz 16694d0e035fdd5e908ff42bc44ea805 stunnel.conf diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index d60525c..d0267b1 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl zlib name=stunnel -version=5.31 +version=5.32 release=1 source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \ $name.conf $name)

1 0