sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ae684f3241fd077e02a9303d085839ecf5d3de36)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ae684f3241fd077e02a9303d085839ecf5d3de36)
Date: Wed, 2 Jan 2013 04:50:42 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

python-pypi/pyasn1/DETAILS | 4 ++--
python-pypi/pyasn1/HISTORY | 3 +++
utils/kbd/DETAILS | 1 +
utils/kbd/HISTORY | 5 +++++
utils/kbd/PRE_BUILD | 3 ++-
utils/kbd/loadkeys.patch | 40 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 53 insertions(+), 3 deletions(-)

New commits:
commit ae684f3241fd077e02a9303d085839ecf5d3de36
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pyasn1: => 0.1.5

commit d7be81024e0fb3e04c2048231fb20581d51a0a04
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

kbd: fixed regression that breaks keymap loading

diff --git a/python-pypi/pyasn1/DETAILS b/python-pypi/pyasn1/DETAILS
index ea87f99..0fc61dd 100755
--- a/python-pypi/pyasn1/DETAILS
+++ b/python-pypi/pyasn1/DETAILS
@@ -1,10 +1,10 @@
SPELL=pyasn1
- VERSION=0.1.3
+ VERSION=0.1.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:3f449f7c4fcc0097572294e41a1cf0dbb1ded79bcfbdd8dfb316e5a0dc113b851bd0c6ffab4455c1b0ffb9e251964b29617156961413aba2a92d8409420eb1b9
+
SOURCE_HASH=sha512:2011fb6362ade9159821d5517d41a5b46f123ffc48d89b4a314ccbc22f64f9ee91134ffe616b736ecd2689c7b40f86f27e7fc398933366b3cd231e9cf25cb641
WEB_SITE=http://pyasn1.sourceforge.net/
ENTERED=20060930
LICENSE[0]=BSD
diff --git a/python-pypi/pyasn1/HISTORY b/python-pypi/pyasn1/HISTORY
index 7fff58b..b47d24b 100644
--- a/python-pypi/pyasn1/HISTORY
+++ b/python-pypi/pyasn1/HISTORY
@@ -1,3 +1,6 @@
+2013-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.5
+
2012-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.1.3; added pypi source url
* DEPENDS: added, for missing generic python dependency
diff --git a/utils/kbd/DETAILS b/utils/kbd/DETAILS
index 41c504a..f752645 100755
--- a/utils/kbd/DETAILS
+++ b/utils/kbd/DETAILS
@@ -1,5 +1,6 @@
SPELL=kbd
VERSION=1.15.5
+ PATCHLEVEL=1

SOURCE_HASH=sha512:725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/kbd/HISTORY b/utils/kbd/HISTORY
index c59b55a..a0ff9a6 100644
--- a/utils/kbd/HISTORY
+++ b/utils/kbd/HISTORY
@@ -1,3 +1,8 @@
+2013-01-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply the patch; quoting paths
+ * loadkeys.patch: added, official fix for regression in 1.15.5
+
2012-12-28 Treeve Jelbert <treeve AT sourcemage.org
* DEPENDS: add optional linux-pam (for vlock)

diff --git a/utils/kbd/PRE_BUILD b/utils/kbd/PRE_BUILD
index 2c09365..72586bd 100755
--- a/utils/kbd/PRE_BUILD
+++ b/utils/kbd/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/fgconsole-serial.patch &&
+patch -p0 < "$SPELL_DIRECTORY/loadkeys.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/fgconsole-serial.patch" &&
autoreconf
diff --git a/utils/kbd/loadkeys.patch b/utils/kbd/loadkeys.patch
new file mode 100644
index 0000000..1de6e9f
--- /dev/null
+++ b/utils/kbd/loadkeys.patch
@@ -0,0 +1,40 @@
+--- src/loadkeys.analyze.l.orig
++++ 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--;
++ }
+ }
+ <INCLSTR>[^"]|\"\"|\"[^"\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
+ }
+ <STR>\" {
+ *p = '\0';
+- yy_pop_state();
+- state_ptr--;
++ while (state_ptr > 0) {
++ yy_pop_state();
++ state_ptr--;
++ }
+ return(STRLITERAL);
+ }
+ . {
+--
+1.7.3.3
+

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ae684f3241fd077e02a9303d085839ecf5d3de36), Vlad Glagolev, 01/02/2013