From 51acfd4c59df71d95bd3dbd02819352cb4d5db5f Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9>
Date: Sat, 25 Apr 2009 16:31:52 +0000
Subject: imlib2: adding fix for CVE-2008-5187

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@429 18ef50b8-d735-4ccd-97c1-689132df3dd9
---
 media/libs/imlib2/Manifest          | 24 ++++++++++++++++++++++++
 media/libs/imlib2/imlib2-1.4.2.diff | 12 ++++++++++++
 media/libs/imlib2/imlib2.mkbuild    |  5 +++--
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 media/libs/imlib2/Manifest
 create mode 100644 media/libs/imlib2/imlib2-1.4.2.diff

(limited to 'media')

diff --git a/media/libs/imlib2/Manifest b/media/libs/imlib2/Manifest
new file mode 100644
index 0000000..1a93d47
--- /dev/null
+++ b/media/libs/imlib2/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST imlib2-1.4.2.tar.gz 932684 MD5 0c866a7e696ad5ac58bc9312149f15f0 RMD160 9b1f40ee392c1e27c6a75bbf7e8c7fb379e74695 SHA1 769ea1da26774cd7531d1d66432cf8d7d7b30c2b SHA256 9099c7c33e4150ba6b43d12d1fbe2b7479cfe30285af49a531337c18c088110a SHA512 d2db1f5efef58c1705cb7088b22323d29996229a2964655723f0e3812df08645b1c18b543bce774b990e2c3db32ff23b709059a1d8e941c0f7f45f1602661596
+MKBUILD imlib2.mkbuild 4247 MD5 eb648f4297abe4bd646cecacc0da1649 RMD160 1398c9e162596d150cfa9ee7bc548ed51beff9e1 SHA1 97c45c262f34116cb99fa1cbb903fbe4d2a5e440 SHA256 1d6ec014cdc5f46037301c70295acb659712937f365dec4b762ad2f045094ae0 SHA512 5824599437f036987fe1bbf9392d137f176df43582620449190c2b36e68c8cc29263a2dcfa05928d1b294c18d0f89c5411ea8a3d1227906868a6ef36825f277d
+PATCH imlib2-1.4.2.diff 647 MD5 97523ae37781df933e293ad1838e736e RMD160 aaddd99a4d8c208c540078d030ac24384d86dce5 SHA1 f98dde66eb1effee3a51d58741fde01748a7ff99 SHA256 403e83bbd29a9a8e37b6a24916ab7f56ad03cf115106ae62a2390e78ce48af15 SHA512 f4a3d26b0a660c736c96ef7f9d16685e794ff542944d00c5f13023724ce7034b1fb5a320b05efe419fdff3655445d9d8570d6c9dd34b824714066e4c62677f40
+SLACKBUILD imlib2.SlackBuild 7960 MD5 ddae0e3dc08b5056533e5deb968a4ceb RMD160 c525c2c3afed5b111d06a500efbc962a436f7959 SHA1 d02680646801cdf413d50e21dd1556f14ed5f211 SHA256 94bad8140f0a98d18e1cd60696d23c3d328de4bde8624706e8fdc263687d6e3a SHA512 1e3500519811f733406eba0ea8f98e9aee887d3450afe72fff655b31804e019985d1c4c6606fe28b808817797df32e97453d558aa3fe54d17abc7460818d858c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ8zvDAAoJEEHL93ESzgeizMoP/i3N7PGL5yj8Ca4NeXaiMLz6
+2CkP3iSenr7Zg+Eem/uapYR9hmDmXovsCLtQqzGKGPlVuLnLdcYKcKADmBINF1Pe
+LjR5Wo03NS+pc0cvqrHkLT0u4bH7mKTsPxqnwDhQ+ocx6yU9ehVktsRN4px+ldRv
+Mso1hXTTy2NRadn5eNq42UPvChRGmIUWzSjMqBarT7No1f6Pu/z8/aokCo+MlFm5
+0PzvWYAX09tPT07wRZZyzOSJVAYnl1/Q1OLHjgZNR8k05mc7RNWgBTtxTkj90isa
+LfOQ7M3K7SA7ORp8C1bf4h3dLCIpKR81At71NqtRMi4R7yqOZFuIk6yH1rOBS7rW
+RM615QtcrnYPiztj356VNuhE+oCX1MQabICIFmll2Ha8Ks+bikefClxgE41D2WXJ
+GW5TNHn+MvwmcAHvuwx5Evpo41IF6//brbGF9YNHGjGCRzdYjD4PkK/7VLY+4blp
+Ll/Z0q6XydScTa8teIiWvDr1fHlQJfIaUFFUcMgq19TF5J0MiGplsMGuhetVYswB
+GQdMxQB/+mDKBQTR9ar0zNYEmzz6wSG9rNmI2EDjgnRhZypnRNVuPik+0K2oI6lf
+05XNOO8UOOViTijVML+L9b4vxZNc4nrcjUnEroE+ACPNJgW/hq5M7UcY0fE3Ete5
+obGC80bHIgxmot/+qe+X
+=yGO2
+-----END PGP SIGNATURE-----
diff --git a/media/libs/imlib2/imlib2-1.4.2.diff b/media/libs/imlib2/imlib2-1.4.2.diff
new file mode 100644
index 0000000..30523ef
--- /dev/null
+++ b/media/libs/imlib2/imlib2-1.4.2.diff
@@ -0,0 +1,12 @@
+diff -Naur imlib2-1.4.2.orig/src/modules/loaders/loader_xpm.c imlib2-1.4.2/src/modules/loaders/loader_xpm.c
+--- imlib2-1.4.2.orig/src/modules/loaders/loader_xpm.c	2008-10-21 00:32:51.000000000 -0200
++++ imlib2-1.4.2/src/modules/loaders/loader_xpm.c	2009-04-25 13:31:35.000000000 -0300
+@@ -253,7 +253,7 @@
+                                  return 0;
+                               }
+                             ptr = im->data;
+-                            end = ptr + (sizeof(DATA32) * w * h);
++                            end = ptr + (pixels);
+                             pixels = w * h;
+                          }
+                        else
diff --git a/media/libs/imlib2/imlib2.mkbuild b/media/libs/imlib2/imlib2.mkbuild
index 13c55cc..f78a73b 100644
--- a/media/libs/imlib2/imlib2.mkbuild
+++ b/media/libs/imlib2/imlib2.mkbuild
@@ -45,7 +45,7 @@
 #
 # Build number.
 # Auto-set to default 1
-[[BUILD NUMBER]]=""
+[[BUILD NUMBER]]="2"
 
 #
 # Source Name construction string
@@ -132,8 +132,9 @@ off: svn_source
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
+ on: manifest_check
  on: untar_source
-off: patch_source
+ on: patch_source
  on: configure
  on: make_package
  on: install_package
-- 
cgit v1.2.3