Source Mage code commit list

[Julien ROZO <scm AT sourcemage.org>]

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

 disk/yaboot/BUILD              |    2 --
 disk/yaboot/CONFIGURE          |    2 +-
 disk/yaboot/DETAILS            |    4 ++--
 disk/yaboot/FINAL              |    8 +++++++-
 disk/yaboot/HISTORY            |    7 +++++++
 disk/yaboot/yaboot-strstr.diff |   14 --------------
 6 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit f04e64c44f4cb92f9cc6f79cc89bd469db06ce14
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    yaboot: updated version to 1.3.14
    removed yaboot-strstr.diff (old gcc 3.4.3 patch)
    removed tabs in CONFIGURE
    ybin in FINAL is run during upgrade only if bootstrap partition in 
yaboot.conf is set (bug #8111)

diff --git a/disk/yaboot/BUILD b/disk/yaboot/BUILD
index 0c53d91..f09e040 100755
--- a/disk/yaboot/BUILD
+++ b/disk/yaboot/BUILD
@@ -1,3 +1 @@
-# needed patch for gcc-3.4.3
-patch -p1 < "${SCRIPT_DIRECTORY}/yaboot-strstr.diff" &&
 make ROOT=/ PREFIX=usr MANDIR=share/man
diff --git a/disk/yaboot/CONFIGURE b/disk/yaboot/CONFIGURE
index 390adcb..731b4fe 100755
--- a/disk/yaboot/CONFIGURE
+++ b/disk/yaboot/CONFIGURE
@@ -1 +1 @@
-config_query   RUN_YBIN        "Run bootloader automatically upon upgrades?" 
  n
+config_query  RUN_YBIN  "Run bootloader automatically upon upgrades?"  n
diff --git a/disk/yaboot/DETAILS b/disk/yaboot/DETAILS
index b2e147b..8077ab3 100755
--- a/disk/yaboot/DETAILS
+++ b/disk/yaboot/DETAILS
@@ -1,9 +1,9 @@
            SPELL=yaboot
-         VERSION=1.3.13
+         VERSION=1.3.14
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://yaboot.ozlabs.org/releases/$SOURCE
-  
SOURCE_HASH[0]=sha512:c98df0ae4d0e744f03fb52af22d8460f1a1e2d0a176630aa22a2a41dacb5dd8b1acb3bef7b8b8ff80843215cd3288bdc73b128e8b0d3f0c6d5a46c975a907b6b
+  
SOURCE_HASH[0]=sha512:7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
         WEB_SITE=http://yaboot.ozlabs.org/
          ENTERED=20020307
           UPDATE=20050127
diff --git a/disk/yaboot/FINAL b/disk/yaboot/FINAL
index 8ab8556..3378428 100755
--- a/disk/yaboot/FINAL
+++ b/disk/yaboot/FINAL
@@ -1,3 +1,9 @@
 if  [ $RUN_YBIN = "y" ]; then
-    /usr/sbin/ybin
+    if grep -q "boot=unconfigured" "/etc/yaboot.conf"; then
+       message "\n${PROBLEM_COLOR}You should configure your 
/etc/yaboot.conf,"\
+       "particularly your bootstrap partition,\nthen run ybin -v as root."   
 \
+        "$DEFAULT_COLOR"
+    else
+        /usr/sbin/ybin
+    fi &&
 fi
diff --git a/disk/yaboot/HISTORY b/disk/yaboot/HISTORY
index 7bfbc68..413d6c7 100644
--- a/disk/yaboot/HISTORY
+++ b/disk/yaboot/HISTORY
@@ -1,3 +1,10 @@
+2008-03-03 Julien "_kaze_" ROZO
+       * DETAILS: updated version to 1.3.14
+       * BUILD, yaboot-strstr.diff: removed old gcc 3.4.3 patch
+       * CONFIGURE: removed tabs
+       * FINAL: runs ybin during upgrade only if bootstrap partition in
+         yaboot.conf is set (bug #8111)
+       
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * PROVIDES: [automated] Fixed invalid entries.
 
diff --git a/disk/yaboot/yaboot-strstr.diff b/disk/yaboot/yaboot-strstr.diff
deleted file mode 100644
index 1279c17..0000000
--- a/disk/yaboot/yaboot-strstr.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN yaboot-1.3.13.ori/lib/strstr.c yaboot-1.3.13/lib/strstr.c
---- yaboot-1.3.13.ori/lib/strstr.c     2001-09-20 15:15:31.000000000 +0200
-+++ yaboot-1.3.13/lib/strstr.c 2004-11-21 19:02:10.540078610 +0100
-@@ -76,7 +76,9 @@
-             a = *++haystack;
-             if (a == '\0')
-               goto ret0;
--shloop:           }
-+shloop:
-+            ;
-+          }
-           while (a != b);
- 
- jin:    a = *++haystack;