Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=d3aba3f487f0e32ec41c582f4dd80c4f5bd14358
commit d3aba3f487f0e32ec41c582f4dd80c4f5bd14358
Author: voroskoi <[EMAIL PROTECTED]>
Date: Tue Aug 5 09:00:57 2008 +0200
mrxvt-0.5.4-1-x86_64
version bump
mrxvt-0.5.3-display-security.patch in upstream
diff --git a/source/x11-extra/mrxvt/FrugalBuild
b/source/x11-extra/mrxvt/FrugalBuild
index b5bb954..dc6f217 100644
--- a/source/x11-extra/mrxvt/FrugalBuild
+++ b/source/x11-extra/mrxvt/FrugalBuild
@@ -3,19 +3,16 @@
# Maintainer: voroskoi <[EMAIL PROTECTED]>
pkgname=mrxvt
-pkgver=0.5.3
-pkgrel=2
+pkgver=0.5.4
+pkgrel=1
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')
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'"
-source=($source mrxvt-0.5.3-display-security.patch)
-sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4' \
- 'af49d324e36b9a719fd6065a5bbf9279aa8fa272')
-
+up2date="lynx -dump http://materm.sourceforge.net/wiki/Main/Download |grep
Unstable -A10 |grep Release |sed -ne 's/.*-\(.*\)/\1/;$ p'"
+sha1sums=('f50e9ad2f652d4212b0ac5241b919372d9e43744')
Fconfopts="$Fconfopts --enable-everything --disable-debug \
--disable-greek --disable-cjk --disable-thai --disable-utmp \
--disable-wtmp --disable-lastlog --disable-utempter \
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
deleted file mode 100644
index 69f24d8..0000000
--- a/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
