New commits:
commit f6b27a088e319f1a150632761fcc0f055c0d4de3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.59-4
commit c3c36d80f05abcc50d2b0670a93a1a9e81ee6a9f
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunderbird: updated version to 6.0.2, SECURITY_PATCH=28 (MFSA 2011-35)
(cherry picked from commit 2acea6469ee4fb4e9ce16d7c03150e77b6f73296)
commit db2a6feac76a00e861791c3293b1bb25e7ab3a6a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunderbird 6.0.1, SECURITY_PATCH=27, MFSA 2011-34
(cherry picked from commit 831b75c8849ada71b517ab8d1e29bb79692e3079)
commit 95946d6a8e7c3cde2a2bf889e16a1bc8c3e4ebae
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunderbird: updated version to 6.0
(cherry picked from commit c9bf457fca6685dfc80d4babd2b0f8b00dbc6ad0)
commit 42b1024e87776756e99b48d2496609964ee9ffbe
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunderbird: Updated to version 5.0. Various fixes need for
this specific build.
(cherry picked from commit 55f17eaa2fd336ffe659f085899f96e17022b067)
commit 5e80151249ce463e1e26aed308949d010e078b5c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: security bump (legacy)
(cherry picked from commit 68bae4bcc4b2cfbd1af9a242e7a756adfdbc29a8)
commit e86e9b20b4b8bd2b1005c736648b73068b6a00a6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: apply the latest suhosin patch for legacy PHP branch
(cherry picked from commit 8a05f5322219ca38be1e0558ea12e39ebda0e265)
commit 8baa8852e5314e5c6278e5b688d03cc58810481d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/ChangeLog b/ChangeLog
index 1ebbe49..a512970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * apache.gpg: added public key B55D9977 (William A. Rowe, Jr.
+ <wrowe AT rowe-clan.net>)
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* apache.gpg: added 791485A8 public key (Jim Jagielski (Release
Signing
Key) <jim AT apache.org>)
diff --git a/VERSION b/VERSION
index 18e093e..bf06229 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.59-3
+0.59-4
diff --git a/apache.gpg b/apache.gpg
index 7c7efad..67d54cc 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/devel/perl/DETAILS b/devel/perl/DETAILS
index a66bbf7..4d5bdf4 100755
--- a/devel/perl/DETAILS
+++ b/devel/perl/DETAILS
@@ -1,6 +1,7 @@
SPELL=perl
- VERSION=5.14.1
-
SOURCE_HASH=sha512:24b8e2f50d7031f255ddbc45e0a608e79f3d0a6c55e2c0243944e23f5ab01679567a92712179e3b2ebd4df89ef3a84ee5ab875bd9cfbda16c0cc14147cdfa705
+ VERSION=5.14.2
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:023a0d86302ebf2cbc22457e6799fe75c07498a4974abacdff5b6259982bb4a0388585e57d50b52ea05a1ab186d4bc9d47e80c0981ef9288d502e42f18a21144
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.cpan.org/src/5.0/$SOURCE
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index 9a321b6..a77d3db 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,7 @@
+2011-09-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.14.2; SECURITY_PATCH++
+ (fixes CVE-2011-2728, CVE-2011-2939)
+
2011-06-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.14.1
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index aea9a4b..600cae4 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * REPAIR^all^{,PRE}SUB_DEPENDS: use the latest version for REPAIR not
some ancient
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: killed another typo
diff --git a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
index 34515c6..5922183 100755
--- a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
+++ b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
case $THIS_SUB_DEPENDS in
- EXTRAS) list_find "$UDEV_OPTS" --enable-extras;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
+ EXTRAS) message "the spell you are trying to cast is broken."
+ message "Udev's sub_depends have changed, contact the maintainer."
;;
+ GUDEV) is_depends_enabled $SPELL glib2 && return 0 ;;
+ ACL) is_depends_enabled $SPELL acl && return 0 ;;
+ HWDB) list_find "$UDEV_HWDB" --enable-hwdb ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
esac
diff --git a/disk/udev/REPAIR^all^SUB_DEPENDS
b/disk/udev/REPAIR^all^SUB_DEPENDS
new file mode 100755
index 0000000..f078172
--- /dev/null
+++ b/disk/udev/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,9 @@
+case "$THIS_SUB_DEPENDS" in
+ EXTRAS) message "${PROBLEM_COLOR}EXTRAS is obsolete, please fix the
spell using it${DEFAULT_COLOR}" ;;
+ GUDEV) depends glib2 '--enable-gudev' ;;
+ ACL) depends acl '--enable-udev_acl' ;;
+ HWDB) list_remove UDEV_HWDB '--disable-hwdb'
+ list_add UDEV_HWDB '--enable-hwdb' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index e8bcf7a..494eb0a 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,5 +1,6 @@
SPELL=librsvg2
- VERSION=2.32.1
+ VERSION=2.34.1
+ SECURITY_PATCH=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL%?}-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%?}-$VERSION"
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 54746cd..2947639 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,9 @@
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.34.1; SECURITY_PATCH++
+
+2011-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.34.0
+
2010-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1
diff --git a/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig
deleted file mode 100644
index 08561f3..0000000
Binary files a/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
new file mode 100644
index 0000000..4373b8c
Binary files /dev/null and b/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
differ
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index d3b1807..64548b4 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,5 +1,6 @@
SPELL=gcc
VERSION=4.6.1
+ PATCHLEVEL=1
BASE_SOURCE_URL="ftp://gcc.gnu.org/gnu/gcc/${SPELL}-${VERSION}"
SOURCE=gcc-core-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 4e20a2e..57e250b 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,11 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: fixed the source numbers for java (fixes #115)
+
+2011-09-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply the patch
+ * python-gdb.patch: added, to fix gdb module install path
+
2011-07-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* CONFIGURE: should be _list not _multi
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 8e136d6..db485e2 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -40,9 +40,9 @@ fi &&
if list_find "$GCC_COMPILER" "java" ; then
cd $BUILD_DIRECTORY &&
unpack_file 9 &&
- verify_file 14 &&
+ verify_file 15 &&
- cp -v $SOURCE_CACHE/$SOURCE14 $SOURCE_DIRECTORY/ecj.jar
+ cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
fi &&
if list_find "$GCC_COMPILER" "fortran" ; then
cd $BUILD_DIRECTORY &&
@@ -59,4 +59,5 @@ cd $SOURCE_DIRECTORY &&
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
-patch -p1 < $SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch
+patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch"
diff --git a/gnu/gcc/python-gdb.patch b/gnu/gcc/python-gdb.patch
new file mode 100644
index 0000000..b95d611
--- /dev/null
+++ b/gnu/gcc/python-gdb.patch
@@ -0,0 +1,22 @@
+--- libstdc++-v3/python/Makefile.in.orig 2011-03-08 03:04:05.000000000
+0300
++++ libstdc++-v3/python/Makefile.in 2011-09-10 18:09:36.692249020 +0400
+@@ -493,7 +493,7 @@
+ -e 's,@toolexeclibdir@,$(toolexeclibdir),' < $(srcdir)/hook.in >
$@
+
+ install-data-local: gdb.py
+- @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
++ @$(mkdir_p) $(DESTDIR)$(datadir)/gdb/auto-load
+ @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
+ for file in libstdc++*; do \
+ case $$file in \
+@@ -506,8 +506,8 @@
+ esac; \
+ done; \
+ cd $$here; \
+- echo " $(INSTALL_DATA) gdb.py
$(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
+- $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
++ echo " $(INSTALL_DATA) gdb.py
$(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py"; \
++ $(INSTALL_DATA) gdb.py
$(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index 32db176..67ab6cc 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -4,6 +4,9 @@ APACHE22_EXTRA="${APACHE22_EXTRA} --with-mpm=${APACHE22_MPM}"
&&
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&
+# correct flags to find external apr-util
+CPPFLAGS="`apr-config --includes` $CPPFLAGS" &&
+
# use smgl standard layout
cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&
diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index 54bc751..b8f5444 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -1,4 +1,4 @@
-message "${PROBLEM_COLOR}Before picking a MPM, please see: http://sourcemage.org/ApacheMPM${DEFAULT_COLOR}" &&
+message "${PROBLEM_COLOR}Before picking a MPM, please see: http://wiki.sourcemage.org/ApacheMPM${DEFAULT_COLOR}" &&
config_query_list APACHE22_MPM "Which MPM would you like?" prefork worker
event &&
# Apache2 CONFIGURE script
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index 6d9f5d8..d55d3e9 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.20
- SECURITY_PATCH=13
+ VERSION=2.2.21
+ SECURITY_PATCH=14
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index b583274..98b1151 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,13 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.21; SECURITY_PATCH++ (CVE-2011-3348,
+ regression introduced by the CVE-2011-3192)
+
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE: fixed url sourcemage.org -> wiki.sourcemage.org (fixes
#181)
+
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed build with external apr-util (resolves #51)
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.20; SECURITY_PATCH++ (CVE-2011-3192)