From e98ba651fabbfdfe20ea661b9d499a259e62a95a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 31 Jan 2011 10:22:26 +0000
Subject: Add comments to patches.

---
 graphics/imlib2/distinfo         | 12 ++++++------
 graphics/imlib2/patches/patch-aa |  4 +++-
 graphics/imlib2/patches/patch-ac |  6 +++++-
 graphics/imlib2/patches/patch-ad |  6 +++++-
 graphics/imlib2/patches/patch-ae |  6 +++++-
 graphics/imlib2/patches/patch-cb |  5 ++++-
 6 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'graphics/imlib2')

diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 028d80c5a0d..b41310859d6 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.24 2011/01/14 10:02:53 wiz Exp $
+$NetBSD: distinfo,v 1.25 2011/01/31 10:22:26 wiz Exp $
 
 SHA1 (imlib2-1.4.2.tar.gz) = 769ea1da26774cd7531d1d66432cf8d7d7b30c2b
 RMD160 (imlib2-1.4.2.tar.gz) = 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695
 Size (imlib2-1.4.2.tar.gz) = 932684 bytes
-SHA1 (patch-aa) = deb91537edb7c0ff44dfb2be2ad377f960f65c06
+SHA1 (patch-aa) = 034313d952ab98a690ba8ea40cde33bf6d5d0eac
 SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5
-SHA1 (patch-ac) = bd81a8f1dfaacb43a4f62a187c4d00c43be5a7e3
-SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7
-SHA1 (patch-ae) = 6503e4cbc9bbb93f971ab2ae9fd7d50ddee9e0e8
+SHA1 (patch-ac) = 02e6706b640a6e51cb028447e56ceb65816c64d2
+SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
+SHA1 (patch-ae) = 8cb6e0f0fa1220b2e6840b19256eaf8cd947b63b
 SHA1 (patch-af) = 9ee80e6dac9cc182ac847ac0b8c215352ee99290
-SHA1 (patch-cb) = da837b92a1a4cfd139fe2d9ed319d1cd6e0fb703
+SHA1 (patch-cb) = 15b44bb49545c5cffcb8eb59b68797a08e29369d
diff --git a/graphics/imlib2/patches/patch-aa b/graphics/imlib2/patches/patch-aa
index 78512bd8cfa..07a6d6b5d0e 100644
--- a/graphics/imlib2/patches/patch-aa
+++ b/graphics/imlib2/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2008/11/23 18:41:16 tron Exp $
+$NetBSD: patch-aa,v 1.13 2011/01/31 10:22:26 wiz Exp $
+
+Debian patch to fix a buffer overflow in the XPM file loader.
 
 --- src/modules/loaders/loader_xpm.c.orig	2008-10-21 03:32:51.000000000 +0100
 +++ src/modules/loaders/loader_xpm.c	2008-11-23 18:36:37.000000000 +0000
diff --git a/graphics/imlib2/patches/patch-ac b/graphics/imlib2/patches/patch-ac
index ea1f3375ecb..99b5c7a5718 100644
--- a/graphics/imlib2/patches/patch-ac
+++ b/graphics/imlib2/patches/patch-ac
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2007/09/18 19:18:11 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2011/01/31 10:22:26 wiz Exp $
+
+Use my_lround() on Interix too.
+
+Add minimalist #ifndef blocks to rip out XShm support on Interix.
 
 --- src/lib/grab.c.orig	2007-02-16 12:58:53.000000000 +0100
 +++ src/lib/grab.c
diff --git a/graphics/imlib2/patches/patch-ad b/graphics/imlib2/patches/patch-ad
index 90b31aee863..2c4fce873b8 100644
--- a/graphics/imlib2/patches/patch-ad
+++ b/graphics/imlib2/patches/patch-ad
@@ -1,4 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2005/11/04 20:11:47 tv Exp $
+$NetBSD: patch-ad,v 1.5 2011/01/31 10:22:26 wiz Exp $
+
+Use my_lround() on Interix too.
+
+Add minimalist #ifndef blocks to rip out XShm support on Interix.
 
 --- src/lib/rend.c.orig	2004-11-01 04:39:42.000000000 -0500
 +++ src/lib/rend.c
diff --git a/graphics/imlib2/patches/patch-ae b/graphics/imlib2/patches/patch-ae
index 4604f19d628..ed9f53985af 100644
--- a/graphics/imlib2/patches/patch-ae
+++ b/graphics/imlib2/patches/patch-ae
@@ -1,4 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2005/11/04 20:11:47 tv Exp $
+$NetBSD: patch-ae,v 1.5 2011/01/31 10:22:26 wiz Exp $
+
+Use my_lround() on Interix too.
+
+Add minimalist #ifndef blocks to rip out XShm support on Interix.
 
 --- src/lib/ximage.c.orig	2004-11-01 04:39:42.000000000 -0500
 +++ src/lib/ximage.c
diff --git a/graphics/imlib2/patches/patch-cb b/graphics/imlib2/patches/patch-cb
index f550835fc03..dbe4f7f6804 100644
--- a/graphics/imlib2/patches/patch-cb
+++ b/graphics/imlib2/patches/patch-cb
@@ -1,4 +1,7 @@
-$NetBSD: patch-cb,v 1.1 2006/11/24 12:46:12 drochner Exp $
+$NetBSD: patch-cb,v 1.2 2011/01/31 10:22:26 wiz Exp $
+
+fix some insufficient validation of graphics files, patches from Ubuntu
+(CVE-2006-4806, CVE-2006-4807, CVE-2006-4808, CVE-2006-4809)
 
 --- src/modules/loaders/loader_jpeg.c.orig	2006-09-05 02:37:07.000000000 +0200
 +++ src/modules/loaders/loader_jpeg.c
-- 
cgit v1.2.3