New commits:
commit 8dd9feb4fa6e85e3088c372296779f0ed7dc5f3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.60-4
commit 06f642c200f91857592de1e60e7f0e68c4898298
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libsasl: => 2.1.25
(cherry picked from commit 27fe52de5d25c5d3b6d9daaf589cd9204a03edd0)
commit a2ef18929a282037a38cac34382e60a19674fa61
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libsasl: fixed long description wrap (scripted)
(cherry picked from commit dd9d043a3dbe5d8cd8fec4bab0981730664d3c46)
commit b6472292bd9df6c083939fdfdeec41b07d3dd7a7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
spine: => 0.8.7i
(cherry picked from commit 2d8027a02f5532201738a465d37c33f1edf79f72)
commit 811cdcc32e41e838fd2144d5afbd340e59561e77
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cacti: => 0.8.7i (security)
(cherry picked from commit 8954c73b2da81d8d3c0f2daa44a2361a9647388d)
commit 10cf3a6063aaca3fa9905a2b5da5b3b5199956b3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl 0.9.8t, 1.0.0g, SECURITY_PATCH=15
(cherry picked from commit 4aaec186408d348e6c7a90f25299ea48e37ba638)
commit 901d63bd5e8c33c1a332f97668fd85757d4e0b59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cyrus-sasl: => 2.1.25
(cherry picked from commit 67e9f75bf34dac0b056f3bdc85e537cb34f330e2)
commit d1beb545256aaa37d3575ef07b42f9eddc226608
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ipset: => 6.11
(cherry picked from commit b6ad334c2fdd26baa2dac1af492d7e650f0374bf)
commit 3a2d46ce11f5c53a67e357e0f9e8e96ba6d2f4d6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ftp/ncftp: fixed source url
(cherry picked from commit 6d051623d87de4601291e6f6f36d110c5a7dca4c)
commit ae7b334e4f0b478254ceefebe9c4f7a676bdedc5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
windowmanager/blackbox: fixed typo in DEPENDS
(cherry picked from commit 3fd7aa99f5985df6cf568f3b73c584c4a19ddf10)
commit 703946f981ae5eefcefbcedb5439ec31d0c990a5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg 0.7.11, SECURITY_PATCH=10
(cherry picked from commit 6063e1df4ce88b7abe83dc222c2dab786c8169ba)
commit 6e44e96709a0d5f4495edfe6f5c88f36543677e1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.7.10
(cherry picked from commit d74ba156fe40174ca52aa0b53789039c8c64c89e)
commit ea47d9a0df6c1f60d01dcbb3b88dd73e5e65d777
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg 0.7.9
(cherry picked from commit feec368174f8fa95268fab857aef06a092ba43ec)
commit f46c814dc04edfe7424af451befc76b720f5ccfe
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
kde4-apps/FUNCTIONS fix path to find correct QT binaries
(cherry picked from commit 6a649defadf2f5d5bef76e2a2009707d29027a8f)
Conflicts:
ChangeLog
commit b7eadf19403cbabd0085c669f5f2f574e29fc237
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.6.5, SECURITY_PATCH=34
(cherry picked from commit a1186c394a6eb170f6852193b4ec3b1e850adc30)
Conflicts:
security/wireshark/HISTORY
commit 22e61e8ee19a6a2207ccb1edcd7e200203225c87
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark: => 1.6.4
(cherry picked from commit 35c5d1428df877a420fdd9ae6744c9e0d8c9e9e2)
commit 25cd71b08b94e1a753aa86025d1f1ad3b036001a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2 - force minimise size of kernel.img
(cherry picked from commit d9827e06a5b14d430182755124b3e27d579bf120)
commit 0a06815035c7930563319f128e3ad844366a7add
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
disk/grub2: forced disable_pic for all architectures
(cherry picked from commit ef2c9c334d6641f7c4b68842af23aa54547530b5)
commit 7bf3afd5034b971ea5803c0c9cbe5bec8be430c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: Disable PIC for x86
Error without PIC disabled on x86:
gcc -DHAVE_CONFIG_H -I. -I.. -Wall -W -I../include -I../include
-DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -nostdinc -isystem
/usr/lib/gcc/i686-pc-linux-gnu/4.6.2/include
-DGRUB_FILE=\"loader/i386/xnu.c\" -I. -I. -I.. -I.. -I../include
-I../include -Os -Wall -W -Wshadow -Wpointer-arith
-Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1
-falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2
-mno-3dnow -fno-dwarf2-cfi-asm -m32 -fno-stack-protector
-mno-stack-arg-probe -Wno-trampolines -mrtd -mregparm=3
-ffreestanding -march=native -mtune=native -m32 -pipe -DPIC -fPIC -O2
-MT loader/i386/xnu_module-xnu.o -MD -MP -MF
loader/i386/.deps-core/xnu_module-xnu.Tpo -c -o
loader/i386/xnu_module-xnu.o `test -f 'loader/i386/xnu.c' || echo
'./'`loader/i386/xnu.c
loader/i386/xnu.c: In function 'grub_cpu_xnu_fill_devicetree':
loader/i386/xnu.c:184:3: error: PIC register clobbered by '%rbx' in
'asm'
In file included from loader/i386/xnu.c:27:0:
../include/grub/i386/tsc.h:47:3: error: PIC register clobbered by '%rbx'
in 'asm'
../include/grub/i386/tsc.h:47:3: error: PIC register clobbered by '%rbx'
in 'asm'
make[3]: *** [loader/i386/xnu_module-xnu.o] Error 1
make[3]: Leaving directory `/usr/src/grub-1.99/grub-core'
(cherry picked from commit 956770cf4398d4bf92115606a191454993e5493f)
commit 5746dab8c59fec39aa7a608d0f70dd51ffe61e7d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: Remove debugging echo
(cherry picked from commit dfe2bdb3709aeae2bd9d7be4edd2a25a5b9a3299)
commit 8feaf7b164cb74d82f9240e33f1bb4733e916b99
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: Cleaned up HISTORY formatting
(cherry picked from commit a89a979304ae06250d2e85bf23ddf278e694a7d8)
commit fb6fbdbfa74d26b32d80230d799409801f7de7b3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: fstest is no longer a valid option with 1.99
configure: WARNING: unrecognized options: --disable-grub-fstest
(cherry picked from commit c99dbb70c6102b117ab2f0a017d1becad5158606)
commit 6ab19509887478c880b3c05b7831f94852b78ec4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grub2: => 1.99
(cherry picked from commit 04d1f5e1a84d0d9647ee707511a3e5f2a2619147)
diff --git a/ChangeLog b/ChangeLog
index 8fc9e87..eb046b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-01-13 Thomas Orgis <sobukus AT sourcemage.org>
+ * kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
+
2011-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* doc/ebook-tools: new spell - tools for converting ebook formats
can be used by okular
diff --git a/VERSION b/VERSION
index 784e2b3..13f0a0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-3
+0.60-4
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec8500..d1d1c7a 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=cyrus-sasl
- VERSION=2.1.23
+ VERSION=2.1.25
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index e333934..138848b 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,8 @@
+2012-01-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.25; quoting paths
+ * gcc44.diff: removed, fixed by upstream
+ * db5.patch: added, for db >5.0 support
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ec632ca..ba9528d 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/gcc44.diff
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/db5.patch b/crypto/cyrus-sasl/db5.patch
new file mode 100644
index 0000000..5228240
--- /dev/null
+++ b/crypto/cyrus-sasl/db5.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej AT debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR
>= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR
>= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE,
0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/crypto/cyrus-sasl/gcc44.diff b/crypto/cyrus-sasl/gcc44.diff
deleted file mode 100644
index 9f3fb53..0000000
--- a/crypto/cyrus-sasl/gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c 2006-05-17 18:46:17.000000000 +0200
-+++ plugins/digestmd5.c.cp 2009-04-07 16:20:31.000000000 +0200
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/crypto/libsasl/DETAILS b/crypto/libsasl/DETAILS
index fad5341..40532b1 100755
--- a/crypto/libsasl/DETAILS
+++ b/crypto/libsasl/DETAILS
@@ -1,5 +1,5 @@
SPELL=libsasl
- VERSION=2.1.23
+ VERSION=2.1.25
SOURCE=cyrus-sasl-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cyrus-sasl-$VERSION
@@ -13,7 +13,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/cyrus-sasl-$VERSION
ENTERED=20090722
SHORT="Cyrus SASL (RFC 2222) Library"
cat << EOF
-This is the Cyrus SASL API implentation. This spell can only be used on the
client
-side to provide authentication. Use the cyrus-sasl spell for server side
authentication.
+This is the Cyrus SASL API implentation. This spell can only be used on
+the client
+side to provide authentication. Use the cyrus-sasl spell for server side
+authentication.
See RFC 2222 for more information.
EOF
diff --git a/crypto/libsasl/HISTORY b/crypto/libsasl/HISTORY
index 7ab135d..717651c 100644
--- a/crypto/libsasl/HISTORY
+++ b/crypto/libsasl/HISTORY
@@ -1,3 +1,9 @@
+2011-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.25
+
+2011-10-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed long description wrap (scripted)
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c195bf3..6f9094d 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8s
- SECURITY_PATCH=14
+ VERSION=0.9.8t
+ SECURITY_PATCH=15
;;
1.0)
- VERSION=1.0.0f
- SECURITY_PATCH=14
+ VERSION=1.0.0g
+ SECURITY_PATCH=15
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 04837c3..ad4034a 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8t, 1.0.0g, SECURITY_PATCH=15
+ http://www.openssl.org/news/secadv_20120118.txt
+
2012-01-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8s, 1.0.0f, SECURITY_PATCH=14 http://www.openssl.org/news/secadv_20120104.txt
diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index 590633f..564f1c6 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -1,3 +1,5 @@
OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" &&
-make_single &&
+CFLAGS=${CFLAGS/-m64/} &&
+CFLAGS=${CFLAGS/-O?/-Os} &&
+disable_pic force &&
default_build
diff --git a/disk/grub2/CONFIGURE b/disk/grub2/CONFIGURE
index f79d5ef..ccc09ee 100755
--- a/disk/grub2/CONFIGURE
+++ b/disk/grub2/CONFIGURE
@@ -4,6 +4,9 @@
list_remove GRUB2_OPTS '--enable-grub-mkfont' &&
list_remove GRUB2_OPTS '--enable-grub-emu' &&
list_remove GRUB2_OPTS '--enable-grub-pe2elf' &&
+# fstest is no longer an option as of 1.99
+list_remove GRUB2_OPTS '--enable-grub-fstest' &&
+list_remove GRUB2_OPTS '--disable-grub-fstest' &&
config_query_option GRUB2_OPTS 'include memory manger debugging?' n \
'--enable-mm-debug' \
@@ -11,9 +14,6 @@ config_query_option GRUB2_OPTS 'include memory manger
debugging?' n \
config_query_option GRUB2_OPTS 'build and install the grub-emu-usb debugging
utility?' n \
'--enable-grub-emu-usb' \
'--disable-grub-emu-usb' &&
-config_query_option GRUB2_OPTS 'build and install the grub-fstest debugging
utility?' n \
- '--enable-grub-fstest' \
- '--disable-grub-fstest' &&
config_query_option GRUB2_OPTS 'build and install the efiemu runtimes?' y \
'--enable-efiemu' \
'--disable-efiemu'
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index 3891283..d21f5d9 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -10,6 +10,11 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
depends RUBY
fi &&
+optional_depends lvm \
+ '--enable-device-mapper' \
+ '--disable-device-mapper' \
+ 'device Mapper/ RAID support' &&
+
optional_depends freetype2 \
'--enable-grub-mkfont' \
'--disable-grub-mkfont' \
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index a29e9bc..83c13e8 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -11,10 +11,10 @@
# SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
# SOURCE_IGNORE=volatile
#else
- VERSION=1.98
+ VERSION=1.99
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
- SOURCE_URL[0]=http://alpha.gnu.org/gnu/grub/$SOURCE
+ SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/grub-${VERSION}
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 2bbdb30..8e6c388 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,5 +1,27 @@
+2012-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: explicity disable device mapper/ LVM support
+ * BUILD: force -Os
+ without this, the kernel image is too big to install on one of my
machines
+ * grub-default: update to latest syntax
+
+2012-01-11 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: force disable_pic for all architectures
+
+2012-01-10 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Remove debugging echo
+ Disable PIC for x86
+ * CONFIGURE: fstest is no longer a valid option with 1.99
+
+2012-01-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.99
+ use GNU_URL
+ * BUILD: remove make_single
+ strip -m64 from CFLAGS
+ * config, volatiles: add /etc/grub.d
+
2011-09-20 Arjan Bouter <abouter AT sourcemage.org>
- * CONFIGURE: remove obsolete emu and pe2elf options from GRUB_OPTS
(fixes bug #212)
+ * CONFIGURE: remove obsolete emu and pe2elf options from GRUB_OPTS
(fixes
+ bug #212)
2011-08-17 Robin Cook <rcook AT wyrms.net>
* BUILD: added configure switch to disable -Werror
@@ -9,7 +31,8 @@
gettext disable -> enable for enable option
gettext isn't actually optional
./configure doesn't --enable-gettext is --disable-device-mapper
- Doesn't actually care if lvm is installed or not, always builds the
LVM modules
+ Doesn't actually care if lvm is installed or not, always builds the
LVM
+ modules
2011-05-27 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: switched to http download
@@ -19,17 +42,20 @@
* BUILD: Fails with multiple make jobs
2010-03-29 Sukneet Basuta <sukneet AT sourcemage.org>
- * grub-default: changed GRUB_DISTRIBUTOR to "SourceMage", grub did
not like the space
+ * grub-default: changed GRUB_DISTRIBUTOR to "SourceMage", grub did
not like
+ the space
2010-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.98
- Commented out SCM version, as bazaar is now used and is not yet
supported by summon
+ Commented out SCM version, as bazaar is now used and is not yet
supported
+ by summon
* CONFIGURE: removed "--enable-grub-pe2elf" option, no longer in
configure
changed blabla
removed "--enable-grub-emu", no longer seems to be used
added "--enable-mm-debug" to include memory manager debugging
* PREPARE: Commented out SVN query
- * DEPENDS: addded optional dependency on SDL for grub-emu debugging
with sdl support
+ * DEPENDS: addded optional dependency on SDL for grub-emu debugging
with
+ sdl support
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 0938ade..457375e 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -2,4 +2,6 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
+else
+ rm -rf autom4te.cache
fi
diff --git a/disk/grub2/configs b/disk/grub2/configs
index 7af7e16..559e48c 100755
--- a/disk/grub2/configs
+++ b/disk/grub2/configs
@@ -1,2 +1,3 @@
^/boot/grub/grub.cfg$
^/etc/default/grub$
+^/etc/grub.d/*
diff --git a/disk/grub2/grub-default b/disk/grub2/grub-default
index 3683aaa..a1631d0 100644
--- a/disk/grub2/grub-default
+++ b/disk/grub2/grub-default
@@ -7,8 +7,8 @@ GRUB_HIDDEN_TIMEOUT=0
# Graphics mode
GRUB_GFXMODE=640x480
# Add recovery items (single mode)
-GRUB_DISABLE_LINUX_RECOVERY=
+GRUB_DISABLE_RECOVERY=
# Booting using UUID's appears broken
-GRUB_DISABLE_LINUX_UUID=true
+GRUB_DISABLE_UUID=true
# We rule ;)
GRUB_DISTRIBUTOR="SourceMage"
diff --git a/disk/grub2/volatiles b/disk/grub2/volatiles
index 7af7e16..559e48c 100755
--- a/disk/grub2/volatiles
+++ b/disk/grub2/volatiles
@@ -1,2 +1,3 @@
^/boot/grub/grub.cfg$
^/etc/default/grub$
+^/etc/grub.d/*
diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 8b153dc..93389d7 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -10,7 +10,7 @@ if [[ "$NCFTP_IPV6" == "y" ]]; then