Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (c1913f230e14336f661a834f1e62bea9d9b5802b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (c1913f230e14336f661a834f1e62bea9d9b5802b)
  • Date: Sun, 7 Oct 2012 08:05:00 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

devel/ctemplate/DETAILS | 8 ++++----
devel/ctemplate/HISTORY | 5 +++++
devel/ctemplate/PRE_BUILD | 6 ------
utils/util-linux/CONFIGURE | 29 -----------------------------
utils/util-linux/HISTORY | 4 ++++
utils/util-linux/PREPARE | 33 ++++++++++++++++++++++++++++++++-
6 files changed, 45 insertions(+), 40 deletions(-)

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

util-linux: prevent triggerring from other spells for migrating process

commit c3b15290f0942de4e87ca76e489485f5cc04fa28
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ctemplate: => 2.2

diff --git a/devel/ctemplate/DETAILS b/devel/ctemplate/DETAILS
index 2c109c1..75cd1e9 100755
--- a/devel/ctemplate/DETAILS
+++ b/devel/ctemplate/DETAILS
@@ -1,10 +1,10 @@
SPELL=ctemplate
- VERSION=0.99
-
SOURCE_HASH=sha512:46e91c80b7c24d0845c74304140f8b3a266ae9d459f4f6b009141f486635aff418af6f1761c6b7da76496e9f5f2a92f01b720b0221c52c47dd1701cc92ca1c37
+ VERSION=2.2
+
SOURCE_HASH=sha512:b8f2cbebb3988ce5248ef3b4c224a02626bbc77e3ab4cff8d2fb967f421000048c0923c8410cc800ed29f5fa68e1172aefcfde1e2a610372462018cb1b6809bb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://code.google.com/p/google-ctemplate
- SOURCE_URL[0]=http://google-ctemplate.googlecode.com/files/$SOURCE
+ WEB_SITE=http://code.google.com/p/ctemplate
+ SOURCE_URL[0]=http://ctemplate.googlecode.com/files/$SOURCE
LICENSE[0]=BSD
ENTERED=20100112
KEYWORDS="c++ devel"
diff --git a/devel/ctemplate/HISTORY b/devel/ctemplate/HISTORY
index b0b3b67..cc1e765 100644
--- a/devel/ctemplate/HISTORY
+++ b/devel/ctemplate/HISTORY
@@ -1,3 +1,8 @@
+2012-10-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2
+ enw URL & WEBSITE
+ * PRE_BUILD: deleted
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/devel/ctemplate/PRE_BUILD b/devel/ctemplate/PRE_BUILD
deleted file mode 100755
index 97c3c53..0000000
--- a/devel/ctemplate/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix for gcc-4.6.0
-sed -i '/<string/ i\
-#include <cstddef>
-' src/ctemplate/template.h.in src/ctemplate/template_dictionary.h.in
diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index df6572b..3b00f63 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,32 +1,3 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-local OLD_SPELL_VERSION="" &&
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-
-# util-linux 2.20 needs ttyX in /etc/inittab without /dev
-# http://www.sourcemage.org/issues/110
-message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
-
-if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
- if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
- message "${DEFAULT_COLOR}" &&
-
- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
- fi
- fi
-fi &&
-
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break
systems like MS Windows)?" y
fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index a65becf..ee46ca2 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,7 @@
+2012-10-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE, PREPARE: prevent triggerring from other spells for
+ migrating process
+
2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.21.2

diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index 13921a1..63612c1 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -1,3 +1,34 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
message "aes version is older usually, but needed for loop-AES patch" &&

-config_query_list UL_VERSION "What version do you want to use?" latest aes
+config_query_list UL_VERSION "What version do you want to use?" \
+ latest \
+ aes &&
+
+local OLD_SPELL_VERSION="" &&
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
+
+if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
+ if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1
${VERSION}; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
+ fi
+ fi
+fi



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (c1913f230e14336f661a834f1e62bea9d9b5802b), Vlad Glagolev, 10/07/2012

Archive powered by MHonArc 2.6.24.

Top of Page