Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (42c4e11e455c432c34a191f52ac6744fb34c7ae5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (42c4e11e455c432c34a191f52ac6744fb34c7ae5)
  • Date: Thu, 11 Oct 2012 15:55:32 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
disk/grub2/HISTORY | 5
disk/grub2/PRE_BUILD | 5
disk/grub2/glibc-2.16.patch | 16 +
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 3
ftp/curl/DETAILS | 2
ftp/curl/HISTORY | 3
graphics/darktable/DETAILS | 2
graphics/darktable/HISTORY | 7
graphics/darktable/PRE_BUILD | 5
graphics/darktable/rsvg.patch | 24 ++
http/firefox/DETAILS | 6
http/firefox/HISTORY | 5
http/firefox/PRE_BUILD | 3
http/firefox/install_dir.patch | 56 ++---
http/firefox/installer.patch | 112
----------
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 3
kernels/linux/HISTORY | 3
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31 | 5
libs/libxml2/DETAILS | 4
libs/libxml2/HISTORY | 4
libs/libxml2/PRE_BUILD | 4
libs/libxml2/bufsize.patch.gz | 0
net/bind-tools/DETAILS | 4
net/bind-tools/HISTORY | 3
net/hostapd/DETAILS | 1
net/hostapd/HISTORY | 5
net/hostapd/PRE_BUILD | 2
net/hostapd/eap-tls.patch | 48 ++++
wm-addons/cairo-dock-plugins/DETAILS | 2
wm-addons/cairo-dock-plugins/HISTORY | 3
wm-addons/cairo-dock/DETAILS | 2
wm-addons/cairo-dock/HISTORY | 3
x11-libs/cairo/DETAILS | 8
x11-libs/cairo/HISTORY | 3
37 files changed, 205 insertions(+), 166 deletions(-)

New commits:
commit 481430fd28c61f8abcd2c3af7a1cf730f737aa8b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partclone: => 0.2.55

commit 7841015f7f751b8bc919f51a6227abed2010ce7a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libxml2: => 2.9.0

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

curl: => 7.28.0

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

cairo 1.12.4

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

graphics/darktable: add patch to prevent compile error

commit 9ce506ecb4b4f5e888325c6c3ab4dc791885974a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

wm-addons/cairo-dock-plugins: version 3.1.0

commit f75f1ffbf323abb60fe45dd8c5de6fd7e09759eb
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

wm-addons/cairo-dock: version 3.1.0

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

seamonkey 2.13, SECURITY_PATCH=47

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

firefox 16.0, SECURITY_PATCH=54

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

linux: => 3.2.31 (eol)

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

hostapd: fixed CVE-2012-4445 (security)

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

bind-tools: => 9.9.1-P4 (security)

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

graphics/darktable: fix source url for scm version

commit 14cc7d3318f834fdd54981d967188ae5f1e3afd1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Fix compilation with glibc 2.16+
gets removed from GNU libc, see
http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/30292)

make[4]: Entering directory `/usr/src/grub-2.00/grub-core/gnulib'
gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -march=native
-mtune=native -m32 -pipe -Os -MT argp-eexst.o -MD -MP -MF
.deps/argp-eexst.Tpo -c -o argp-eexst.o argp-eexst.c
In file included from argp.h:22:0,
from argp-eexst.c:25:
./stdio.h:456:20: error: 'gets' undeclared here (not in a function)

diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 334fd19..883a698 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2012-10-09 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.16.patch
+ * glibc-2.16.patch: Fix compilation with glibc 2.16+ (gets removed
from GNU
+ libc, see
http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/30292)
+
2012-06-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.00
less versbosity
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e..ceb321f 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,4 +1,9 @@
default_pre_build &&
+
+message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/grub-core/gnulib/stdio.in.h \
+ "${SPELL_DIRECTORY}"/glibc-2.16.patch &&
+
cd ${SOURCE_DIRECTORY} &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
diff --git a/disk/grub2/glibc-2.16.patch b/disk/grub2/glibc-2.16.patch
new file mode 100644
index 0000000..92db840
--- /dev/null
+++ b/disk/grub2/glibc-2.16.patch
@@ -0,0 +1,16 @@
+diff -Naur grub-2.00.orig/grub-core/gnulib/stdio.in.h
grub-2.00/grub-core/gnulib/stdio.in.h
+--- grub-2.00.orig/grub-core/gnulib/stdio.in.h 2012-10-09 13:25:40.346175444
-0700
++++ grub-2.00/grub-core/gnulib/stdio.in.h 2012-10-09 13:26:23.112172937
-0700
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index b299f93..79e7ad0 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.54
-
SOURCE_HASH=sha512:a874d02ae2b049dd4408344f922b0651f123bf4c068a78b74b6e083fb64e6398986e686a23792d8fbf32777b5908c951f5579fe4a63ae9ff95a06d04570cc7ae
+ VERSION=0.2.55
+
SOURCE_HASH=sha512:ee001e5764035e525c382c6d789fb956daf8f2c495f3bb85e726f7066443b8751949bbe36d0802cb860981191e26cec5be388cc88fc000b547cb44bfb50e4a9b
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 676305c..e7b1793 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2012-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.55
+
2012-10-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.54

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 0f9407a..5038d72 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.27.0
+ VERSION=7.28.0
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 59388fe..7071a61 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2012-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.28.0
+
2012-07-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.27.0

diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index d8f25ef..fed0949 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -14,7 +14,7 @@ fi
FORCE_DOWNLOAD=on
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
-
SOURCE_URL[0]=git://darktable.git.sourceforge.net/gitroot/darktable/darktable
+ SOURCE_URL[0]=git://github.com/darktable-org/darktable.git
SOURCE_IGNORE=volatile
fi
WEB_SITE="http://www.darktable.org";
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 3ccc298..462f335 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,10 @@
+2012-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * rsvg.patch, PRE_BUILD: add patch from upstream to prevent
+ compile error
+
+2012-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix source_url for scm version
+
2012-07-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.5

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000..4a45c23
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
+ patch -p1 < ${SPELL_DIRECTORY}/rsvg.patch
+fi
diff --git a/graphics/darktable/rsvg.patch b/graphics/darktable/rsvg.patch
new file mode 100644
index 0000000..2ad46d2
--- /dev/null
+++ b/graphics/darktable/rsvg.patch
@@ -0,0 +1,24 @@
+diff --git a/src/iop/watermark.c b/src/iop/watermark.c
+index bcd65d6..e3da730 100644
+--- a/src/iop/watermark.c
++++ b/src/iop/watermark.c
+@@ -36,7 +36,10 @@
+ #include <inttypes.h>
+
+ #include <librsvg/rsvg.h>
++// ugh, ugly hack. why do people break stuff all the time?
++#ifndef RSVG_CAIRO_H
+ #include <librsvg/rsvg-cairo.h>
++#endif
+
+ #include "common/metadata.h"
+ #include "common/utility.h"
+@@ -712,7 +715,7 @@ static void refresh_watermarks( dt_iop_module_t *self )
+ snprintf(filename, DT_MAX_PATH_LEN, "%s/%s", configdir, d_name);
+ gtk_combo_box_append_text( g->combobox1, d_name );
+ count++;
+- }
++ }
+ g_dir_close(dir) ;
+ }
+
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 4670547..53f2367 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=15.0.1
+ VERSION=16.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=15.0.1
+ VERSION=16.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=53
+ SECURITY_PATCH=54
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 5f3c8be..edcbb7a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 16.0, SECURITY_PATCH=54
+ * install_dir.patch: updated, from Arch
+ * PRE_BUILD, installer.patch: patch removed
+
2012-09-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 15.0.1, SECURITY_PATCH=53

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index c993d21..1ed86c5 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,9 +11,6 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
-patch -p1 < $SPELL_DIRECTORY/installer.patch &&
-
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index b6f9700..9c115f0 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,28 +1,30 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST = @TOP_DIST@
+diff -Nur mozilla-release.orig/config/baseconfig.mk
mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280
+0000
++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576
+0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk
mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09
07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09
07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
deleted file mode 100644
index d3232b5..0000000
--- a/http/firefox/installer.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# HG changeset patch
-# User Andrew Benton <b3nton AT gmail.com>
-# Date 1339485009 -7200
-# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
-# Parent 253d5996845e9fd994dc9ee542d293fbc412ec56
-Bug 752895 - Don't try to install nspr, nss and sqlite when using system
libraries.
-r=glandium
-
-diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
---- a/browser/installer/Makefile.in
-+++ b/browser/installer/Makefile.in
-@@ -39,16 +39,24 @@ endif
- ifdef MOZ_ENABLE_GNOME_COMPONENT
- DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
- endif
-
- ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
-
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
-
- ifdef _MSC_VER
- DEFINES += -D_MSC_VER=$(_MSC_VER)
- endif
-
-diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -53,19 +53,21 @@
- #endif
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- #ifdef MOZ_SHARED_MOZGLUE
- @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
- #endif
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
- @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
- #endif
- #ifdef XP_MACOSX
- @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@@ -104,17 +106,19 @@
- @BINPATH@/@MOZ_APP_NAME@
- #endif
- @BINPATH@/application.ini
- #ifdef MOZ_UPDATER
- @BINPATH@/update-settings.ini
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
- @BINPATH@/blocklist.xml
- #ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
- #ifndef XP_MACOSX
- @BINPATH@/mozilla-xremote-client
-@@ -578,26 +582,28 @@
- @BINPATH@/components/dom_svg.xpt
- @BINPATH@/components/dom_smil.xpt
-
- ; [Personal Security Manager]
- ;
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
- @BINPATH@/components/pipnss.xpt
- @BINPATH@/components/pippki.xpt
-
- ; for Solaris SPARC
- #ifdef SOLARIS
-
-
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7aaee80..9e82d4e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.12.1
+ VERSION=2.13
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:f4fa9179d1ef15396dea188279f69342082d99fae5dbfb7c3eb9f5de61638d737342c8d267ed2f51e9f2de7a8629702081385c1930984239d695fc6989c20dbc
+
SOURCE_HASH=sha512:d4193557b25e8a1852276aa591d5986faf1c4cfc4db7dfa01f23d62abc0b274f54617e847c0aae9d3edff9c6b6b8efea3d21bce99f39cf39fe5320151629e2eb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=46
+ SECURITY_PATCH=47
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d5b287f..a531a93 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.13, SECURITY_PATCH=47
+
2012-09-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.12.1; SECURITY_PATCH++
* DEPENDS: added check for minimum sqlite version
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index f23ce16..ea4ad02 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.2.31: added
+
2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.5.6: added
* info/patches/maintenance_patches_3/patch-3.4.13: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
new file mode 100755
index 0000000..7ce5b22
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.31"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f8a87eaeaf3c3976564e39449bd959023b6ead6f"
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index d056161..0703bec 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libxml2
- VERSION=2.8.0
+ VERSION=2.9.0
+
SOURCE_HASH=sha512:b13268ea3725a8b534974ece33981b001324164e5687df94b0d15c77189070e2a5d9f08c1646e5492e70a607ca0adf00788772fcf300ac2d4a110e9bf57d4afe
SECURITY_PATCH=8
-
SOURCE_HASH=sha512:e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 37bb42e..8872664 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,7 @@
+2012-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.0
+ * PRE_BUILD, bufsize.patch.gz: deleted - applied upstream
+
2012-08-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++ (CVE-2012-2807)
* PRE_BUILD: added, to apply the patch
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index c7262aa..0000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-zcat "$SPELL_DIRECTORY/bufsize.patch.gz" | patch -p1
diff --git a/libs/libxml2/bufsize.patch.gz b/libs/libxml2/bufsize.patch.gz
deleted file mode 100644
index 5106ed6..0000000
Binary files a/libs/libxml2/bufsize.patch.gz and /dev/null differ
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 2cc83da..07145c7 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.1-P3
+ VERSION=9.9.1-P4
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 1dc8802..f064c2d 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.9.1-P4; SECURITY_PATCH++
+
2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.9.1-P3; SECURITY_PATCH++

diff --git a/net/hostapd/DETAILS b/net/hostapd/DETAILS
index 9529ff5..ff82790 100755
--- a/net/hostapd/DETAILS
+++ b/net/hostapd/DETAILS
@@ -1,5 +1,6 @@
SPELL=hostapd
VERSION=1.0
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/hostapd/HISTORY b/net/hostapd/HISTORY
index 7a610d3..2cb45aa 100644
--- a/net/hostapd/HISTORY
+++ b/net/hostapd/HISTORY
@@ -1,3 +1,8 @@
+2012-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * PRE_BUILD: apply the patch
+ * eap-tls.patch: added, to fix CVE-2012-4445
+
2012-07-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, {PRE_,}BUILD, CONFIGURE, DEPENDS, FINAL, INSTALL,
init.d/hostapd{,.conf}: spell created
diff --git a/net/hostapd/PRE_BUILD b/net/hostapd/PRE_BUILD
index 8053703..0d06435 100755
--- a/net/hostapd/PRE_BUILD
+++ b/net/hostapd/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "$SPELL_DIRECTORY/eap-tls.patch" &&
+
# /etc/hostapd.* -> /etc/hostapd/hostapd.*
sedit "s:/etc/hostapd:/etc/hostapd/hostapd:g" hostapd/hostapd.conf &&

diff --git a/net/hostapd/eap-tls.patch b/net/hostapd/eap-tls.patch
new file mode 100644
index 0000000..bda92cf
--- /dev/null
+++ b/net/hostapd/eap-tls.patch
@@ -0,0 +1,48 @@
+From 586c446e0ff42ae00315b014924ec669023bd8de Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j AT w1.fi>
+Date: Sun, 7 Oct 2012 20:06:29 +0300
+Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
+
+EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
+Message Length value properly and could end up trying to store more
+information into the message buffer than the allocated size if the first
+fragment is longer than the indicated size. This could result in hostapd
+process terminating in wpabuf length validation. Fix this by rejecting
+messages that have invalid TLS Message Length value.
+
+This would affect cases that use the internal EAP authentication server
+in hostapd either directly with IEEE 802.1X or when using hostapd as a
+RADIUS authentication server and when receiving an incorrectly
+constructed EAP-TLS message. Cases where hostapd uses an external
+authentication are not affected.
+
+Thanks to Timo Warns for finding and reporting this issue.
+
+Signed-hostap: Jouni Malinen <j AT w1.fi>
+intended-for: hostap-1
+---
+ src/eap_server/eap_server_tls_common.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/eap_server/eap_server_tls_common.c
b/src/eap_server/eap_server_tls_common.c
+index 31be2ec..46f282b 100644
+--- a/src/eap_server/eap_server_tls_common.c
++++ b/src/eap_server/eap_server_tls_common.c
+@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct
eap_ssl_data *data,
+ return -1;
+ }
+
++ if (len > message_length) {
++ wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes)
in "
++ "first fragment of frame (TLS Message "
++ "Length %d bytes)",
++ (int) len, (int) message_length);
++ return -1;
++ }
++
+ data->tls_in = wpabuf_alloc(message_length);
+ if (data->tls_in == NULL) {
+ wpa_printf(MSG_DEBUG, "SSL: No memory for message");
+--
+1.7.4-rc1
+
diff --git a/wm-addons/cairo-dock-plugins/DETAILS
b/wm-addons/cairo-dock-plugins/DETAILS
index 6d36f99..0069663 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock-plugins
- VERSION=3.0.2
+ VERSION=3.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock-plugins/HISTORY
b/wm-addons/cairo-dock-plugins/HISTORY
index f2e48b2..970146f 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.1.0
+
2012-09-02 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.0.2

diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index b754c29..9636367 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock
- VERSION=3.0.2
+ VERSION=3.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index 219f4a9..563b865 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.1.0
+
2012-09-02 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.0.2
* DEPENDS: use either gtk+2 or gtk+3
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 3de42a4..f3f4d7a 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,15 +1,15 @@
SPELL=cairo
if [[ $CAIRO_DEVEL == y ]]; then
- VERSION=1.12.2
+ VERSION=1.12.4
PATCHLEVEL=0
-
SOURCE_HASH=sha512:149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847
+
SOURCE_HASH=sha512:4fff690117d43c8775bd27e3aa5fd46d9aea8526728da25430a0dd3805d3921070d02ec6544411a91d607b969e9b95fe7dc98a036eb4830d3aed7fc1089e1380
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.12.2
+ VERSION=1.12.4
PATCHLEVEL=0
-
SOURCE_HASH=sha512:149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847
+
SOURCE_HASH=sha512:4fff690117d43c8775bd27e3aa5fd46d9aea8526728da25430a0dd3805d3921070d02ec6544411a91d607b969e9b95fe7dc98a036eb4830d3aed7fc1089e1380
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f293030..b85a477 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2012-10-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.4
+
2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
* {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (42c4e11e455c432c34a191f52ac6744fb34c7ae5), Eric Sandall, 10/11/2012

Archive powered by MHonArc 2.6.24.

Top of Page