commit 2cad8006aaa1fc21a3a80d4b108dc66771ddead8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "xf86-video-intel: Updated to 2.10.0""
This reverts commit 681b600af31f4645f73e9d490da8539c1c8b6bf7.
2.10.0 works now with commits 8cfc3a7b0bad4d316a60721a0c8d74e9e92f72bd,
35b10d52656cd6c4b3ac8a969b3290ddcec6e865, and
684e4e5758d71400b728d313f2dd5a622ef6333b
commit 684e4e5758d71400b728d313f2dd5a622ef6333b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xf86-video-intel: Depends on libdrm built with Intel KMS API
Fixes one issue found in Bug #15547
commit 35b10d52656cd6c4b3ac8a969b3290ddcec6e865
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libdrm: Allow forcing Intel KMS API
commit 8cfc3a7b0bad4d316a60721a0c8d74e9e92f72bd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
glibc: Remove kernel DRM headers (Bug #15547)
PATCHLEVEL++
Rebuild libdrm if drm/drm.h is registered as from glibc
commit 705c345994164e91c1a18cfad41f98ed45806592
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ipsec-tools: => 0.7.3
commit e28e2c6302202fdaaa30e30a18ec9a279daf3f83
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bind-tools: => 9.6.1-P3
commit 4131b4be4452a5b0b5ad89f44effbd272288e4c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mpd: => 0.15.8
commit 7e4ee969e88df2e49a4e09989ce5108db3cd24c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
pcre: Updated to 8.01
commit 7cdc72430dc6561a3002f7c98aea63508c5b02db
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "dhcpcd: => 5.1.4"
This reverts commit 1f2433419fc595eb76e89e9afb8574f843bb991f.
Same as 5.1.2 (see 8de2ca485d1d370a0a78ca61429156e64149d8e0), does not
start DHCP when called from /etc/network/interfaces.
commit 52b422265442134acc40daeb6cc61af82c1192e5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
shell-term-fm/fish: version 1.23.1
commit aa8faea625dcfed8de1e3dbc06109610cf61551a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
.mailmap: Another map for Tommy :)
commit 8ab6360060ff3da7e1fa23ab0c5e894495ab5f67
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: fixed compilation of apache/*cgi sapis
commit 8b64790b3955734dfe8db5dcfb7d289a71cfb474
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gmime 2.4.13
commit 902366f6c99add5d3aaaa0ecfbdf7f819d9201b2
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>
hercules: updated to 3.06
commit 0d9888d4e3f7740db1d89b1e3b4c0e0acdd7de84
Author: tboatman AT sourcemage.org <root@columbia.(none)>
Commit: tboatman AT sourcemage.org <root@columbia.(none)>
x3270: updated to 3.3.10ga4
changed readline to a non-optional depend
removed INSTALL
commit b639eb3787b9460663c6520feff3f19d0c1eb034
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
samba 3.4.5
commit 8e8551dba933548c0993df485960518962732487
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: => 5.2.12 (after suhosin patch release for 5.2.12)
commit 5e5dca7bd31d5a6d8faf5016c41bd9cb1b6a6dac
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
policykit-gnome 0.96
commit 59edeaf97de2aff131666c6d078bbdb61156ced2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
policykit 0.96
commit f4abaf09bcec27cdba51bd8ca9b24724ce788083
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
.mailmap: Add Tommy Boatman's root map
commit 63ab032d7c6310f27b4348a88e49c41bce1438e4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libtasn1 2.4
commit 4e882bab0e67e4c42231545454da1edbebeecddd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
lsof 4.83
commit 0f4ad7b5a861d0ae67b4d87f57b092a7fc690595
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.27.44
commit 14774953cb3b5e477ed3aac32f3069847ad3e2f5
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
x3270: updated to 3.3.8p3 - future releases
will be moved to suite3270
commit 7bc23dfb21b7e3f4d76986fc020d3565dd000f25
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
totem-pl-parser: put back libxml2, glib2 as dependencies
sorry, didn't thought of UP_TRIGGERS
commit a3c1980d697220e71c364ce7e657f00d5e3a6600
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
util-macros: Updated to 1.5.0
SOURCE matches upstream posted SHA1
diff --git a/.mailmap b/.mailmap
index 60cdbe1..7a7eedb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -65,6 +65,8 @@ Remko van der Vossen <wich AT sourcemage.org> Remko van der
Vossen <wich AT stack.nl>
Remko van der Vossen <wich AT sourcemage.org> Remko van der Vossen
<wich AT yuugen.jp>
Robert Figura <template AT sourcemage.org> Robert Figura
<rfigura@kartoffel.(none)>
Thomas Orgis <sobukus AT sourcemage.org> Thomas Orgis <thomas AT orgis.org>
+Tommy Boatman <tboatman AT sourcemage.org> root <root@columbia.(none)>
+Tommy Boatman <tboatman AT sourcemage.org> tboatman AT sourcemage.org
<root@columbia.(none)>
Tommy Boatman <tboatman AT sourcemage.org> Tommy Boatman
<tboatman2 AT sourcemage.org>
Tommy Boatman <tboatman AT sourcemage.org> Tommy Boatman
<tboatman2 AT houston.rr.com>
Treeve Jelbert <treeve AT sourcemage.org> Treeve Jelbert <treeve AT scarlet.be>
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 416bd33..4f68a0d 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.15.7
+ VERSION=0.15.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:75baf576167d97b7515ef094c07e5612b6c24530112b21e9cc30cbee63d82be9ab42df9f0460ef6e2b074cf9d400dd449616a66178663a03aea3059e729e0fd1
+
SOURCE_HASH=sha512:865b924f272244174397e59ec1574e28eaa5775a67227e70dded7e81d23b3b35a9b15578fa4fed0293744e1124644503cc4f6028b045626640bd255245710e87
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index f48cc21..19073c2 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2010-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.8
+
2009-12-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.7
diff --git a/gnome2-libs/policykit-gnome/DETAILS
b/gnome2-libs/policykit-gnome/DETAILS
index b043836..45311c6 100755
--- a/gnome2-libs/policykit-gnome/DETAILS
+++ b/gnome2-libs/policykit-gnome/DETAILS
@@ -1,5 +1,5 @@
SPELL=policykit-gnome
- VERSION=0.95
+ VERSION=0.96
SOURCE=polkit-gnome-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/polkit-gnome-$VERSION
SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
diff --git a/gnome2-libs/policykit-gnome/HISTORY
b/gnome2-libs/policykit-gnome/HISTORY
index 1773b3e..0b76d9d 100644
--- a/gnome2-libs/policykit-gnome/HISTORY
+++ b/gnome2-libs/policykit-gnome/HISTORY
@@ -1,3 +1,6 @@
+2010-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.96
+
2009-11-25 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: added optional_depends gobject-introspection
diff --git a/gnome2-libs/policykit-gnome/polkit-gnome-0.95.tar.bz2.sig
b/gnome2-libs/policykit-gnome/polkit-gnome-0.95.tar.bz2.sig
deleted file mode 100644
index 2836880..0000000
Binary files a/gnome2-libs/policykit-gnome/polkit-gnome-0.95.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/policykit-gnome/polkit-gnome-0.96.tar.bz2.sig
b/gnome2-libs/policykit-gnome/polkit-gnome-0.96.tar.bz2.sig
new file mode 100644
index 0000000..f0a4891
Binary files /dev/null and
b/gnome2-libs/policykit-gnome/polkit-gnome-0.96.tar.bz2.sig differ
diff --git a/gnome2-libs/policykit/DETAILS b/gnome2-libs/policykit/DETAILS
index e71321b..86a6767 100755
--- a/gnome2-libs/policykit/DETAILS
+++ b/gnome2-libs/policykit/DETAILS
@@ -1,6 +1,6 @@
SPELL=policykit
- VERSION=0.95
-
SOURCE_HASH=sha512:94f1dcec48fe1c0fb3d1aeb499562e7ca0a433eca28bc868323c496a35a27204854f21f9f87ff5e1bf3b7b5624bc9643fadbbd1a2014317e75693f67ced4897f
+ VERSION=0.96
+
SOURCE_HASH=sha512:b21c0531dc4b5663593bb4a9ba343f3ff3d174e2498a025f16da2357e2b643c7aa0ea3e1aca440f1d06eb4dead7d78b5dd7e9902cd2b48aa3f06509ed24c5fd0
SOURCE=polkit-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/polkit-$VERSION
SOURCE_URL[0]=http://hal.freedesktop.org/releases/$SOURCE
diff --git a/gnome2-libs/policykit/HISTORY b/gnome2-libs/policykit/HISTORY
index 7fd3a1a..7e6dbb7 100644
--- a/gnome2-libs/policykit/HISTORY
+++ b/gnome2-libs/policykit/HISTORY
@@ -1,3 +1,6 @@
+2010-01-19 Laidslav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.96
+
2009-12-15 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on docbook-xsl for man page
generation
diff --git a/gnome2-libs/policykit/polkit-0.94.tar.gz.sig
b/gnome2-libs/policykit/polkit-0.94.tar.gz.sig
deleted file mode 100644
index 3bc48ff..0000000
Binary files a/gnome2-libs/policykit/polkit-0.94.tar.gz.sig and /dev/null
differ
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index 1c20412..dd37fb3 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,6 +1,6 @@
SPELL=akonadi
- VERSION=1.2.90
-
SOURCE_HASH=sha512:3e4131907cf5e1edb02e2287375ec012aa4c1750eae7d2c950485a0815df6b7532af1de16a6c2640e25e76858a3399c1dee66dab2109a89cb1b565ca51c2f63f
+ VERSION=1.3.0
+
SOURCE_HASH=sha512:1b2a7edb11734a4a7a6cd3820ab4d3935b6f9193c999155bca64f9279a6609e55ec87d33d8f6219a00b23077c01fa3bc031d33d5174d9f3d008defac1ae782f4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index 995e110..01d4e82 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2010-01-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0
+
2010-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.90
remove multiversion support
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index db78884..4640023 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,9 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: stable/4.2.1 got moved to Attic/4.2.1
+ See http://www.mail-archive.com/release-team AT kde.org/msg03306.html
+ Fixes Bug #15548
+ Removed SOURCE_URL[1], nothing in the phonon directory anymore
+
2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: made glib2 a non-optional dependency,
bug #15506
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index ae2ecd1..1a61007 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2010-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: updated latest to patch-2.6.32.4
+ * info/patches/maintenance_patches/patch-2.6.32.4: added
+ * info/patches/maintenance_patches/patch-2.6.27.44: added
+
2010-01-07 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: updated latest to patch-2.6.32.3
* info/patches/maintenance_patches/patch-2.6.32.3: added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.44
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.44
new file mode 100755
index 0000000..6d6ac80
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.44
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.44"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.4
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.4
new file mode 100755
index 0000000..1fb4863
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 9cb9457..a495921 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
LATEST_2_6=2.6.32
LATEST_PRE_2_6=patch-2.6.32
-LATEST_maintenance_patches=patch-2.6.32.3
+LATEST_maintenance_patches=patch-2.6.32.4
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index ac7a739..fd8b4b3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -41,7 +41,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
+ PATCHLEVEL=1
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.32
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3aaa8f9..8ef253a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Remove kernel DRM headers (Bug #15547)
+ * UP_TRIGGERS: Rebuild libdrm if drm/drm.h is registered as from glibc
+
2009-12-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.11.1
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index c3bb267..c49726c 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -58,6 +58,13 @@ else
fi &&
#
+# Remove kernel DRM headers
+# Fixes Bug #15547
+#
+sed -i '/^header-y += drm\//d' $GLIBC_HEADERS_DIR/include/Kbuild &&
+rm -rf $GLIBC_HEADERS_DIR/include/drm &&
+
+#
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
index 23d6683..b64343d 100755
--- a/libs/glibc/UP_TRIGGERS
+++ b/libs/glibc/UP_TRIGGERS
@@ -2,3 +2,7 @@ if ! spell_ok locale; then
up_trigger locale cast_self
echo
fi
+
+if $(gaze from $INSTALL_ROOT/usr/include/drm/drm.h|grep -q glibc); then
+ up_trigger libdrm cast_self
+fi
diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index 89a36a8..ae4400a 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -2,7 +2,7 @@
if [[ "$GMIME_22BRANCH" == "y" ]]; then
VERSION=2.2.23
else
- VERSION=2.4.12
+ VERSION=2.4.13
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index 4a634bc..25e0d01 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,6 @@
+2010-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.13
+
2010-01-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.12
diff --git a/libs/gmime/gmime-2.4.12.tar.gz.sig
b/libs/gmime/gmime-2.4.12.tar.gz.sig
deleted file mode 100644
index 3d6828a..0000000
Binary files a/libs/gmime/gmime-2.4.12.tar.gz.sig and /dev/null differ
diff --git a/libs/gmime/gmime-2.4.13.tar.gz.sig
b/libs/gmime/gmime-2.4.13.tar.gz.sig
new file mode 100644
index 0000000..6837544
Binary files /dev/null and b/libs/gmime/gmime-2.4.13.tar.gz.sig differ
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index b90bf61..7bd4eac 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: Allow forcing Intel KMS API
+ * REPAIR^none^{PRE_,}SUB_DEPENDS: Replace missing files
+
2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE,BUILD,INSTALL: there is no longer a libdrm subdir
and the kernel modules can not be build here. Made intel optional.
diff --git a/libs/libdrm/PRE_SUB_DEPENDS b/libs/libdrm/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..688b0c9
--- /dev/null
+++ b/libs/libdrm/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..688b0c9
--- /dev/null
+++ b/libs/libdrm/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) [[ "$LIBDRM_INTEL" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/libdrm/REPAIR^none^SUB_DEPENDS
b/libs/libdrm/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000..2a26b03
--- /dev/null
+++ b/libs/libdrm/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_INTEL='--enable-intel'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libdrm/SUB_DEPENDS b/libs/libdrm/SUB_DEPENDS
new file mode 100755
index 0000000..2a26b03
--- /dev/null
+++ b/libs/libdrm/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ INTEL) message "${SPELL_COLOR}libdrm${DEFAULT_COLOR}${MESSAGE_COLOR}
requested with Intel KMS API${DEFAULT_COLOR}" &&
+ LIBDRM_INTEL='--enable-intel'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/libs/libmemcached/DETAILS b/libs/libmemcached/DETAILS
index 5c22215..e429c9e 100755
--- a/libs/libmemcached/DETAILS
+++ b/libs/libmemcached/DETAILS
@@ -1,8 +1,8 @@
SPELL=libmemcached
- VERSION=0.35
+ VERSION=0.37
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://download.tangent.org/$SOURCE
-
SOURCE_HASH=sha512:6b9c839d33f2ae79a167a40d76f2dec1a12aab585713b04779e52550c1fb9a2206ad0bfb64e7b11559d1a1641e552a49902749bc61966e30b4c21b32cd824c6c
+
SOURCE_HASH=sha512:91591c2db18a33695648b576054ecae203414eb9d199678d5648fcabaea7661a558ae794053934e5c0cb58e112750755232f95c78833038514e2ecb35e6ef1e9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://tangent.org/552/libmemcached.html
LICENSE[0]=BSD
diff --git a/libs/libmemcached/HISTORY b/libs/libmemcached/HISTORY
index b7dd194..08b54b2 100644
--- a/libs/libmemcached/HISTORY
+++ b/libs/libmemcached/HISTORY
@@ -1,2 +1,5 @@
+2010-01-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.37
+
2009-11-23 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD, DETAILS, DEPENDS: spell created
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index aee95f1..fa227ff 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtasn1
- VERSION=2.3
+ VERSION=2.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index ef4bdff..106f169 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2010-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4
+
2009-07-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3
diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index a1fb2a5..e8d66bf 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.00
+ VERSION=8.01
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index bd2ca3d..e8f339c 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2010-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 8.01
+
2009-10-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 8.00
# Check to see if internal GD requested
if [[ "${PHP5_GD}" == "internal" ]]; then
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 3bb4130..8c4b411 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -26,13 +26,21 @@ config_query_option PHP5_OPTS "Enable calendar support?"
y \
config_query_option PHP5_OPTS "Enable pcntl support (Only affects CLI/CGI)"
n \
"--enable-pcntl" "--disable-pcntl" &&
-message "${MESSAGE_COLOR}Both FastCGI and CGI can be enabled at the same
time${DEFAULT_COLOR}" &&
+message "${MESSAGE_COLOR}Apache-based and *CGI SAPIs are mutually exclusive
(though both FastCGI and CGI can be enabled at the same
time)${DEFAULT_COLOR}" &&
-config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
- "--enable-fastcgi" "--disable-fastcgi" &&
+config_query_list PHP5_SAPI "What SAPI do you want to use?" \
+ apache cgi &&
if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" ||
list_find "$PHP5_OPTS" "--enable-fastcgi" ; then
message "${MESSAGE_COLOR}Enabling CLI version for PEAR/CGI/FastCGI
support${DEFAULT_COLOR}" &&
@@ -113,9 +121,6 @@ config_query_option PHP5_OPTS "Enable System V semaphore
support?" n \
config_query_option PHP5_OPTS "Enable System V shared memory support?" n \
"--enable-sysvshm" "--disable-sysvshm" &&