From voroskoi at frugalware.org Mon Sep 3 19:27:21 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 3 19:27:23 2007 Subject: [Frugalware-darcs] frugalware-0.6: php-5.2.3-1terminus3-i686 Message-ID: <20070903172721.6653213A4152@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070903172344-dd049-616b3b28c6d20bbd7ab29a6f5ebc0c0670088096.gz; [php-5.2.3-1terminus3-i686 voroskoi **20070903172344 secfix relbump, closes #2267 ] { addfile ./source/devel/php/CVE-2007-3806.diff hunk ./source/devel/php/CVE-2007-3806.diff 1 +--- ext/standard/dir.c.orig 2007-02-25 02:16:23.000000000 +0900 ++++ ext/standard/dir.c +@@ -395,6 +395,7 @@ PHP_FUNCTION(glob) + } + #endif + ++ memset(&globbuf, 0, sizeof(glob_t)); + globbuf.gl_offs = 0; + if (0 != (ret = glob(pattern, flags & GLOB_FLAGMASK, NULL, &globbuf))) { + #ifdef GLOB_NOMATCH hunk ./source/devel/php/FrugalBuild 7 -pkgrel=1terminus2 +pkgrel=1terminus3 hunk ./source/devel/php/FrugalBuild 20 - http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz) + http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz \ + CVE-2007-3806.diff) hunk ./source/devel/php/FrugalBuild 195 - 'f479e4943e14c3a442659c3af05e30d32156d1b1') + 'f479e4943e14c3a442659c3af05e30d32156d1b1' \ + 'c4bfe3432ccbc2d369269f44d3b70a2afc244452') } From voroskoi at frugalware.org Mon Sep 3 20:40:04 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 3 20:40:08 2007 Subject: [Frugalware-darcs] frugalware-0.6: opera-9.23-1terminus1-i686 Message-ID: <20070903184004.1F59113A4152@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070903183515-dd049-4ff395118c07ac30b5cbb9d30f902137c6903e60.gz; [opera-9.23-1terminus1-i686 voroskoi **20070903183515 version bump, closes #2369 ] { hunk ./source/xapps-extra/opera/FrugalBuild 6 -pkgver=9.22 -pkgextraver=20070716.1-static-qt.i386-en +pkgver=9.23 +pkgextraver=20070809.1-static-qt.i386-en hunk ./source/xapps-extra/opera/FrugalBuild 23 - Fcd $pkgname-$pkgver-$pkgextraver-655 + Fcd $pkgname-$pkgver-$pkgextraver-660 hunk ./source/xapps-extra/opera/FrugalBuild 28 -sha1sums=('bdcbdd5e8303f42e5af254f9b074fb19c3e90436') +sha1sums=('514751453e39ab2dad250306bc258011c2ecbf66') } From voroskoi at frugalware.org Mon Sep 3 20:55:09 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 3 20:55:15 2007 Subject: [Frugalware-darcs] frugalware-0.6: poppler-0.5.4-3terminus1-i686 Message-ID: <20070903185510.0D54313A4152@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070903184804-dd049-bf7abc44954ab78512dc5e6631c4b01596a4c0c8.gz; [poppler-0.5.4-3terminus1-i686 voroskoi **20070903184804 secfix relbump, closes #2300 ] { addfile ./source/xlib/poppler/100_streampredictor_overflow.patch.diff hunk ./source/xlib/poppler/100_streampredictor_overflow.patch.diff 1 +diff -Nur poppler-0.5.4/poppler/Stream.cc poppler-0.5.4.new/poppler/Stream.cc +--- poppler-0.5.4/poppler/Stream.cc 2006-07-28 11:07:41.000000000 -0700 ++++ poppler-0.5.4.new/poppler/Stream.cc 2007-08-07 11:29:59.854631893 -0700 +@@ -422,21 +422,14 @@ + ok = gFalse; + + nVals = width * nComps; +- if (width <= 0 || nComps <= 0 || nBits <= 0 || +- nComps >= INT_MAX/nBits || +- width >= INT_MAX/nComps/nBits || +- nVals * nBits + 7 < 0) { +- return; +- } +- totalBits = nVals * nBits; +- if (totalBits == 0 || +- (totalBits / nBits) / nComps != width || +- totalBits + 7 < 0) { +- return; +- } + pixBytes = (nComps * nBits + 7) >> 3; +- rowBytes = ((totalBits + 7) >> 3) + pixBytes; +- if (rowBytes < 0) { ++ rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; ++ if (width <= 0 || nComps <= 0 || nBits <= 0 || ++ nComps > gfxColorMaxComps || ++ nBits > 16 || ++ nVals <= 0 || ++ nVals * nBits + 7 <= 0 || ++ rowBytes <= 0) { + return; + } + predLine = (Guchar *)gmalloc(rowBytes); hunk ./source/xlib/poppler/FrugalBuild 6 -pkgrel=2 +pkgrel=3terminus1 hunk ./source/xlib/poppler/FrugalBuild 15 - 01-poppler.conf MOAB-06-01-2007.diff) + 01-poppler.conf MOAB-06-01-2007.diff 100_streampredictor_overflow.patch.diff) hunk ./source/xlib/poppler/FrugalBuild 42 +sha1sums=('edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1' \ + 'a048348d9a8c6d545714350d3ab66dc7028e4b7f' \ + '3b026ffef9cf8c1c273077c3282d70938c7b5a4b' \ + '7179b5d4b0240e528150a471e54c219446dfc012') hunk ./source/xlib/poppler/FrugalBuild 47 -sha1sums=('edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1'\ - 'a048348d9a8c6d545714350d3ab66dc7028e4b7f'\ - '3b026ffef9cf8c1c273077c3282d70938c7b5a4b') } From voroskoi at frugalware.org Mon Sep 3 20:58:16 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 3 20:58:19 2007 Subject: [Frugalware-darcs] frugalware-0.6: tor-0.1.2.16-1terminus1-i686 Message-ID: <20070903185816.D79A713A4152@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070903185257-dd049-24aa02712f25124674e0dd8d42adbedf804139c1.gz; [tor-0.1.2.16-1terminus1-i686 voroskoi **20070903185257 version bump, closes #2365 ] { hunk ./source/network-extra/tor/FrugalBuild 6 -pkgver=0.1.2.14 +pkgver=0.1.2.16 hunk ./source/network-extra/tor/FrugalBuild 31 -sha1sums=('94140509bf158d2cab265e5193067f335d2a3cce'\ - 'f2d940f3fe3496bac73bf48aba5d33063865578f'\ +sha1sums=('f8eb950612db49b2f7176c068ca69e0091950bdb' \ + 'f2d940f3fe3496bac73bf48aba5d33063865578f' \ } From voroskoi at frugalware.org Thu Sep 6 08:48:32 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 08:48:34 2007 Subject: [Frugalware-darcs] frugalware-0.6: tar-1.16.1-2terminus1-i686 Message-ID: <20070906064832.DD80E13A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906063713-dd049-bbf20d39c2bf524c23965946773841b0d763ace9.gz; [tar-1.16.1-2terminus1-i686 voroskoi **20070906063713 secfix relbump, closes #2376 ] { addfile ./source/base/tar/CVE-2007-4131.diff hunk ./source/base/tar/CVE-2007-4131.diff 1 +2005-05-15 Dmitry V. Levin + + * src/names.c (contains_dot_dot): Fix ".." detection. + Previous edition fails to recognize "foo//.." case. + +--- tar-1.15.1/src/names.c.orig 2004-09-06 11:30:54 +0000 ++++ tar-1.15.1/src/names.c 2005-05-15 13:21:13 +0000 +@@ -1152,11 +1152,10 @@ contains_dot_dot (char const *name) + if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) + return 1; + +- do ++ while (! ISSLASH (*p)) + { + if (! *p++) + return 0; + } +- while (! ISSLASH (*p)); + } + } hunk ./source/base/tar/FrugalBuild 6 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/base/tar/FrugalBuild 14 - $pkgname-1.16-lzma.diff) -signatures=($source.sig '' '') + $pkgname-1.16-lzma.diff CVE-2007-4131.diff) +signatures=($source.sig '' '' '') hunk ./source/base/tar/FrugalBuild 23 -# optimization ok +# optimization OK } From voroskoi at frugalware.org Thu Sep 6 09:03:03 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 09:03:06 2007 Subject: [Frugalware-darcs] frugalware-0.6: kdelibs-3.5.6-4terminus1-i686 Message-ID: <20070906070303.3579D13A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906055254-dd049-a7a1133678a7e4b6a8726fe5dae76cacdda5dd2d.gz; [kdelibs-3.5.6-4terminus1-i686 voroskoi **20070906055254 secfix relbump, partially closes #2265 ] { hunk ./source/kde/kdelibs/FrugalBuild 7 -pkgrel=3 +pkgrel=4terminus1 hunk ./source/kde/kdelibs/FrugalBuild 29 - ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.6-kdelibs.diff) + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.6-kdelibs.diff \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff) hunk ./source/kde/kdelibs/FrugalBuild 66 -sha1sums=('2cc15499bd2191bd9333cfd1892b5ecf1199fbfd'\ - 'b67afb54be3b2ac24ba9a491cb38a871a27a6316'\ - '916c2a2c5e28f4d72720d37348f9c813114adabf'\ - '538d8f2076e360f1d733e79b7c35b5326edb41af'\ - 'e45f5f357859f243e627cfaa7bd9682ac49c2eab'\ - '49b52e2c722f2b519818ceea186da39fe7314f5c'\ - 'b5b86e4dec97f2355f0a1ac42979cb8d4640bf42'\ - '28bc994050782f5e84839e70dcacf7422d990818'\ - '92a69598fca05c346e954ad55bb9ea9defa93b1e'\ - '9579606c340dc9b983e5f8d0b163e7e0ab7f90b4'\ - 'dc36cd3f10324974038eb569cfa4e3fb95e790fa'\ - '25424adbddc1968d8d3cec549b5328190cbd7710') +sha1sums=('2cc15499bd2191bd9333cfd1892b5ecf1199fbfd' \ + 'b67afb54be3b2ac24ba9a491cb38a871a27a6316' \ + '916c2a2c5e28f4d72720d37348f9c813114adabf' \ + '538d8f2076e360f1d733e79b7c35b5326edb41af' \ + 'e45f5f357859f243e627cfaa7bd9682ac49c2eab' \ + '49b52e2c722f2b519818ceea186da39fe7314f5c' \ + 'b5b86e4dec97f2355f0a1ac42979cb8d4640bf42' \ + '28bc994050782f5e84839e70dcacf7422d990818' \ + '92a69598fca05c346e954ad55bb9ea9defa93b1e' \ + '9579606c340dc9b983e5f8d0b163e7e0ab7f90b4' \ + 'dc36cd3f10324974038eb569cfa4e3fb95e790fa' \ + '25424adbddc1968d8d3cec549b5328190cbd7710' \ + '2952806f4ad8a31b82cd2795cad95b73822a663b') } From voroskoi at frugalware.org Thu Sep 6 09:29:23 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 09:29:24 2007 Subject: [Frugalware-darcs] frugalware-0.6: apache-2.2.4-2terminus2-i686 Message-ID: <20070906072923.767A113A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906072020-dd049-96012b6db65011ee186f72b1ff9f3d91c2207f11.gz; [apache-2.2.4-2terminus2-i686 voroskoi **20070906072020 secfix relbump, closes #2381 ] { addfile ./source/network/apache/CVE-2007-3847.patch hunk ./source/network/apache/CVE-2007-3847.patch 1 +--- 2.2.x/modules/proxy/proxy_util.c 2007/07/17 17:12:58 556972 ++++ 2.2.x/modules/proxy/proxy_util.c 2007/08/06 17:27:09 563198 +@@ -280,70 +280,28 @@ + return NULL; + } + +-static const char * const lwday[7] = +-{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; +- + /* + * If the date is a valid RFC 850 date or asctime() date, then it +- * is converted to the RFC 1123 format, otherwise it is not modified. +- * This routine is not very fast at doing conversions, as it uses +- * sscanf and sprintf. However, if the date is already correctly +- * formatted, then it exits very quickly. ++ * is converted to the RFC 1123 format. + */ + PROXY_DECLARE(const char *) +- ap_proxy_date_canon(apr_pool_t *p, const char *x1) ++ ap_proxy_date_canon(apr_pool_t *p, const char *date) + { +- char *x = apr_pstrdup(p, x1); +- int wk, mday, year, hour, min, sec, mon; +- char *q, month[4], zone[4], week[4]; ++ apr_status_t rv; ++ char* ndate; + +- q = strchr(x, ','); +- /* check for RFC 850 date */ +- if (q != NULL && q - x > 3 && q[1] == ' ') { +- *q = '\0'; +- for (wk = 0; wk < 7; wk++) +- if (strcmp(x, lwday[wk]) == 0) +- break; +- *q = ','; +- if (wk == 7) +- return x; /* not a valid date */ +- if (q[4] != '-' || q[8] != '-' || q[11] != ' ' || q[14] != ':' || +- q[17] != ':' || strcmp(&q[20], " GMT") != 0) +- return x; +- if (sscanf(q + 2, "%u-%3s-%u %u:%u:%u %3s", &mday, month, &year, +- &hour, &min, &sec, zone) != 7) +- return x; +- if (year < 70) +- year += 2000; +- else +- year += 1900; +- } +- else { +-/* check for acstime() date */ +- if (x[3] != ' ' || x[7] != ' ' || x[10] != ' ' || x[13] != ':' || +- x[16] != ':' || x[19] != ' ' || x[24] != '\0') +- return x; +- if (sscanf(x, "%3s %3s %u %u:%u:%u %u", week, month, &mday, &hour, +- &min, &sec, &year) != 7) +- return x; +- for (wk = 0; wk < 7; wk++) +- if (strcmp(week, apr_day_snames[wk]) == 0) +- break; +- if (wk == 7) +- return x; ++ apr_time_t time = apr_date_parse_http(date); ++ if (!time) { ++ return date; + } + +-/* check date */ +- for (mon = 0; mon < 12; mon++) +- if (strcmp(month, apr_month_snames[mon]) == 0) +- break; +- if (mon == 12) +- return x; ++ ndate = apr_palloc(p, APR_RFC822_DATE_LEN); ++ rv = apr_rfc822_date(ndate, time); ++ if (rv != APR_SUCCESS) { ++ return date; ++ } + +- q = apr_palloc(p, 30); +- apr_snprintf(q, 30, "%s, %.2d %s %d %.2d:%.2d:%.2d GMT", apr_day_snames[wk], +- mday, apr_month_snames[mon], year, hour, min, sec); +- return q; ++ return ndate; + } + + PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r) hunk ./source/network/apache/FrugalBuild 7 -pkgrel=2terminus1 +pkgrel=2terminus2 hunk ./source/network/apache/FrugalBuild 19 - CVE-2006-5752.patch CVE-2007-1863.patch CVE-2007-3304.patch) -signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '') + CVE-2006-5752.patch CVE-2007-1863.patch CVE-2007-3304.patch CVE-2007-3847.patch) +signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '') } From voroskoi at frugalware.org Thu Sep 6 10:51:00 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 10:51:02 2007 Subject: [Frugalware-darcs] frugalware-0.6: po4a-0.30-2terminus1-i686 Message-ID: <20070906085100.0F13E13A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906084358-dd049-3b94c01d980e6e8c0caf08da70aadab816afbac8.gz; [po4a-0.30-2terminus1-i686 voroskoi **20070906084358 secfix relbump, closes #2374 ] { addfile ./source/devel-extra/po4a/CVE-2007-4462.diff hunk ./source/devel-extra/po4a/CVE-2007-4462.diff 1 +--- po4a/lib/Locale/Po4a/Po.pm 2007/04/18 08:36:04 1.76 ++++ po4a/lib/Locale/Po4a/Po.pm 2007/06/17 00:19:39 1.77 +@@ -487,14 +487,14 @@ sub gettextize { + # Make sure both type are the same + # + if ($typeorig ne $typetrans){ +- $pores->write("/tmp/gettextization.failed.po"); ++ $pores->write("gettextization.failed.po"); + die wrap_msg(dgettext("po4a", + "po4a gettextization: Structure disparity between original and translated files:\n". + "msgid (at %s) is of type '%s' while\n". + "msgstr (at %s) is of type '%s'.\n". + "Original text: %s\n". + "Translated text: %s\n". +- "(result so far dumped to /tmp/gettextization.failed.po)")."%s", ++ "(result so far dumped to gettextization.failed.po)")."%s", + $reforig, $typeorig, $reftrans, $typetrans, $orig, $trans,$toobad); + } + hunk ./source/devel-extra/po4a/FrugalBuild 7 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/devel-extra/po4a/FrugalBuild 15 -source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz) -sha1sums=('43491759455899a1a72ee22556440f376f50b5fe') +source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz CVE-2007-4462.diff) +sha1sums=('43491759455899a1a72ee22556440f376f50b5fe' \ + '3dcf4e64a8960f44a8a6c451668e8bfc009fda03') } From voroskoi at frugalware.org Thu Sep 6 12:45:38 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 12:45:40 2007 Subject: [Frugalware-darcs] frugalware-0.6: kdebase-3.5.6-3terminus1-i686 Message-ID: <20070906104538.41FCC13A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906104235-dd049-c52ba7ee8d4b76409bc8dce4195d349c8eebef5a.gz; [kdebase-3.5.6-3terminus1-i686 voroskoi **20070906104235 secfix relbump, closes #2265 ] { hunk ./source/kde/kdebase/FrugalBuild 7 -pkgrel=2 +pkgrel=3terminus1 hunk ./source/kde/kdebase/FrugalBuild 9 -depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.6-3' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \ +depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.6-4terminus1' 'libraw1394' 'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \ hunk ./source/kde/kdebase/FrugalBuild 36 - media_ntfs3g.patch) + media_ntfs3g.patch \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff) hunk ./source/kde/kdebase/FrugalBuild 84 -sha1sums=('0b37cae9637692c123a28c405dea8540e6b935c5'\ - 'e1f706c984fc81633663c662e674b6f2c64d2f83'\ - '81092d3c9cfc08de1ac63c8318f0f1391501fb8d'\ - '47f17c8b39c11496cb13a25db4bf796444f895de'\ - '9c91aef12565bdc07c7643885e8ed506bc44d51c'\ - '08fbbf8bbd4efd83a78028e2ff4a6bd95d67c869'\ - 'e4a8e199be90e752d89897979699914d0f62e714'\ - '5581c23aba58d083b159a2173b91b32f73433c26'\ - 'c50196fd00fc7cc59d660cedfa2905ffba1fdfe4'\ - '21a1e2942383f8eed59c09a7372f3e6fde4fe706'\ - '8c23593b38a050cb38c135209daee85f46a7ee2a'\ - 'a940daab394615afd1105a4da28418a931c321e0'\ - 'da0d7ef890d5788cfa31ccd1e4812ba17894eb73'\ - 'a184a44d85b999d3072b5ede35b8b6947f2947f4'\ - '59b570e137fa6bb622eeb3da1237ca5ec6dbf5a3'\ - '1233baad88df6a7a5347db7392a3afa7f21812fd'\ - 'afff70bdd816bfbff5fb3fd6e612c648ef901858') +sha1sums=('0b37cae9637692c123a28c405dea8540e6b935c5' \ + 'e1f706c984fc81633663c662e674b6f2c64d2f83' \ + '81092d3c9cfc08de1ac63c8318f0f1391501fb8d' \ + '47f17c8b39c11496cb13a25db4bf796444f895de' \ + '9c91aef12565bdc07c7643885e8ed506bc44d51c' \ + '08fbbf8bbd4efd83a78028e2ff4a6bd95d67c869' \ + 'e4a8e199be90e752d89897979699914d0f62e714' \ + '5581c23aba58d083b159a2173b91b32f73433c26' \ + 'c50196fd00fc7cc59d660cedfa2905ffba1fdfe4' \ + '21a1e2942383f8eed59c09a7372f3e6fde4fe706' \ + '8c23593b38a050cb38c135209daee85f46a7ee2a' \ + 'a940daab394615afd1105a4da28418a931c321e0' \ + 'da0d7ef890d5788cfa31ccd1e4812ba17894eb73' \ + 'a184a44d85b999d3072b5ede35b8b6947f2947f4' \ + '59b570e137fa6bb622eeb3da1237ca5ec6dbf5a3' \ + '1233baad88df6a7a5347db7392a3afa7f21812fd' \ + 'afff70bdd816bfbff5fb3fd6e612c648ef901858' \ + '3868392701ebe9fce14567a1f52d458d00f31287') } From voroskoi at frugalware.org Thu Sep 6 13:11:57 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 13:12:00 2007 Subject: [Frugalware-darcs] frugalware-0.6: thunderbird-1.5.0.13-1terminus1-x86_64 Message-ID: <20070906111157.3FE7013A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906110911-dd049-6648b3ec7cb8fe6bd7a148d60cb9f8c42be7c09d.gz; [thunderbird-1.5.0.13-1terminus1-x86_64 voroskoi **20070906110911 secfix bump, closes #2264 ] { hunk ./source/xapps/thunderbird/FrugalBuild 6 -pkgver=1.5.0.12 +pkgver=1.5.0.13 } From voroskoi at frugalware.org Thu Sep 6 13:51:40 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 13:51:41 2007 Subject: [Frugalware-darcs] frugalware-0.6: asterisk-1.4.11-1terminus1-i686 Message-ID: <20070906115140.A1F0C13A41FB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906111748-dd049-b8191802c17eb7b9219e33344c6b94f704cb58bb.gz; [asterisk-1.4.11-1terminus1-i686 voroskoi **20070906111748 secfix bump, closes #2328 ] { hunk ./source/apps-extra/asterisk/FrugalBuild 6 -pkgver=1.4.8 +pkgver=1.4.11 hunk ./source/apps-extra/asterisk/FrugalBuild 20 -sha1sums=('030a6719940321b30f0aef32abc89c3caeeaa57b' \ +sha1sums=('2a27155dd716bf8bd3f92fe9eee7fe82e311170c' \ } From voroskoi at frugalware.org Thu Sep 6 20:04:23 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 20:04:25 2007 Subject: [Frugalware-darcs] frugalware-0.6: id3lib-3.8.3-4terminus1-i686 Message-ID: <20070906180423.1B31413A421C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906175558-dd049-667513401d43f89181d90810e064e41789efa310.gz; [id3lib-3.8.3-4terminus1-i686 voroskoi **20070906175558 secfix relbump, closes #2372 ] { addfile ./source/multimedia/id3lib/CVE-2007-4460.diff hunk ./source/multimedia/id3lib/CVE-2007-4460.diff 1 +--- id3lib3.8.3-3.8.3.orig/src/tag_file.cpp ++++ id3lib3.8.3-3.8.3/src/tag_file.cpp +@@ -242,8 +242,8 @@ + strcpy(sTempFile, filename.c_str()); + strcat(sTempFile, sTmpSuffix.c_str()); + +-#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) +- // This section is for Windows folk && gcc 3.x folk ++#if !defined(HAVE_MKSTEMP) ++ // This section is for Windows folk + fstream tmpOut; + createFile(sTempFile, tmpOut); + +@@ -257,7 +257,7 @@ + tmpOut.write((char *)tmpBuffer, nBytes); + } + +-#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) ++#else //!defined(HAVE_MKSTEMP) + + // else we gotta make a temp file, copy the tag into it, copy the + // rest of the old file after the tag, delete the old file, rename +@@ -270,7 +270,7 @@ + //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); + } + +- ofstream tmpOut(fd); ++ ofstream tmpOut(sTempFile); + if (!tmpOut) + { + tmpOut.close(); +@@ -285,14 +285,14 @@ + uchar tmpBuffer[BUFSIZ]; + while (file) + { +- file.read(tmpBuffer, BUFSIZ); ++ file.read((char *)tmpBuffer, BUFSIZ); + size_t nBytes = file.gcount(); +- tmpOut.write(tmpBuffer, nBytes); ++ tmpOut.write((char *)tmpBuffer, nBytes); + } + + close(fd); //closes the file + +-#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) ++#endif ////!defined(HAVE_MKSTEMP) + + tmpOut.close(); + file.close(); +only in patch2: +unchanged: hunk ./source/multimedia/id3lib/FrugalBuild 6 -pkgrel=3 +pkgrel=4terminus1 hunk ./source/multimedia/id3lib/FrugalBuild 12 -source=(${source[@]} id3lib-3.8.3-autoconf259.patch id3lib-3.8.3-zlib.patch) +source=(${source[@]} id3lib-3.8.3-autoconf259.patch id3lib-3.8.3-zlib.patch CVE-2007-4460.diff) hunk ./source/multimedia/id3lib/FrugalBuild 16 - '231721feb310f5ef6d820d1c1397e3605b5689cb') + '231721feb310f5ef6d820d1c1397e3605b5689cb' \ + '05f00def566a151b3e47a2bfed67d28df898918a') } From voroskoi at frugalware.org Thu Sep 6 20:46:55 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 20:46:57 2007 Subject: [Frugalware-darcs] frugalware-0.6: sudo-1.6.8p12-4terminus1-i686 Message-ID: <20070906184655.5592C13A421C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906184133-dd049-7e1e55772b1f42875c390c0908c6042775b71f72.gz; [sudo-1.6.8p12-4terminus1-i686 voroskoi **20070906184133 secfix relbump, closes #2373 ] { addfile ./source/apps/sudo/CVE-2007-3149.diff hunk ./source/apps/sudo/CVE-2007-3149.diff 1 +diff -u -p -r1.27 -r1.28 +--- sudo/auth/kerb5.c 2005/03/30 04:38:25 1.27 ++++ sudo/auth/kerb5.c 2007/06/07 11:22:22 1.28 +@@ -274,7 +274,6 @@ verify_krb_v5_tgt(sudo_context, ccache, auth_name) + log_error(NO_EXIT, + "%s: host service key not found: %s", auth_name, + error_message(error)); +- error = 0; + goto cleanup; + } + if (keyblock) hunk ./source/apps/sudo/FrugalBuild 6 -pkgrel=3 +pkgrel=4terminus1 hunk ./source/apps/sudo/FrugalBuild 14 -source=(http://www.sudo.ws/dist/$pkgname-$pkgver.tar.gz sudo.sh) +source=(http://www.sudo.ws/dist/$pkgname-$pkgver.tar.gz sudo.sh CVE-2007-3149.diff) hunk ./source/apps/sudo/FrugalBuild 16 - 'ff0745f1d95c614f55e8fd1f85abee2486cf24ba') + 'ff0745f1d95c614f55e8fd1f85abee2486cf24ba' \ + 'a4894bb31ed20df74af0ffbef03927bd54a7dc75') } From voroskoi at frugalware.org Thu Sep 6 21:07:03 2007 From: voroskoi at frugalware.org (voroskoi) Date: Thu Sep 6 21:07:06 2007 Subject: [Frugalware-darcs] frugalware-0.6: terminal-0.2.6-2terminus1-i686 Message-ID: <20070906190703.AB27713A421C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070906185955-dd049-274b8dbed93c37831b8eba4b4179916328388eba.gz; [terminal-0.2.6-2terminus1-i686 voroskoi **20070906185955 secfix relbump, closes #2256 ] { addfile ./source/xfce4/terminal/02_CVE-2007-3770.patch.diff hunk ./source/xfce4/terminal/02_CVE-2007-3770.patch.diff 1 +diff -Nur xfce4-terminal-0.2.6/helpers/balsa.desktop.in xfce4-terminal-0.2.6.new/helpers/balsa.desktop.in +--- xfce4-terminal-0.2.6/helpers/balsa.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/balsa.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=balsa + X-Terminal-Category=MailReader +-X-Terminal-Command=%B -m "mailto:%u" ++X-Terminal-Command=%B -m mailto:%u +diff -Nur xfce4-terminal-0.2.6/helpers/epiphany.desktop.in xfce4-terminal-0.2.6.new/helpers/epiphany.desktop.in +--- xfce4-terminal-0.2.6/helpers/epiphany.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/epiphany.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=epiphany; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B "%u" ++X-Terminal-Command=%B %u +diff -Nur xfce4-terminal-0.2.6/helpers/evolution.desktop.in xfce4-terminal-0.2.6.new/helpers/evolution.desktop.in +--- xfce4-terminal-0.2.6/helpers/evolution.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/evolution.desktop.in 2007-08-13 10:32:15.316271487 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B "mailto:%u" ++X-Terminal-Command=%B mailto:%u +diff -Nur xfce4-terminal-0.2.6/helpers/exo-open-browser.desktop.in xfce4-terminal-0.2.6.new/helpers/exo-open-browser.desktop.in +--- xfce4-terminal-0.2.6/helpers/exo-open-browser.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/exo-open-browser.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=exo-open + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B --launch WebBrowser "%u" ++X-Terminal-Command=%B --launch WebBrowser %u +diff -Nur xfce4-terminal-0.2.6/helpers/exo-open-mailer.desktop.in xfce4-terminal-0.2.6.new/helpers/exo-open-mailer.desktop.in +--- xfce4-terminal-0.2.6/helpers/exo-open-mailer.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/exo-open-mailer.desktop.in 2007-08-13 10:32:15.316271487 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=exo-open + X-Terminal-Category=MailReader +-X-Terminal-Command=%B --launch MailReader "%u" ++X-Terminal-Command=%B --launch MailReader %u +diff -Nur xfce4-terminal-0.2.6/helpers/firefox.desktop.in xfce4-terminal-0.2.6.new/helpers/firefox.desktop.in +--- xfce4-terminal-0.2.6/helpers/firefox.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/firefox.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u" ++X-Terminal-Command=%B -remote openURL\(%u\) || %B %u +diff -Nur xfce4-terminal-0.2.6/helpers/galeon.desktop.in xfce4-terminal-0.2.6.new/helpers/galeon.desktop.in +--- xfce4-terminal-0.2.6/helpers/galeon.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/galeon.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=galeon; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B "%u" ++X-Terminal-Command=%B %u +diff -Nur xfce4-terminal-0.2.6/helpers/kmail.desktop.in xfce4-terminal-0.2.6.new/helpers/kmail.desktop.in +--- xfce4-terminal-0.2.6/helpers/kmail.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/kmail.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=kmail; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B "%u" ++X-Terminal-Command=%B %u +diff -Nur xfce4-terminal-0.2.6/helpers/konqueror.desktop.in xfce4-terminal-0.2.6.new/helpers/konqueror.desktop.in +--- xfce4-terminal-0.2.6/helpers/konqueror.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/konqueror.desktop.in 2007-08-13 10:32:19.804190841 -0700 +@@ -5,6 +5,4 @@ + Type=Application + X-Terminal-Binaries=konqueror; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B "%u" +- +- ++X-Terminal-Command=%B %u +diff -Nur xfce4-terminal-0.2.6/helpers/lynx.desktop.in xfce4-terminal-0.2.6.new/helpers/lynx.desktop.in +--- xfce4-terminal-0.2.6/helpers/lynx.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/lynx.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=lynx; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=Terminal -x %B "%u" ++X-Terminal-Command=Terminal -x %B %u +diff -Nur xfce4-terminal-0.2.6/helpers/mozilla-browser.desktop.in xfce4-terminal-0.2.6.new/helpers/mozilla-browser.desktop.in +--- xfce4-terminal-0.2.6/helpers/mozilla-browser.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/mozilla-browser.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u" ++X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u +diff -Nur xfce4-terminal-0.2.6/helpers/mozilla-mailer.desktop.in xfce4-terminal-0.2.6.new/helpers/mozilla-mailer.desktop.in +--- xfce4-terminal-0.2.6/helpers/mozilla-mailer.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/mozilla-mailer.desktop.in 2007-08-13 10:32:15.316271487 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u" ++X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u +diff -Nur xfce4-terminal-0.2.6/helpers/mutt.desktop.in xfce4-terminal-0.2.6.new/helpers/mutt.desktop.in +--- xfce4-terminal-0.2.6/helpers/mutt.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/mutt.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=mutt; + X-Terminal-Category=MailReader +-X-Terminal-Command=Terminal -x %B "%u" ++X-Terminal-Command=Terminal -x %B %u +diff -Nur xfce4-terminal-0.2.6/helpers/opera-browser.desktop.in xfce4-terminal-0.2.6.new/helpers/opera-browser.desktop.in +--- xfce4-terminal-0.2.6/helpers/opera-browser.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/opera-browser.desktop.in 2007-08-13 10:32:15.316271487 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=opera; + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u" ++X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u +diff -Nur xfce4-terminal-0.2.6/helpers/opera-mailer.desktop.in xfce4-terminal-0.2.6.new/helpers/opera-mailer.desktop.in +--- xfce4-terminal-0.2.6/helpers/opera-mailer.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/opera-mailer.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=opera; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u" ++X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u +diff -Nur xfce4-terminal-0.2.6/helpers/sensible-browser.desktop.in xfce4-terminal-0.2.6.new/helpers/sensible-browser.desktop.in +--- xfce4-terminal-0.2.6/helpers/sensible-browser.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/sensible-browser.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=sensible-browser + X-Terminal-Category=WebBrowser +-X-Terminal-Command=%B "%u" ++X-Terminal-Command=%B %u +diff -Nur xfce4-terminal-0.2.6/helpers/sylpheed-claws.desktop.in xfce4-terminal-0.2.6.new/helpers/sylpheed-claws.desktop.in +--- xfce4-terminal-0.2.6/helpers/sylpheed-claws.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/sylpheed-claws.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -7,4 +7,4 @@ + StartupNotify=true + X-Terminal-Binaries=sylpheed-claws; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B --compose "%u" ++X-Terminal-Command=%B --compose %u +diff -Nur xfce4-terminal-0.2.6/helpers/thunderbird.desktop.in xfce4-terminal-0.2.6.new/helpers/thunderbird.desktop.in +--- xfce4-terminal-0.2.6/helpers/thunderbird.desktop.in 2007-01-20 06:30:46.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/helpers/thunderbird.desktop.in 2007-08-13 10:32:15.320271415 -0700 +@@ -5,4 +5,4 @@ + Type=Application + X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird; + X-Terminal-Category=MailReader +-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u" ++X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u +diff -Nur xfce4-terminal-0.2.6/terminal/terminal-helper.c xfce4-terminal-0.2.6.new/terminal/terminal-helper.c +--- xfce4-terminal-0.2.6/terminal/terminal-helper.c 2007-01-20 06:30:51.000000000 -0800 ++++ xfce4-terminal-0.2.6.new/terminal/terminal-helper.c 2007-08-13 10:32:15.324271343 -0700 +@@ -349,6 +349,7 @@ + gchar *argv[4]; + gchar *command; + gchar *t; ++ gchar *escaped; + guint n; + + g_return_if_fail (TERMINAL_IS_HELPER (helper)); +@@ -359,6 +360,8 @@ + if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u') + ++n; + ++ escaped = g_shell_quote (uri); ++ + if (n > 0) + { + command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1); +@@ -366,7 +369,7 @@ + { + if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u') + { +- for (u = uri; *u != '\0'; ) ++ for (u = escaped; *u != '\0'; ) + *t++ = *u++; + s += 2; + } +@@ -379,9 +382,11 @@ + } + else + { +- command = g_strconcat (helper->command, " ", uri, NULL); ++ command = g_strconcat (helper->command, " ", escaped, NULL); + } + ++ g_free (escaped); ++ + argv[0] = "/bin/sh"; + argv[1] = "-c"; + argv[2] = command; hunk ./source/xfce4/terminal/FrugalBuild 7 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/xfce4/terminal/FrugalBuild 17 -sha1sums=('8851179492c4768a1a53d2424d7a7c8b1a873c58') +source=(${source[@]} 02_CVE-2007-3770.patch.diff) +sha1sums=('8851179492c4768a1a53d2424d7a7c8b1a873c58' \ + '8b2aeb8cbd0dd6e1bb88a38ae205a0249625095e') } From voroskoi at frugalware.org Fri Sep 7 08:47:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 08:47:29 2007 Subject: [Frugalware-darcs] frugalware-0.6: gdm-2.18.0-2terminus1-i686 Message-ID: <20070907064727.362A613A422C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907063715-dd049-3885e04063a127d9b91f00cfb647fa4ac5a7a374.gz; [gdm-2.18.0-2terminus1-i686 voroskoi **20070907063715 secfix relbump, closes #2329 ] { addfile ./source/gnome/gdm/CVE-2007-3381.diff hunk ./source/gnome/gdm/CVE-2007-3381.diff 1 +--- gnome-2-18/daemon/gdm.c 2007/04/09 02:31:48 4777 ++++ gnome-2-18/daemon/gdm.c 2007/07/12 00:06:52 5062 +@@ -2557,190 +2557,216 @@ + NULL, 0, NULL, NULL, NULL); + } else if (strncmp (msg, "opcode="GDM_SOP_SHOW_ERROR_DIALOG, + strlen ("opcode="GDM_SOP_SHOW_ERROR_DIALOG)) == 0) { +- GdmDisplay *d; +- GtkMessageType type; + char **list; +- char *ptr; +- char *error; +- char *details_label; +- char *details_file; +- long slave_pid; +- int uid, gid; +- + list = g_strsplit (msg, "$$", -1); + +- ptr = strchr (list[1], '='); +- slave_pid = atol (ptr + 1); +- +- ptr = strchr (list[2], '='); +- type = atoi (ptr + 1); +- +- ptr = strchr (list[3], '='); +- error = g_malloc0 (strlen (ptr)); +- strcpy (error, ptr + 1); +- +- ptr = strchr (list[4], '='); +- details_label = g_malloc0 (strlen (ptr)); +- strcpy (details_label, ptr + 1); +- +- ptr = strchr (list[5], '='); +- details_file = g_malloc0 (strlen (ptr)); +- strcpy (details_file, ptr + 1); +- +- ptr = strchr (list[6], '='); +- uid = atoi (ptr + 1); +- +- ptr = strchr (list[7], '='); +- gid = atoi (ptr + 1); ++ if (ve_vector_len (list) == 8) { ++ GdmDisplay *d; ++ GtkMessageType type; ++ char *ptr; ++ char *error; ++ char *details_label; ++ char *details_file; ++ long slave_pid; ++ int uid, gid; ++ ++ ptr = strchr (list[1], '='); ++ slave_pid = atol (ptr + 1); ++ ++ ptr = strchr (list[2], '='); ++ type = atoi (ptr + 1); ++ ++ ptr = strchr (list[3], '='); ++ error = g_malloc0 (strlen (ptr)); ++ strcpy (error, ptr + 1); ++ ++ ptr = strchr (list[4], '='); ++ details_label = g_malloc0 (strlen (ptr)); ++ strcpy (details_label, ptr + 1); ++ ++ ptr = strchr (list[5], '='); ++ details_file = g_malloc0 (strlen (ptr)); ++ strcpy (details_file, ptr + 1); ++ ++ ptr = strchr (list[6], '='); ++ uid = atoi (ptr + 1); ++ ++ ptr = strchr (list[7], '='); ++ gid = atoi (ptr + 1); ++ ++ d = gdm_display_lookup (slave_pid); ++ ++ if (d != NULL) { ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0644)); ++ } + +- d = gdm_display_lookup (slave_pid); ++ gdm_error_box_full (d, type, error, ++ details_label, details_file, 0, 0); + +- if (d != NULL) { +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0644)); +- } +- +- gdm_error_box_full (d, type, error, details_label, details_file, 0, 0); ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0640)); ++ } + +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0640)); ++ send_slave_ack_dialog_char (d, ++ GDM_SLAVE_NOTIFY_ERROR_RESPONSE, NULL); + } +- +- send_slave_ack_dialog_char (d, GDM_SLAVE_NOTIFY_ERROR_RESPONSE, NULL); ++ g_free (error); ++ g_free (details_label); ++ g_free (details_file); + } + +- g_free (error); +- g_free (details_label); +- g_free (details_file); + g_strfreev (list); + } else if (strncmp (msg, "opcode="GDM_SOP_SHOW_YESNO_DIALOG, +- strlen ("opcode="GDM_SOP_SHOW_YESNO_DIALOG)) == 0) { +- GdmDisplay *d; ++ strlen ("opcode="GDM_SOP_SHOW_YESNO_DIALOG)) == 0) { + char **list; +- char *ptr; +- char *yesno_msg; +- long slave_pid; +- gboolean response_yesno; +- + list = g_strsplit (msg, "$$", -1); + +- ptr = strchr (list [1], '='); +- slave_pid = atol (ptr + 1); +- +- ptr = strchr (list [2], '='); +- yesno_msg = g_malloc0 (strlen (ptr)); +- strcpy (yesno_msg, ptr + 1); +- +- d = gdm_display_lookup (slave_pid); +- if (d != NULL) { +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0644)); +- } +- +- response_yesno = gdm_failsafe_yesno (d, yesno_msg); ++ if (ve_vector_len (list) == 3) { ++ GdmDisplay *d; ++ char *ptr; ++ char *yesno_msg; ++ long slave_pid; ++ gboolean resp; ++ ++ ptr = strchr (list [1], '='); ++ slave_pid = atol (ptr + 1); ++ ++ ptr = strchr (list [2], '='); ++ yesno_msg = g_malloc0 (strlen (ptr)); ++ strcpy (yesno_msg, ptr + 1); ++ ++ d = gdm_display_lookup (slave_pid); ++ if (d != NULL) { ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0644)); ++ } + +- send_slave_ack_dialog_int (d, GDM_SLAVE_NOTIFY_YESNO_RESPONSE, response_yesno); ++ resp = gdm_failsafe_yesno (d, yesno_msg); + +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0640)); ++ send_slave_ack_dialog_int (d, ++ GDM_SLAVE_NOTIFY_YESNO_RESPONSE, ++ resp); ++ ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0640)); ++ } + } +- } + +- g_free (yesno_msg); ++ g_free (yesno_msg); ++ } + g_strfreev (list); + } else if (strncmp (msg, "opcode="GDM_SOP_SHOW_QUESTION_DIALOG, + strlen ("opcode="GDM_SOP_SHOW_QUESTION_DIALOG)) == 0) { +- GdmDisplay *d; + char **list; +- char *ptr; +- char *question_msg; +- char *response_question; +- long slave_pid; +- gboolean echo; +- + list = g_strsplit (msg, "$$", -1); + +- ptr = strchr (list [1], '='); +- slave_pid = atol (ptr + 1); +- +- ptr = strchr (list [2], '='); +- question_msg = g_malloc0 (strlen (ptr)); +- strcpy (question_msg, ptr + 1); +- +- ptr = strchr (list [3], '='); +- echo = atoi (ptr + 1); +- +- d = gdm_display_lookup (slave_pid); +- if (d != NULL) { +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0644)); +- } +- +- response_question = gdm_failsafe_question (d, question_msg, echo); ++ if (ve_vector_len (list) == 4) { ++ GdmDisplay *d; ++ char *ptr; ++ char *question_msg; ++ char *resp; ++ long slave_pid; ++ gboolean echo; ++ ++ ptr = strchr (list [1], '='); ++ slave_pid = atol (ptr + 1); ++ ++ ptr = strchr (list [2], '='); ++ question_msg = g_malloc0 (strlen (ptr)); ++ strcpy (question_msg, ptr + 1); ++ ++ ptr = strchr (list [3], '='); ++ echo = atoi (ptr + 1); ++ ++ d = gdm_display_lookup (slave_pid); ++ if (d != NULL) { ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0644)); ++ } + +- send_slave_ack_dialog_char (d, GDM_SLAVE_NOTIFY_QUESTION_RESPONSE, response_question); ++ resp = gdm_failsafe_question (d, ++ question_msg, echo); + +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0640)); ++ send_slave_ack_dialog_char (d, ++ GDM_SLAVE_NOTIFY_QUESTION_RESPONSE, ++ resp); ++ ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0640)); ++ } + } +- } + +- g_free (question_msg); ++ g_free (question_msg); ++ } + g_strfreev (list); + } else if (strncmp (msg, "opcode="GDM_SOP_SHOW_ASKBUTTONS_DIALOG, + strlen ("opcode="GDM_SOP_SHOW_ASKBUTTONS_DIALOG)) == 0) { +- GdmDisplay *d; +- char *askbuttons_msg; + char **list; +- char *ptr; +- char *options[4]; +- long slave_pid; +- int i; +- int response_askbuttons; +- + list = g_strsplit (msg, "$$", -1); + +- ptr = strchr (list [1], '='); +- slave_pid = atol (ptr + 1); +- +- ptr = strchr (list [2], '='); +- askbuttons_msg = g_malloc0 (strlen (ptr)); +- strcpy (askbuttons_msg, ptr + 1); +- +- ptr = strchr (list [3], '='); +- options[0] = g_malloc0 (strlen (ptr)); +- strcpy (options[0], ptr + 1); +- +- ptr = strchr (list [4], '='); +- options[1] = g_malloc0 (strlen (ptr)); +- strcpy (options[1], ptr + 1); +- +- ptr = strchr (list [5], '='); +- options[2] = g_malloc0 (strlen (ptr)); +- strcpy (options[2], ptr + 1); +- +- ptr = strchr (list [6], '='); +- options[3] = g_malloc0 (strlen (ptr)); +- strcpy (options[3], ptr + 1); +- +- d = gdm_display_lookup (slave_pid); +- if (d != NULL) { +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0644)); +- } ++ if (ve_vector_len (list) == 7) { ++ GdmDisplay *d; ++ char *askbuttons_msg; ++ char *ptr; ++ char *options[4]; ++ long slave_pid; ++ int i; ++ int resp; ++ ++ ptr = strchr (list [1], '='); ++ slave_pid = atol (ptr + 1); ++ ++ ptr = strchr (list [2], '='); ++ askbuttons_msg = g_malloc0 (strlen (ptr)); ++ strcpy (askbuttons_msg, ptr + 1); ++ ++ ptr = strchr (list [3], '='); ++ options[0] = g_malloc0 (strlen (ptr)); ++ strcpy (options[0], ptr + 1); ++ ++ ptr = strchr (list [4], '='); ++ options[1] = g_malloc0 (strlen (ptr)); ++ strcpy (options[1], ptr + 1); ++ ++ ptr = strchr (list [5], '='); ++ options[2] = g_malloc0 (strlen (ptr)); ++ strcpy (options[2], ptr + 1); ++ ++ ptr = strchr (list [6], '='); ++ options[3] = g_malloc0 (strlen (ptr)); ++ strcpy (options[3], ptr + 1); ++ ++ d = gdm_display_lookup (slave_pid); ++ if (d != NULL) { ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0644)); ++ } + +- response_askbuttons = gdm_failsafe_ask_buttons (d, askbuttons_msg, options); ++ resp = gdm_failsafe_ask_buttons (d, ++ askbuttons_msg, options); + +- send_slave_ack_dialog_int (d, GDM_SLAVE_NOTIFY_ASKBUTTONS_RESPONSE, response_askbuttons); +- if (GDM_AUTHFILE (d)) { +- VE_IGNORE_EINTR (chmod (GDM_AUTHFILE (d), 0640)); ++ send_slave_ack_dialog_int (d, ++ GDM_SLAVE_NOTIFY_ASKBUTTONS_RESPONSE, ++ resp); ++ if (GDM_AUTHFILE (d)) { ++ VE_IGNORE_EINTR ( ++ chmod (GDM_AUTHFILE (d), 0640)); ++ } + } +- } + +- g_free (askbuttons_msg); ++ g_free (askbuttons_msg); + +- for (i = 0; i < 3; i ++) +- g_free (options[i]); ++ for (i = 0; i < 3; i ++) ++ g_free (options[i]); ++ } + g_strfreev (list); + } + } +@@ -3481,9 +3507,13 @@ + + } else if (strncmp (msg, GDM_SUP_GET_SERVER_DETAILS " ", + strlen (GDM_SUP_GET_SERVER_DETAILS " ")) == 0) { +- const gchar *server = &msg[strlen (GDM_SUP_GET_SERVER_DETAILS " ")]; +- gchar **splitstr = g_strsplit (server, " ", 2); +- GdmXserver *svr = gdm_find_xserver ((gchar *)splitstr[0]); ++ const gchar *server = &msg[strlen (GDM_SUP_GET_SERVER_DETAILS " ")]; ++ gchar **splitstr = g_strsplit (server, " ", 2); ++ GdmXserver *svr = NULL; ++ ++ if (splitstr != NULL && splitstr[0] != NULL) { ++ svr = gdm_find_xserver ((gchar *)splitstr[0]); ++ } + + if (svr != NULL) { + if (g_strcasecmp (splitstr[1], "ID") == 0) +@@ -3520,12 +3550,11 @@ + gdm_connection_printf (conn, "OK false\n"); + else + gdm_connection_printf (conn, "ERROR 2 Key not valid\n"); +- +- g_strfreev (splitstr); + } else { + gdm_connection_printf (conn, "ERROR 1 Server not found\n"); + } + ++ g_strfreev (splitstr); + } else if (strcmp (msg, GDM_SUP_GREETERPIDS) == 0) { + GString *msg; + GSList *li; +@@ -3555,10 +3584,15 @@ + } else if (strncmp (msg, GDM_SUP_GET_CONFIG " ", + strlen (GDM_SUP_GET_CONFIG " ")) == 0) { + const gchar *parms = &msg[strlen (GDM_SUP_GET_CONFIG " ")]; +- gchar **splitstr = g_strsplit (parms, " ", 2); +- gchar *retval = NULL; ++ gchar **splitstr = g_strsplit (parms, " ", 2); ++ gchar *retval = NULL; + static gboolean done_prefetch = FALSE; + ++ if (splitstr == NULL || splitstr[0] == NULL) { ++ gdm_connection_printf (conn, "ERROR 50 Unsupported key \n"); ++ return; ++ } ++ + /* + * It is not meaningful to manage this in a per-display + * fashion since the prefetch program is only run once the +--- gnome-2-18/daemon/gdmconfig.c 2007/03/20 08:50:41 4684 ++++ gnome-2-18/daemon/gdmconfig.c 2007/07/12 00:06:52 5062 +@@ -850,9 +850,10 @@ + + file = gdm_get_per_display_custom_config_file (display); + +- if (strcmp (ve_sure_string (splitstr[0]), "greeter") == 0 || +- strcmp (ve_sure_string (splitstr[0]), "gui") == 0 || +- is_key (key, GDM_KEY_PAM_STACK)) { ++ if (splitstr != NULL && ++ (strcmp (ve_sure_string (splitstr[0]), "greeter") == 0 || ++ strcmp (ve_sure_string (splitstr[0]), "gui") == 0 || ++ is_key (key, GDM_KEY_PAM_STACK))) { + gdm_config_key_to_string (file, key, retval); + } + +@@ -878,7 +879,7 @@ + *retval = NULL; + + /* Should not fail, all keys should have a category. */ +- if (splitstr[0] == NULL) ++ if (splitstr == NULL || splitstr[0] == NULL) + return; + + /* If file doesn't exist, then just return */ +@@ -1768,7 +1769,7 @@ + if (custom_cfg != NULL) { + gchar **splitstr = g_strsplit (key, "/", 2); + +- if (splitstr[0] != NULL) { ++ if (splitstr != NULL && splitstr[0] != NULL) { + GList *list = ve_config_get_keys (custom_cfg, splitstr[0]); + + while (list != NULL) { +@@ -1956,7 +1957,7 @@ + /* First check the custom file */ + if (cfgfiles->custom_cfg != NULL) { + gchar **splitstr = g_strsplit (key_in, "/", 2); +- if (splitstr[0] != NULL) { ++ if (splitstr != NULL && splitstr[0] != NULL) { + GList *list = ve_config_get_keys (cfgfiles->custom_cfg, splitstr[0]); + + while (list != NULL) { +--- gnome-2-18/gui/gdmflexiserver.c 2007/04/09 05:07:27 4796 ++++ gnome-2-18/gui/gdmflexiserver.c 2007/07/12 00:06:52 5062 +@@ -136,9 +136,10 @@ + for (i = 0; vec[i] != NULL; i++) { + char **rvec; + rvec = g_strsplit (vec[i], ",", -1); +- if (rvec == NULL || +- ve_vector_len (rvec) != 3) ++ if (ve_vector_len (rvec) != 3) { ++ g_strfreev (rvec); + continue; ++ } + + if (strcmp (rvec[0], vtpart) == 0) { + /* could be nested? */ +@@ -177,9 +178,10 @@ + char **rvec; + int vt; + rvec = g_strsplit (vec[i], ",", -1); +- if (rvec == NULL || +- ve_vector_len (rvec) != 3) ++ if (ve_vector_len (rvec) != 3) { ++ g_strfreev (rvec); + continue; ++ } + + vt = get_vt_num (vec, rvec[2], 5); + +@@ -516,9 +518,10 @@ + char **rvec; + int vt; + rvec = g_strsplit (vec[i], ",", -1); +- if (rvec == NULL || +- ve_vector_len (rvec) != 3) ++ if (ve_vector_len (rvec) != 3) { ++ g_strfreev (rvec); + continue; ++ } + + vt = get_vt_num (vec, rvec[2], 5); + +--- gnome-2-18/gui/gdmsetup.c 2007/04/02 05:28:30 4743 ++++ gnome-2-18/gui/gdmsetup.c 2007/07/12 00:06:52 5062 +@@ -4220,7 +4220,7 @@ + msg = g_string_new (""); + + actions = g_strsplit (strings_list, sep, -1); +- for (i = 0; actions[i]; i++) { ++ for (i = 0; actions != NULL && actions[i] != NULL; i++) { + if (strncmp (actions[i], string, strlen (string)) == 0) + continue; + g_string_append_printf (msg, "%s%s", separator, actions[i]); +--- gnome-2-18/gui/greeter/greeter_item_ulist.c 2007/04/09 02:36:08 4778 ++++ gnome-2-18/gui/greeter/greeter_item_ulist.c 2007/07/12 00:06:52 5062 +@@ -140,8 +140,10 @@ + char **rvec; + + rvec = g_strsplit (vec[i], ",", -1); +- if (rvec == NULL || ve_vector_len (rvec) != 3) ++ if (ve_vector_len (rvec) != 3) { ++ g_strfreev (rvec); + continue; ++ } + + g_hash_table_insert (displays_hash, + g_strdup (rvec[1]), +--- gnome-2-18/gui/gdmconfig.c 2007/03/20 08:50:41 4684 ++++ gnome-2-18/gui/gdmconfig.c 2007/07/12 00:06:52 5062 +@@ -214,11 +214,11 @@ + } + + /* skip the "OK " */ +- splitstr = g_strsplit (result + 3, ";", 0); +- sec = splitstr; ++ splitstr = g_strsplit (result + 3, ";", 0); ++ sec = splitstr; + g_free (result); + +- while (*sec != NULL) { ++ while (sec != NULL && *sec != NULL) { + GdmXserver *svr = g_new0 (GdmXserver, 1); + + temp = gdm_config_get_xserver_details (*sec, "ID"); hunk ./source/gnome/gdm/FrugalBuild 6 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/gnome/gdm/FrugalBuild 21 + CVE-2007-3381.diff \ hunk ./source/gnome/gdm/FrugalBuild 24 - 'a61f7c9569a2d73a5cf078e61a17cfed7d280b12' \ + 'a61f7c9569a2d73a5cf078e61a17cfed7d280b12' \ hunk ./source/gnome/gdm/FrugalBuild 26 - '82bb42ae2217465196b8de03b18efcdd832ff137' \ + '82bb42ae2217465196b8de03b18efcdd832ff137' \ + '67949c3a0c4a32e9dd52927272c37946325b8553' \ } From voroskoi at frugalware.org Fri Sep 7 09:02:10 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 09:02:13 2007 Subject: [Frugalware-darcs] frugalware-0.6: wordpress-2.2.2-1terminus1-i686 Message-ID: <20070907070211.0840413A422C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907065649-dd049-1acc71db48410dcb6538f1112b5df7c63c1f270f.gz; [wordpress-2.2.2-1terminus1-i686 voroskoi **20070907065649 secfix bump, closes #2363 ] { hunk ./source/network-extra/wordpress/FrugalBuild 5 -pkgver=2.2.1 +pkgver=2.2.2 hunk ./source/network-extra/wordpress/FrugalBuild 24 -sha1sums=('9014fe17c1f8913ca89b2e1de67ca9bb4df26bfd') +sha1sums=('2ab690dea011f9addcda18ef6579cdc93b7af3fc') } From voroskoi at frugalware.org Fri Sep 7 09:39:05 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 09:39:07 2007 Subject: [Frugalware-darcs] frugalware-0.6: tetex-3.0-11terminus1-i686 Message-ID: <20070907073905.5DB4713A422C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907073719-dd049-d06bc819f4c2baf1e0ab04aec21c73b41106d56b.gz; [tetex-3.0-11terminus1-i686 voroskoi **20070907073719 secfix relbump, closes #2310 ] { hunk ./source/xapps-extra/tetex/FrugalBuild 7 -pkgrel=10 +pkgrel=11terminus1 hunk ./source/xapps-extra/tetex/FrugalBuild 15 -source=(ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-$pkgver.tar.gz ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-$pkgver.tar.gz) -sha1sums=('10f7d2fa007c95ca066d899fca0e9a8446108824' \ - '7637789f7f4929694aed1b89820f5bad4753e8fc') +source=(ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-$pkgver.tar.gz \ + ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-$pkgver.tar.gz \ + tetex-3.0-CVE-2005-3193.patch tetex-3.0-CVE-2007-0650.patch tetex-3.0-CVE-2007-3387.patch) +sha1sums=('1be97f57a26a6e9b72ebfd932e45914a959aff16' \ + '7637789f7f4929694aed1b89820f5bad4753e8fc' \ + '4a275b1d9a211e94bc13286d05ef619cdf873770' \ + '28208eb13f493c1c9c6538f254f04fc0c2aaff1e' \ + '3ad00a8f16dd16acc765953e10dc68f181e0a156') hunk ./source/xapps-extra/tetex/FrugalBuild 54 + Fpatchall hunk ./source/xapps-extra/tetex/FrugalBuild 87 -# optimalization OK - -# vim: ft=sh +# optimization OK addfile ./source/xapps-extra/tetex/tetex-3.0-CVE-2005-3193.patch hunk ./source/xapps-extra/tetex/tetex-3.0-CVE-2005-3193.patch 1 +--- tetex-src-3.0/libs/xpdf/goo/gmem.c.CVE-2005-3193 2004-01-22 02:26:44.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/goo/gmem.c 2006-01-16 15:41:04.000000000 +0100 +@@ -135,6 +135,28 @@ void *grealloc(void *p, int size) { + #endif + } + ++void *gmallocn(int nObjs, int objSize) { ++ int n; ++ ++ n = nObjs * objSize; ++ if (objSize == 0 || n / objSize != nObjs) { ++ fprintf(stderr, "Bogus memory allocation size\n"); ++ exit(1); ++ } ++ return gmalloc(n); ++} ++ ++void *greallocn(void *p, int nObjs, int objSize) { ++ int n; ++ ++ n = nObjs * objSize; ++ if (objSize == 0 || n / objSize != nObjs) { ++ fprintf(stderr, "Bogus memory allocation size\n"); ++ exit(1); ++ } ++ return grealloc(p, n); ++} ++ + void gfree(void *p) { + #ifdef DEBUG_MEM + int size; +--- tetex-src-3.0/libs/xpdf/goo/gmem.h.CVE-2005-3193 2004-01-22 02:26:44.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/goo/gmem.h 2006-01-16 15:41:04.000000000 +0100 +@@ -28,6 +28,15 @@ extern void *gmalloc(int size); + extern void *grealloc(void *p, int size); + + /* ++ * These are similar to gmalloc and grealloc, but take an object count ++ * and size. The result is similar to allocating nObjs * objSize ++ * bytes, but there is an additional error check that the total size ++ * doesn't overflow an int. ++ */ ++extern void *gmallocn(int nObjs, int objSize); ++extern void *greallocn(void *p, int nObjs, int objSize); ++ ++/* + * Same as free, but checks for and ignores NULL pointers. + */ + extern void gfree(void *p); +--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-16 15:41:04.000000000 +0100 +@@ -666,7 +666,7 @@ GBool JPXStream::readCodestream(Guint le + int segType; + GBool haveSIZ, haveCOD, haveQCD, haveSOT; + Guint precinctSize, style; +- Guint segLen, capabilities, comp, i, j, r; ++ Guint segLen, capabilities, nTiles, comp, i, j, r; + + //----- main header + haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; +@@ -701,8 +701,13 @@ GBool JPXStream::readCodestream(Guint le + / img.xTileSize; + img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) + / img.yTileSize; +- img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * +- sizeof(JPXTile)); ++ nTiles = img.nXTiles * img.nYTiles; ++ // check for overflow before allocating memory ++ if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) { ++ error(getPos(), "Bad tile count in JPX SIZ marker segment"); ++ return gFalse; ++ } ++ img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); + for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { + img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * + sizeof(JPXTileComp)); +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h 2006-01-16 15:41:04.000000000 +0100 +@@ -233,6 +233,8 @@ public: + + ~StreamPredictor(); + ++ GBool isOk() { return ok; } ++ + int lookChar(); + int getChar(); + +@@ -250,6 +252,7 @@ private: + int rowBytes; // bytes per line + Guchar *predLine; // line buffer + int predIdx; // current index in predLine ++ GBool ok; + }; + + //------------------------------------------------------------------------ +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-16 15:41:04.000000000 +0100 +@@ -407,18 +407,33 @@ void ImageStream::skipLine() { + + StreamPredictor::StreamPredictor(Stream *strA, int predictorA, + int widthA, int nCompsA, int nBitsA) { ++ int totalBits; ++ + str = strA; + predictor = predictorA; + width = widthA; + nComps = nCompsA; + nBits = nBitsA; ++ predLine = NULL; ++ ok = gFalse; + + nVals = width * nComps; ++ totalBits = nVals * nBits; ++ if (totalBits == 0 || ++ (totalBits / nBits) / nComps != width || ++ totalBits + 7 < 0) { ++ return; ++ } + pixBytes = (nComps * nBits + 7) >> 3; +- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; ++ rowBytes = ((totalBits + 7) >> 3) + pixBytes; ++ if (rowBytes < 0) { ++ return; ++ } + predLine = (Guchar *)gmalloc(rowBytes); + memset(predLine, 0, rowBytes); + predIdx = rowBytes; ++ ++ ok = gTrue; + } + + StreamPredictor::~StreamPredictor() { +@@ -1012,6 +1027,10 @@ LZWStream::LZWStream(Stream *strA, int p + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } +@@ -2897,6 +2916,14 @@ GBool DCTStream::readBaselineSOF() { + height = read16(); + width = read16(); + numComps = str->getChar(); ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream", prec); ++ return gFalse; ++ } ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream", prec); ++ return gFalse; ++ } + if (prec != 8) { + error(getPos(), "Bad DCT precision %d", prec); + return gFalse; +@@ -3255,6 +3282,10 @@ FlateStream::FlateStream(Stream *strA, i + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } addfile ./source/xapps-extra/tetex/tetex-3.0-CVE-2007-0650.patch hunk ./source/xapps-extra/tetex/tetex-3.0-CVE-2007-0650.patch 1 +--- tetex-src-3.0/texk/makeindexk/mkind.c.CVE-2007-0650 2002-10-02 14:26:37.000000000 +0200 ++++ tetex-src-3.0/texk/makeindexk/mkind.c 2007-02-02 12:29:31.000000000 +0100 +@@ -179,7 +179,9 @@ + argc--; + if (argc <= 0) + FATAL("Expected -p \n",""); +- strcpy(pageno, *++argv); ++ if (strlen(*++argv) >= sizeof(pageno)) ++ FATAL("Page number too high\n",""); ++ strcpy(pageno, *argv); + init_page = TRUE; + if (STREQ(pageno, EVEN)) { + log_given = TRUE; +@@ -230,7 +232,7 @@ + char tmp[STRING_MAX + 5]; + + /* base set by last call to check_idx */ +- sprintf (tmp, "%s%s", base, INDEX_STY); ++ snprintf (tmp, sizeof(tmp), "%s%s", base, INDEX_STY); + if (0 == access(tmp, R_OK)) { + open_sty (tmp); + sty_given = TRUE; +@@ -405,9 +407,9 @@ + STRING_MAX,totmem); + #endif /* DEBUG */ + +- if ((idx_fn = (char *) malloc(STRING_MAX)) == NULL) ++ if ((idx_fn = (char *) malloc(STRING_MAX+5)) == NULL) + FATAL("Not enough core...abort.\n", ""); +- sprintf(idx_fn, "%s%s", base, INDEX_IDX); ++ snprintf(idx_fn, STRING_MAX+5, "%s%s", base, INDEX_IDX); + if ((open_fn && + ((idx_fp = OPEN_IN(idx_fn)) == NULL) + ) || +@@ -434,7 +436,7 @@ + + /* index output file */ + if (!ind_given) { +- sprintf(ind, "%s%s", base, INDEX_IND); ++ snprintf(ind, sizeof(ind), "%s%s", base, INDEX_IND); + ind_fn = ind; + } + if ((ind_fp = OPEN_OUT(ind_fn)) == NULL) +@@ -442,14 +444,14 @@ + + /* index transcript file */ + if (!ilg_given) { +- sprintf(ilg, "%s%s", base, INDEX_ILG); ++ snprintf(ilg, sizeof(ilg), "%s%s", base, INDEX_ILG); + ilg_fn = ilg; + } + if ((ilg_fp = OPEN_OUT(ilg_fn)) == NULL) + FATAL("Can't create transcript file %s.\n", ilg_fn); + + if (log_given) { +- sprintf(log_fn, "%s%s", base, INDEX_LOG); ++ snprintf(log_fn, sizeof(log_fn), "%s%s", base, INDEX_LOG); + if ((log_fp = OPEN_IN(log_fn)) == NULL) { + FATAL("Source log file %s not found.\n", log_fn); + } else { +@@ -505,6 +507,9 @@ + if ((found = kpse_find_file (fn, kpse_ist_format, 1)) == NULL) { + FATAL("Index style file %s not found.\n", fn); + } else { ++ if (strlen(found) >= sizeof(sty_fn)) { ++ FATAL("Style file %s too long.\n", found); ++ } + strcpy(sty_fn,found); + if ((sty_fp = OPEN_IN(sty_fn)) == NULL) { + FATAL("Could not open style file %s.\n", sty_fn); +@@ -512,6 +517,9 @@ + } + #else + if ((path = getenv(STYLE_PATH)) == NULL) { ++ if (strlen(fn) >= sizeof(sty_fn)) { ++ FATAL("Style file %s too long.\n", fn); ++ } + /* style input path not defined */ + strcpy(sty_fn, fn); + sty_fp = OPEN_IN(sty_fn); addfile ./source/xapps-extra/tetex/tetex-3.0-CVE-2007-3387.patch hunk ./source/xapps-extra/tetex/tetex-3.0-CVE-2007-3387.patch 1 +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2007-3387 2007-07-26 17:13:02.000000000 +0200 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2007-07-26 17:21:58.000000000 +0200 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #ifndef WIN32 + #include + #endif +@@ -32,6 +33,7 @@ + #include "JBIG2Stream.h" + #include "JPXStream.h" + #include "Stream-CCITT.h" ++#include "GfxState.h" + + #ifdef __DJGPP__ + static GBool setDJSYSFLAGS = gFalse; +@@ -429,6 +431,13 @@ StreamPredictor::StreamPredictor(Stream + if (rowBytes < 0) { + return; + } ++ if (width <= 0 || nComps <= 0 || nBits <= 0 || ++ nComps > gfxColorMaxComps || ++ nBits > 16 || ++ width >= INT_MAX / nComps || // check for overflow in nVals ++ nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes ++ return; ++ } + predLine = (Guchar *)gmalloc(rowBytes); + memset(predLine, 0, rowBytes); + predIdx = rowBytes; } From voroskoi at frugalware.org Fri Sep 7 10:00:33 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 10:00:36 2007 Subject: [Frugalware-darcs] frugalware-0.6: python-2.5-3terminus2-i686 Message-ID: <20070907080033.B297613A422C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907074127-dd049-f03e19d97b070533c4835512f0161cee45e83dc5.gz; [python-2.5-3terminus2-i686 voroskoi **20070907074127 secfix relbump, closes #2382 ] { hunk ./source/devel/python/FrugalBuild 7 -pkgrel=3terminus1 +pkgrel=3terminus2 hunk ./source/devel/python/FrugalBuild 20 - CVE-2007-2052.diff) -signatures=(http://www.python.org/download/releases/$pkgver/Python-$pkgver.tar.bz2.asc '' '' '' '') + CVE-2007-2052.diff insecure_pathnames.diff) +signatures=(http://www.python.org/download/releases/$pkgver/Python-$pkgver.tar.bz2.asc '' '' '' '' '') addfile ./source/devel/python/insecure_pathnames.diff hunk ./source/devel/python/insecure_pathnames.diff 1 +From: http://bugs.python.org/file8339/insecure_pathnames.diff + +Index: Lib/tarfile.py +=================================================================== +--- a/Lib/tarfile.py (revision 57571) ++++ b/Lib/tarfile.py (working copy) +@@ -340,6 +340,9 @@ + class ExtractError(TarError): + """General exception for extract errors.""" + pass ++class SecurityError(ExtractError): ++ """Exception for insecure pathnames.""" ++ pass + class ReadError(TarError): + """Exception for unreadble tar archives.""" + pass +@@ -2006,12 +2009,13 @@ + + self.members.append(tarinfo) + +- def extractall(self, path=".", members=None): ++ def extractall(self, path=".", members=None, check_paths=True): + """Extract all members from the archive to the current working + directory and set owner, modification time and permissions on + directories afterwards. `path' specifies a different directory + to extract to. `members' is optional and must be a subset of the +- list returned by getmembers(). ++ list returned by getmembers(). If `check_paths' is True insecure ++ pathnames are not extracted. + """ + directories = [] + +@@ -2019,6 +2023,20 @@ + members = self + + for tarinfo in members: ++ if check_paths: ++ try: ++ self._check_path(tarinfo.name) ++ if tarinfo.islnk(): ++ self._check_path(tarinfo.linkname) ++ if tarinfo.issym(): ++ self._check_path(os.path.join(tarinfo.name, tarinfo.linkname)) ++ except SecurityError, e: ++ if self.errorlevel > 1: ++ raise ++ else: ++ self._dbg(1, "tarfile: %s" % e) ++ continue ++ + if tarinfo.isdir(): + # Extract directory with a safe mode, so that + # all files below can be extracted as well. +@@ -2329,6 +2347,15 @@ + #-------------------------------------------------------------------------- + # Little helper methods: + ++ def _check_path(self, path): ++ """Raise an SecurityError if `path' is an insecure pathname. ++ """ ++ path = normpath(path) ++ if path.startswith("/"): ++ raise SecurityError("found insecure absolute path %r" % path) ++ if path.startswith("../"): ++ raise SecurityError("found insecure relative path %r" % path) ++ + def _getmember(self, name, tarinfo=None): + """Find an archive member by name from bottom to top. + If tarinfo is given, it is used as the starting point. } From voroskoi at frugalware.org Fri Sep 7 12:53:19 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 12:53:21 2007 Subject: [Frugalware-darcs] frugalware-0.6: php-5.2.4-1terminus1-i686 Message-ID: <20070907105319.5321013A422C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907105022-dd049-add4fec2b62b9cae43f31e78dc62c7c1660acdca.gz; [php-5.2.4-1terminus1-i686 voroskoi **20070907105022 secfix bump, closes #2383 ] { hunk ./source/devel/php/CVE-2007-3806.diff 1 ---- ext/standard/dir.c.orig 2007-02-25 02:16:23.000000000 +0900 -+++ ext/standard/dir.c -@@ -395,6 +395,7 @@ PHP_FUNCTION(glob) - } - #endif - -+ memset(&globbuf, 0, sizeof(glob_t)); - globbuf.gl_offs = 0; - if (0 != (ret = glob(pattern, flags & GLOB_FLAGMASK, NULL, &globbuf))) { - #ifdef GLOB_NOMATCH rmfile ./source/devel/php/CVE-2007-3806.diff hunk ./source/devel/php/FrugalBuild 6 -pkgver=5.2.3 -pkgrel=1terminus3 +pkgver=5.2.4 +pkgrel=1terminus1 hunk ./source/devel/php/FrugalBuild 20 - http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz \ - CVE-2007-3806.diff) + http://www.php.net/distributions/manual/php_manual_{en,ar,pt_BR,zh,hk,tw,cs,da,nl,fi,fr,de,el,hu,it,ja,kr,pl,ro,ru,sk,es,sv}.tar.gz) hunk ./source/devel/php/FrugalBuild 167 - -sha1sums=('c2dfab484ce16ebac8f29544641b4690f4b8f034' \ +sha1sums=('20e9c6cd9766eca78f04d4166703d26ee24815e8' \ hunk ./source/devel/php/FrugalBuild 193 - 'f479e4943e14c3a442659c3af05e30d32156d1b1' \ - 'c4bfe3432ccbc2d369269f44d3b70a2afc244452') -# optimization OK - + 'f479e4943e14c3a442659c3af05e30d32156d1b1') hunk ./source/devel/php/FrugalBuild 195 +# optimization OK } From voroskoi at frugalware.org Fri Sep 7 13:15:36 2007 From: voroskoi at frugalware.org (voroskoi) Date: Fri Sep 7 13:15:45 2007 Subject: [Frugalware-darcs] frugalware-0.6: clamav-0.91.2-1terminus1-i686 Message-ID: <20070907111536.AFCC813A422F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070907110215-dd049-73d80c1d1493fb12bbd437d62a876ca008b3d32c.gz; [clamav-0.91.2-1terminus1-i686 voroskoi **20070907110215 secfix bump, closes #2375 ] { hunk ./source/apps-extra/clamav/FrugalBuild 5 -pkgver=0.91.1 +pkgver=0.91.2 hunk ./source/apps-extra/clamav/FrugalBuild 15 -sha1sums=('51ff98325b5ffd49dfc0f0cbf92134c0d872cd21' \ - '699ab0197b39df250582ec488e51bf173c9ce32f') +sha1sums=('f18007c3045a1d78967adad805c6934d46ca6419' \ + '90b22c99927b56992ac05042029d2702db79a8b0' \ + '57d36966c45adfd6b3ebd10b91874194924ab2c3') hunk ./source/apps-extra/clamav/FrugalBuild 34 + } From vmiklos at frugalware.org Wed Sep 12 12:48:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Wed Sep 12 12:48:58 2007 Subject: [Frugalware-darcs] frugalware-0.6: kernel-2.6.20-5terminus9-i686 Message-ID: <20070912104855.2999013A4007@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070912104650-e2957-a0dfa181a7acae062b2fe74c0d46bd315a4cb0af.gz; [kernel-2.6.20-5terminus9-i686 VMiklos **20070912104650 bump to patchlevel '19' add CVE-2007-3843.diff closes #2366 ] { addfile ./source/base/kernel/CVE-2007-3843.diff hunk ./source/base/kernel/CVE-2007-3843.diff 1 +From: Steve French +Date: Thu, 28 Jun 2007 18:41:42 +0000 (+0000) +Subject: [CIFS] Fix sign mount option and sign proc config setting +X-Git-Tag: v2.6.23-rc1~478^2~20 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=762e5ab77c803c819e45d054518a98efb70b0f60 + +[CIFS] Fix sign mount option and sign proc config setting + +We were checking the wrong (old) global variable to determine +whether to override server and force signing on the SMB +connection. + +Acked-by: Dave Kleikamp +Signed-off-by: Steve French +--- + +diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c +index ebd1335..42fafa1 100644 +--- a/fs/cifs/cifs_debug.c ++++ b/fs/cifs/cifs_debug.c +@@ -901,90 +901,14 @@ security_flags_write(struct file *file, const char __user *buffer, + } + /* flags look ok - update the global security flags for cifs module */ + extended_security = flags; ++ if (extended_security & CIFSSEC_MUST_SIGN) { ++ /* requiring signing implies signing is allowed */ ++ extended_security |= CIFSSEC_MAY_SIGN; ++ cFYI(1, ("packet signing now required")); ++ } else if ((extended_security & CIFSSEC_MAY_SIGN) == 0) { ++ cFYI(1, ("packet signing disabled")); ++ } ++ /* BB should we turn on MAY flags for other MUST options? */ + return count; + } +- +-/* static int +-ntlmv2_enabled_read(char *page, char **start, off_t off, +- int count, int *eof, void *data) +-{ +- int len; +- +- len = sprintf(page, "%d\n", ntlmv2_support); +- +- len -= off; +- *start = page + off; +- +- if (len > count) +- len = count; +- else +- *eof = 1; +- +- if (len < 0) +- len = 0; +- +- return len; +-} +-static int +-ntlmv2_enabled_write(struct file *file, const char __user *buffer, +- unsigned long count, void *data) +-{ +- char c; +- int rc; +- +- rc = get_user(c, buffer); +- if (rc) +- return rc; +- if (c == '0' || c == 'n' || c == 'N') +- ntlmv2_support = 0; +- else if (c == '1' || c == 'y' || c == 'Y') +- ntlmv2_support = 1; +- else if (c == '2') +- ntlmv2_support = 2; +- +- return count; +-} +- +-static int +-packet_signing_enabled_read(char *page, char **start, off_t off, +- int count, int *eof, void *data) +-{ +- int len; +- +- len = sprintf(page, "%d\n", sign_CIFS_PDUs); +- +- len -= off; +- *start = page + off; +- +- if (len > count) +- len = count; +- else +- *eof = 1; +- +- if (len < 0) +- len = 0; +- +- return len; +-} +-static int +-packet_signing_enabled_write(struct file *file, const char __user *buffer, +- unsigned long count, void *data) +-{ +- char c; +- int rc; +- +- rc = get_user(c, buffer); +- if (rc) +- return rc; +- if (c == '0' || c == 'n' || c == 'N') +- sign_CIFS_PDUs = 0; +- else if (c == '1' || c == 'y' || c == 'Y') +- sign_CIFS_PDUs = 1; +- else if (c == '2') +- sign_CIFS_PDUs = 2; +- +- return count; +-} */ +- +- + #endif +diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c +index 57419a1..4a2458e 100644 +--- a/fs/cifs/cifssmb.c ++++ b/fs/cifs/cifssmb.c +@@ -426,11 +426,11 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) + + /* if any of auth flags (ie not sign or seal) are overriden use them */ + if(ses->overrideSecFlg & (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL))) +- secFlags = ses->overrideSecFlg; ++ secFlags = ses->overrideSecFlg; /* BB FIXME fix sign flags? */ + else /* if override flags set only sign/seal OR them with global auth */ + secFlags = extended_security | ses->overrideSecFlg; + +- cFYI(1,("secFlags 0x%x",secFlags)); ++ cFYI(1, ("secFlags 0x%x", secFlags)); + + pSMB->hdr.Mid = GetNextMid(server); + pSMB->hdr.Flags2 |= (SMBFLG2_UNICODE | SMBFLG2_ERR_STATUS); +@@ -633,22 +633,32 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) + #ifdef CONFIG_CIFS_WEAK_PW_HASH + signing_check: + #endif +- if(sign_CIFS_PDUs == FALSE) { ++ if ((secFlags & CIFSSEC_MAY_SIGN) == 0) { ++ /* MUST_SIGN already includes the MAY_SIGN FLAG ++ so if this is zero it means that signing is disabled */ ++ cFYI(1, ("Signing disabled")); + if(server->secMode & SECMODE_SIGN_REQUIRED) +- cERROR(1,("Server requires " +- "/proc/fs/cifs/PacketSigningEnabled to be on")); ++ cERROR(1, ("Server requires " ++ "/proc/fs/cifs/PacketSigningEnabled " ++ "to be on")); + server->secMode &= + ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED); +- } else if(sign_CIFS_PDUs == 1) { ++ } else if ((secFlags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN) { ++ /* signing required */ ++ cFYI(1, ("Must sign - segFlags 0x%x", secFlags)); ++ if ((server->secMode & ++ (SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) { ++ cERROR(1, ++ ("signing required but server lacks support")); ++ } else ++ server->secMode |= SECMODE_SIGN_REQUIRED; ++ } else { ++ /* signing optional ie CIFSSEC_MAY_SIGN */ + if((server->secMode & SECMODE_SIGN_REQUIRED) == 0) + server->secMode &= + ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED); +- } else if(sign_CIFS_PDUs == 2) { +- if((server->secMode & +- (SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED)) == 0) { +- cERROR(1,("signing required but server lacks support")); +- } + } ++ + neg_err_exit: + cifs_buf_release(pSMB); + hunk ./source/base/kernel/FrugalBuild 8 -pkgrel=5terminus8 -_F_kernel_stable=15 -_F_kernel_patches=(CVE-2007-2525.diff CVE-2007-2878.diff CVE-2007-3104.diff CVE-2007-3513.diff) +pkgrel=5terminus9 +_F_kernel_stable=19 +_F_kernel_patches=(CVE-2007-2525.diff CVE-2007-2878.diff CVE-2007-3104.diff \ + CVE-2007-3513.diff CVE-2007-3843.diff) } From vmiklos at frugalware.org Sun Sep 16 21:38:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Sep 16 21:38:04 2007 Subject: [Frugalware-darcs] frugalware-0.6: asterisk-1.4.8-1terminus2-i686 Message-ID: <20070916193802.1351B1678012@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070916193623-e2957-9cf1f23375e6ac19cf9a53f69c0ec4236cc69a6b.gz; [asterisk-1.4.8-1terminus2-i686 VMiklos **20070916193623 added CVE-2007-4521.patch closes #2377 ] { addfile ./source/apps-extra/asterisk/CVE-2007-4521.patch hunk ./source/apps-extra/asterisk/CVE-2007-4521.patch 1 +--- 1.4/apps/app_voicemail.c 2007/08/24 15:49:37 80749 ++++ 1.4/apps/app_voicemail.c 2007/08/24 15:51:03 80750 +@@ -4421,7 +4421,7 @@ + mail_fetchstructure (vms->mailstream,vms->msgArray[vms->curmsg],&body); + + /* We have the body, now we extract the file name of the first attachment. */ +- if (body->nested.part->next && body->nested.part->next->body.parameter->value) { ++ if (body->nested.part && body->nested.part->next && body->nested.part->next->body.parameter->value) { + attachedfilefmt = ast_strdupa(body->nested.part->next->body.parameter->value); + } else { + ast_log(LOG_ERROR, "There is no file attached to this IMAP message.\n"); hunk ./source/apps-extra/asterisk/FrugalBuild 7 -pkgrel=1terminus1 +pkgrel=1terminus2 hunk ./source/apps-extra/asterisk/FrugalBuild 19 - rc.asterisk) + rc.asterisk \ + CVE-2007-4521.patch) hunk ./source/apps-extra/asterisk/FrugalBuild 22 - '1c18155cdece83d556e2295b54508636ff74f307') + '1c18155cdece83d556e2295b54508636ff74f307' \ + '900ec28ba2121cb996b3d62710e5606e54eadd44') } From voroskoi at frugalware.org Mon Sep 17 17:25:04 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 17 17:25:06 2007 Subject: [Frugalware-darcs] frugalware-0.6: realplayer-10.0.9.809_20070726-1terminus1-i686 Message-ID: <20070917152504.918941678012@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070917151347-dd049-6ddbd3b8da2daf697821c4ce8b6fd14c89cfdc0b.gz; [realplayer-10.0.9.809_20070726-1terminus1-i686 voroskoi **20070917151347 secfix bump, closes #2220 ] { hunk ./source/xapps-extra/realplayer/FrugalBuild 7 -pkgver=10.0.8.805_20060718 -origver=10.0.8.805-20060718 -pkgrel=2terminus1 +pkgver=10.0.9.809_20070726 +origver=10.0.9.809-20070726 +pkgrel=1terminus1 hunk ./source/xapps-extra/realplayer/FrugalBuild 19 -source=(https://helixcommunity.org/projects/player/files/download/2152) +source=(https://helixcommunity.org/projects/player/files/download/2479) hunk ./source/xapps-extra/realplayer/FrugalBuild 25 - rpm2cpio 2152 \ + rpm2cpio 2479 \ hunk ./source/xapps-extra/realplayer/FrugalBuild 46 -sha1sums=('5bca48a23c747d19409330e6d6a94d49152cc557') +sha1sums=('5231a724a1d3987400c79d066ff6b5c0ba3f5251') } From voroskoi at frugalware.org Mon Sep 17 20:39:54 2007 From: voroskoi at frugalware.org (voroskoi) Date: Mon Sep 17 20:39:56 2007 Subject: [Frugalware-darcs] frugalware-0.6: gftp-2.0.18-3terminus1-i686 Message-ID: <20070917183954.3C1EF1678012@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070917182741-dd049-875463f00693051308e70ab6d5bb1f7bde8d644e.gz; [gftp-2.0.18-3terminus1-i686 voroskoi **20070917182741 secfix relbump, closes #2368 ] { addfile ./source/xapps/gftp/CVE-2007-3961-3962.patch hunk ./source/xapps/gftp/CVE-2007-3961-3962.patch 1 +--- lib/fsplib/fsplib.h ++++ lib/fsplib/fsplib.h +@@ -1,6 +1,7 @@ + #ifndef _FSPLIB_H + #define _FSPLIB_H 1 + #include ++#include + /* The FSP v2 protocol support library - public interface */ + + /* +@@ -138,6 +139,12 @@ + unsigned int pos; /* position of next packet */ + } FSP_FILE; + ++ ++typedef union dirent_workaround { ++ struct dirent dirent; ++ char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1]; ++} dirent_workaround; ++ + /* function prototypes */ + + /* session management */ + +--- lib/fsplib/fsplib.c ++++ lib/fsplib/fsplib.c +@@ -612,7 +612,7 @@ + entry->d_reclen = fentry.reclen; + strncpy(entry->d_name,fentry.name,MAXNAMLEN); + +- if (fentry.namlen > MAXNAMLEN) ++ if (fentry.namlen >= MAXNAMLEN) + { + entry->d_name[MAXNAMLEN + 1 ] = '\0'; + #ifdef HAVE_NAMLEN +@@ -681,7 +681,7 @@ + dir->dirpos += 9; + /* read file name */ + entry->name[255 + 1] = '\0'; +- strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN); ++ strncpy(entry->name,(char *)( dir->data + dir->dirpos ),255); + namelen = strlen( (char *) dir->data+dir->dirpos); + /* skip over file name */ + dir->dirpos += namelen +1; +@@ -709,12 +709,12 @@ + + struct dirent * fsp_readdir(FSP_DIR *dirp) + { +- static struct dirent entry; ++ static dirent_workaround entry; + struct dirent *result; + + + if (dirp == NULL) return NULL; +- if ( fsp_readdir_r(dirp,&entry,&result) ) ++ if ( fsp_readdir_r(dirp,&entry.dirent,&result) ) + return NULL; + else + return result; hunk ./source/xapps/gftp/FrugalBuild 7 -pkgrel=2 +pkgrel=3terminus1 hunk ./source/xapps/gftp/FrugalBuild 17 - 01-$pkgname-$pkgver-hu.patch) + 01-$pkgname-$pkgver-hu.patch \ + CVE-2007-3961-3962.patch) hunk ./source/xapps/gftp/FrugalBuild 21 - '667a81f4c0cc8c4092b74b5b1a05a5e682911ee7') + '667a81f4c0cc8c4092b74b5b1a05a5e682911ee7' \ + 'b09a6505107afe4e0f9153a01d33741bbbb53d4e') hunk ./source/xapps/gftp/FrugalBuild 25 - Fcd - Fpatch 00-$pkgname-$pkgver-menu-file.patch || return 1 - Fpatch 01-$pkgname-$pkgver-hu.patch || return 1 + Fpatchall hunk ./source/xapps/gftp/FrugalBuild 34 - } From voroskoi at frugalware.org Tue Sep 18 21:41:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Sep 18 21:41:34 2007 Subject: [Frugalware-darcs] frugalware-0.6: rsync-2.6.9-2terminus1-i686 Message-ID: <20070918194130.301E21678013@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070918193906-dd049-3a91226de698bac5b52a448ca5282c51816ff59f.gz; [rsync-2.6.9-2terminus1-i686 voroskoi **20070918193906 secfix relbump, closes #2371 ] { hunk ./source/network/rsync/FrugalBuild 7 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/network/rsync/FrugalBuild 17 + http://www.suse.de/~krahmer/rsync-2.6.9-fname-obo.diff \ hunk ./source/network/rsync/FrugalBuild 26 +sha1sums=('341618e230ea2e0e551d0ccf06f840d4f824c843' \ + 'c535e86fa3a847250ad01a50e0840937ef24c969' \ + '23179269b311d00b518e2c54ca4cba8c9d3cb586' \ + '194d1aa56d9a7e974d282665bbf0a2918b5dcbd5') hunk ./source/network/rsync/FrugalBuild 32 -sha1sums=('341618e230ea2e0e551d0ccf06f840d4f824c843' \ - '23179269b311d00b518e2c54ca4cba8c9d3cb586' \ - '194d1aa56d9a7e974d282665bbf0a2918b5dcbd5') } From voroskoi at frugalware.org Tue Sep 18 22:03:55 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Sep 18 22:03:57 2007 Subject: [Frugalware-darcs] frugalware-0.6: xorg-server-1.2.0-2terminus2-i686 Message-ID: <20070918200355.08C091678013@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070918193801-dd049-d370bdd929356131025f96f0aafe36d2044b27f2.gz; [xorg-server-1.2.0-2terminus2-i686 voroskoi **20070918193801 secfix relbump, closes #2411 ] { addfile ./source/x11/xorg-server/CVE-2007-4730.patch hunk ./source/x11/xorg-server/CVE-2007-4730.patch 1 +From: Keith Packard +Date: Sun, 2 Sep 2007 04:14:22 +0000 (-0700) +Subject: [COMPOSITE] Composite used for pixmap population on redirect. (Bug #7447) +X-Git-Tag: xf-3_9_16d / xf-3_9_16e / xf-3_9_16f / xf-3_9_16Z +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=b69e6165136ff76ba4649bb9d11906fef27b78bc + +[COMPOSITE] Composite used for pixmap population on redirect. (Bug #7447) + +compNewPixmap copies bits from the parent window to the redirected child +pixmap to populate the pixmap with reasonable data. It cannot always use +CopyArea as that only works across matching depths. Use Composite when +the depths do not match. +(cherry picked from commit f98dfec79dadb70fa7bba84e7335f92b3a73dc02) +--- + +--- a/composite/compalloc.c ++++ b/composite/compalloc.c +@@ -461,7 +461,6 @@ compNewPixmap (WindowPtr pWin, int x, in + ScreenPtr pScreen = pWin->drawable.pScreen; + WindowPtr pParent = pWin->parent; + PixmapPtr pPixmap; +- GCPtr pGC; + + pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth); + +@@ -471,25 +470,63 @@ compNewPixmap (WindowPtr pWin, int x, in + pPixmap->screen_x = x; + pPixmap->screen_y = y; + +- pGC = GetScratchGC (pWin->drawable.depth, pScreen); +- +- /* +- * Copy bits from the parent into the new pixmap so that it will +- * have "reasonable" contents in case for background None areas. +- */ +- if (pGC) ++ if (pParent->drawable.depth == pWin->drawable.depth) + { +- XID val = IncludeInferiors; ++ GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); + +- ValidateGC(&pPixmap->drawable, pGC); +- dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); +- (*pGC->ops->CopyArea) (&pParent->drawable, +- &pPixmap->drawable, +- pGC, +- x - pParent->drawable.x, +- y - pParent->drawable.y, +- w, h, 0, 0); +- FreeScratchGC (pGC); ++ /* ++ * Copy bits from the parent into the new pixmap so that it will ++ * have "reasonable" contents in case for background None areas. ++ */ ++ if (pGC) ++ { ++ XID val = IncludeInferiors; ++ ++ ValidateGC(&pPixmap->drawable, pGC); ++ dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL); ++ (*pGC->ops->CopyArea) (&pParent->drawable, ++ &pPixmap->drawable, ++ pGC, ++ x - pParent->drawable.x, ++ y - pParent->drawable.y, ++ w, h, 0, 0); ++ FreeScratchGC (pGC); ++ } ++ } ++ else ++ { ++ PictFormatPtr pSrcFormat = compWindowFormat (pParent); ++ PictFormatPtr pDstFormat = compWindowFormat (pWin); ++ XID inferiors = IncludeInferiors; ++ int error; ++ ++ PicturePtr pSrcPicture = CreatePicture (None, ++ &pParent->drawable, ++ pSrcFormat, ++ CPSubwindowMode, ++ &inferiors, ++ serverClient, &error); ++ ++ PicturePtr pDstPicture = CreatePicture (None, ++ &pPixmap->drawable, ++ pDstFormat, ++ 0, 0, ++ serverClient, &error); ++ ++ if (pSrcPicture && pDstPicture) ++ { ++ CompositePicture (PictOpSrc, ++ pSrcPicture, ++ NULL, ++ pDstPicture, ++ x - pParent->drawable.x, ++ y - pParent->drawable.y, ++ 0, 0, 0, 0, w, h); ++ } ++ if (pSrcPicture) ++ FreePicture (pSrcPicture, 0); ++ if (pDstPicture) ++ FreePicture (pDstPicture, 0); + } + return pPixmap; + } +--- a/composite/compint.h ++++ b/composite/compint.h +@@ -232,6 +232,9 @@ compCheckTree (ScreenPtr pScreen); + #define compCheckTree(s) + #endif + ++PictFormatPtr ++compWindowFormat (WindowPtr pWin); ++ + void + compSetPixmap (WindowPtr pWin, PixmapPtr pPixmap); + +--- a/composite/compwindow.c ++++ b/composite/compwindow.c +@@ -685,7 +685,7 @@ compGetWindowVisual (WindowPtr pWin) + return 0; + } + +-static PictFormatPtr ++PictFormatPtr + compWindowFormat (WindowPtr pWin) + { + ScreenPtr pScreen = pWin->drawable.pScreen; hunk ./source/x11/xorg-server/FrugalBuild 6 -pkgrel=2terminus1 +pkgrel=2terminus2 hunk ./source/x11/xorg-server/FrugalBuild 45 - http://xorg.freedesktop.org/archive/X11R7.2/patches/xorg-xserver-1.2.0-xcmisc.diff) + http://xorg.freedesktop.org/archive/X11R7.2/patches/xorg-xserver-1.2.0-xcmisc.diff \ + CVE-2007-4730.patch) hunk ./source/x11/xorg-server/FrugalBuild 79 + Fpatch CVE-2007-4730.patch hunk ./source/x11/xorg-server/FrugalBuild 117 -sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106'\ - 'ba860bb6ee57c02202342dfd5927464a068ea18f'\ - 'f31702e0029b2d68018598e73ed55c4d6c58367b'\ - '859b98a4049400be152032fc09ceff2afe9e6dcf'\ - '863ad92892785c3785b122bf54d0def4d4d2732c'\ - '777194af057a8cfe02a4d5aacade37c6e4c4786f'\ - '4713d46b31eafbde58a1fafe8269642df6a12d77'\ - '426b0b08617ec19cba41ab20f3891cab82f205a2'\ - 'b49bb4f22426fd0dab7551ef8907276214c9a3fa'\ - '2937d6a50155cc16f73ae44b1e5b6e26cabbb86a'\ - '31938c89a107ce89b06287b28c6d355ecaa13217'\ - '0eb64d46172b6f2f4462c02dad7964c6d7656076'\ - '067931e73ffd718f0715ddd69040c660821083d8'\ - 'af385a1f28afb4368719c634b4fb5d3991e9e432'\ - '9d0d4102b26962cc453c4d66f5638f0cfb33c4fd'\ - 'f53de93da5e110867db8b1655b5798d2049f43ae'\ - '22025bd7b96deec8cd31f24fe87a170f1c7898d1'\ - '3557cbe23be6912106ed7220d95301311fb93a26') +sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \ + 'ba860bb6ee57c02202342dfd5927464a068ea18f' \ + 'f31702e0029b2d68018598e73ed55c4d6c58367b' \ + '859b98a4049400be152032fc09ceff2afe9e6dcf' \ + '863ad92892785c3785b122bf54d0def4d4d2732c' \ + '777194af057a8cfe02a4d5aacade37c6e4c4786f' \ + '4713d46b31eafbde58a1fafe8269642df6a12d77' \ + '426b0b08617ec19cba41ab20f3891cab82f205a2' \ + 'b49bb4f22426fd0dab7551ef8907276214c9a3fa' \ + '2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \ + '31938c89a107ce89b06287b28c6d355ecaa13217' \ + '0eb64d46172b6f2f4462c02dad7964c6d7656076' \ + '067931e73ffd718f0715ddd69040c660821083d8' \ + 'af385a1f28afb4368719c634b4fb5d3991e9e432' \ + '9d0d4102b26962cc453c4d66f5638f0cfb33c4fd' \ + 'f53de93da5e110867db8b1655b5798d2049f43ae' \ + '22025bd7b96deec8cd31f24fe87a170f1c7898d1' \ + '3557cbe23be6912106ed7220d95301311fb93a26' \ + '4b8f2ea8ac293db6d0c2942ef01d894e66a9764f') } From voroskoi at frugalware.org Tue Sep 18 22:22:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Tue Sep 18 22:22:31 2007 Subject: [Frugalware-darcs] frugalware-0.6: lighttpd-1.4.16-1terminus2-x86_64 Message-ID: <20070918202230.4CEC41678013@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070918202017-dd049-535df69a2d49412a9169235bcbe74ab160c034c7.gz; [lighttpd-1.4.16-1terminus2-x86_64 voroskoi **20070918202017 secfix relbump, closes #2410 ] { hunk ./source/network-extra/lighttpd/FrugalBuild 7 -pkgrel=1terminus1 +pkgrel=1terminus2 hunk ./source/network-extra/lighttpd/FrugalBuild 13 - $pkgname.conf rc.$pkgname index.html http://frugalware.org/images/frugalware.png) + $pkgname.conf rc.$pkgname index.html http://frugalware.org/images/frugalware.png \ + lighttpd-1.4.x_mod_fastcgi_overrun.patch) hunk ./source/network-extra/lighttpd/FrugalBuild 38 - hunk ./source/network-extra/lighttpd/FrugalBuild 42 - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e' \ + 'e3242012652f76addaeda55d5d2b4a722ea69eba') + addfile ./source/network-extra/lighttpd/lighttpd-1.4.x_mod_fastcgi_overrun.patch hunk ./source/network-extra/lighttpd/lighttpd-1.4.x_mod_fastcgi_overrun.patch 1 +diff -aur lighttpd-1.4.16.orig/src/mod_fastcgi.c lighttpd-1.4.16/src/mod_fastcgi.c +--- lighttpd-1.4.16.orig/src/mod_fastcgi.c 2007-09-18 21:57:35.000000000 +0200 ++++ lighttpd-1.4.16/src/mod_fastcgi.c 2007-09-18 22:02:59.000000000 +0200 +@@ -54,6 +54,12 @@ + #include + #endif + ++#define FCGI_ENV_ADD_CHECK(ret, con) \ ++ if (ret == -1) { \ ++ con->http_status = 400; \ ++ con->file_finished = 1; \ ++ return -1; \ ++ }; + + /* + * +@@ -1575,6 +1581,21 @@ + len += key_len > 127 ? 4 : 1; + len += val_len > 127 ? 4 : 1; + ++ if (env->used + len >= FCGI_MAX_LENGTH) { ++ /** ++ * we can't append more headers, ignore it ++ */ ++ return -1; ++ } ++ ++ /** ++ * field length can be 31bit max ++ * ++ * HINT: this can't happen as FCGI_MAX_LENGTH is only 16bit ++ */ ++ if (key_len > 0x7fffffff) key_len = 0x7fffffff; ++ if (val_len > 0x7fffffff) val_len = 0x7fffffff; ++ + buffer_prepare_append(env, len); + + if (key_len > 127) { +@@ -1604,6 +1625,8 @@ + } + + static int fcgi_header(FCGI_Header * header, unsigned char type, size_t request_id, int contentLength, unsigned char paddingLength) { ++ assert(contentLength <= FCGI_MAX_LENGTH); ++ + header->version = FCGI_VERSION_1; + header->type = type; + header->requestIdB0 = request_id & 0xff; +@@ -1758,7 +1781,7 @@ + } + srv->tmp_buf->ptr[srv->tmp_buf->used++] = '\0'; + +- fcgi_env_add(p->fcgi_env, CONST_BUF_LEN(srv->tmp_buf), CONST_BUF_LEN(ds->value)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_BUF_LEN(srv->tmp_buf), CONST_BUF_LEN(ds->value)),con); + } + } + +@@ -1785,7 +1808,7 @@ + } + srv->tmp_buf->ptr[srv->tmp_buf->used++] = '\0'; + +- fcgi_env_add(p->fcgi_env, CONST_BUF_LEN(srv->tmp_buf), CONST_BUF_LEN(ds->value)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_BUF_LEN(srv->tmp_buf), CONST_BUF_LEN(ds->value)), con); + } + } + +@@ -1829,10 +1852,10 @@ + buffer_prepare_copy(p->fcgi_env, 1024); + + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_SOFTWARE"), CONST_STR_LEN(PACKAGE_NAME"/"PACKAGE_VERSION)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_SOFTWARE"), CONST_STR_LEN(PACKAGE_NAME"/"PACKAGE_VERSION)),con) + + if (con->server_name->used) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_NAME"), CONST_BUF_LEN(con->server_name)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_NAME"), CONST_BUF_LEN(con->server_name)),con) + } else { + #ifdef HAVE_IPV6 + s = inet_ntop(srv_sock->addr.plain.sa_family, +@@ -1843,10 +1866,10 @@ + #else + s = inet_ntoa(srv_sock->addr.ipv4.sin_addr); + #endif +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_NAME"), s, strlen(s)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_NAME"), s, strlen(s)),con) + } + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("GATEWAY_INTERFACE"), CONST_STR_LEN("CGI/1.1")); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("GATEWAY_INTERFACE"), CONST_STR_LEN("CGI/1.1")),con) + + ltostr(buf, + #ifdef HAVE_IPV6 +@@ -1856,7 +1879,7 @@ + #endif + ); + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf)),con) + + /* get the server-side of the connection to the client */ + our_addr_len = sizeof(our_addr); +@@ -1866,7 +1889,7 @@ + } else { + s = inet_ntop_cache_get_ip(srv, &(our_addr)); + } +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s)),con) + + ltostr(buf, + #ifdef HAVE_IPV6 +@@ -1876,10 +1899,10 @@ + #endif + ); + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_PORT"), buf, strlen(buf)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_PORT"), buf, strlen(buf)),con) + + s = inet_ntop_cache_get_ip(srv, &(con->dst_addr)); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s)),con) + + if (!buffer_is_empty(con->authed_user)) { + /* AUTH_TYPE fix by Troy Kruthoff (tkruthoff@gmail.com) +@@ -1895,7 +1918,7 @@ + char *http_authorization = NULL; + data_string *ds; + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), CONST_BUF_LEN(con->authed_user)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), CONST_BUF_LEN(con->authed_user)),con) + + if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Authorization"))) { + http_authorization = ds->value->ptr; +@@ -1919,7 +1942,7 @@ + + /* request.content_length < SSIZE_MAX, see request.c */ + ltostr(buf, con->request.content_length); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf)),con) + } + + if (host->mode != FCGI_AUTHORIZER) { +@@ -1930,10 +1953,10 @@ + * For AUTHORIZER mode these headers should be omitted. + */ + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path)),con) + + if (!buffer_is_empty(con->request.pathinfo)) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo)),con) + + /* PATH_TRANSLATED is only defined if PATH_INFO is set */ + +@@ -1943,9 +1966,9 @@ + buffer_copy_string_buffer(p->path, con->physical.doc_root); + } + buffer_append_string_buffer(p->path, con->request.pathinfo); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)),con) + } else { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")),con) + } + } + +@@ -1966,8 +1989,8 @@ + buffer_copy_string_buffer(p->path, host->docroot); + buffer_append_string_buffer(p->path, con->uri.path); + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path)); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(host->docroot)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path)),con) ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(host->docroot)),con) + } else { + buffer_copy_string_buffer(p->path, con->physical.path); + +@@ -1979,8 +2002,8 @@ + buffer_append_string_buffer(p->path, con->request.pathinfo); + } + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path)); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(p->path)),con) ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root)),con) + } + + if (host->strip_request_uri->used > 1) { +@@ -2006,34 +2029,34 @@ + con->request.orig_uri->ptr + (host->strip_request_uri->used - 2), + con->request.orig_uri->used - (host->strip_request_uri->used - 2)); + } else { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri)),con) + } + } else { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri)),con) + } + if (!buffer_is_equal(con->request.uri, con->request.orig_uri)) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REDIRECT_URI"), CONST_BUF_LEN(con->request.uri)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REDIRECT_URI"), CONST_BUF_LEN(con->request.uri)),con) + } + if (!buffer_is_empty(con->uri.query)) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query)),con) + } else { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("QUERY_STRING"), CONST_STR_LEN("")); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("QUERY_STRING"), CONST_STR_LEN("")),con) + } + + s = get_http_method_name(con->request.http_method); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_METHOD"), s, strlen(s)); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REDIRECT_STATUS"), CONST_STR_LEN("200")); /* if php is compiled with --force-redirect */ ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REQUEST_METHOD"), s, strlen(s)),con) ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REDIRECT_STATUS"), CONST_STR_LEN("200")),con) /* if php is compiled with --force-redirect */ + s = get_http_version_name(con->request.http_version); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s)); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s)),con) + + #ifdef USE_OPENSSL + if (srv_sock->is_ssl) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on")); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on")),con) + } + #endif + + +- fcgi_env_add_request_headers(srv, con, p); ++ FCGI_ENV_ADD_CHECK(fcgi_env_add_request_headers(srv, con, p), con); + + fcgi_header(&(header), FCGI_PARAMS, request_id, p->fcgi_env->used, 0); + buffer_append_memory(b, (const char *)&header, sizeof(header)); +@@ -2928,10 +2951,8 @@ + } + + /* fall through */ +- fcgi_create_env(srv, hctx, hctx->request_id); +- ++ if (-1 == fcgi_create_env(srv, hctx, hctx->request_id)) return HANDLER_ERROR; + fcgi_set_state(srv, hctx, FCGI_STATE_WRITE); +- + /* fall through */ + case FCGI_STATE_WRITE: + ret = srv->network_backend_write(srv, con, hctx->fd, hctx->wb); +@@ -3113,7 +3134,7 @@ + + buffer_reset(con->physical.path); + con->mode = DIRECT; +- con->http_status = 503; ++ if (con->http_status != 400) con->http_status = 503; + joblist_append(srv, con); /* really ? */ + + return HANDLER_FINISHED; } From voroskoi at frugalware.org Sat Sep 22 19:24:14 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sat Sep 22 19:24:20 2007 Subject: [Frugalware-darcs] frugalware-0.6: qt-3.3.7-5terminus2-i686 Message-ID: <20070922172414.62C581768005@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070922170758-dd049-ac947d81b4e61ed2a731330c73b8f335a4020f0f.gz; [qt-3.3.7-5terminus2-i686 voroskoi **20070922170758 secfix relbump, closes #2414 ] { addfile ./source/kde/qt/CVE-2007-4137.diff hunk ./source/kde/qt/CVE-2007-4137.diff 1 +diff -aur qt-x11-free-3.3.7/src/codecs/qutfcodec.cpp fw_qt-x11-free-3.3.7/src/codecs/qutfcodec.cpp +--- qt-x11-free-3.3.7/src/codecs/qutfcodec.cpp 2006-10-19 16:25:07.000000000 +0200 ++++ fw_qt-x11-free-3.3.7/src/codecs/qutfcodec.cpp 2007-09-22 18:23:41.000000000 +0200 +@@ -164,7 +164,7 @@ + QString toUnicode(const char* chars, int len) + { + QString result; +- result.setLength( len ); // worst case ++ result.setLength( len + 1 ); // worst case + QChar *qch = (QChar *)result.unicode(); + uchar ch; + for (int i=0; i Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070923151123-e2957-0567204499dd5d01f474726d787b80a664f7b5e9.gz; [kdebase-3.5.6-3terminus2-i686 VMiklos **20070923151123 secfix update closes #2430 ] { hunk ./source/kde/kdebase/FrugalBuild 7 -pkgrel=3terminus1 +pkgrel=3terminus2 hunk ./source/kde/kdebase/FrugalBuild 37 - ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff) + post-3.5.7-kdebase-konqueror.diff \ + ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-kdm.diff) hunk ./source/kde/kdebase/FrugalBuild 102 - '3868392701ebe9fce14567a1f52d458d00f31287') + '3868392701ebe9fce14567a1f52d458d00f31287' \ + 'b270a1d5b3980f49a274308bec7fc649be1bd315') addfile ./source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff hunk ./source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff 1 +--- konqueror/konq_combo.cc ++++ konqueror/konq_combo.cc +@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", + "addToCombo(QString,QCString)", data); + } ++ // important security consideration: always display the beginning ++ // of the url rather than its end to prevent spoofing attempts. ++ lineEdit()->setCursorPosition( 0 ); + } + + void KonqCombo::setTemporary( const QString& text ) +--- konqueror/konq_mainwindow.cc ++++ konqueror/konq_mainwindow.cc +@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView * + } + else // no known serviceType, use KonqRun + { +- if ( ( view && view == m_currentView ) || +- ( !view && !req.newTab ) ) // startup with argument ++ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument + { + // Show it for now in the location bar, but we'll need to store it in the view + // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called). +- kdDebug(1202) << "setLocationBarURL : url = " << url << endl; ++ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl; + setLocationBarURL( url ); + } + +@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s + if ( childView ) + { + enableAllActions( true ); +- +- m_pViewManager->setActivePart( childView->part() ); + m_currentView = childView; + } + } +--- konqueror/konq_viewmgr.cc ++++ konqueror/konq_viewmgr.cc +@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan + + void KonqViewManager::emitActivePartChanged() + { ++ // prevent unnecessary multiple calls to slotPartActivated: ++ m_activePartChangedTimer->stop(); + m_pMainWindow->slotPartActivated( activePart() ); + } + } From voroskoi at frugalware.org Sun Sep 23 19:02:27 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Sep 23 19:02:28 2007 Subject: [Frugalware-darcs] frugalware-0.6: qt4-4.2.3-2terminus2-x86_64 Message-ID: <20070923170227.ACFFF13A4055@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070923165853-dd049-25d60515efca807116d9a51138e76ce813b483fd.gz; [qt4-4.2.3-2terminus2-x86_64 voroskoi **20070923165853 secfix relbump, closes #2422 ] { hunk ./source/kde-extra/qt4/FrugalBuild 7 -pkgrel=2terminus1 +pkgrel=2terminus2 hunk ./source/kde-extra/qt4/FrugalBuild 23 - Qt-$pkgver-UTF-8-fix.patch) + Qt-$pkgver-UTF-8-fix.patch \ + CVE-2007-4137.diff) hunk ./source/kde-extra/qt4/FrugalBuild 95 -sha1sums=('b988aab4fa1dcce8532c36bb63947a556076e8c8'\ - '991ed0d2f047e0ead54efc050c652595b7bed00b'\ - '19281b54674d4071a3814200fd8a64e097ece2e8'\ - '410b18b9a496cf551f7ff6cb282c719c874bc883'\ - 'dfa7acb2259f65aeb23968241983110e509fa90c'\ - '6868adc53c2037a83b0601c92ea39dd3394a8fdf'\ - 'b52999fc0c57d92f5e41fedeec00804f8b498465'\ - '2468fea7b127253832148115d5aa9e85b2e0aea6'\ - '8f9843991d4773f10986069ee996eb1668196a49') +sha1sums=('b988aab4fa1dcce8532c36bb63947a556076e8c8' \ + '991ed0d2f047e0ead54efc050c652595b7bed00b' \ + '19281b54674d4071a3814200fd8a64e097ece2e8' \ + '410b18b9a496cf551f7ff6cb282c719c874bc883' \ + 'dfa7acb2259f65aeb23968241983110e509fa90c' \ + '6868adc53c2037a83b0601c92ea39dd3394a8fdf' \ + 'b52999fc0c57d92f5e41fedeec00804f8b498465' \ + '2468fea7b127253832148115d5aa9e85b2e0aea6' \ + '8f9843991d4773f10986069ee996eb1668196a49' \ + 'af4666c1777ec4efa03bbce8c1afcf35dee54cbe') } From voroskoi at frugalware.org Sun Sep 23 19:09:21 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Sep 23 19:09:23 2007 Subject: [Frugalware-darcs] frugalware-0.6: qt4-4.2.3-2terminus2-x86_64 Message-ID: <20070923170921.5396113A4055@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070923170629-dd049-8a935166b4ab90bd488fac5f569e0c2029fd1158.gz; [qt4-4.2.3-2terminus2-x86_64 voroskoi **20070923170629 forgot the patch ] { addfile ./source/kde-extra/qt4/CVE-2007-4137.diff hunk ./source/kde-extra/qt4/CVE-2007-4137.diff 1 +diff -aur qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp fw_qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp +--- qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp 2007-02-21 10:58:41.000000000 +0100 ++++ fw_qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp 2007-09-22 18:31:16.000000000 +0200 +@@ -146,7 +146,7 @@ + } + + QString result; +- result.resize(len); // worst case ++ result.resize( len + 1 ); // worst case + QChar *qch = result.data(); + uchar ch; + int invalid = 0; } From voroskoi at frugalware.org Wed Sep 26 09:00:55 2007 From: voroskoi at frugalware.org (voroskoi) Date: Wed Sep 26 09:00:56 2007 Subject: [Frugalware-darcs] frugalware-0.6: claws-mail-2.8.1-2terminus1-i686 Message-ID: <20070926070055.1CA9A13A4126@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070926063648-dd049-371268a48b32e523d3e292b10650a03dd4b7e572.gz; [claws-mail-2.8.1-2terminus1-i686 voroskoi **20070926063648 secfix relbump, closes #2378 ] { addfile ./source/xapps-extra/claws-mail/CVE-2007-2958.diff hunk ./source/xapps-extra/claws-mail/CVE-2007-2958.diff 1 +diff -u -r1.149.2.79 -r1.149.2.80 +--- sylpheed-claws/src/inc.c 2007/08/13 21:36:33 1.149.2.79 ++++ sylpheed-claws/src/inc.c 2007/08/22 16:11:46 1.149.2.80 +@@ -1217,7 +1217,7 @@ + mainwindow_show_error(); + + if (err_msg) { +- alertpanel_error_log(err_msg); ++ alertpanel_error_log("%s", err_msg); + g_free(err_msg); + } + } hunk ./source/xapps-extra/claws-mail/FrugalBuild 7 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/xapps-extra/claws-mail/FrugalBuild 24 +source=(${source[@]} CVE-2007-2958.diff) hunk ./source/xapps-extra/claws-mail/FrugalBuild 47 +sha1sums=('10b9297361a892690af2da0e5297473537c1ff7f' \ + '7757f80e0a43b9fc7d3d80c3671841f6429025a0') hunk ./source/xapps-extra/claws-mail/FrugalBuild 50 -sha1sums=('10b9297361a892690af2da0e5297473537c1ff7f') } From voroskoi at frugalware.org Wed Sep 26 10:24:30 2007 From: voroskoi at frugalware.org (voroskoi) Date: Wed Sep 26 10:24:33 2007 Subject: [Frugalware-darcs] frugalware-0.6: sylpheed-2.3.1-2terminus1-i686 Message-ID: <20070926082430.3233913A4126@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.6;a=darcs_commitdiff;h=20070926081014-dd049-d474bca36d5ffe0fb42879b6aa6cc84ffe822971.gz; [sylpheed-2.3.1-2terminus1-i686 voroskoi **20070926081014 secfix relbump, closes #2378 ] { addfile ./source/xapps-extra/sylpheed/CVE-2007-2958.diff hunk ./source/xapps-extra/sylpheed/CVE-2007-2958.diff 1 +diff -aur sylpheed-2.3.1/src/inc.c fw_sylpheed-2.3.1/src/inc.c +--- sylpheed-2.3.1/src/inc.c 2007-01-12 07:14:57.000000000 +0100 ++++ fw_sylpheed-2.3.1/src/inc.c 2007-09-26 09:04:43.000000000 +0200 +@@ -1249,7 +1249,7 @@ + log_warning("%s\n", log_msg); + } + if (err_msg) { +- alertpanel_error(err_msg); ++ alertpanel_error("%s", err_msg); + g_free(err_msg); + } + } hunk ./source/xapps-extra/sylpheed/FrugalBuild 7 -pkgrel=1 +pkgrel=2terminus1 hunk ./source/xapps-extra/sylpheed/FrugalBuild 15 -source=($url/$pkgname/v${branch}/$pkgname-$pkgver.tar.bz2) +source=($url/$pkgname/v${branch}/$pkgname-$pkgver.tar.bz2 CVE-2007-2958.diff) hunk ./source/xapps-extra/sylpheed/FrugalBuild 17 -sha1sums=('a88e728853ac5a546d063247ba9f7755d54adc52') +sha1sums=('a88e728853ac5a546d063247ba9f7755d54adc52' \ + '8fa255d329549a303097ad48239db55f4ca6c483') }