Skip to Content.
Sympa Menu

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

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 (5bb997afbccdec53ec1e253c6d1b269c59177e75)
  • Date: Thu, 17 May 2012 10:28:06 -0500

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

net/socat/DETAILS | 6 +++---
net/socat/HISTORY | 3 +++
utils/qemu/DETAILS | 26 +++++++++++++++-----------
utils/qemu/HISTORY | 5 +++++
utils/qemu/PREPARE | 6 +++---
utils/util-linux/CONFIGURE | 7 +++----
utils/util-linux/HISTORY | 5 +++++
utils/util-linux/POST_INSTALL | 7 +++++++
8 files changed, 44 insertions(+), 21 deletions(-)

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

util-linux: autofix /etc/inittab only on successful installation of new
util-linux version

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

socat: => 1.7.2.1 (security)

commit 406293827820210f18760ea5a5b8a7d13f86b952
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Fix branch 1.1 VERSION and SOURCE

commit b22373a4636bd45cce65c7baa3b27cebce244e43
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Add branch 1.1, and rename 1.00 to 1.0

commit 4ca52cc46b2a489885a339cdf9454832ceb2f293
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Cut $QEMU_VER at the last dot

diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index 323de28..8046827 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -1,7 +1,7 @@
SPELL=socat
- VERSION=1.7.2.0
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:407d132f01518452f15dd73694079053a33d82ab6a45e692523d9f59d5f16772ab47a8d7d6c2e23edac08e1ff616ea456cfad5b0598a0e0d2c6c4c7da26dadd4
+ VERSION=1.7.2.1
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:ce3d8097b58cbe71b58b9bc9961c55e0da2831fb3b680685577d6926d1d29181c72b7ab6121241c8d6d6368104a8c2887b3dd63af211056c08cf4592245f39af
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.dest-unreach.org/$SPELL/download/$SOURCE
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index 19d84a7..c8b7b81 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,6 @@
+2012-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.2.1; SECURITY_PATCH++
+
2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2.0

diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index c334171..51ab8ee 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,10 +1,5 @@
SPELL=qemu
-
-if [[ -z $QEMU_VER ]]; then
- QEMU_VER="1.00"
-fi
-
-case ${QEMU_VER:0:4} in
+case $QEMU_VER in
0.12)
VERSION=0.12.5
;;
@@ -17,18 +12,27 @@ case ${QEMU_VER:0:4} in
0.15)
VERSION=0.15.1
;;
- 1.00)
+ 1.0)
VERSION=1.0.1
;;
+ *)
+ VERSION=1.1.0-rc2
+ ;;
esac
-
+if [ $QEMU_VER = 1.1 ]; then
+ SOURCE=$SPELL-$VERSION.tar.bz2
+else
SOURCE=$SPELL-$VERSION.tar.gz
+fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-if [[ $QEMU_VER == "0.12" ]] || [[ $QEMU_VER == "0.14" ]]; then
+case $QEMU_VER in
+ 0.12|0.14)
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
-else
+ ;;
+ *)
SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
-fi
+ ;;
+esac
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 66eb921..4319796 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2012-05-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed branch 1.1 VERSION and SOURCE
+ * DETAILS, PREPARE: Added branch 1.1, and renamed 1.00 to 1.0
+ * PREPARE: Cut $QEMU_VER at the last dot
+
2012-02-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.1

diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index 49b63ee..a322469 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,6 +1,6 @@
-if [[ ${#QEMU_VER} -eq 6 ]]; then
- QEMU_VER=${QEMU_VER:0:4}
+if [[ ${#QEMU_VER} -gt 4 ]]; then
+ QEMU_VER=${QEMU_VER%.*}
fi

config_query_list QEMU_VER "Which branch to build?" \
- 1.00 0.15 0.14 0.13 0.12
+ 1.1 1.0 0.15 0.14 0.13 0.12
diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 1e8f012..df6572b 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -5,7 +5,7 @@ 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 /etc/inittab...${DEFAULT_COLOR}"
&&
+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
@@ -21,9 +21,8 @@ if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
if ! query "Attempt to replace the lines automatically?" n; then
return 1
else
- cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
- sedit "s:/dev/tty:tty:g" "$INSTALL_ROOT/etc/inittab" &&
- message "${MESSAGE_COLOR}Updated${DEFAULT_COLOR}"
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
fi
fi
fi &&
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 8cdaf26..5b94165 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2012-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: moved real actions to POST_INSTALL
+ * POST_INSTALL: added, to autofix /etc/inittab only on successful
+ installation of new util-linux version
+
2012-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* CONFIGURE, PRE_BUILD, FINAL: properly handle /etc/inittab upgrade

diff --git a/utils/util-linux/POST_INSTALL b/utils/util-linux/POST_INSTALL
new file mode 100755
index 0000000..ed1c955
--- /dev/null
+++ b/utils/util-linux/POST_INSTALL
@@ -0,0 +1,7 @@
+if [[ $UL_DEV_AUTOREPLACE == y ]]; then
+ cp -v $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date
+'%Y%m%d%H%M') &&
+ message -n "${MESSAGE_COLOR}Updating /etc/inittab... " &&
+ sedit "s:/dev/tty:tty:g" "$INSTALL_ROOT/etc/inittab" &&
+ message "DONE${DEFAULT_COLOR}" &&
+ persistent_remove UL_DEV_AUTOREPLACE
+fi



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (5bb997afbccdec53ec1e253c6d1b269c59177e75), Vlad Glagolev, 05/17/2012

Archive powered by MHonArc 2.6.24.

Top of Page