Skip to Content.
Sympa Menu

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

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 (4dca3d0151b4948194d665d740e321c1f99c08a5)
  • Date: Thu, 16 Feb 2012 21:12:20 -0600

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

ChangeLog | 3
devel/gdb/DETAILS | 2
devel/gdb/HISTORY | 3
devel/ghc/BUILD | 2
devel/ghc/HISTORY | 4
devel/ghc/PRE_BUILD | 8
devel/iasl/BUILD | 2
devel/iasl/DETAILS | 6
devel/iasl/HISTORY | 6
devel/iasl/INSTALL | 2
devel/iasl/PRE_BUILD | 5
devel/iasl/iasl-gcc-4.6.1.patch | 142 --
disk/mbootpack/BUILD | 1
disk/mbootpack/DETAILS | 21
disk/mbootpack/HISTORY | 2
disk/mbootpack/INSTALL | 1
disk/mbootpack/PRE_BUILD | 8
disk/mbootpack/header.patch | 30
graphics-libs/jpeg/DETAILS | 4
graphics-libs/jpeg/HISTORY | 3
graphics/inkscape/DETAILS | 2
graphics/inkscape/HISTORY | 3
haskell/happy/DETAILS | 4
haskell/happy/HISTORY | 3
haskell/haskell-bytestring/DETAILS | 4
haskell/haskell-bytestring/HISTORY | 3
haskell/haskell-deepseq/DETAILS | 4
haskell/haskell-deepseq/HISTORY | 3
haskell/haskell-random/DETAILS | 4
haskell/haskell-random/HISTORY | 3
haskell/haskell-syb/DETAILS | 4
haskell/haskell-syb/HISTORY | 3
haskell/haskell-x11/DEPENDS | 5
haskell/haskell-x11/DETAILS | 4
haskell/haskell-x11/HISTORY | 4
net/nsd/DETAILS | 4
net/nsd/HISTORY | 3
python-pypi/hatta/DEPENDS | 3
python-pypi/hatta/DETAILS | 4
python-pypi/hatta/HISTORY | 4
shell-term-fm/busybox/DETAILS | 6
shell-term-fm/busybox/HISTORY | 6
shell-term-fm/busybox/INSTALL | 7
shell-term-fm/busybox/busybox.config | 556
+++++++---
smgl/linux-initramfs/DETAILS | 5
smgl/linux-initramfs/HISTORY | 4
smgl/linux-initramfs/mkinitrd | 5
smgl/upstart/HISTORY | 3
utils/htop/DETAILS | 4
utils/htop/HISTORY | 3
utils/xen/BUILD | 15
utils/xen/CONFIGURE | 4
utils/xen/DEPENDS | 20
utils/xen/DETAILS | 6
utils/xen/HISTORY | 17
utils/xen/INSTALL | 21
utils/xen/PRE_BUILD | 5
utils/xen/init.d/xend | 123 +-
utils/xen/init.d/xend.conf | 8
utils/xen/init.d/xendomains | 133 ++
utils/xen/init.d/xendomains.conf | 136 ++
video-libs/schroedinger/DETAILS | 4
video-libs/schroedinger/HISTORY | 3
video/ffmpeg/DEPENDS | 2
video/ffmpeg/HISTORY | 3
video/guvcview/DEPENDS | 2
video/guvcview/DETAILS | 4
video/guvcview/HISTORY | 5
video/guvcview/PRE_BUILD | 3
windowmanagers/windowmaker/BUILD | 9
windowmanagers/windowmaker/DETAILS | 11
windowmanagers/windowmaker/HISTORY | 4
windowmanagers/windowmaker/PRE_BUILD | 3
windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch | 23
windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch | 131 --
75 files changed, 1057 insertions(+), 563 deletions(-)

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

nsd: => 3.2.10

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

xen: level up ^^

commit 59d3813835ab85dcd437cc67b925727f38a9fe8f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

htop 1.0.1

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

mbootpack: new spell, multiboot kernel packager

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

linux-initramfs: => 0.7

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

busybox: => 1.19.2

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

gdb: => 7.4

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

iasl: => 20120215

commit c17123cc4ea698001aa4c9d0afc889f347fbb16e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

inkscape 0.48.3

commit 4f767cd7329025f10d370ddc94be56ce48e20b4a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

jpeg 8d

commit 4eec27b37cfe4adb01a2040c0f2726c75b4f0c25
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

schroedinger 1.0.11

commit 133d8211601727fa4d34a5986fcfc5ca77dfd116
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: create /lib64 symlink on x86_64

commit 844fe716406e6fb61c559eb7b78ca520e6ff4c60
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/ghc: activated parallel build

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

hatta: => 1.4.5

commit f2180117cb369cab619af2bbb92a9000e437c201
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

guvcview 1.5.2

commit 8eaf1e6ed0aa39bd2ddd75d336f2c6f754e5c68f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

windowmaker: version 0.95.2 and removed obsolete patches

commit a2adcaf9dc5344daaf662f18a832eaa67c6cfd80
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

upstart: re-added a HISTORY entry that got lost

commit 1bd3e8b6eed98907b3f3719e10ee20d4c25ef1b9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/ffmpeg: added --disable-libopenjpeg switch to openjpeg dependency

commit e237b2d0b8574bf3438ceb759a97bb5d7a7e71e7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-random: version 1.0.1.1

commit 375d21e9292f8b71a7021241cd661360e98770fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-x11: version 1.5.0.1

commit 379cb4f19a3b50a10292ea954c6f67bbd0d630b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-bytestring: version 0.9.2.1

commit 9b4bd17ba27e590e4655b2d3bab240b11052dbd5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/happy: version 1.18.9

commit ccaced20d49eda5482cf763bffb412559c2a260c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-deepseq: version 1.3.0.0

commit 232fee6393bd839415693c63f89e21048a5b6497
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-syb: version 0.3.6

diff --git a/ChangeLog b/ChangeLog
index a66f592..2f04203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-02-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * disk/mbootpack: new spell, multiboot kernel packager
+
2012-02-15 Treeve Jelbert <treeve AT sourcemage.org>
* xorg-lib/wayland: new compositor libary
* xorg-lib/libxkbcommon: library interface to the XKB compiler
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index 67c26d9..b39edc9 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdb
- VERSION=7.3.1
+ VERSION=7.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index 0b0fc39..bd190aa 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,6 @@
+2012-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.4
+
2011-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added, for required and optional dependencies

diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 3f38164..1998651 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -18,6 +18,8 @@ if [[ $SOURCE2 != "" ]] ; then
cd ..
fi &&

+make_normal &&
+
cd $SPELL-$VERSION &&

./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index dd83989..e92e7a1 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,7 @@
+2012-02-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: activated parallel build
+ * PRE_BUILD: create /lib64 symlink on x86_64
+
2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: marked 'base' as trusted to work around compile error caused
by 7.2.1
* DETAILS: version 7.4.1, TMPFS=off
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 18e4368..4e62d69 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -1,3 +1,11 @@
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+ if [[ ! -d $INSTALL_ROOT/lib64 ]] && [[ ! -h $INSTALL_ROOT/lib64 ]]
+ then
+ ln -sf $INSTALL_ROOT/lib $INSTALL_ROOT/lib64
+ fi
+fi &&
+
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&

diff --git a/devel/iasl/BUILD b/devel/iasl/BUILD
index f798026..bdd2610 100755
--- a/devel/iasl/BUILD
+++ b/devel/iasl/BUILD
@@ -1,4 +1,4 @@
-cd compiler &&
+cd source/compiler &&

make_single &&
make &&
diff --git a/devel/iasl/DETAILS b/devel/iasl/DETAILS
index be608db..a67e10b 100755
--- a/devel/iasl/DETAILS
+++ b/devel/iasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=iasl
- VERSION=20110623
+ VERSION=20120215
SOURCE=acpica-unix-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/acpica-unix-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/acpica-unix-$VERSION"
SOURCE_URL[0]=http://www.acpica.org/download/acpica-unix-$VERSION.tar.gz
-
SOURCE_HASH=sha512:f5f7595250225fd05cbe58eb23f5e63d7d7386c307a81d6a8efc94e3f68f4208fd2dcd96d68c626b9267f731c9d0764ad7709ad665ff222f609318d931705409
+
SOURCE_HASH=sha512:311f2ee52869c542593ffecef9d7b91b1b9f2dd33e7b40c3729dfca5326baf5ac048dc09a3c86321d1a99865f3dbe081aaf985d2b847c30daaa33bced2e28867
LICENSE[0]=IASL
WEB_SITE=http://www.intel.com/technology/iapc/acpi/
ENTERED=20070530
diff --git a/devel/iasl/HISTORY b/devel/iasl/HISTORY
index 2eb486b..b76fa52 100644
--- a/devel/iasl/HISTORY
+++ b/devel/iasl/HISTORY
@@ -1,3 +1,9 @@
+2012-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20120215; quoting paths
+ * BUILD: corrected path to sources
+ * INSTALL: verbosity++
+ * PRE_BUILD, iasl-gcc-4.6.1.patch: removed
+
2011-08-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch to get rid of -Werror

diff --git a/devel/iasl/INSTALL b/devel/iasl/INSTALL
index be126e1..34f5713 100755
--- a/devel/iasl/INSTALL
+++ b/devel/iasl/INSTALL
@@ -1 +1 @@
-install -m 0755 iasl ${INSTALL_ROOT}/usr/bin
+install -vm 0755 iasl ${INSTALL_ROOT}/usr/bin
diff --git a/devel/iasl/PRE_BUILD b/devel/iasl/PRE_BUILD
deleted file mode 100755
index 479fef0..0000000
--- a/devel/iasl/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/iasl-gcc-4.6.1.patch
diff --git a/devel/iasl/iasl-gcc-4.6.1.patch b/devel/iasl/iasl-gcc-4.6.1.patch
deleted file mode 100644
index 594bdae..0000000
--- a/devel/iasl/iasl-gcc-4.6.1.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -ur acpica-unix-20110623/compiler/Makefile
acpica-unix-mod/compiler/Makefile
---- acpica-unix-20110623/compiler/Makefile 2011-06-23 11:34:09.000000000
-0500
-+++ acpica-unix-mod/compiler/Makefile 2011-08-10 19:25:14.815970671 -0500
-@@ -43,7 +43,7 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
-+ \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-@@ -243,16 +243,16 @@
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
- aslcompilerlex.o : aslcompilerlex.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
-
- aslcompilerparse.o : aslcompilerparse.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
-
- dtparserlex.o : dtparserlex.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
-
- dtparserparse.o : dtparserparse.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
-
-
- #
-diff -ur acpica-unix-20110623/generate/unix/iasl/Makefile
acpica-unix-mod/generate/unix/iasl/Makefile
---- acpica-unix-20110623/generate/unix/iasl/Makefile 2011-06-23
11:34:12.000000000 -0500
-+++ acpica-unix-mod/generate/unix/iasl/Makefile 2011-08-10
19:25:54.095970658 -0500
-@@ -200,16 +200,16 @@
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
- aslcompilerlex.o : aslcompilerlex.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -o$@ $?
-
- aslcompilerparse.o : aslcompilerparse.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -o$@ $?
-
- dtparserlex.o : dtparserlex.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -o$@ $?
-
- dtparserparse.o : dtparserparse.c
-- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+ $(CC) -c $(CFLAGS) -Wall -o$@ $?
-
- #
- # Compiler source
-diff -ur acpica-unix-20110623/generate/unix/Makefile.config
acpica-unix-mod/generate/unix/Makefile.config
---- acpica-unix-20110623/generate/unix/Makefile.config 2011-06-23
11:34:12.000000000 -0500
-+++ acpica-unix-mod/generate/unix/Makefile.config 2011-08-10
19:29:36.743970583 -0500
-@@ -58,7 +58,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpibin/Makefile
acpica-unix-mod/tools/acpibin/Makefile
---- acpica-unix-20110623/tools/acpibin/Makefile 2011-06-23
11:34:18.000000000 -0500
-+++ acpica-unix-mod/tools/acpibin/Makefile 2011-08-10 19:26:40.389970642
-0500
-@@ -41,7 +41,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpiexec/Makefile
acpica-unix-mod/tools/acpiexec/Makefile
---- acpica-unix-20110623/tools/acpiexec/Makefile 2011-06-23
11:34:18.000000000 -0500
-+++ acpica-unix-mod/tools/acpiexec/Makefile 2011-08-10 19:28:08.378970613
-0500
-@@ -37,6 +37,7 @@
- -D$(HOST) \
- -D_GNU_SOURCE \
- -DACPI_EXEC_APP \
-+
- -I$(ACPICA_SRC)/include
-
- CWARNINGFLAGS = \
-@@ -44,7 +45,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpihelp/Makefile
acpica-unix-mod/tools/acpihelp/Makefile
---- acpica-unix-20110623/tools/acpihelp/Makefile 2011-06-23
11:34:18.000000000 -0500
-+++ acpica-unix-mod/tools/acpihelp/Makefile 2011-08-10 19:27:36.955970623
-0500
-@@ -42,7 +42,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpinames/Makefile
acpica-unix-mod/tools/acpinames/Makefile
---- acpica-unix-20110623/tools/acpinames/Makefile 2011-06-23
11:34:18.000000000 -0500
-+++ acpica-unix-mod/tools/acpinames/Makefile 2011-08-10 19:29:15.432970590
-0500
-@@ -44,7 +44,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpisrc/Makefile
acpica-unix-mod/tools/acpisrc/Makefile
---- acpica-unix-20110623/tools/acpisrc/Makefile 2011-06-23
11:34:19.000000000 -0500
-+++ acpica-unix-mod/tools/acpisrc/Makefile 2011-08-10 19:28:56.064970597
-0500
-@@ -42,7 +42,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
-diff -ur acpica-unix-20110623/tools/acpixtract/Makefile
acpica-unix-mod/tools/acpixtract/Makefile
---- acpica-unix-20110623/tools/acpixtract/Makefile 2011-06-23
11:34:19.000000000 -0500
-+++ acpica-unix-mod/tools/acpixtract/Makefile 2011-08-10 19:28:30.250970606
-0500
-@@ -40,7 +40,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
diff --git a/disk/mbootpack/BUILD b/disk/mbootpack/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/disk/mbootpack/BUILD
@@ -0,0 +1 @@
+make
diff --git a/disk/mbootpack/DETAILS b/disk/mbootpack/DETAILS
new file mode 100755
index 0000000..011eadf
--- /dev/null
+++ b/disk/mbootpack/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=mbootpack
+ VERSION=0.6a
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.tjd.phlegethon.org/software/$SOURCE
+
SOURCE_HASH=sha512:7e03a232a2349f3113602f3e578b660f4344b3eedf107bab96b54e0c8277512fb69d94a0cd37317348d1fba5472496f9ed56139ed81a7225fecfdf77f386a8fb
+ WEB_SITE=http://www.tjd.phlegethon.org/software/#mbootpack
+ ENTERED=20120217
+ LICENSE[0]=GPL
+ DOCS="README GPL Changes"
+ KEYWORDS="loader multiboot xen"
+ SHORT="multiboot kernel packager"
+cat << EOF
+This is a tool that takes a multiboot kernel and modules (e.g. a Xen VMM,
linux
+kernel and initrd), and packages them up as a single file that looks like a
+bzImage linux kernel.
+
+The aim is to allow you to boot multiboot kernels (in particular, Xen) using
+bootloaders that don't support multiboot (i.e. pretty much anything except
GRUB
+and SYSLINUX).
+EOF
diff --git a/disk/mbootpack/HISTORY b/disk/mbootpack/HISTORY
new file mode 100644
index 0000000..d4b8dfd
--- /dev/null
+++ b/disk/mbootpack/HISTORY
@@ -0,0 +1,2 @@
+2012-02-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, INSTALL, header.patch: spell created
diff --git a/disk/mbootpack/INSTALL b/disk/mbootpack/INSTALL
new file mode 100755
index 0000000..17d3db7
--- /dev/null
+++ b/disk/mbootpack/INSTALL
@@ -0,0 +1 @@
+install -vm 755 mbootpack "$INSTALL_ROOT/usr/sbin"
diff --git a/disk/mbootpack/PRE_BUILD b/disk/mbootpack/PRE_BUILD
new file mode 100755
index 0000000..a6adba5
--- /dev/null
+++ b/disk/mbootpack/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# drop unused header
+patch -p0 < "$SPELL_DIRECTORY/header.patch" &&
+
+# use custom C/LD flags
+sedit "s:^CFLAGS += -pipe -O3.*:CFLAGS += $CFLAGS:" Makefile
diff --git a/disk/mbootpack/header.patch b/disk/mbootpack/header.patch
new file mode 100644
index 0000000..2abda14
--- /dev/null
+++ b/disk/mbootpack/header.patch
@@ -0,0 +1,30 @@
+--- buildimage.c.orig 2008-12-09 17:10:59.000000000 +0400
++++ buildimage.c 2012-02-17 01:12:25.770006929 +0400
+@@ -38,7 +38,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+-#include <asm/page.h>
+
+ #include "mbootpack.h"
+ #include "mb_header.h"
+--- mbootpack.c.orig 2008-12-09 17:10:59.000000000 +0400
++++ mbootpack.c 2012-02-17 01:12:58.050000542 +0400
+@@ -43,7 +43,6 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+-#include <asm/page.h>
+
+ /* From GNU GRUB */
+ #include "mb_header.h"
+--- setup.S.orig 2008-12-09 17:10:59.000000000 +0400
++++ setup.S 2012-02-17 01:12:32.930000555 +0400
+@@ -82,7 +82,6 @@
+ #include <linux/compile.h>
+ #include <asm/boot.h>
+ #include <asm/e820.h>
+-#include <asm/page.h>
+ */
+
+ /* Definitions that should have come from these includes */
diff --git a/graphics-libs/jpeg/DETAILS b/graphics-libs/jpeg/DETAILS
index 246dea4..d1a1daf 100755
--- a/graphics-libs/jpeg/DETAILS
+++ b/graphics-libs/jpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=jpeg
- VERSION=8c
-
SOURCE_HASH=sha512:9a8de546c1d0746a09f33cc71e7a3e6c584fdd55efb76b2e1fdebf7b649bcc0dde2bff32be5ceb19d7b57ca3fb0f84902d2fd76d5e9f43a1cc4c04777d061a24
+ VERSION=8d
+
SOURCE_HASH=sha512:7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
SOURCE=${SPELL}src.v$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ijg.org
diff --git a/graphics-libs/jpeg/HISTORY b/graphics-libs/jpeg/HISTORY
index f6a6ba1..231f690 100644
--- a/graphics-libs/jpeg/HISTORY
+++ b/graphics-libs/jpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-02-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 8d
+
2011-01-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8c

diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS
index eff1308..139008d 100755
--- a/graphics/inkscape/DETAILS
+++ b/graphics/inkscape/DETAILS
@@ -1,5 +1,5 @@
SPELL=inkscape
- VERSION=0.48.2
+ VERSION=0.48.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index 9824ecb..b9f2a71 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,6 @@
+2012-02-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.48.3
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/haskell/happy/DETAILS b/haskell/happy/DETAILS
index ba75c35..e052f29 100755
--- a/haskell/happy/DETAILS
+++ b/haskell/happy/DETAILS
@@ -1,8 +1,8 @@
SPELL=happy
- VERSION=1.18.6
+ VERSION=1.18.9
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:2a05d933baa79b3c052956a8fc094dcb831ae03361196d3107c229380d8f231b0410b2caec2d7c2fc42b227754d484a061da7d6f1e9c1900fccc2b7e671345f0
+
SOURCE_HASH=sha512:eaf601e6d78546947b475dd5d396d9086af070f2fc6c49c04a7c373e233bda330702454b8f08650bca8493f7bad04b1ef6ee59d47fadc0b5fcbd68ad07f6d79b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.haskell.org/happy/";
LICENSE[0]=BSD3
diff --git a/haskell/happy/HISTORY b/haskell/happy/HISTORY
index 7813bcc..7b45c63 100644
--- a/haskell/happy/HISTORY
+++ b/haskell/happy/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.18.9
+
2011-10-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description

diff --git a/haskell/haskell-bytestring/DETAILS
b/haskell/haskell-bytestring/DETAILS
index cb05296..9bd57b7 100755
--- a/haskell/haskell-bytestring/DETAILS
+++ b/haskell/haskell-bytestring/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-bytestring
- VERSION=0.9.2.0
+ VERSION=0.9.2.1
SOURCE="bytestring-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/bytestring/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:dac19622eb5bbb4891d0076a797e80d21e78da3413f93022e60f956ea81f35640ff505ac9c3335833d35bd5c51568acd37b88a453a0b43b0fa7428fe8c9888f3
+
SOURCE_HASH=sha512:8a7fff14319b1f2236b25d207556f4507097396eb8e8fd0bc76e12378be7e4d75d25c2fca4e0e288da549f554ea1f70409f9f442190e5f38cb8a5bdfd2788f22
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/bytestring-${VERSION}"
WEB_SITE="http://www.cse.unsw.edu.au/~dons/fps.html";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-bytestring/HISTORY
b/haskell/haskell-bytestring/HISTORY
index 93106cb..e9857e5 100644
--- a/haskell/haskell-bytestring/HISTORY
+++ b/haskell/haskell-bytestring/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.2.1
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.2.0

diff --git a/haskell/haskell-deepseq/DETAILS b/haskell/haskell-deepseq/DETAILS
index dff3efa..fea3644 100755
--- a/haskell/haskell-deepseq/DETAILS
+++ b/haskell/haskell-deepseq/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-deepseq
- VERSION=1.2.0.1
+ VERSION=1.3.0.0
SOURCE="deepseq-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/deepseq/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:9f02c05c14a79f4ad743f1fb25ed47706789c0141b6f765e140e9b088c5358bdde9ba6b096bf4d478f970839d347e1af40326063d4f3f913c33dc4b3b993454a
+
SOURCE_HASH=sha512:f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/deepseq-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/deepseq";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-deepseq/HISTORY b/haskell/haskell-deepseq/HISTORY
index 059b8a6..b9f951a 100644
--- a/haskell/haskell-deepseq/HISTORY
+++ b/haskell/haskell-deepseq/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.0.0
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-random/DETAILS b/haskell/haskell-random/DETAILS
index e9faf3c..377e229 100755
--- a/haskell/haskell-random/DETAILS
+++ b/haskell/haskell-random/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-random
- VERSION=1.0.1.0
+ VERSION=1.0.1.1
SOURCE="random-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/random/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0fe104e72de6e323342310f64643519bc95542873c994c85936c09b4bba4bc7e91f6b135bedc829df69098252f3052afac9476faac958c20959b0b3271fedde2
+
SOURCE_HASH=sha512:dc2f76e87a497d6f5196a8829027d5a9f0eaa2907995f432e26a1594c287c90884253a994fc4a325b0c05c97816e3c3b940a97ccb50d31917a87a99200f1ebff
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/random-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/random";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-random/HISTORY b/haskell/haskell-random/HISTORY
index 059b8a6..d7c6ad4 100644
--- a/haskell/haskell-random/HISTORY
+++ b/haskell/haskell-random/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1.1
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-syb/DETAILS b/haskell/haskell-syb/DETAILS
index 582c6a0..7d7a9d3 100755
--- a/haskell/haskell-syb/DETAILS
+++ b/haskell/haskell-syb/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-syb
- VERSION=0.3.3
+ VERSION=0.3.6
SOURCE="syb-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/syb/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0347d7ea9084e00c16fef423c1e8610cc9dd9e8ae3501b4c3fdd8c4033801378723deb4f2134c14028162196f4b5d4aa6505092078cb4bf21d3003da88955e21
+
SOURCE_HASH=sha512:346a786aba6ca531981dff3dd5fbf76721bbbb3a515fc4667b9328f65e5985e8011a6d68399f7700be0a051ebb2871de0d789dc07d0417fc8b6d8bf009d4e8f1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/syb-${VERSION}"
WEB_SITE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-syb/HISTORY b/haskell/haskell-syb/HISTORY
index 218d010..87d594f 100644
--- a/haskell/haskell-syb/HISTORY
+++ b/haskell/haskell-syb/HISTORY
@@ -1,3 +1,6 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.6
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.3

diff --git a/haskell/haskell-x11/DEPENDS b/haskell/haskell-x11/DEPENDS
index 3cc2d89..d35e204 100755
--- a/haskell/haskell-x11/DEPENDS
+++ b/haskell/haskell-x11/DEPENDS
@@ -1,2 +1,3 @@
-depends ghc &&
-depends xorg-libs
+depends ghc &&
+depends xorg-libs &&
+depends haskell-syb
diff --git a/haskell/haskell-x11/DETAILS b/haskell/haskell-x11/DETAILS
index 94753d2..9c00d83 100755
--- a/haskell/haskell-x11/DETAILS
+++ b/haskell/haskell-x11/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11
- VERSION=1.5.0.0
+ VERSION=1.5.0.1
SOURCE="X11-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:dc097012c09c19a7dbb42711fd0cd54c84e98cb3bc150d77a7470c63912908d3241079a87ca3797cae36b00fa2d52c9e6db33287e9d44dc58a43f1b85ee33518
+
SOURCE_HASH=sha512:de3e32543fcdcf86aa14443aea02a6862ed39cdbaaf732cee325155af2e84570a9cbdbb9da69ab247bfcdc8e475b9d3b7c678f9e7b3e996370bbbb9b1aacabce
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index f676bae..363bd26 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,7 @@
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.5.0.1
+ * DEPENDS: added dependency on haskell-syb
+
2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added to fix build process

diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index 964b7ae..4eecebb 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
SPELL=nsd
- VERSION=3.2.9
+ VERSION=3.2.10
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:1146c5ac1035ec2b3421ef8c7bb2eea4505928546678f76f287c0544db9fc449521a26b47a716e57c4ae90f3eb531c02930f07d6aca0e2c74e9e2ee64858f3e3
+
SOURCE_HASH=sha512:a96ebd73c9bc5c6f6fa994f326fb7f901bf6e4329ce9e5b2fe0b7eead527a7690125831f509acecf089a951030a78953b6ba0e1179aaa844ec72204f0cd8fa54
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 78475c8..1a46c94 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2012-02-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.10
+
2011-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.9

diff --git a/python-pypi/hatta/DEPENDS b/python-pypi/hatta/DEPENDS
index 97e7339..7410d2e 100755
--- a/python-pypi/hatta/DEPENDS
+++ b/python-pypi/hatta/DEPENDS
@@ -2,5 +2,4 @@ depends -sub SQLITE python &&
depends werkzeug &&
depends mercurial &&

-suggest_depends pygtk2 "" "" "for GTK+2 icon interface" &&
-suggest_depends pyqt4 "" "" "for QT4 icon interface"
+suggest_depends pil "" "" "for thumbnails rendering support"
diff --git a/python-pypi/hatta/DETAILS b/python-pypi/hatta/DETAILS
index bb7b501..57c209f 100755
--- a/python-pypi/hatta/DETAILS
+++ b/python-pypi/hatta/DETAILS
@@ -1,8 +1,8 @@
SPELL=hatta
- VERSION=1.4.4
+ VERSION=1.4.5
SOURCE=$VERSION.zip
SOURCE_URL[0]=http://hg.hatta-wiki.org/$SPELL/archive/$SOURCE
-
SOURCE_HASH=sha512:9a27223f7c835b2f362939fc08b7cb53ac7ab234172660f1a6dfee12b5ca0e8b1df4757731f9075bee1ca9d8ab5853300af6f4789fd478b8734ecb9f1d3adbb3
+
SOURCE_HASH=sha512:f549c77a67d093184a4522b744cc13e2c1113ca9d4e602bb50ff99ccfcab97e9b77c8eae1d479e24a28945cbee8e44faf691ccddef1140338e3e71f451d6fd2f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Hatta-Wiki-${VERSION}"
WEB_SITE=http://hatta-wiki.org/
LICENSE[0]=GPL
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index acf834c..6e17e63 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,7 @@
+2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.5
+ * DEPENDS: dropped qt/gtk icon support; added pil support
+
2011-12-08 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: needs python with sqlite support

diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index 6aa19c1..a07adff 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,8 +1,8 @@
SPELL=busybox
- VERSION=1.17.2
-
SOURCE_HASH=sha512:f98d14121e5cb2c859e08750ae2ae8cc4a474ea0ce9ca9298d5dbc885071156cf551d45a5c4a5215b4bee7463f31794d1fd34bf59a53976c6c2bf0065624d935
+ VERSION=1.19.2
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_HASH=sha512:e28c1f0e4ca2308862c609ec86744d8eef1dfab07b33ecb2b3c6b44dcaad5cdb2a8270a9c8d761848532565ad9f796aebd4d2aa5ba371aa1331794f9828f939f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.busybox.net/downloads/$SOURCE
WEB_SITE=http://www.busybox.net
ENTERED=20011020
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index dd0f583..73c745a 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2012-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.19.2 (stable); quoting paths
+ * INSTALL: removed deprecated section; verbosity++
+ * busybox.config: updated config for 1.19.2 version with default
values
+ (as of 04 feb 2012)
+
2010-08-30 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.17.2

diff --git a/shell-term-fm/busybox/INSTALL b/shell-term-fm/busybox/INSTALL
index 0824b75..24048e5 100755
--- a/shell-term-fm/busybox/INSTALL
+++ b/shell-term-fm/busybox/INSTALL
@@ -1,9 +1,4 @@
-install -m 755 busybox ${INSTALL_ROOT}/sbin &&
-
-if [ "$BB_RESCUE" = "y" ] ; then
- mv busybox_unstripped bb &&
- install -m 755 bb ${INSTALL_ROOT}/sbin
-fi
+install -vm 755 busybox ${INSTALL_ROOT}/sbin

#
# This one is needed only when symlinks needed ...
diff --git a/shell-term-fm/busybox/busybox.config
b/shell-term-fm/busybox/busybox.config
index ab2d0a2..a4088ae 100644
--- a/shell-term-fm/busybox/busybox.config
+++ b/shell-term-fm/busybox/busybox.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.8.2
-# Fri Jan 18 01:08:20 2008
+# Busybox version: 1.19.2
+# Thu Feb 16 21:10:07 2012
#
CONFIG_HAVE_DOT_CONFIG=y

@@ -12,19 +12,35 @@ CONFIG_HAVE_DOT_CONFIG=y
#
# General Configuration
#
-# CONFIG_NITPICK is not set
# CONFIG_DESKTOP is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
CONFIG_SHOW_USAGE=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set
CONFIG_FEATURE_COMPRESS_USAGE=y
CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
CONFIG_LOCALE_SUPPORT=y
-CONFIG_GETOPT_LONG=y
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
CONFIG_FEATURE_PIDFILE=y
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
@@ -33,31 +49,34 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
# CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_FEATURE_HAVE_RPC is not set

#
# Build Options
#
CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""

#
# Debugging Options
#
# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_WERROR is not set
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
-# CONFIG_INCLUDE_SUSv2 is not set

#
-# Installation Options
+# Installation Options ("make install" behavior)
#
-# CONFIG_INSTALL_NO_USR is not set
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
@@ -70,21 +89,30 @@ CONFIG_PREFIX="./_install"
#
# Busybox Library Tuning
#
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
# CONFIG_FEATURE_FAST_TOP is not set
# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
# CONFIG_FEATURE_EDITING is not set
-CONFIG_FEATURE_EDITING_MAX_LEN=
-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
+CONFIG_FEATURE_EDITING_MAX_LEN=0
# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=
+CONFIG_FEATURE_EDITING_HISTORY=0
# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
# CONFIG_FEATURE_TAB_COMPLETION is not set
# CONFIG_FEATURE_USERNAME_COMPLETION is not set
# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
CONFIG_MONOTONIC_SYSCALL=y
CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y

#
# Applets
@@ -93,65 +121,87 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
#
# Archival Utilities
#
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+# CONFIG_FEATURE_SEAMLESS_Z is not set
# CONFIG_AR is not set
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
CONFIG_BUNZIP2=y
# CONFIG_BZIP2 is not set
# CONFIG_CPIO is not set
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
CONFIG_GZIP=y
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_LZOP=y
+# CONFIG_LZOP_COMPR_HIGH is not set
# CONFIG_RPM2CPIO is not set
# CONFIG_RPM is not set
-# CONFIG_FEATURE_RPM_BZ2 is not set
CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_AUTODETECT=y
# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
# CONFIG_UNCOMPRESS is not set
# CONFIG_UNLZMA is not set
# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+CONFIG_UNXZ=y
+CONFIG_XZ=y
CONFIG_UNZIP=y

#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
# Coreutils
#
CONFIG_BASENAME=y
-# CONFIG_CAL is not set
CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_BASE64=y
+CONFIG_WHO=y
+CONFIG_USERS=y
+# CONFIG_CAL is not set
# CONFIG_CATV is not set
CONFIG_CHGRP=y
CONFIG_CHMOD=y
CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
CONFIG_CHROOT=y
# CONFIG_CKSUM is not set
# CONFIG_COMM is not set
CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
# CONFIG_FEATURE_DD_IBS_OBS is not set
CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=y
CONFIG_DIRNAME=y
# CONFIG_DOS2UNIX is not set
# CONFIG_UNIX2DOS is not set
@@ -167,13 +217,12 @@ CONFIG_ENV=y
# CONFIG_EXPR_MATH_SUPPORT_64 is not set
CONFIG_FALSE=y
# CONFIG_FOLD is not set
+CONFIG_FSYNC=y
CONFIG_HEAD=y
CONFIG_FEATURE_FANCY_HEAD=y
# CONFIG_HOSTID is not set
-CONFIG_ID=y
CONFIG_INSTALL=y
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
CONFIG_LN=y
# CONFIG_LOGNAME is not set
CONFIG_LS=y
@@ -203,10 +252,14 @@ CONFIG_READLINK=y
CONFIG_REALPATH=y
CONFIG_RM=y
CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
# CONFIG_SEQ is not set
# CONFIG_SHA1SUM is not set
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_FEATURE_FLOAT_SLEEP=y
CONFIG_SORT=y
CONFIG_FEATURE_SORT_BIG=y
# CONFIG_SPLIT is not set
@@ -216,16 +269,11 @@ CONFIG_FEATURE_SORT_BIG=y
# CONFIG_STTY is not set
# CONFIG_SUM is not set
CONFIG_SYNC=y
+CONFIG_TAC=y
CONFIG_TAIL=y
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-CONFIG_TR=y
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
@@ -237,7 +285,6 @@ CONFIG_UUDECODE=y
CONFIG_UUENCODE=y
CONFIG_WC=y
# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHO=y
CONFIG_WHOAMI=y
CONFIG_YES=y

@@ -257,7 +304,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
CONFIG_FEATURE_HUMAN_READABLE=y

#
-# Common options for md5sum, sha1sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y

@@ -265,6 +312,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
# Console Utilities
#
# CONFIG_CHVT is not set
+CONFIG_FGCONSOLE=y
CONFIG_CLEAR=y
# CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set
@@ -277,8 +325,18 @@ CONFIG_RESET=y
# CONFIG_FEATURE_RESIZE_PRINT is not set
# CONFIG_SETCONSOLE is not set
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETFONT=y
+CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
+CONFIG_DEFAULT_SETFONT_DIR=""
# CONFIG_SETKEYCODES is not set
# CONFIG_SETLOGCONS is not set
+CONFIG_SHOWKEY=y
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y

#
# Debian Utilities
@@ -296,28 +354,30 @@ CONFIG_WHICH=y
#
# Editors
#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_BINARY is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-# CONFIG_ED is not set
CONFIG_PATCH=y
-CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=1024
+# CONFIG_FEATURE_VI_8BIT is not set
CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
CONFIG_FEATURE_VI_USE_SIGNALS=y
CONFIG_FEATURE_VI_DOT_CMD=y
CONFIG_FEATURE_VI_READONLY=y
CONFIG_FEATURE_VI_SETOPTS=y
CONFIG_FEATURE_VI_SET=y
CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
CONFIG_FEATURE_ALLOW_EXEC=y

#
@@ -345,6 +405,7 @@ CONFIG_FEATURE_FIND_PRUNE=y
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
CONFIG_GREP=y
CONFIG_FEATURE_GREP_EGREP_ALIAS=y
CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -358,32 +419,47 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
#
# Init Utilities
#
+CONFIG_BOOTCHARTD=y
+CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
+CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
CONFIG_INIT=y
-# CONFIG_DEBUG_INIT is not set
CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
# CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_INIT_SYSLOG is not set
# CONFIG_FEATURE_EXTRA_QUIET is not set
# CONFIG_FEATURE_INIT_COREDUMPS is not set
CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y

#
# Login/Password Management Utilities
#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_SHADOW=y
CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
+CONFIG_USE_BB_CRYPT_SHA=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_DELUSER=y
CONFIG_DELGROUP=y
# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-CONFIG_ADDUSER=y
-CONFIG_DELUSER=y
CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
# CONFIG_PAM is not set
# CONFIG_LOGIN_SCRIPTS is not set
@@ -405,34 +481,48 @@ CONFIG_VLOCK=y
# CONFIG_CHATTR is not set
# CONFIG_FSCK is not set
# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set

#
# Linux Module Utilities
#
-CONFIG_INSMOD=y
-CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
-CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-CONFIG_FEATURE_INSMOD_LOAD_MAP=y
-CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
+CONFIG_MODINFO=y
+CONFIG_MODPROBE_SMALL=y
+CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
+CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
+# CONFIG_INSMOD is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+# CONFIG_DEPMOD is not set

#
# Options common to multiple modutils
#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_2_4_MODULES=y
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_MODUTILS_ALIAS is not set
+# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"

#
# Linux System Utilities
#
+CONFIG_BLOCKDEV=y
+CONFIG_REV=y
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKID=y
+# CONFIG_FEATURE_BLKID_TYPE is not set
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
@@ -441,48 +531,64 @@ CONFIG_FEATURE_FBSET_READMODE=y
# CONFIG_FDFLUSH is not set
CONFIG_FDFORMAT=y
CONFIG_FDISK=y
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
# CONFIG_FEATURE_SUN_LABEL is not set
# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FLOCK=y
CONFIG_FREERAMDISK=y
CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_EXT2=y
# CONFIG_MKFS_MINIX is not set
-
-#
-# Minix filesystem support
-#
# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
+CONFIG_MKFS_VFAT=y
CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
CONFIG_HWCLOCK=y
# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
# CONFIG_IPCRM is not set
# CONFIG_IPCS is not set
CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
# CONFIG_MDEV is not set
# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
# CONFIG_FEATURE_MDEV_EXEC is not set
# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_FEATURE_MKSWAP_UUID=y
CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_LABEL=y
# CONFIG_FEATURE_MOUNT_NFS is not set
# CONFIG_FEATURE_MOUNT_CIFS is not set
CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_PIVOT_ROOT=y
# CONFIG_RDATE is not set
+CONFIG_RDEV=y
# CONFIG_READPROFILE is not set
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SCRIPTREPLAY=y
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
CONFIG_SWITCH_ROOT=y
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
@@ -491,33 +597,94 @@ CONFIG_UMOUNT=y
# Common options for mount/umount
#
CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y

#
# Miscellaneous Utilities
#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_SETSERIAL=y
+CONFIG_UBIATTACH=y
+CONFIG_UBIDETACH=y
+CONFIG_UBIMKVOL=y
+CONFIG_UBIRMVOL=y
+CONFIG_UBIRSVOL=y
+CONFIG_UBIUPDATEVOL=y
# CONFIG_ADJTIMEX is not set
CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
+CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
+CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
+CONFIG_FEATURE_CHAT_CLR_ABORT=y
# CONFIG_CHRT is not set
# CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_D is not set
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
# CONFIG_CRONTAB is not set
# CONFIG_DC is not set
+# CONFIG_FEATURE_DC_LIBM is not set
# CONFIG_DEVFSD is not set
# CONFIG_DEVFSD_MODLOAD is not set
# CONFIG_DEVFSD_FG_NP is not set
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
+CONFIG_DEVMEM=y
CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FBSPLASH=y
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+CONFIG_IONICE=y
+# CONFIG_INOTIFYD is not set
# CONFIG_LAST is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
CONFIG_HDPARM=y
# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -528,31 +695,55 @@ CONFIG_HDPARM=y
CONFIG_MAKEDEVS=y
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MAN=y
# CONFIG_MICROCOM is not set
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_RAIDAUTORUN is not set
# CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
-CONFIG_STRINGS=y
# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
# CONFIG_TASKSET is not set
# CONFIG_FEATURE_TASKSET_FANCY is not set
CONFIG_TIME=y
+CONFIG_TIMEOUT=y
# CONFIG_TTYSIZE is not set
+CONFIG_VOLNAME=y
+CONFIG_WALL=y
# CONFIG_WATCHDOG is not set

#
# Networking Utilities
#
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NBDCLIENT=y
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WHOIS=y
# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
+CONFIG_BRCTL=y
+CONFIG_FEATURE_BRCTL_FANCY=y
+CONFIG_FEATURE_BRCTL_SHOW=y
# CONFIG_DNSD is not set
# CONFIG_ETHER_WAKE is not set
# CONFIG_FAKEIDENTD is not set
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
@@ -560,23 +751,24 @@ CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
# CONFIG_FEATURE_HTTPD_RANGES is not set
# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
# CONFIG_FEATURE_HTTPD_CGI is not set
# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
CONFIG_FEATURE_IFCONFIG_HW=y
# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFENSLAVE=y
+CONFIG_IFPLUGD=y
# CONFIG_IFUPDOWN is not set
CONFIG_IFUPDOWN_IFSTATE_PATH=""
# CONFIG_FEATURE_IFUPDOWN_IP is not set
@@ -609,56 +801,100 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
# CONFIG_IPCALC is not set
# CONFIG_FEATURE_IPCALC_FANCY is not set
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
# CONFIG_NETSTAT is not set
# CONFIG_FEATURE_NETSTAT_WIDE is not set
+# CONFIG_FEATURE_NETSTAT_PRG is not set
# CONFIG_NSLOOKUP is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
+CONFIG_NTPD=y
+CONFIG_FEATURE_NTPD_SERVER=y
# CONFIG_PSCAN is not set
-CONFIG_FEATURE_FANCY_PING=y
CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
# CONFIG_TELNET is not set
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
# CONFIG_TFTP is not set
+CONFIG_TFTPD=y
+
+#
+# Common options for tftp/tftpd
+#
# CONFIG_FEATURE_TFTP_GET is not set
# CONFIG_FEATURE_TFTP_PUT is not set
# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_TFTP_DEBUG is not set
# CONFIG_TRACEROUTE is not set
+# CONFIG_TRACEROUTE6 is not set
# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_DHCPRELAY is not set
-# CONFIG_APP_DUMPLEASES is not set
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+CONFIG_UDHCPD=y
+CONFIG_DHCPRELAY=y
+CONFIG_DUMPLEASES=y
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_APP_UDHCPC is not set
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_FEATURE_RFC3397 is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=9
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+# CONFIG_UDPSVD is not set
CONFIG_VCONFIG=y
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
# CONFIG_ZCIP is not set

#
+# Print Utilities
+#
+CONFIG_LPD=y
+CONFIG_LPR=y
+CONFIG_LPQ=y
+
+#
+# Mail Utilities
+#
+CONFIG_MAKEMIME=y
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+CONFIG_REFORMIME=y
+CONFIG_FEATURE_REFORMIME_COMPAT=y
+CONFIG_SENDMAIL=y
+
+#
# Process Utilities
#
+CONFIG_IOSTAT=y
+CONFIG_MPSTAT=y
+# CONFIG_NMETER is not set
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
+CONFIG_SMEMCAP=y
+CONFIG_UPTIME=y
+CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
CONFIG_FREE=y
# CONFIG_FUSER is not set
CONFIG_KILL=y
CONFIG_KILLALL=y
# CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
# CONFIG_PGREP is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
@@ -666,59 +902,98 @@ CONFIG_PIDOF=y
# CONFIG_PKILL is not set
CONFIG_PS=y
# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
CONFIG_RENICE=y
CONFIG_BB_SYSCTL=y
CONFIG_TOP=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
# CONFIG_FEATURE_TOP_DECIMALS is not set
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
# CONFIG_FEATURE_TOPMEM is not set
-CONFIG_UPTIME=y
+CONFIG_FEATURE_SHOW_THREADS=y
CONFIG_WATCH=y

#
-# Shells
+# Runit Utilities
#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set

#
-# Ash Shell Options
+# Shells
#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
CONFIG_ASH_GETOPTS=y
CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
CONFIG_ASH_BUILTIN_TEST=y
CONFIG_ASH_CMDCMD=y
CONFIG_ASH_MAIL=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
# CONFIG_ASH_RANDOM_SUPPORT is not set
# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
# CONFIG_HUSH_HELP is not set
# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
# CONFIG_HUSH_TICK is not set
# CONFIG_HUSH_IF is not set
# CONFIG_HUSH_LOOPS is not set
-# CONFIG_LASH is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_CTTYHACK is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y

#
# System Logging Utilities
@@ -726,42 +1001,13 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSLOGD=y
CONFIG_FEATURE_ROTATE_LOGFILE=y
# CONFIG_FEATURE_REMOTE_LOG is not set
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG=y
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
# CONFIG_LOGREAD is not set
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
CONFIG_LOGGER=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_SV is not set
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-
-#
-# ipsvd utilities
-#
-# CONFIG_TCPSVD is not set
-# CONFIG_UDPSVD is not set
diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index 9eadb79..4288de9 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,10 +1,9 @@
SPELL=linux-initramfs
- VERSION=0.6
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ VERSION=0.7
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
WEB_SITE="http://www.sourcemage.org/";
ENTERED=20030803
GATHER_DOCS=off
- PATCHLEVEL=3
KEYWORDS="kernels"
SHORT="This spell provides initramfs scripts that can be loaded
into the kernel"
cat << EOF
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 679902c..68a7e57 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2012-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7; quoting paths
+ * mkinitrd: unstfu usage; mdadm strictly requires /proc
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 2c4f82f..c3e225e 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -37,9 +37,11 @@ CPIO_TMP_ROOT=$(mktemp -d -p ${TMP_DIR:-/tmp})

function usage()
{
- local usage=<<EOF
+ local usage=$(cat << EOF
$0 [OPTIONS] -o <initrdfile> <kernel-version>
+
EOF
+)
echo $usage
}

@@ -80,6 +82,7 @@ function linuxrc_raid()
if $USE_RAID || $FORCE_RAID
then
cat <<-EOF
+/bin/mount -t proc proc /proc > /dev/null 2>&1
/bin/mdadm --assemble --scan
EOF
fi
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 6badb02..c525689 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -3,6 +3,9 @@
* PRE_BUILD: fixed removal of sysv-compat jobs
* upstart.gpg: added another key they use for releases

+2011-10-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed long description wrap (scripted)
+
2011-11-10 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.2, long description <80 col
switched to upstream gpg checking
diff --git a/utils/htop/DETAILS b/utils/htop/DETAILS
index 202605f..e84d45d 100755
--- a/utils/htop/DETAILS
+++ b/utils/htop/DETAILS
@@ -1,11 +1,11 @@
SPELL=htop
- VERSION=1.0
+ VERSION=1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://htop.sourceforge.net/
ENTERED=20050218
-
SOURCE_HASH=sha512:99ad5c2d1ffb1aabd18c100d1f5f995ce2e6bf0345b2adf006ef15b5e7b996d30b2d6f895ab81e97d36f647e69659fbb416972ebe9b0b42091df6921da60068a
+
SOURCE_HASH=sha512:9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="an interactive process viewer for Linux"
diff --git a/utils/htop/HISTORY b/utils/htop/HISTORY
index 74d3883..310e3cd 100644
--- a/utils/htop/HISTORY
+++ b/utils/htop/HISTORY
@@ -1,3 +1,6 @@
+2012-02-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.1
+
2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0

diff --git a/utils/xen/BUILD b/utils/xen/BUILD
index 65516c8..e930828 100755
--- a/utils/xen/BUILD
+++ b/utils/xen/BUILD
@@ -1,4 +1,11 @@
-unset LDFLAGS
-unset CFLAGS
-cd $SOURCE_DIRECTORY &&
-make dist-xen dist-tools dist-stubdom dist-misc
+unset LDFLAGS &&
+unset CFLAGS &&
+
+cd "$SOURCE_DIRECTORY" &&
+make xen tools &&
+
+if [[ $XEN_STUBDOM == y ]]; then
+ make_single &&
+ make stubdom &&
+ make_normal
+fi
diff --git a/utils/xen/CONFIGURE b/utils/xen/CONFIGURE
new file mode 100755
index 0000000..a1e249b
--- /dev/null
+++ b/utils/xen/CONFIGURE
@@ -0,0 +1,4 @@
+config_query XEN_HVM "Do you want to build HVM (hardware-assisted
virtualization) support" y &&
+config_query XEN_STUBDOM "Do you want to include Device Model Stub Domains?
support" y &&
+
+config_query XEN_UPINIT "Do you want to install upstream init scripts" y
diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 7c5832a..6002d09 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -1,16 +1,18 @@
-# this package provides a symlink needed to build xen
-# I'm less than happy with the symlink, but apparently it's not a problem
-# as identified in the gnustubs32 spell itself.
-# And it works fine for me :)
depends gnustubs32 &&
depends bridge-utils &&
depends python &&
-depends setuptools &&
-depends python-pam &&
+depends SETUPTOOLS &&
+depends pyxml &&
depends iproute2 &&
depends dev86 &&
depends curl &&
depends udev &&
-depends pyopenssl &&
-depends pyxml &&
-depends iasl
+
+if [[ $XEN_HVM == y ]]; then
+ depends iasl &&
+ depends sdl
+fi &&
+
+suggest_depends lxml "" "" "for XenAPI support in XM" &&
+suggest_depends pyopenssl "" "" "for SSL support" &&
+suggest_depends python-pam "" "" "for PAM support"
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index e5f03aa..43b7113 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -4,12 +4,12 @@
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=xen.gpg:$SOURCE.sig:UPSTREAM_KEY
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
SOURCE_URL[0]=http://bits.xensource.com/oss-xen/release/${VERSION}/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+
SOURCE_URL[0]=http://bits.xensource.com/oss-${SPELL}/release/${VERSION}/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
WEB_SITE=http://www.xen.org
ENTERED=20041110
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="xen"
SHORT="Xen is a paravirtualising virtual machine monitor"
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index a38e910..62663c5 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,5 +1,18 @@
-2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: replaced non-existent var
+2012-02-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++; quoting paths
+ * DEPENDS: made python-pam, pyopenssl, iasl optional; added missing
+ suggest and required dependencies
+ * CONFIGURE: added, for HVM and STUBDOM options, as well as ability to
+ choose installation of upstream init scripts
+ * PRE_BUILD: don't install upstream init scripts when selected
+ * BUILD: dist-misc does nothing for us; fixed multijob build for
stubdom
+ target; made stubdom optional
+ * INSTALL: fixed multijob install for stubdom target; made stubdom
+ optional; install appropriate configuration files for init scripts
+ * init.d/xend: rewritten from scratch
+ * init.d/xend.conf: added, for new init script
+ * init.d/xendomains{,.conf}: added 1st draft of scripting framework to
+ run domains properly

2011-01-30 David Kowis <dkowis AT shlrm.org>
* DEPENDS: depend on the gnustubs32 symlink spell
diff --git a/utils/xen/INSTALL b/utils/xen/INSTALL
index 437f62a..a60a3c6 100755
--- a/utils/xen/INSTALL
+++ b/utils/xen/INSTALL
@@ -1,3 +1,18 @@
-unset LDFLAGS
-unset CFLAGS
-make install-xen install-tools install-stubdom
+unset LDFLAGS &&
+unset CFLAGS &&
+
+make install-xen install-tools &&
+
+if [[ $XEN_STUBDOM == y ]]; then
+ make_single &&
+ make install-stubdom &&
+ make_normal
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SPELL_DIRECTORY/init.d/xend.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/xend" &&
+
+ install_config_file "$SPELL_DIRECTORY/init.d/xendomains.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/xendomains"
+fi
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index ec51a92..c7f9a4a 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,3 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+
+if [[ $XEN_UPINIT != y ]]; then
+ sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
+fi &&
+
sedit 's/lib64/lib/' config/StdGNU.mk
diff --git a/utils/xen/init.d/xend b/utils/xen/init.d/xend
index 318160d..6e05b5b 100755
--- a/utils/xen/init.d/xend
+++ b/utils/xen/init.d/xend
@@ -1,5 +1,7 @@
#!/bin/bash

+. /etc/sysconfig/xend
+
PROGRAM=/bin/false
RUNLEVEL=3
NEEDS="+local_fs +network"
@@ -7,23 +9,98 @@ PROVIDES="xend"
RECOMMENDED=yes

. /etc/init.d/smgl_init
-. /etc/init.d/smgl_functions

-await_daemons_up()
+XENSTORED_PIDFILE=/var/run/xenstored.pid
+XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
+
+# Wait for Xend to be up
+function await_daemons_up()
{
- i=1
- rets=10
- xend status
- while [ $? -ne 0 -a $i -lt $rets ]
- do
- sleep 1
- i=$(($i + 1))
- xend status
- done
+ i=1
+ rets=10
+ xend status
+ while [ $? -ne 0 -a $i -lt $rets ]; do
+ sleep 1
+ echo -n .
+ i=$(($i + 1))
+ xend status
+ done
+}
+
+function checkprocfs()
+{
+ if test -d /proc/xen && \
+ ! test -f /proc/xen/capabilities && \
+ ! grep '^xenfs ' /proc/mounts >/dev/null;
+ then
+ echo "XEN: Preparing proc filesystem..."
+ mount -t xenfs xenfs /proc/xen
+ evaluate_retval || exit 1
+ fi
+
+ echo "XEN: Detecting capabilities..."
+ if ! grep -q "control_d" /proc/xen/capabilities ; then
+ print_status failure
+ exit 1
+ else
+ print_status success
+ fi
}

start()
{
+ checkprocfs
+
+ required_executable /usr/bin/xenstore-read
+ required_executable /usr/bin/xenstore-write
+ required_executable /usr/sbin/xenstored
+ required_executable /usr/sbin/xenconsoled
+
+ local time=0
+ local timeout=30
+
+ if ! `xenstore-read -s / >/dev/null 2>&1`; then
+ rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
+ test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T
/var/log/xen/xenstored-trace.log"
+
+ echo -n "XEN: Starting xenstored..."
+ xenstored --pid-file=$XENSTORED_PIDFILE $XENSTORED_ARGS
+
+ # Wait for xenstored to actually come up, timing out after 30 seconds
+ while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ;
do
+ echo -n '.'
+ time=$(($time+1))
+ sleep 1
+ done
+ echo
+
+ # Exit if we timed out
+ if ! [ $time -lt $timeout ] ; then
+ print_status failure
+ exit 1
+ else
+ print_status success
+ fi
+
+ echo "XEN: Setting domain 0 name..."
+ xenstore-write "/local/domain/0/name" "Domain-0"
+ evaluate_retval
+ fi
+
+ echo "XEN: Starting xenconsoled..."
+ test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS="
--log=$XENCONSOLED_TRACE"
+ xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
+ evaluate_retval || exit 1
+
+ # mkdir shouldn't be needed as most distros have this already created.
Default to using subsys.
+ # See docs/misc/distro_mapping.txt
+ mkdir -p /var/lock
+ if [ -d /var/lock/subsys ] ; then
+ touch /var/lock/subsys/xend
+ else
+ touch /var/lock/xend
+ fi
+
xend start
await_daemons_up
}
@@ -31,10 +108,23 @@ start()
stop()
{
xend stop
+ rm -f /var/lock/subsys/xend /var/lock/xend
+
+ echo "XEN: Stopping xenconsoled..."
+ if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
+ kill $pid
+ while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ evaluate_retval
+ rm -f $XENCONSOLED_PIDFILE
+ fi
+
+ echo "XEN: WARNING: Not stopping xenstored, as it cannot be restarted."
}

status()
{
+ xenstore-read -s /
+
xend status
}

@@ -45,12 +135,9 @@ reload()

restart()
{
- xend restart
- await_daemons_up
-}
+ echo "XEN: Restarting..."

-force-reload()
-{
- restart
+ stop
+ sleep 1
+ start
}
-
diff --git a/utils/xen/init.d/xend.conf b/utils/xen/init.d/xend.conf
new file mode 100644
index 0000000..69d8dcb
--- /dev/null
+++ b/utils/xen/init.d/xend.conf
@@ -0,0 +1,8 @@
+# Log xenconsoled messages (cf xl dmesg): [none|guest|hv|all]
+#XENCONSOLED_TRACE=
+
+# Log xenstored messages: [yes|on|1]
+#XENSTORED_TRACE=
+
+# Running xenstored on XENSTORED_ROOTDIR
+XENSTORED_ROOTDIR=/var/lib/xenstored
diff --git a/utils/xen/init.d/xendomains b/utils/xen/init.d/xendomains
new file mode 100755
index 0000000..75cc264
--- /dev/null
+++ b/utils/xen/init.d/xendomains
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+. /etc/sysconfig/xendomains
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+xend"
+
+. /etc/init.d/smgl_init
+
+function check_userland()
+{
+ echo "XEN: Checking userland environment..."
+
+ required_executable /usr/sbin/xm
+ CMD=xm
+
+ $CMD list &> /dev/null
+ if test $? -ne 0; then
+ required_executable /usr/sbin/xl
+ CMD=xl
+ fi
+
+ $CMD list &> /dev/null
+ if test $? -ne 0; then
+ print_status failure
+ exit 1
+ fi
+
+ # Correct exit code would probably be 5, but it's enough
+ # if xend complains if we're not running as privileged domain
+ if ! [ -e /proc/xen/privcmd ]; then
+ print_status failure
+ exit 1
+ fi
+
+ # See docs/misc/distro_mapping.txt
+ if [ -d /var/lock/subsys ]; then
+ LOCKFILE=/var/lock/subsys/xendomains
+ else
+ LOCKFILE=/var/lock/xendomains
+ fi
+
+ print_status success
+}
+
+function get_domname()
+{
+ local name_from_file=$(sed -rn
's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+ if [[ -z ${name_from_file} ]] ; then
+ basename "${1}"
+ else
+ echo ${name_from_file}
+ fi
+}
+
+function is_running()
+{
+ $CMD list "${1}" >/dev/null 2>&1
+}
+
+start()
+{
+ check_userland
+
+ if [ -f $LOCKFILE ]; then
+ echo -e "XEN: xendomains already running (lockfile exists)"
+ exit 0
+ fi
+
+ if [ $(ls ${XENDOMAINS_AUTO} | wc -l) == 0 ]; then
+ echo "XEN: no domains in ${XENDOMAINS_AUTO}"
+ exit 0
+ fi
+
+ touch $LOCKFILE
+ echo "XEN: Starting domains:"
+ for dom in $(ls "${XENDOMAINS_AUTO}/"* 2>/dev/null | sort); do
+ name=$(get_domname ${dom})
+ echo "XEN: domain ${name}... "
+ if ! is_running ${name}; then
+ $CMD create --quiet --defconfig $dom
+ evaluate_retval
+ else
+ echo -n "(skip: already running)"
+ fi
+ done
+}
+
+stop()
+{
+ check_userland
+
+ if [ $(ls ${XENDOMAINS_AUTO} | wc -l) == 0 ]; then
+ echo "XEN: no domains in ${XENDOMAINS_AUTO}"
+ exit 0
+ fi
+
+ DOMAINS="$(ls "${XENDOMAINS_AUTO}/"* 2>/dev/null | sort -r)"
+
+ echo "XEN: Shutting down domains:"
+ for dom in $DOMAINS; do
+ name=$(get_domname ${dom})
+ echo "XEN: Waiting for domain ${name} to shutdown... "
+ if is_running ${name}; then
+ $CMD shutdown -w ${name} > /dev/null
+ evaluate_retval
+ else
+ echo -n "(skip: not running)"
+ fi
+ done
+
+ rm -f $LOCKFILE
+}
+
+status()
+{
+ check_userland
+
+ $CMD list
+}
+
+restart()
+{
+ stop
+ start
+}
+
+reload()
+{
+ restart
+}
diff --git a/utils/xen/init.d/xendomains.conf
b/utils/xen/init.d/xendomains.conf
new file mode 100644
index 0000000..27d12cc
--- /dev/null
+++ b/utils/xen/init.d/xendomains.conf
@@ -0,0 +1,136 @@
+## Path: System/xen
+## Description: xen domain start/stop on boot
+## Type: string
+## Default:
+#
+# The xendomains script can send SysRq requests to domains on shutdown.
+# If you don't want to MIGRATE, SAVE, or SHUTDOWN, this may be a possibility
+# to do a quick and dirty shutdown ("s e i u o") or at least sync the disks
+# of the domains ("s").
+#
+XENDOMAINS_SYSRQ=""
+
+## Type: integer
+## Default: 100000
+#
+# If XENDOMAINS_SYSRQ is set, this variable determines how long to wait
+# (in microseconds) after each SysRq, so the domain has a chance to react.
+# If you want to a quick'n'dirty shutdown via SysRq, you may want to set
+# it to a relatively high value (1200000).
+#
+XENDOMAINS_USLEEP=100000
+
+## Type: integer
+## Default: 5000000
+#
+# When creating a guest domain, it is sensible to allow a little time for it
+# to get started before creating another domain or proceeding through the
+# boot process. Without this, the booting guests will thrash the disk as
they
+# start up. This timeout (in microseconds) specifies the delay after guest
+# domain creation.
+#
+XENDOMAINS_CREATE_USLEEP=5000000
+
+## Type: string
+## Default: ""
+#
+# Set this to a non-empty string if you want to migrate virtual machines
+# on shutdown. The string will be passed to the xm migrate DOMID command
+# as is: It should contain the target IP address of the physical machine
+# to migrate to and optionally parameters like --live. Leave empty if
+# you don't want to try virtual machine relocation on shutdown.
+# If migration succeeds, neither SAVE nor SHUTDOWN will be executed for
+# that domain.
+#
+XENDOMAINS_MIGRATE=""
+
+## Type: string
+## Default: /var/lib/xen/save
+#
+# Directory to save running domains to when the system (dom0) is
+# shut down. Will also be used to restore domains from if #
XENDOMAINS_RESTORE
+# is set (see below). Leave empty to disable domain saving on shutdown
+# (e.g. because you rather shut domains down).
+# If domain saving does succeed, SHUTDOWN will not be executed.
+#
+XENDOMAINS_SAVE=/var/lib/xen/save
+
+## Type: string
+## Default: "--halt --wait"
+#
+# If neither MIGRATE nor SAVE were enabled or if they failed, you can
+# try to shut down a domain by sending it a shutdown request. To do this,
+# set this to "--halt --wait". Omit the "--wait" flag to avoid waiting
+# for the domain to be really down. Leave empty to skip domain shutdown.
+#
+XENDOMAINS_SHUTDOWN="--halt --wait"
+
+## Type: string
+## Default: "--all --halt --wait"
+#
+# After we have gone over all virtual machines (resp. all automatically
+# started ones, see XENDOMAINS_AUTO_ONLY below) in a loop and sent SysRq,
+# migrated, saved and/or shutdown according to the settings above, we
+# might want to shutdown the virtual machines that are still running
+# for some reason or another. To do this, set this variable to
+# "--all --halt --wait", it will be passed to xm shutdown.
+# Leave it empty not to do anything special here.
+# (Note: This will hit all virtual machines, even if XENDOMAINS_AUTO_ONLY
+# is set.)
+#
+XENDOMAINS_SHUTDOWN_ALL="--all --halt --wait"
+
+## Type: boolean
+## Default: true
+#
+# This variable determines whether saved domains from XENDOMAINS_SAVE
+# will be restored on system startup.
+#
+XENDOMAINS_RESTORE=true
+
+## Type: string
+## Default: /etc/xen/auto
+#
+# This variable sets the directory where domains configurations
+# are stored that should be started on system startup automatically.
+# Leave empty if you don't want to start domains automatically
+# (or just don't place any xen domain config files in that dir).
+# Note that the script tries to be clever if both RESTORE and AUTO are
+# set: It will first restore saved domains and then only start domains
+# in AUTO which are not running yet.
+# Note that the name matching is somewhat fuzzy.
+#
+XENDOMAINS_AUTO=/etc/xen/auto
+
+## Type: boolean
+## Default: false
+#
+# If this variable is set to "true", only the domains started via config
+# files in XENDOMAINS_AUTO will be treated according to XENDOMAINS_SYSRQ,
+# XENDOMAINS_MIGRATE, XENDOMAINS_SAVE, XENDMAINS_SHUTDOWN; otherwise
+# all running domains will be.
+# Note that the name matching is somewhat fuzzy.
+#
+XENDOMAINS_AUTO_ONLY=false
+
+## Type: integer
+## Default: 300
+#
+# On xendomains stop, a number of xm commands (xm migrate, save, shutdown,
+# shutdown --all) may be executed. In the worst case, these commands may
+# stall forever, which will prevent a successful shutdown of the machine.
+# If this variable is non-zero, the script will set up a watchdog timer
+# for every of these xm commands and time it out after the number of seconds
+# specified by this variable.
+# Note that SHUTDOWN_ALL will not be called if no virtual machines or only
+# zombies are still running, so you don't need to enable this timeout just
+# for the zombie case.
+# The setting should be large enough to make sure that migrate/save/shutdown
+# can succeed. If you do live migrations, keep in mind that live migration
+# of a 1GB machine over Gigabit ethernet may actually take something like
+# 100s (assuming that live migration uses 10% of the network # bandwidth).
+# Depending on the virtual machine, a shutdown may also require a significant
+# amount of time. So better setup this variable to a huge number and hope the
+# watchdog never fires.
+#
+XENDOMAINS_STOP_MAXWAIT=300
diff --git a/video-libs/schroedinger/DETAILS b/video-libs/schroedinger/DETAILS
index d08357d..ce7ccfb 100755
--- a/video-libs/schroedinger/DETAILS
+++ b/video-libs/schroedinger/DETAILS
@@ -1,6 +1,6 @@
SPELL=schroedinger
- VERSION=1.0.10
-
SOURCE_HASH=sha512:732264bcf1a3d1005924d93534bb36f1473fcb94d288165b0184f2728029b2a496bbe9c06794e26a97a4f20516eda163b1e92768f4127670ff70af9b38f1ef19
+ VERSION=1.0.11
+
SOURCE_HASH=sha512:a39dd5360eb87a63379de71d91f48cde309ded91632c0ab8b1dc76b73591f7d0dfa7003c606d1b546d495b18c916aae905a9540b48dff7cbeb5b289e0f880438
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.diracvideo.org/download/schroedinger/$SOURCE
diff --git a/video-libs/schroedinger/HISTORY b/video-libs/schroedinger/HISTORY
index 6a2e0bd..8353fe0 100644
--- a/video-libs/schroedinger/HISTORY
+++ b/video-libs/schroedinger/HISTORY
@@ -1,3 +1,6 @@
+2012-02-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.11
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 4f06b6d..4edab6b 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -36,7 +36,7 @@ optional_depends speex \
"support for the Speex codec" &&
optional_depends openjpeg \
"--enable-libopenjpeg" \
- "" \
+ "--disable-libopenjpeg" \
"support for JPEG 2000" &&
optional_depends "lame" \
"--enable-libmp3lame" \
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index f986aa7..1a8114b 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-02-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added --disable-libopenjpeg switch to openjpeg dependency
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: corrected major version detection

diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index 6c19a1d..96eabf8 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -1,4 +1,4 @@
-depends gtk+2 &&
+depends gtk+3 &&
depends sdl &&
depends udev &&
depends libpng &&
diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index 37501a3..f748bfd 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,8 +1,8 @@
SPELL=guvcview
- VERSION=1.5.0
+ VERSION=1.5.2
SOURCE=${SPELL}-src-${VERSION}.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c5d266eb0165eab0973b78ad527bf7806dc1e77d8a4e8d318c613acfaf764677c7a560156b25eb0a6fae5651d1a3e38ed83bb675885be4d1dcc63e57746d886a
+
SOURCE_HASH=sha512:8dcc1f21ac30aa723c7dd35d7cc1493d22c073f4cdd55dde68fbd7dcd6cac495579d30dbeed7f2d469b999d7d412dc11b359cd530c3789fca5019f48fa8f6c18
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
WEB_SITE=http://guvcview.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index b41680e..785a884 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,8 @@
+2012-02-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.5.2
+ * DEPENDS: gtk+2 -> gtk+3
+ * PRE_BUILD: added
+
2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: WEB_SITE and SOURCE_URL[0] updated, berlios -> sourceforge

diff --git a/video/guvcview/PRE_BUILD b/video/guvcview/PRE_BUILD
new file mode 100755
index 0000000..da87c42
--- /dev/null
+++ b/video/guvcview/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sed -i -e '29i#include <locale.h>' src/options.c
diff --git a/windowmanagers/windowmaker/BUILD
b/windowmanagers/windowmaker/BUILD
deleted file mode 100755
index a6a90d1..0000000
--- a/windowmanagers/windowmaker/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == alpha ]] || [[ "${SMGL_COMPAT_ARGS[1]}"
!= x86_64 ]]; then
- message "we are on alpha or x66_64, letting it PIC" &&
- default_build
-else
- message "disabling PIC on non-alpha or non-x86_64 arch" &&
- OPTS="--without-pic ${OPTS}" &&
- disable_pic force &&
- default_build
-fi
diff --git a/windowmanagers/windowmaker/DETAILS
b/windowmanagers/windowmaker/DETAILS
index 2078523..c911a97 100755
--- a/windowmanagers/windowmaker/DETAILS
+++ b/windowmanagers/windowmaker/DETAILS
@@ -1,10 +1,9 @@
SPELL=windowmaker
- VERSION=current
- SOURCE=WindowMaker-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker
-# SOURCE_URL[0]=http://hg.windowmaker.info/wmaker/archive/tip.tar.bz2
- SOURCE_URL[0]=http://bfr.kicks-ass.net/smgl/WindowMaker-current.tar.bz2
-
SOURCE_HASH=sha512:dfdefa349d3afe39459b2d62c185a9073088ce527b99ed094bf8b6cdcb6b5a072a6010b9a53689a507d7830d873868762b0a860a822c44d74d256ccaf1c1e315
+ VERSION=0.95.2
+ SOURCE=WindowMaker-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker-${VERSION}
+
SOURCE_URL[0]=http://windowmaker.org/pub/source/release/WindowMaker-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:91899b36573d4a174ed1c9516df2f4ada03a91f0d50a501053c970ec818874b7597c6db9a004189ce97d66345d0bee06d951f16c808203e6be13075bd8bf02ae
WEB_SITE=http://www.windowmaker.info
LICENSE[0]=GPL
LICENSE[1]=http://windowmaker.info/disclaimer.html
diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index c4350bf..ad6b740 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,7 @@
+2012-02-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.95.2
+ * PRE_BUILD, BUILD, INSTALL, windowmaker*.patch: removed obsolete
patches.
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/windowmanagers/windowmaker/PRE_BUILD
b/windowmanagers/windowmaker/PRE_BUILD
deleted file mode 100755
index 33efff7..0000000
--- a/windowmanagers/windowmaker/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-./autogen.sh
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
deleted file mode 100644
index e3b50ac..0000000
--- a/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac.orig 2007-08-27 00:51:31.000000000 +0200
-+++ configure.ac 2007-08-27 00:52:14.000000000 +0200
-@@ -197,7 +197,7 @@
-
- AC_CACHE_CHECK(whether gcc supports x86 inline asm,
- ac_cv_c_inline_asm,
-- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n"::
-+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n\t pushal\n\t popal"::
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m"
(x));}],
- ac_cv_c_inline_asm=yes,
-@@ -840,11 +840,6 @@
- else
- gnustepdir=$appspath
-
-- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
-- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e
"s|^${prefix}|prefix|"`
-- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
-- fi
--
- wprefs_base_dir=$gnustepdir/Applications
- wprefs_datadir=$wprefs_base_dir/WPrefs.app
- wprefs_bindir=$wprefs_base_dir/WPrefs.app
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
deleted file mode 100644
index 4312435..0000000
--- a/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- NEW FILE windowmaker-gcc4-x86_64.patch ---
---- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000
+0100
-+++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-22 21:07:57.000000000
+0200
-@@ -98,15 +98,23 @@
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-+
- short *tmp_err;
- short *tmp_nerr;
- int x;
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- // pack dr, dg and db into mm6
- "movl %7, %%eax \n\t"
-@@ -290,7 +298,7 @@
-
- ".Enda: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -309,17 +317,18 @@
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x) // %26
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
-@@ -342,8 +351,15 @@
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-
- short *tmp_err;
- short *tmp_nerr;
-@@ -354,7 +370,7 @@
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- "movl %13, %%eax \n\t" // eax = width
- "movl %%eax, %%ebx \n\t"
-@@ -424,7 +440,7 @@
-
- ".Endc: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -443,19 +459,20 @@
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x), // %26
- "m" (w1), // %27
- "m" (w2) // %28
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (4dca3d0151b4948194d665d740e321c1f99c08a5), Vlad Glagolev, 02/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page