diff --git a/cairo/.footprint b/cairo/.footprint index a1c9cb781..f99a8f77c 100644 --- a/cairo/.footprint +++ b/cairo/.footprint @@ -32,19 +32,19 @@ drwxr-xr-x root/root usr/lib/cairo/ -rwxr-xr-x root/root usr/lib/cairo/libcairo-trace.so -rw-r--r-- root/root usr/lib/libcairo-gobject.a -rwxr-xr-x root/root usr/lib/libcairo-gobject.la -lrwxrwxrwx root/root usr/lib/libcairo-gobject.so -> libcairo-gobject.so.2.11506.0 -lrwxrwxrwx root/root usr/lib/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11506.0 --rwxr-xr-x root/root usr/lib/libcairo-gobject.so.2.11506.0 +lrwxrwxrwx root/root usr/lib/libcairo-gobject.so -> libcairo-gobject.so.2.11508.0 +lrwxrwxrwx root/root usr/lib/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11508.0 +-rwxr-xr-x root/root usr/lib/libcairo-gobject.so.2.11508.0 -rw-r--r-- root/root usr/lib/libcairo-script-interpreter.a -rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.la -lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11506.0 -lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11506.0 --rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.so.2.11506.0 +lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11508.0 +lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11508.0 +-rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.so.2.11508.0 -rw-r--r-- root/root usr/lib/libcairo.a -rwxr-xr-x root/root usr/lib/libcairo.la -lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11506.0 -lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11506.0 --rwxr-xr-x root/root usr/lib/libcairo.so.2.11506.0 +lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11508.0 +lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11508.0 +-rwxr-xr-x root/root usr/lib/libcairo.so.2.11508.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/cairo-fc.pc -rw-r--r-- root/root usr/lib/pkgconfig/cairo-ft.pc diff --git a/cairo/.md5sum b/cairo/.md5sum index 6e904d877..80c299629 100644 --- a/cairo/.md5sum +++ b/cairo/.md5sum @@ -1,5 +1,4 @@ a3d7abd8e20b780f76300a76a4a4d963 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch -3f7fad1ce2f2564f1726cda7ae7fad18 cairo-1.15.6.tar.xz -ef74467172b3a8703c5d7da943f5bbfb cairo-fix-off-by-one-check.patch +e9cd63849e4792ec403fb6de78cfd9dd cairo-1.15.8.tar.xz bff33916d8b44e9c3f0f3e6644e61bfc cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff d602f595c5800bf470c33cd1af7541d1 cairo-xlib-endianness.patch diff --git a/cairo/.signature b/cairo/.signature index 72446b3d0..8c069af5d 100644 --- a/cairo/.signature +++ b/cairo/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aoffrUblj/Md9PFIuH/PeKJPxlzAnueHldM+bT8bip6oCRGrRK5I1TuCq0UQnj9iIZftp79D5+7gExFOBVsSQE= -SHA256 (Pkgfile) = 75f6d709e74039b2f3e7ca12dccc163490f67d88f459e9de8bdec5a5ee5f4b05 -SHA256 (.footprint) = 01f56a1c4513bb142b94d81c220f5838103a12f0101cadf878525f486d03ef72 -SHA256 (cairo-1.15.6.tar.xz) = 5228e0a1f8fd14317f30f08f3dd72971bca432f8cdd2281d421fdcc2279de58c +RWSE3ohX2g5d/bAwCjP7PryPl8Tf4yYJ6nd5DNUIGz6KnhEcElTCcLt6lkTYJNqtWMqpEY/1cwQUQtuhHHnFlC43gO3jqh6IrwY= +SHA256 (Pkgfile) = 6517c61341777e0f35d589f0667b5552b9a9fdf01b807b5fc14f3a11eff00ad3 +SHA256 (.footprint) = ee6c1181f6e5f8f8ad3b7a0457ee1c2da8f5ce43c2702b453effa04aa98af9d8 +SHA256 (cairo-1.15.8.tar.xz) = 3224260a4f8e22e7ea95faf706ae111b974833dd74185be1db5ebc7618a98464 SHA256 (cairo-xlib-endianness.patch) = 58d39311edee6d8ddf76deac1d2e3526b4c02d4aa1f35a6ca16ff50c8e65429f SHA256 (cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff) = 4c8b8095a41f244ddfbc9b24e2f73a6fd8d697f43903617e0519b95b27b30726 -SHA256 (cairo-fix-off-by-one-check.patch) = e4f3239497d2c6d248745a2c398715fef54c62cdf60380ea5173c4c62d1c4c33 SHA256 (0001-image-prevent-invalid-ptr-access-for-4GB-images.patch) = 79cb7b65d1079efb36ee62ec5ddf6e930dc24e0fd3ac4d914aadf98afb15c8f8 diff --git a/cairo/Pkgfile b/cairo/Pkgfile index 91ff833e2..b80adad0b 100644 --- a/cairo/Pkgfile +++ b/cairo/Pkgfile @@ -4,19 +4,17 @@ # Depends on: fontconfig, xorg-libxext, xorg-libxrender, xorg-libpixman, xorg-xcb-util, glib name=cairo -version=1.15.6 -release=2 +version=1.15.8 +release=1 source=(https://cairographics.org/snapshots/cairo-$version.tar.xz cairo-xlib-endianness.patch cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff - cairo-fix-off-by-one-check.patch 0001-image-prevent-invalid-ptr-access-for-4GB-images.patch) build() { cd $name-$version patch -p1 -i $SRC/cairo-xlib-endianness.patch patch -p1 -i $SRC/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff - patch -p1 -i $SRC/cairo-fix-off-by-one-check.patch patch -p1 -i $SRC/0001-image-prevent-invalid-ptr-access-for-4GB-images.patch ./configure --prefix=/usr \ diff --git a/cairo/cairo-fix-off-by-one-check.patch b/cairo/cairo-fix-off-by-one-check.patch deleted file mode 100644 index c9c2adddf..000000000 --- a/cairo/cairo-fix-off-by-one-check.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 57b40507dda3f58dfc8635548d606b86dc7bcf51 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson -Date: Thu, 15 Jun 2017 20:53:29 +0930 -Subject: Fix off by one check in cairo-image-info.c - -https://bugs.freedesktop.org/show_bug.cgi?id=101427 - -diff --git a/src/cairo-image-info.c b/src/cairo-image-info.c -index 2ecce95..3b4cf6e 100644 ---- a/src/cairo-image-info.c -+++ b/src/cairo-image-info.c -@@ -154,7 +154,7 @@ _cairo_image_info_get_jpeg_info (cairo_image_info_t *info, - break; - } - -- if (p + 2 > data + length) -+ if (p + 3 > data + length) - return CAIRO_INT_STATUS_UNSUPPORTED; - - p = _jpeg_skip_segment (p); --- -cgit v0.10.2 -