Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (97c2ea9f128e97fa098f9aa47d750fec5059eed9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (97c2ea9f128e97fa098f9aa47d750fec5059eed9)
  • Date: Wed, 22 Sep 2010 12:55:24 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 30 ++++++++++++++++++++++++++++++
etc/sorcery/config | 1 +
etc/sorcery/version | 2 +-
usr/sbin/scribe | 2 +-
var/lib/sorcery/modules/libdispel | 2 +-
var/lib/sorcery/modules/libgrimoire | 4 ++--
var/lib/sorcery/modules/libinitd | 13 +++++++++----
var/lib/sorcery/modules/libtrack | 6 +++---
var/lib/sorcery/modules/libunpack | 2 +-
var/lib/sorcery/sustained | 6 ++++++
10 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit 97c2ea9f128e97fa098f9aa47d750fec5059eed9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.14.5-rc2

commit 3bf2addaa3fb7b5e4bb869919836f5152f215e65
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libinitd: fixed bad regexes, grep 2.7 does not tolerate them #15852

(cherry-picked from commit 1b5578de0d6689d5aad43b68fb5dbe453da3d3b3)

commit cb96ca9e7a26a111adb631b1be3ca82d334d8136
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sustained: added missing spells #15332

(cherry-picked from commit e308fca70b550153a81137585c1aac6cc9d0995e)

commit 5a217ed3975b2d037407767efe1a5cc59c13be47
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrack: unhardcoded the installwatch location #15594

(cherry-picked from commit 812bca9d870c3b35df5493d8bd999246d2aa9fbd)

commit 01dc4003b8e6ad99879b77d61d56e87ad5db1cc8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libgrimoire: don't hardcode the build dir, patch from Pol Vinogradov,
bug #15501

(cherry-picked from commit 664c60e24c33b98abf1108b0cc98e4b7462176d8)

commit b4763ea0be9d2ccb6e67b2de42645d7e9aace84a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libunpack: follow symlinks in real_guess_compressor, patch from
Kirikaza #15767

(cherry-picked from commit 1077a9a503b591e59f60256168feec78c778364a)

commit 9fcc84187bd13bec56654463ddc9c0821e90190f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

scribe: show the correct grimoire url when updating all grimoires,
patch from Bor Kraljič

(cherry-picked from commit 0679ca2b9ed1ef681032ceef40cd2310a88a28a9)

commit c9fa6f41900654e379e5009e2a7a9a9d84a86b21
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrack, libdispel: use the correct whole-line option for grep fixes the
"grep: invalid matcher blabla" errors
thanks to PyroBor for finding the cause

(cherry-picked from commit a3e5e92d7f4d8536f0645e5fa03b2d969721237d)

commit c9ff6d94f6872962112259b330aff719db8f1217
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libinitd: if staging is on, mark the staged init file as modified,
fixes part of #15192

(cherry-picked from commit 8fd6ad19a26e877c4bbda9ca6337fad5e5e97c73)

commit f5fd0d18b3e8e1330bd7fd08e9473a3ed52e68a3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrack, libdispel: match complete lines when comparing md5s, fixes
part of #15192

(cherry-picked from commit 60bd0f9df3886432d986c90abf28930071c73a87)

diff --git a/ChangeLog b/ChangeLog
index 3f9b1f9..ee5d121 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libinitd: fixed bad regexes, grep 2.7 does not tolerate them #15852
+
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sustained: added missing spells #15332
+
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack: unhardcoded the installwatch location #15594
+
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgrimoire: don't hardcode the build dir, patch from Pol
Vinogradov,
+ bug #15501
+
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libunpack: follow symlinks in real_guess_compressor, patch from
+ Kirikaza #15767
+
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * scribe: show the correct grimoire url when updating all grimoires,
+ patch from Bor Kraljič
+
+2010-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack, libdispel: use the correct whole-line option for grep
+
+2009-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack, libdispel: match complete lines when comparing md5s, fixes
+ part of #15192
+ * libinitd: if staging is on, mark the staged init file as modified,
+ fixes part of #15192
+
2009-10-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: quote $SHORT to prevent glob expansion #15460

diff --git a/etc/sorcery/config b/etc/sorcery/config
index 6e75585..03ed8cf 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -79,6 +79,7 @@ FORCE_BASESYSTEM_DEPENDS=${FORCE_BASESYSTEM_DEPENDS:-off}
LOCAL_CONFIG=/etc/sorcery/local/config

SORCERY_INSTALL_LOG=/etc/sorcery/install.log
+ INSTALLWATCH_SO=${INSTALLWATCH_SO:-/usr/lib/installwatch.so}

MIRRORS=/etc/sorcery/mirrors
SM_LICENSE_DIRECTORY=/etc/sorcery/licenses
diff --git a/etc/sorcery/version b/etc/sorcery/version
index fa71c5f..344cb51 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.5-rc1
+1.14.5-rc2
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 7afdfcb..ed6b7c1 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -674,7 +674,7 @@ function scribe_update() {

#include metadata
. $grimoire/GRIMOIRE
- message "Updating grimoire $grim from $from"
+ message "Updating grimoire $grim from $FROM_URL"
scribe_add_update_worker "$grimoire" "$FROM_URL" update ||
let rc++
done
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index c123277..bfa2216 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -43,7 +43,7 @@ function reap_config_files() {
[[ $FILE ]] || continue
if [[ $TOTAL_DISPEL ]] ; then
rm -f "$FILE"
- elif grep -q "$(md5sum "$FILE" )" "$MD5S"; then
+ elif grep -qx "$(md5sum "$FILE")" "$MD5S"; then
debug libdispel "$FILE is a config file that hasnt changed,
removing..."
rm -f "$FILE"
else
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 811b31e..b28f1a8 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -93,8 +93,8 @@ function real_rm_source_dir() {
# a) $DEAD_DIR being an empty string
# b) $DEAD_DIR being set to "/" (or anything above /usr/src)
# c) $DEAD_DIR containing metacharacters (like newline)
- mv "$DEAD_DIR" "$INSTALL_ROOT/usr/src/deaddir" &&
- rm -rf "$INSTALL_ROOT/usr/src/deaddir" 2> /dev/null
+ mv "$DEAD_DIR" "$BUILD_DIRECTORY/deaddir" &&
+ rm -rf "$BUILD_DIRECTORY/deaddir" 2> /dev/null

popd 2>&1 > /dev/null
true
diff --git a/var/lib/sorcery/modules/libinitd
b/var/lib/sorcery/modules/libinitd
index c9b4148..b489ee8 100755
--- a/var/lib/sorcery/modules/libinitd
+++ b/var/lib/sorcery/modules/libinitd
@@ -141,7 +141,12 @@ function _init_install_conf_files()
fi

if [ -f "$target_file" ] ; then
- check_if_modified "$target_file" && mark_file_modified "$target_file"
+ check_if_modified "$target_file" &&
+ if [[ $STAGED_INSTALL == on ]]; then
+ mark_file_modified "$STAGE_DIRECTORY/TRANSL$target_file"
+ else
+ mark_file_modified "$target_file"
+ fi
_init_merge_config_file $file $target_file
else
install -m 644 -g root -o root $file $target_file
@@ -168,7 +173,7 @@ function init_prepare_install()
local old_provides="$2"
local result_list="$3"
local script_path="$SCRIPT_DIRECTORY/init.d/$service"
- local script_provides=$( grep '^[:space:]*PROVIDES' $script_path )
+ local script_provides=$( grep '^[[:space:]]*PROVIDES' $script_path )
script_provides=$( eval "( ${script_provides:=:} ; echo \$PROVIDES ; )" )

[ -z "$script_provides" ] && return
@@ -200,7 +205,7 @@ function init_install()
local enable_script="$1"
local script_name="$2"
local script_path="$SCRIPT_DIRECTORY/init.d/$script_name"
- local script_runlevel=$( grep '^[:space:]*RUNLEVEL' $script_path )
+ local script_runlevel=$( grep '^[[:space:]]*RUNLEVEL' $script_path )
script_runlevel=$( eval "( $script_runlevel ; echo \$RUNLEVEL )" )

[ "$script_runlevel" = "s" ] && script_runlevel="S"
@@ -257,7 +262,7 @@ function init_post_install()
mark_file_modified "$INSTALL_ROOT/etc/sysconfig/facilities"
IFS=":"
set $sp # $1 - script name, $2 - facility
- if ! sedit "s/^\([:space:]*$2\)=.*/\1=$1/" \
+ if ! sedit "s/^\([[:space:]]*$2\)=.*/\1=$1/" \
$INSTALL_ROOT/etc/sysconfig/facilities ; then
message -n "${PROBLEM_COLOR}Unable to modify facilities file to make
"
message "$1 provider of $2.${DEFAULT_COLOR}"
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index ef74990..951c14a 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -152,9 +152,9 @@ function destroy_stage_root()
##
#---------------------------------------------------------------------
function real_invoke_installwatch() {
- if [ -e /usr/lib/installwatch.so ]; then
+ if [[ -e $INSTALLWATCH_SO ]]; then
export INSTALLWATCHFILE=$IW_LOG
- export LD_PRELOAD=/usr/lib/installwatch.so
+ export LD_PRELOAD=$INSTALLWATCH_SO
fi
}

@@ -322,7 +322,7 @@ function check_if_modified() {
fi
fi
local my_md5=$(md5sum "$to")
- if test -f "$md5_log" && grep -q "$my_md5" "$md5_log"; then
+ if test -f "$md5_log" && grep -qx "$my_md5" "$md5_log"; then
false
else
true
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index dd11660..7a9d11e 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -249,7 +249,7 @@ function real_guess_compressor() {
# NOTE: if the file doesn't exist, `file' still completes successfully
# the COMPRESSOR value in this case will be "can't"

- local OUTPUT="$($FILEPROG -b "$1")"
+ local OUTPUT="$($FILEPROG -L -b "$1")"
local COMPRESSOR="$(echo "$OUTPUT" | cut -d ' ' -f1)"
[ "$COMPRESSOR" = "GNU" -o "$COMPRESSOR" = "POSIX" ] &&
COMPRESSOR="$(echo "$OUTPUT" | cut -d ' ' -f2)"
diff --git a/var/lib/sorcery/sustained b/var/lib/sorcery/sustained
index 883ca6d..ab4036d 100755
--- a/var/lib/sorcery/sustained
+++ b/var/lib/sorcery/sustained
@@ -1,3 +1,5 @@
+acl
+attr
bash
binutils
bzip2
@@ -12,6 +14,7 @@ gawk
gcc
gettext
glibc
+gmp
gnupg
grep
gzip
@@ -20,13 +23,16 @@ ifupdown
init.d
installwatch
less
+libmpc
locale
make
module-init-tools
+mpfr
nano
ncurses
net-tools
patch
+pcre
procps
readline
sed



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (97c2ea9f128e97fa098f9aa47d750fec5059eed9), Jaka Kranjc, 09/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page