Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0633caff69b58a7b90d506b9e5542cde0b64583
commit d0633caff69b58a7b90d506b9e5542cde0b64583 Author: DeX77 <[email protected]> Date: Fri Jun 12 11:23:25 2015 +0200 cups-2.0.3-1-x86_64 * version bump diff --git a/source/xapps/cups/CVE-2014-5029-5030-5031.patch b/source/xapps/cups/CVE-2014-5029-5030-5031.patch deleted file mode 100644 index 44c11b7..0000000 --- a/source/xapps/cups/CVE-2014-5029-5030-5031.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d40220801eec992804cb728d51228d19496fffd9 Mon Sep 17 00:00:00 2001 -From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> -Date: Tue, 22 Jul 2014 14:03:19 +0000 -Subject: [PATCH] Mirror changes from trunk. - -git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12057 a1ca3aef-8c08-0410-bb20-df032aa958be ---- -diff --git a/scheduler/client.c b/scheduler/client.c -index e5959fa..366b351 100644 ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -3310,7 +3310,7 @@ get_file(cupsd_client_t *con, /* I - Client connection */ - * then fallback to the default one... - */ - -- if ((status = stat(filename, filestats)) != 0 && language[0] && -+ if ((status = lstat(filename, filestats)) != 0 && language[0] && - strncmp(con->uri, "/icons/", 7) && - strncmp(con->uri, "/ppd/", 5) && - strncmp(con->uri, "/rss/", 5) && -@@ -3408,13 +3408,13 @@ get_file(cupsd_client_t *con, /* I - Client connection */ - plen = len - (ptr - filename); - - strlcpy(ptr, "index.html", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - - #ifdef HAVE_JAVA - if (status) - { - strlcpy(ptr, "index.class", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - } - #endif /* HAVE_JAVA */ - -@@ -3422,7 +3422,7 @@ get_file(cupsd_client_t *con, /* I - Client connection */ - if (status) - { - strlcpy(ptr, "index.pl", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - } - #endif /* HAVE_PERL */ - -@@ -3430,7 +3430,7 @@ get_file(cupsd_client_t *con, /* I - Client connection */ - if (status) - { - strlcpy(ptr, "index.php", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - } - #endif /* HAVE_PHP */ - -@@ -3438,18 +3438,39 @@ get_file(cupsd_client_t *con, /* I - Client connection */ - if (status) - { - strlcpy(ptr, "index.pyc", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - } - - if (status) - { - strlcpy(ptr, "index.py", plen); -- status = stat(filename, filestats); -+ status = lstat(filename, filestats); - } - #endif /* HAVE_PYTHON */ - - } - while (status && language[0]); -+ -+ /* -+ * If we've found a symlink, 404 the sucker to avoid disclosing information. -+ */ -+ -+ if (!status && S_ISLNK(filestats->st_mode)) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Symlinks such as \"%s\" are not allowed.", con->http.fd, filename); -+ return (NULL); -+ } -+ -+ /* -+ * Similarly, if the file/directory does not have world read permissions, do -+ * not allow access... -+ */ -+ -+ if (!status && !(filestats->st_mode & S_IROTH)) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Files/directories such as \"%s\" must be world-readable.", con->http.fd, filename); -+ return (NULL); -+ } - } - - cupsdLogMessage(CUPSD_LOG_DEBUG2, --- -1.9.3 - diff --git a/source/xapps/cups/FrugalBuild b/source/xapps/cups/FrugalBuild index 93ac756..4c61b7e 100644 --- a/source/xapps/cups/FrugalBuild +++ b/source/xapps/cups/FrugalBuild @@ -6,7 +6,7 @@ options+=('asneeded') pkgname=cups -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="The CUPS Printing System" url="http://www.cups.org/"; @@ -16,9 +16,9 @@ rodepends=('libcups') groups=('xapps') archs=('i686' 'x86_64' 'arm') backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) -_F_archive_nosort=y -up2date="Flastarchive $url -source.tar.bz2" -source=(http://www.cups.org/software/$pkgver/cups-$pkgver-source.tar.bz2) +_F_archive_grepv="b" +up2date="Flastarchive $url/software.php -source.tar.gz" +source=(http://www.cups.org/software/$pkgver/cups-$pkgver-source.tar.gz) signatures=("${source[@]}".sig) provides=('cupsddk') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
