Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=f01c37a62df75969d5b38cef2fbc367385ed62c8
commit f01c37a62df75969d5b38cef2fbc367385ed62c8 Author: Devil505 <devil505li...@gmail.com> Date: Sat Jul 31 20:18:25 2010 +0200 rxvt-unicode-9.07-1-i686 * version bump * removing useless patches diff --git a/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch b/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch deleted file mode 100644 index 6bcfb5c..0000000 --- a/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 d1743f9..778b682 100644 --- a/source/x11-extra/rxvt-unicode/FrugalBuild +++ b/source/x11-extra/rxvt-unicode/FrugalBuild @@ -2,20 +2,17 @@ # Maintainer: voroskoi <voros...@frugalware.org> pkgname=rxvt-unicode -pkgver=9.06 -pkgrel=3 +pkgver=9.07 +pkgrel=1 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>=2.1.13-2' '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 \ - CVE-2008-1142.patch gcc44.diff) +source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2) Fconfopts="${fconfop...@]} --enable-everything" -sha1sums=('df623ebdad001de534781721f8298ba1add0df2c' \ - 'de0ef44bdf799c7a41469f1082f7981348379faa' \ - '00af8ea40a473ec8334491fa764f324206c7e04b') +sha1sums=('0e623daa15c45ba3add622277d32493a97059619') build() { Fmkdir /usr/share/terminfo diff --git a/source/x11-extra/rxvt-unicode/gcc44.diff b/source/x11-extra/rxvt-unicode/gcc44.diff deleted file mode 100644 index 5368c93..0000000 --- a/source/x11-extra/rxvt-unicode/gcc44.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- src/background.C.orig 2009-04-25 01:12:46.000000000 +0200 -+++ src/background.C 2009-04-25 01:19:21.000000000 +0200 -@@ -261,7 +261,7 @@ - unsigned int w = 0, h = 0; - unsigned int n; - unsigned long new_flags = (flags & (~geometryFlags)); -- char *p; -+ const char *p; - # define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ - - if (geom == NULL) -@@ -677,7 +677,7 @@ - if (!target->asimman) - target->asimman = create_generic_imageman (target->rs[Rs_path]); - -- if (char *f = strchr (file, ';')) -+ if (char *f = (char *) strchr (file, ';')) - { - size_t len = f - file; - f = (char *)malloc (len + 1); ---- src/command.C.orig 2009-04-25 01:20:29.000000000 +0200 -+++ src/command.C 2009-04-25 01:21:20.000000000 +0200 -@@ -3336,7 +3336,7 @@ - } - else - { -- char *eq = strchr (str, '='); // constness lost, but verified to be ok -+ char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok - - if (eq) - { ---- src/misc.C.orig 2009-04-25 01:41:05.000000000 +0200 -+++ src/misc.C 2009-04-25 01:41:37.000000000 +0200 -@@ -170,7 +170,7 @@ - char * - rxvt_basename (const char *str) NOTHROW - { -- char *base = strrchr (str, '/'); -+ char *base = (char *) strrchr (str, '/'); - - return (char *) (base ? base + 1 : str); - } - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git