[Frugalware-git] interim: rxvt-unicode-9.02-2-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=42d40f72accb9296d6163073751850dbd971b506

commit 42d40f72accb9296d6163073751850dbd971b506
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu May 22 13:43:05 2008 +0200

rxvt-unicode-9.02-2-i686
- added CVE-2008-1142.patch
- closes #3089

diff --git a/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch b/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch
new file mode 100644
index 0000000..6bcfb5c
--- /dev/null
+++ b/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch
@@ -0,0 +1,24 @@
+diff -urN rxvt-unicode-9.02.orig/src/init.C rxvt-unicode-9.02/src/init.C
+--- rxvt-unicode-9.02.orig/src/init.C	2008-05-04 20:16:26.000000000 +0200
++++ rxvt-unicode-9.02/src/init.C	2008-05-04 20:24:14.000000000 +0200
+@@ -372,15 +372,16 @@
+    * Open display, get options/resources and create the window
+    */
+
+-  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+-    rs[Rs_display_name] = ":0";
++  rs[Rs_display_name] = getenv ("DISPLAY");
+
+   get_options (r_argc, r_argv);
+
+-  if (!(display = displays.get (rs[Rs_display_name])))
++  if (!rs[Rs_display_name] || !(display = displays.get (rs[Rs_display_name])))
+     {
+       free (r_argv);
+-      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
++      rxvt_fatal ("can't open display %s, aborting.\n",
++                  (rs[Rs_display_name] ? rs[Rs_display_name] :
++                   "as no -display option given and DISPLAY not set"));
+     }
+
+   // using a local pointer decreases code size a lot
diff --git a/source/x11-extra/rxvt-unicode/FrugalBuild b/source/x11-extra/rxvt-unicode/FrugalBuild
index d68eb66..6c4ce74 100644
--- a/source/x11-extra/rxvt-unicode/FrugalBuild
+++ b/source/x11-extra/rxvt-unicode/FrugalBuild
@@ -3,16 +3,18 @@

pkgname=rxvt-unicode
pkgver=9.02
-pkgrel=1
+pkgrel=2
pkgdesc="rxvt-unicode is a clone of the well known terminal emulator rxvt"
url="http://software.schmorp.de/"
depends=('perl>=5.10.0-2' 'libxft' 'libgcc')
groups=('x11-extra')
archs=('i686' 'x86_64')
up2date="Flasttar http://dist.schmorp.de/rxvt-unicode/"
-source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2)
+source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2 \
+	CVE-2008-1142.patch)
Fconfopts="${Fconfopts[@]} --enable-everything"
-sha1sums=('f58a851ab4bf2da60a926a4885749302e73a92ed')
+sha1sums=('f58a851ab4bf2da60a926a4885749302e73a92ed' \
+          'de0ef44bdf799c7a41469f1082f7981348379faa')

build() {
Fmkdir /usr/share/terminfo