Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb9531b4f2f24404ebcbff1e3b33bc2c8e5339ca
commit eb9531b4f2f24404ebcbff1e3b33bc2c8e5339ca
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Thu May 22 13:30:40 2008 +0200
mrxvt-0.5.3-2-i686
- added display-security.patch
- closes #3090
diff --git a/source/x11-extra/mrxvt/FrugalBuild
b/source/x11-extra/mrxvt/FrugalBuild
index 4450b88..b5bb954 100644
--- a/source/x11-extra/mrxvt/FrugalBuild
+++ b/source/x11-extra/mrxvt/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=mrxvt
pkgver=0.5.3
-pkgrel=1
+pkgrel=2
pkgdesc="Mrxvt(Materm) is a portable, lightweight, fast and multi-tabbed X
terminal emulator based on rxvt."
depends=('libjpeg' 'libsm' 'libxft' 'libpng' 'libxpm')
groups=('x11-extra')
@@ -12,7 +12,9 @@ archs=('i686' 'x86_64')
_F_sourceforge_dirname="materm"
Finclude sourceforge
up2date="lynx -dump http://materm.sourceforge.net/wiki/Main/Download |grep
Unstable -A10 |grep Release |sed -ne 's/.*vt-\(.*\) (.*/\1/;$ p'"
-sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4')
+source=($source mrxvt-0.5.3-display-security.patch)
+sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4' \
+ 'af49d324e36b9a719fd6065a5bbf9279aa8fa272')
Fconfopts="$Fconfopts --enable-everything --disable-debug \
--disable-greek --disable-cjk --disable-thai --disable-utmp \
diff --git a/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch
b/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch
new file mode 100644
index 0000000..69f24d8
--- /dev/null
+++ b/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch
@@ -0,0 +1,64 @@
+Index: src/init.c
+===================================================================
+--- src/init.c (revision 265)
++++ src/init.c (working copy)
+@@ -1030,38 +1030,38 @@
+ /*
+ * Open display, get options/resources and create the window
+ */
+- if (IS_NULL(rs[Rs_display_name] = getenv("DISPLAY")))
+- rs[Rs_display_name] = ":0";
+-
+ rxvt_get_options( r, r_argc, r_argv );
+ rxvt_free( r_argv ); /* XXX memory leak? */
+
+ #ifdef LOCAL_X_IS_UNIX
+- if( rs[Rs_display_name][0] == ':' )
++ /*
++ * 2008-04-29 gi1242: Force UNIX sockets for security (Gentoo Bug #219750)
++ */
++ if( IS_NULL( rs[Rs_display_name] ) )
++ rs[Rs_display_name] = getenv( "DISPLAY" );
++
++ if( rs[Rs_display_name] && rs[Rs_display_name][0] == ':' )
+ {
+- int l = 5 + STRLEN(rs[Rs_display_name]);
++ char *val;
++ int l = 5 + STRLEN(rs[Rs_display_name]);
+ if (l <= 0 || l > 1024) /* possible integer overflow */
+ l = 1024;
++
+ val = rxvt_malloc(l);
+- STRCPY(val, "unix");
+- STRNCAT(val, rs[Rs_display_name], l-5);
+- val[l-1] = (char) 0;
+- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n", val);
+- r->Xdisplay = XOpenDisplay(val);
+- rxvt_free(val);
++ STRCPY( val, "unix");
++ STRNCAT( val, rs[Rs_display_name], l-5);
++
++ rs[Rs_display_name] = val;
+ }
+-#endif
++#endif /* LOCAL_X_IS_UNIX */
+
+- if (IS_NULL(r->Xdisplay))
++ rxvt_msg( DBG_INFO, DBG_INIT, "Open X display %s\n", rs[Rs_display_name]
);
++ r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
++ if( IS_NULL(r->Xdisplay) )
+ {
+- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n",
+- rs[Rs_display_name] ? rs[Rs_display_name] : "nil");
+- r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
+- if (IS_NULL(r->Xdisplay))
+- {
+- rxvt_msg (DBG_ERROR, DBG_INIT, "can't open display %s",
rs[Rs_display_name] );
+- exit( EXIT_FAILURE );
+- }
++ rxvt_msg( DBG_ERROR, DBG_INIT, "Error opening display %s\n",
++ rs[Rs_display_name] );
++ exit( EXIT_FAILURE );
+ }
+
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
