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 84B9D138247 for ; Sat, 18 Jan 2014 14:32:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60336E0C7E; Sat, 18 Jan 2014 14:32:04 +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 77A59E0C81 for ; Sat, 18 Jan 2014 14:32:03 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BE3C33F97B for ; Sat, 18 Jan 2014 14:32:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3480C1872C for ; Sat, 18 Jan 2014 14:32:01 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1390055514.0bfd3f914541ef0e3c2a19c42d37e5b47f39fcf3.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:musl commit in: sys-apps/kbd/files/, sys-apps/kbd/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch sys-apps/kbd/kbd-1.15.3-r99.ebuild sys-apps/kbd/kbd-1.15.5-r99.ebuild X-VCS-Directories: sys-apps/kbd/files/ sys-apps/kbd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 0bfd3f914541ef0e3c2a19c42d37e5b47f39fcf3 X-VCS-Branch: musl Date: Sat, 18 Jan 2014 14:32:01 +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: caa990aa-8613-4271-a9bc-df600ecf0a85 X-Archives-Hash: e4f0f8b82020f073f7af46fcd1a06fcb commit: 0bfd3f914541ef0e3c2a19c42d37e5b47f39fcf3 Author: layman localhost> AuthorDate: Thu Jan 16 13:52:35 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Jan 18 14:31:54 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0bfd3f91 sys-apps/kbd: bump and fix struct winsize collision --- .../kbd-1.15.5-fix-struct_winsize-collision.patch | 11 +++ sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch | 90 ++++++++++++++++++++++ ...r.patch => kbd-1.15.5-musl-headers-error.patch} | 0 ...kbd-1.15.3-r99.ebuild => kbd-1.15.5-r99.ebuild} | 36 +++++---- 4 files changed, 120 insertions(+), 17 deletions(-) diff --git a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch new file mode 100644 index 0000000..2936090 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch @@ -0,0 +1,11 @@ +diff -Naur kbd-1.15.5.orig/src/resizecons.c kbd-1.15.5/src/resizecons.c +--- kbd-1.15.5.orig/src/resizecons.c 2012-12-01 21:41:38.000000000 +0000 ++++ kbd-1.15.5/src/resizecons.c 2014-01-16 13:48:25.793935059 +0000 +@@ -82,7 +82,6 @@ + #include + #else + #include +-#include + #endif + #include + #include "paths.h" diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch new file mode 100644 index 0000000..c78a227 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch @@ -0,0 +1,90 @@ +https://bugs.gentoo.org/447440 + +From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Tue, 11 Dec 2012 14:24:44 +0400 +Subject: [PATCH] Fix regression in 16117ce6ab + +Signed-off-by: Alexey Gladkov +--- + src/loadkeys.analyze.l | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l +index c18dcea..f817c78 100644 +--- a/src/loadkeys.analyze.l ++++ b/src/loadkeys.analyze.l +@@ -307,8 +307,10 @@ To to|To|TO + char *s = xstrndup(yytext+1, strlen(yytext)-2); + /* use static pathname to store *s ? */ + open_include(s); +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + } + [^"]|\"\"|\"[^"\n]*{Eol} { + yyerror(_("expected filename between quotes")); +@@ -323,7 +325,7 @@ To to|To|TO + } + {Eol} { + line_nr++; +- if (state_ptr > 0) { ++ while (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } +@@ -428,8 +430,10 @@ To to|To|TO + } + \" { + *p = '\0'; +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + return(STRLITERAL); + } + . { +--- a/src/loadkeys.analyze.c ++++ b/src/loadkeys.analyze.c +@@ -1359,8 +1359,10 @@ YY_RULE_SETUP + char *s = xstrndup(yytext+1, strlen(yytext)-2); + /* use static pathname to store *s ? */ + open_include(s); +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + } + YY_BREAK + case 3: +@@ -1393,7 +1395,7 @@ YY_RULE_SETUP + #line 324 "loadkeys.analyze.l" + { + line_nr++; +- if (state_ptr > 0) { ++ while (state_ptr > 0) { + yy_pop_state(); + state_ptr--; + } +@@ -1670,8 +1670,10 @@ YY_RULE_SETUP + #line 429 "loadkeys.analyze.l" + { + *p = '\0'; +- yy_pop_state(); +- state_ptr--; ++ while (state_ptr > 0) { ++ yy_pop_state(); ++ state_ptr--; ++ } + return(STRLITERAL); + } + YY_BREAK +-- +1.8.0.2 diff --git a/sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch similarity index 100% rename from sys-apps/kbd/files/kbd-1.15.3-musl-headers-error.patch rename to sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch diff --git a/sys-apps/kbd/kbd-1.15.3-r99.ebuild b/sys-apps/kbd/kbd-1.15.5-r99.ebuild similarity index 57% rename from sys-apps/kbd/kbd-1.15.3-r99.ebuild rename to sys-apps/kbd/kbd-1.15.5-r99.ebuild index 4a732dd..45ac2ed 100644 --- a/sys-apps/kbd/kbd-1.15.3-r99.ebuild +++ b/sys-apps/kbd/kbd-1.15.5-r99.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.3.ebuild,v 1.7 2011/10/11 16:44:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.6 2014/01/09 13:37:41 polynomial-c Exp $ + +EAPI="4" inherit eutils @@ -10,17 +12,15 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="nls" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" +IUSE="nls pam" -RDEPEND="" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +RDEPEND="pam? ( virtual/pam )" +DEPEND="${RDEPEND}" src_unpack() { - unpack ${A} + default cd "${S}" - epatch "${FILESDIR}"/${P}-musl-headers-error.patch # broken file ... upstream git punted it rm po/es.po @@ -32,19 +32,21 @@ src_unpack() { mv olpc/es.map olpc/es-olpc.map mv olpc/pt.map olpc/pt-olpc.map mv qwerty/cz.map qwerty/cz-qwerty.map +} - - # bundled timestamps are broken - find "${S}" -type f -exec touch -r "${S}"/configure {} + +src_prepare() { + epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440 + epatch "${FILESDIR}"/${P}-musl-headers-error.patch + epatch "${FILESDIR}"/${P}-fix-struct_winsize-collision.patch } -src_compile() { - econf $(use_enable nls) || die - emake || die +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable pam vlock) } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog INSTALL NEWS README + default dohtml doc/*.html }