Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4343260d36f5abb330316f4d77fd0524bb5f1d1
commit e4343260d36f5abb330316f4d77fd0524bb5f1d1 Author: Baste <[email protected]> Date: Thu Apr 18 16:03:07 2013 +0200 cups-pk-helper-0.2.4-2-x86_64 * Fix pkg diff --git a/source/gnome/cups-pk-helper/FrugalBuild b/source/gnome/cups-pk-helper/FrugalBuild index b392146..55358a7 100644 --- a/source/gnome/cups-pk-helper/FrugalBuild +++ b/source/gnome/cups-pk-helper/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cups-pk-helper pkgver=0.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A helper that makes system-config-printer use PolicyKit" url="http://www.freedesktop.org/software/cups-pk-helper/releases"; depends=('polkit' 'cups') @@ -11,7 +11,8 @@ makedepends=('intltool') groups=('gnome') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=($url/$pkgname-$pkgver.tar.xz) -sha1sums=('7a36a857eec68bd42597c7637c0116488e0cdcb8') +source=($url/$pkgname-$pkgver.tar.xz revert-git.patch) +sha1sums=('7a36a857eec68bd42597c7637c0116488e0cdcb8' \ + 'e44869ef6db7a1e477e2c077834d4024fc48b057') # optimization OK diff --git a/source/gnome/cups-pk-helper/revert-git.patch b/source/gnome/cups-pk-helper/revert-git.patch new file mode 100644 index 0000000..7ea0426 --- /dev/null +++ b/source/gnome/cups-pk-helper/revert-git.patch @@ -0,0 +1,37 @@ +--- src/cups.c ++++ src/cups.c +@@ -327,25 +327,23 @@ _cph_cups_is_printer_name_valid_internal (const char *name) + int i; + int len; + +- /* Quoting http://www.cups.org/documentation.php/doc-1.1/sam.html#4_1: +- * +- * The printer name must start with any printable character except +- * " ", "/", and "@". It can contain up to 127 letters, numbers, and +- * the underscore (_). +- * +- * The first part is a bit weird, as the second part is more +- * restrictive. So we only consider the second part. */ +- + /* no empty string */ + if (!name || name[0] == '\0') + return FALSE; + + len = strlen (name); +- if (len > 127) ++ /* no string that is too long; see comment at the beginning of the ++ * validation code block */ ++ if (len > CPH_STR_MAXLEN) + return FALSE; + ++ /* only printable characters, no space, no /, no # */ + for (i = 0; i < len; i++) { +- if (!g_ascii_isalnum (name[i]) && name[i] != '_') ++ if (!g_ascii_isprint (name[i])) ++ return FALSE; ++ if (g_ascii_isspace (name[i])) ++ return FALSE; ++ if (name[i] == '/' || name[i] == '#') + return FALSE; + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
