From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5FDED1388C0 for ; Sun, 21 Feb 2016 09:37:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90E6821C062; Sun, 21 Feb 2016 09:37:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D47D121C0B2 for ; Sun, 21 Feb 2016 09:37:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E1DD340BB1 for ; Sun, 21 Feb 2016 09:37:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2340218A4 for ; Sun, 21 Feb 2016 09:37:12 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1456047419.642225a785aa53d00dab301baf24fcb9ae8e799c.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups-pk-helper/files/, net-print/cups-pk-helper/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups-pk-helper/Manifest net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch X-VCS-Directories: net-print/cups-pk-helper/ net-print/cups-pk-helper/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 642225a785aa53d00dab301baf24fcb9ae8e799c X-VCS-Branch: master Date: Sun, 21 Feb 2016 09:37:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ed6a405b-88c8-469d-aa4f-de31fb68f339 X-Archives-Hash: 09fb2c09824b4948a740fbfd8facb503 commit: 642225a785aa53d00dab301baf24fcb9ae8e799c Author: Pacho Ramos gentoo org> AuthorDate: Sun Feb 21 09:29:57 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Feb 21 09:36:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642225a7 net-print/cups-pk-helper: Drop old Package-Manager: portage-2.2.27 net-print/cups-pk-helper/Manifest | 1 - .../cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild | 39 --------------- .../cups-pk-helper-0.2.4-revert-stricter.patch | 55 ---------------------- 3 files changed, 95 deletions(-) diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest index 608bff0..7011395 100644 --- a/net-print/cups-pk-helper/Manifest +++ b/net-print/cups-pk-helper/Manifest @@ -1,2 +1 @@ -DIST cups-pk-helper-0.2.4.tar.xz 149828 SHA256 d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3 SHA512 0e071cad5cb8177caefa973de754f015fca3f6bc291ff1f30b978be990f45e443ca91999a2c733aff616cd9a5fc3b4074e1e01a18dd049f6d9b629171587ba02 WHIRLPOOL 7b34eba1fd4fc26c81dafe1eb118e2aec7b6f955a3f0323866a732c85ae3046236e87deb7f6c0427c02bfaff6e823182f42909ac8b19817c6cb089e90127da32 DIST cups-pk-helper-0.2.5.tar.xz 152620 SHA256 19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40 WHIRLPOOL b97000a948cdd82c46e83ab1e2be936068fc2eb28af13f672495c5827fe7ac7ddc4c5ac8df5fe146686aec386f513a2e36609727077254911a12162818003932 diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild deleted file mode 100644 index 2e3a348..0000000 --- a/net-print/cups-pk-helper/cups-pk-helper-0.2.4-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils - -DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/cups-pk-helper" -SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=">=dev-libs/glib-2.30.0:2 - net-print/cups - >=sys-auth/polkit-0.97" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=dev-util/gdbus-codegen-2.30.0 - >=dev-util/intltool-0.40.6 - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - DOCS="AUTHORS HACKING NEWS README" - - # Revert "Be stricter when validating printer names", bug #459596 - epatch "${FILESDIR}/${P}-revert-stricter.patch" - - # Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773 - rm -v src/cph-iface-mechanism.{c,h} || die -} diff --git a/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch b/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch deleted file mode 100644 index d20e348..0000000 --- a/net-print/cups-pk-helper/files/cups-pk-helper-0.2.4-revert-stricter.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f00aee0b43c31e94087668b23b72e873c660de5e Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Mon, 10 Dec 2012 09:44:31 +0000 -Subject: Revert "Be stricter when validating printer names" - -Apparently, this is way too strict. The lpadmin man page says: - - CUPS allows printer names to contain any printable character except - SPACE, TAB, "/", or "#". - -So the previous code was (mostly) correct. - -This reverts commit 7bf9cbe43ef8f648f308e4760f75c2aa6b61fa8e. ---- -diff --git a/src/cups.c b/src/cups.c -index 96c2c20..09f0e7b 100644 ---- a/src/cups.c -+++ b/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; - } - --- -cgit v0.9.0.2-2-gbebe