Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (8dd9feb4fa6e85e3088c372296779f0ed7dc5f3a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (8dd9feb4fa6e85e3088c372296779f0ed7dc5f3a)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (8dd9feb4fa6e85e3088c372296779f0ed7dc5f3a)
  • Date: Thu, 19 Jan 2012 08:33:11 -0600
GIT changes to stable-0.60 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 +
VERSION | 2 -
crypto/cyrus-sasl/DETAILS | 4 +-
crypto/cyrus-sasl/HISTORY | 5 ++
crypto/cyrus-sasl/PRE_BUILD | 7 ++-
crypto/cyrus-sasl/db5.patch | 24 ++++++++++++
crypto/cyrus-sasl/gcc44.diff | 20 ----------
crypto/libsasl/DETAILS | 8 ++--
crypto/libsasl/HISTORY | 6 +++
crypto/openssl/DETAILS | 8 ++--
crypto/openssl/HISTORY | 4 ++
disk/grub2/BUILD | 4 +-
disk/grub2/CONFIGURE | 6 +--
disk/grub2/DEPENDS | 5 ++
disk/grub2/DETAILS | 4 +-
disk/grub2/HISTORY | 36 ++++++++++++++++---
disk/grub2/PRE_BUILD | 2 +
disk/grub2/configs | 1
disk/grub2/grub-default | 4 +-
disk/grub2/volatiles | 1
ftp/ncftp/DETAILS | 2 -
ftp/ncftp/HISTORY | 3 +
kde4-apps/FUNCTIONS | 7 ++-
net/cacti/DETAILS | 18 +++------
net/cacti/HISTORY | 5 ++
net/cacti/INSTALL | 7 ---
net/cacti/PREPARE | 4 --
net/cacti/PRE_BUILD | 14 -------
net/cacti/patches/settings_checkbox.patch | 56
++++++++++++++++++++++++++++++
net/ipset/DETAILS | 4 +-
net/ipset/HISTORY | 3 +
net/spine/DETAILS | 4 +-
net/spine/HISTORY | 3 +
security/wireshark/CONFIGURE | 5 ++
security/wireshark/DEPENDS | 2 -
security/wireshark/DETAILS | 6 +--
security/wireshark/HISTORY | 12 ++++++
video/ffmpeg/DETAILS | 6 +--
video/ffmpeg/HISTORY | 9 ++++
windowmanagers/blackbox/DEPENDS | 2 -
windowmanagers/blackbox/HISTORY | 3 +
41 files changed, 231 insertions(+), 98 deletions(-)

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

SOURCE_HASH=sha512:7fad4b2234e4f4506c5129cfccba1b4d89172b40e5d611c16d11722a3c1a602b0644ad11784eab2ad412aca245c23dfd471f344ece954b791d7ce9d9404ecfc7
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/older_versions/${SOURCE}
VERSION2=20080821
SOURCE2=$SPELL-$(echo $VERSION | sed -e
's/\.//g')-v6-$VERSION2.diff.gz
SOURCE2_URL[0]=ftp://ftp.kame.net/pub/kame/misc/$SOURCE2
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index 25e4a77..702311e 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixe source url
+
2011-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: SOURCE_HASH updated, sources changed upstream, #15942

diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 2ea66b4..527e375 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -1,12 +1,13 @@
prepare_environment() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
- PATH="$QTDIR/bin/qt4:$PATH" &&
-
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
KDE4ETC="$INSTALL_ROOT/etc" &&

PATH="$KDE4DIR/bin:$PATH" &&
+ # Correct QT binaries need to be found first!
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+ PATH="$QTDIR/bin/qt4:$PATH" &&
+
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
QT_PLUGIN_PATH="$KDE4DIR/lib/kde4/plugins"
}
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 4971f4d..6b878be 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,16 +1,10 @@
SPELL=cacti
- VERSION=0.8.7h
- SECURITY_PATCH=2
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:cbd96e8d0fd0fe49249fa4b85174dbdf27d79b42a7934a6466995585f748ddc8b771cd7903199fe4e53d54b1bcfd3c271bbdc93477904cece00520b65c806ebf
-if [[ $CACTI_PA == y ]]; then
- VERSION_PA=3.0
- SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
- SOURCE2_URL[0]=http://www.cacti.net/downloads/pia/$SOURCE2
-
SOURCE2_HASH=sha512:2d6d45b2095ec1c09e504516f5c0ebee8734c351a25750565ec09fe5d2a98ccc6e74e0bed12e005d4157f4ec85a3fe3941bf0e538621011c36ba79f0f764c224
-SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=0.8.7i
+ VERSION_PIA=3.1
+ SECURITY_PATCH=3
+ SOURCE=$SPELL-$VERSION-PIA-${VERSION_PIA}.tar.gz
+
SOURCE_HASH=sha512:239e5e4f8697029b6075cd194937aefd95bba961388c98591a867d2ad83d3284d9960bf1ca9241e167f100697fd91b532d311d842a91d63220d6b678eec3699c
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-PIA-${VERSION_PIA}"
SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.cacti.net/
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 92862c4..f688dd0 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i; SECURITY_PATCH++; PA is now
bundled
+ * PREPARE: removed
+ * patches: added official patch
(http://cacti.net/download_patches.php)
+
2011-10-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.7h; SECURITY_PATCH++; updated plugin
arch to 3.0; updated PA source url
diff --git a/net/cacti/INSTALL b/net/cacti/INSTALL
index cd7fd58..3ab09b7 100755
--- a/net/cacti/INSTALL
+++ b/net/cacti/INSTALL
@@ -1,6 +1 @@
-cd ${SOURCE_DIRECTORY} &&
-install_www_files &&
-
-if [[ $CACTI_PA == y ]]; then
- rm_source_dir "$SOURCE_DIRECTORY2"
-fi
+install_www_files
diff --git a/net/cacti/PREPARE b/net/cacti/PREPARE
deleted file mode 100755
index 521ab6d..0000000
--- a/net/cacti/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-message "Plugin Architecture provides users with the ability to write or
use\n" \
- "plugins with Cacti" &&
-
-config_query CACTI_PA "Install Plugin Architecture?" n
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 5d34beb..4f1cd3f 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -5,18 +5,4 @@ if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
patch -p1 < $patch
done
-fi &&
-
-if [[ $CACTI_PA == y ]]; then
- mk_source_dir "$SOURCE_DIRECTORY2"
- cd "$SOURCE_DIRECTORY2" &&
- unpack_file 2 &&
-
- cd "$SOURCE_DIRECTORY" &&
-
- cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
- patch -p1 <
"$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff"
&&
-
- # cleaning up post-patching
- rm -f *.orig
fi
diff --git a/net/cacti/patches/settings_checkbox.patch
b/net/cacti/patches/settings_checkbox.patch
new file mode 100644
index 0000000..2226df2
--- /dev/null
+++ b/net/cacti/patches/settings_checkbox.patch
@@ -0,0 +1,56 @@
+--- 0.8.7i/graph_settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/graph_settings.php 2011-12-21 11:34:38.000000000 -0500
+@@ -54,7 +54,29 @@
+
+ while (list($tab_short_name, $tab_fields) = each($settings_graphs)) {
+ while (list($field_name, $field_array) = each($tab_fields)) {
+- if ((isset($field_array["items"])) &&
(is_array($field_array["items"]))) {
++ if ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("REPLACE INTO
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] .
",'$field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] .
",'$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name,
$sub_field_array) = each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("REPLACE INTO
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] .
",'$sub_field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] .
",'$sub_field_name', '')");
++ }
++ }
++ }elseif ($field_array["method"] ==
"textbox_password") {
++ if ($_POST[$field_name] !=
$_POST[$field_name."_confirm"]) {
++ raise_message(4);
++ break;
++ }elseif (isset($_POST[$field_name])) {
++ $value =
$cnn_id->qstr(get_request_var_post($field_name));
++ db_execute("REPLACE INTO
settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] .
",'$field_name', $value)");
++ }
++ }elseif ((isset($field_array["items"])) &&
(is_array($field_array["items"]))) {
+ while (list($sub_field_name,
$sub_field_array) = each($field_array["items"])) {
+ if (isset($_POST[$sub_field_name])) {
+ $value =
$cnn_id->qstr(get_request_var_post($sub_field_name));
+--- 0.8.7i/settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/settings.php 2011-12-21 13:50:23.868244800 -0500
+@@ -32,6 +31,20 @@
+ while (list($field_name, $field_array) =
each($settings{$_POST["tab"]})) {
+ if (($field_array["method"] == "header") ||
($field_array["method"] == "spacer" )){
+ /* do nothing */
++ }elseif ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("replace into settings
(name,value) values ('$field_name', 'on')");
++ }else{
++ db_execute("replace into settings
(name,value) values ('$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name, $sub_field_array) =
each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("replace into settings
(name,value) values ('$sub_field_name', 'on')");
++ }else{
++ db_execute("replace into settings
(name,value) values ('$sub_field_name', '')");
++ }
++ }
+ }elseif ($field_array["method"] == "textbox_password") {
+ if ($_POST[$field_name] !=
$_POST[$field_name."_confirm"]) {
+ raise_message(4);
diff --git a/net/ipset/DETAILS b/net/ipset/DETAILS
index 45782f4..15fd03b 100755
--- a/net/ipset/DETAILS
+++ b/net/ipset/DETAILS
@@ -6,9 +6,9 @@ if is_version_less $(get_kernel_version) 2.6.35; then
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_HASH=sha512:ccac555257600b8fd2e229426514582e6f3f04000b4f2bc704d28efdae0869c1c6952ddb9a833a32e49604d16a4a9aa0a5ea847d469a31e567e84f36b76e19f2
else
- VERSION=6.9.1
+ VERSION=6.11
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:024a071613fd56577a2fd37ea6e2a961c113f3ca816077fd24b1698e4bd78a8cb3897291505ea02a9b6565b110170ba93b321b3e1a6476ce93b8d93abe3bd1ed
+
SOURCE_HASH=sha512:ac210f71c2a7a55fc71e36044b8d35174c4a423c74204ac24f056b684af03dde57a617d1f0f4f8e77336db8d716a4d50b58704038fb34073f8fa1bffa9d44210
fi
SOURCE_URL[0]=http://ipset.netfilter.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index 3630102..f45283a 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,2 +1,5 @@
+2012-01-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.11
+
2011-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE_}BUILD, INSTALL: spell created
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 13385aa..e8d4fcc 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
SPELL=spine
- VERSION=0.8.7h
+ VERSION=0.8.7i
SOURCE=cacti-$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:681ea0849a477636348fbede7b11d04900cb3a2bbcb747deccaea31c67adfdb07f2692934a44de5975a142632154c7249ca66455c4f1beb1679bcfb56088e396
+
SOURCE_HASH=sha512:3ccca10cdd12672c37591579a9ce9e70a7b4a60c562904ed99c4f26bd73b9227421ea0ba3a87351629847fcf54fdc659404b6e0abaf97d4b63213de82703fabd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
WEB_SITE=http://www.cacti.net/spine_info.php
LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index eac4652..d8fe182 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i
+
2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.7h
* DEPENDS: added libcap optional dependency
diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index cf67d9b..5d4e1cc 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -4,5 +4,10 @@ config_query_option WIRESHARK_OPTS \
"--disable-ipv6" &&

config_query_option WIRESHARK_OPTS \
+ "Enable threads support?" n \
+ "--enable-threads" \
+ "--disable-threads" &&
+
+config_query_option WIRESHARK_OPTS \
"Install dumpcap as setuid?" n \
"--enable-setuid-install" ""
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index c79165f..0a77ad6 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -1,4 +1,4 @@
-depends glibc "--enable-threads" &&
+depends glibc &&
depends glib2 &&
depends libpcap &&

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 1a2cb70..08e4196 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.3
- SECURITY_PATCH=33
+ VERSION=1.6.5
+ SECURITY_PATCH=34
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:fb2c231bd5d90db769d3d571b75085a3722399e2f94f1d4e518a4137e26444db6381b229eef3cae4000e38b3cec4f56f4bc0d644a8adebf595f5d24d9bc44eb6
+
SOURCE_HASH=sha512:67c12d6853219f3c57c7946ffb98697639e9e40fc4c0b9dc27ca50b301fb40cb74c08d31cc35b1120cbb0315f1ddcce47d82ae2dec9733a764614090c76df0f3
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 8501af9..e8190e9 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,15 @@
+2012-01-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.5, SECURITY_PATCH=34
+ * PRE_BUILD, dumpcap.patch: removed
+
+2011-11-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.4
+ * DEPENDS: made threads support optional
+ * CONFIGURE: added option for thread support (officially disabled by
+ default)
+ * PRE_BUILD: added, to apply the patch
+ * dumpcap.patch: added, to fix compilation with threads support
+
2011-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3, SECURITY_PATCH=33
http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index bf605c2..5a47e72 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg
- VERSION=0.7.8
- SECURITY_PATCH=9
+ VERSION=0.7.11
+ SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-
SOURCE_HASH=sha512:2368bd2d7c3d553fedbfa6e2e738c60a76951f61702d5fd4b030f542ff92c98f43f3e494f56c57dcafe156d007447ca109b096b95cd57415c216530aa381ef60
+
SOURCE_HASH=sha512:2078e13d40d660a85540349681c7a9a8d2648812167775c2d28cd1be3e29eb34aae944e18e1c798e4cf52f631737af1831eb508634e47e6ae0dee5c0cf9fe0fa
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index 676d75f..b4687aa 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,12 @@
+2012-01-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.11, SECURITY_PATCH=10
+
+2012-01-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.10
+
+2012-01-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.9
+
2011-11-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.8, SECURITY_PATCH=9

diff --git a/windowmanagers/blackbox/DEPENDS b/windowmanagers/blackbox/DEPENDS
index d381d56..ff5c67f 100755
--- a/windowmanagers/blackbox/DEPENDS
+++ b/windowmanagers/blackbox/DEPENDS
@@ -1,5 +1,5 @@
depends xorg-libs &&
-if [[ ${BLACKBOX_BRANCH == scm ]]; then
+if [[ $BLACKBOX_BRANCH == scm ]]; then
depends libtool &&
depends automake
fi &&
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index 2a57897..256a4ba 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed { which prevented the spell from being built
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch



  • [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (8dd9feb4fa6e85e3088c372296779f0ed7dc5f3a), Vlad Glagolev, 01/19/2012

Archive powered by MHonArc 2.6.24.

Top of Page