sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (5a3b0c4fb010d3f6b71694b95ab2980d28c0425d)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (5a3b0c4fb010d3f6b71694b95ab2980d28c0425d)
- Date: Mon, 28 Jan 2013 16:13:48 -0600
GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
VERSION | 2
chat-irc/ircd-ratbox/DETAILS | 7 -
chat-irc/ircd-ratbox/HISTORY | 7 +
chat-irc/ircd-ratbox/INSTALL | 2
cluster/drbd/HISTORY | 3
cluster/drbd/TRIGGERS | 4
crypto/ca-certificates/DETAILS | 4
crypto/ca-certificates/HISTORY | 6 +
database/mysql/DETAILS | 3
database/mysql/HISTORY | 3
database/redis/DETAILS | 5 -
database/redis/HISTORY | 13 ++
kernels/linux/BUILD | 2
kernels/linux/HISTORY | 18 +++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.58 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.59 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.60 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.61 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.37 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.25 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.26 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.27 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.28 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4 | 5 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5 | 5 +
kernels/linux/latest.defaults | 2
mail/dovecot/DETAILS | 4
mail/dovecot/HISTORY | 4
mail/postfix/BUILD | 22 +++-
mail/postfix/DEPENDS | 11 +-
mail/postfix/DETAILS | 31 +++---
mail/postfix/HISTORY | 10 ++
mail/postfix/PRE_BUILD | 4
mail/postfix/no-db.patch | 31 ++++++
mail/thunderbird/BUILD | 1
mail/thunderbird/DEPENDS | 9 +
mail/thunderbird/DETAILS | 6 -
mail/thunderbird/HISTORY | 9 +
mail/thunderbird/thunderbird.gpg |binary
python-pypi/django/DETAILS | 6 -
python-pypi/django/HISTORY | 4
utils/xen/DETAILS | 2
utils/xen/HISTORY | 8 +
utils/xen/INSTALL | 6 -
utils/xen/PRE_BUILD | 5 +
utils/xen/xsa-27-1.patch | 12 ++
utils/xen/xsa-33.patch | 21 ++++
utils/xen/xsa-41-1.patch | 41 ++++++++
utils/xen/xsa-41.patch | 46
++++++++++
49 files changed, 381 insertions(+), 48 deletions(-)
New commits:
commit 5a3b0c4fb010d3f6b71694b95ab2980d28c0425d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.61-16
commit 4a0a72fe72bfe432ce44af90b979ac581977f23c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.4.28 (lts)
(cherry picked from commit 0ed62c2b96012e1f46120296ba593c87e9c05443)
commit 68cd6d874eec70573f54e511de8de521d60adc2d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.61 (lts)
(cherry picked from commit 527c6b3d76a36e082f7f55ee25eb3f19c8b09d49)
commit fc1146872d7c32f5c3e85dd591691d4473be6068
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xen: security update
(cherry picked from commit 7a2a1fc8b6e1bbc04199ce91587a02b2e4d1f223)
commit f8973f56ac9e3150ad3a596591f7b20afb6af2a8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
dovecot: => 2.0.21 (security)
(cherry picked from commit a10913a8243acd371701ef6bf482ace27fb39746)
commit 2e7dcae4adc9d9495becc29934de8d331f9c1a22
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mysql: => 5.1.66 (security)
(cherry picked from commit 577a1b2298d5790a20771c53951a87c706198794)
commit 0ffa0929a5cb777846ce8c38594f8a8740445d5c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
redis: => 2.6.9 (security)
(cherry picked from commit 451910d450747441900749753ff4a7232aed4955)
commit 47f828e5bfdf2f5bb29a4d25483e76bfa069bebd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
redis: => 2.6.7
(cherry picked from commit 5c08ca4906d5d3f52e8af72e0bcc9c4df8b50737)
commit 264b3df555c86339e23d2385b5acf892b9e2f41f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
redis: => 2.6.5
(cherry picked from commit b2d5c0d9e173c873362a861dd07ac55ea01eae33)
commit 13b0f8780ea7f98ff9e3d63116086af16e4bdec4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
redis: => 2.6.3
(cherry picked from commit 56a9e6579193f153af5c214e54c3aa39659e4b0d)
commit e5b737be790f4df5467bc966e45314514223ec0d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ircd-ratbox: this was a security update
(cherry picked from commit 78820b0c9262a4d2fb6eded2e4f3564a4084f5dc)
commit 87d433653888c129d0c19421708680eabca1539d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ircd-ratbox: => 3.0.8 (stable)
(cherry picked from commit 6ddb765daebd241986bb90ee097f462d302c4ed0)
commit 73474f7c102a43a88dbfc603864ec94b182303a3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
django: => 1.4.3 (security)
(cherry picked from commit 4c83cf921174b3954e251b63510c5fa45e9c23fc)
commit 9ef9411cebf580459c4e01f652cfdd6990b701b4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: BUILD: -I/usr/src/linux/include removed from ifenslave
This fixes linux 3.7 problem.
Why don't we have ifenslave spell?
(cherry picked from commit 226ed13dc12bd9aa794b54dddfbb7b5dd9885cfd)
commit 5cd1463583533b79abcf4e75b9bb16c3cc73bffc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.7.5
(cherry picked from commit 9b98984c7bc9c1e14c2f4c837734352e9226c1d8)
commit cc1207a1ae0b4f2139403c38caf60c64bfb21648
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
drbd: recast on linux update only when kernel module is enabled
(cherry picked from commit af870f702ef33040e7ea31fa7783e985aa3d4381)
commit bf68d0787f80ebb98779693cc27a55980d824721
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ca-certificates: => 20130119
(cherry picked from commit 7c1a946a07cb1eae460903209bab3e083ae01957)
commit 0165700bbdf306182f5375e66b48e3e1d26fb05a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ca-certificates: => 20121105
(cherry picked from commit c9410b624e2903853c377e22de28e39fa40c2b90)
commit f2141802daa93d577deb5df4a4b15d8b4554da14
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.7.4
(cherry picked from commit 9c5d64652f75b5ec21e08dcc088a5214497c263d)
commit e99c73940e78011536e384130216097f42c6c440
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postfix: made pcre support optional
(cherry picked from commit e3642628650696ebf157544ec4cfa42688adbae1)
commit d0108a914c7c7f75c43d31caa81257b630ff9ac8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postfix: it was a security update
(cherry picked from commit dbb6177ab13605ffaa7622298057d4402a1e22a1)
commit 733e560f36a2e6b80adb90187b0568915b8b54a7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postfix: => 2.9.5
(cherry picked from commit 10b6fb75ac8b8a72538e1e19162d4834d94db3f2)
Conflicts:
mail/postfix/HISTORY
commit ba906fa0cb293680723db35bed252bda71abdcda
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.4.25 (lts)
(cherry picked from commit cc27faa0aee5662a62a82ce2a6f345dfc2dc589e)
commit 95ac00beab6cc21b3ee8b6e22f639a604d48090c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.2.37 (lts)
(cherry picked from commit 87b7cbf967f3b285c005486dd0122d350e42529b)
commit e90fa2ce12ff09cb050923d2ec82f391e69c9afb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: => 3.0.58 (lts)
(cherry picked from commit 1a3ff0208f3b66acafe7e5ce90661fba02bd5d47)
commit 1ff0884ae7e6de7e4542df02ad0953822f5012b2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunderbird: SECURITY_PATCH++
(cherry picked from commit 6932db96beac2d32a64f84d7f103876ee2a0111f)
commit 418517cddc2522f5855714ac46d467f42f763410
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mail/thunderbird: version 17.0.2
(cherry picked from commit 93518d29e2b04eb660545c4799f8e18b014d2a90)
diff --git a/VERSION b/VERSION
index 0d6100f..75613fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-15
+0.61-16
diff --git a/chat-irc/ircd-ratbox/DETAILS b/chat-irc/ircd-ratbox/DETAILS
index 1ba885f..89cd083 100755
--- a/chat-irc/ircd-ratbox/DETAILS
+++ b/chat-irc/ircd-ratbox/DETAILS
@@ -3,12 +3,13 @@ if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
VERSION=3.0.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.ratbox.org/download/testing/$SOURCE
- SOURCE_URL[1]=ftp://ftp.parodius.com/pub/$SPELL/testing/$SOURCE
+ SOURCE_URL[1]=http://mirrors.gigenet.com/ratbox/testing/$SOURCE
else
- VERSION=3.0.7
+ VERSION=3.0.8
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.ratbox.org/download/$SOURCE
- SOURCE_URL[1]=ftp://ftp.parodius.com/pub/$SPELL/$SOURCE
+ SOURCE_URL[1]=http://mirrors.gigenet.com/ratbox/$SOURCE
fi
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=$SOURCE_URL.asc
diff --git a/chat-irc/ircd-ratbox/HISTORY b/chat-irc/ircd-ratbox/HISTORY
index ab16667..41bfaf0 100644
--- a/chat-irc/ircd-ratbox/HISTORY
+++ b/chat-irc/ircd-ratbox/HISTORY
@@ -1,3 +1,10 @@
+2013-01-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1 (CVE-2012-6084)
+
+2013-01-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.8 (stable); renewed mirror url
+ * INSTALL: fixed multijob install
+
2011-11-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.7 (stable)
* BUILD, CONFIGURE: removed deprecated options
diff --git a/chat-irc/ircd-ratbox/INSTALL b/chat-irc/ircd-ratbox/INSTALL
index 611453a..0292190 100755
--- a/chat-irc/ircd-ratbox/INSTALL
+++ b/chat-irc/ircd-ratbox/INSTALL
@@ -1,3 +1,5 @@
+make_single &&
default_install &&
+make_normal &&
install -d -o ratbox -g ratbox -vm 755 "$INSTALL_ROOT/var/run/ircd"
diff --git a/cluster/drbd/HISTORY b/cluster/drbd/HISTORY
index 9c34967..d6ae51b 100644
--- a/cluster/drbd/HISTORY
+++ b/cluster/drbd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * TRIGGERS: recast on linux update only when kernel module is enabled
+
2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added kernel 3.5-3.7 support (see
drbd.org/download/mainline)
diff --git a/cluster/drbd/TRIGGERS b/cluster/drbd/TRIGGERS
index bb1c400..dc81599 100755
--- a/cluster/drbd/TRIGGERS
+++ b/cluster/drbd/TRIGGERS
@@ -1 +1,3 @@
-on_cast linux cast_self
+if list_find "$DRBD_OPTS" "--with-km"; then
+ on_cast linux cast_self
+fi
diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index 963cabe..9ca6739 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -1,7 +1,7 @@
SPELL=ca-certificates
- VERSION=20120212
+ VERSION=20130119
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:c22cb3b3472deb7819bae6518b136a5af27e4cb29610b12713908ce7effbe5e39f9f1856efd75d071d70016462e66b34d5800ab061a2b3a213e4f2969330f8f0
+
SOURCE_HASH=sha512:b93621e578dfa5ea224b3528839ca250fd9470dc28b17dd82e8669d64a631cb62218f1c53ebdb165ea3fffcaa8717210132215b5407ea0185e76ac2a11c0d157
SOURCE=${SPELL}_${VERSION}_all.deb
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/c/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index ef1b1d9..e0c976d 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,3 +1,9 @@
+2013-01-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20130119
+
+2012-11-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20121105
+
2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 20120212
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index 093b8cf..952d803 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -4,7 +4,8 @@ if [[ $OLD == y ]]; then
SECURITY_PATCH=4
else
- VERSION=5.1.61
+ VERSION=5.1.66
+ SECURITY_PATCH=1
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 2a9dba1..3c9f378 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.66; SECURITY_PATCH++ (CVE-2012-5611)
+
2012-06-26 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Cleanup MSQL_ENGINES for "none"
* BUILD: Fix plugin configure flags
diff --git a/database/redis/DETAILS b/database/redis/DETAILS
index bfba51e..c2e4920 100755
--- a/database/redis/DETAILS
+++ b/database/redis/DETAILS
@@ -1,8 +1,9 @@
SPELL=redis
- VERSION=2.4.6
+ VERSION=2.6.9
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://redis.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:c335545fce0024cd9e44f4b7d52ccd569bee36cda13afae6a2274fc7f679c9603431684a9b375fb6472be335d881c9a74fe403a2e1f7dabe7a009027222b8ee2
+
SOURCE_HASH=sha512:5263bccd4e175dd00318436be3818c07b880ba6f2e2552e1811d909fddf1fbbff5addbd684e116bd7f8cca727c61f6f45cd264fff61d2ffad18d57f6ae0456e5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=BSD
WEB_SITE=http://redis.io/
diff --git a/database/redis/HISTORY b/database/redis/HISTORY
index 24b4a2c..9e0eff6 100644
--- a/database/redis/HISTORY
+++ b/database/redis/HISTORY
@@ -1,3 +1,16 @@
+2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.9; SECURITY_PATCH++ (CVE-2013-0178 and
+ CVE-2013-0180 fixed in 2.6.8)
+
+2012-12-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.7
+
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.5
+
+2012-11-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.3
+
2012-01-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.6
diff --git a/kernels/linux/BUILD b/kernels/linux/BUILD
index f18e66b..8a33626 100755
--- a/kernels/linux/BUILD
+++ b/kernels/linux/BUILD
@@ -30,7 +30,7 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
eval make $EXTRA_MAKE_OPTIONS modules &&
if grep -q CONFIG_BONDING=m ./.config || grep -q CONFIG_BONDING=y ./.config
then
- gcc -Wall -O -I/usr/src/linux/include
./Documentation/networking/ifenslave.c -o ifenslave
+ gcc -Wall -O ./Documentation/networking/ifenslave.c -o ifenslave
fi
else
# This is for the iso team don't touch
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8bc8cce..bcd6adc 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,21 @@
+2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.{59-61}: added
+ * info/patches/maintenance_patches_3/patch-3.4.{26-28}: added
+
+2013-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.5
+ * info/patches/maintenance_patches_3/patch-3.7.5: added
+ * BUILD: -I/usr/src/linux/include removed from ifenslave
+
+2013-01-22 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.4
+ * info/patches/maintenance_patches_3/patch-3.7.4: added
+
+2013-01-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.58: added
+ * info/patches/maintenance_patches_3/patch-3.2.37: added
+ * info/patches/maintenance_patches_3/patch-3.4.25: added
+
2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.2.36: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.58
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.58
new file mode 100755
index 0000000..69ff4c8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.58
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.58"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="887295a79da04419ce1ed3b46f0971ff47a309ff"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.59
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.59
new file mode 100755
index 0000000..1a4bd60
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.59
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.59"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="a78602dd69a4ae6d73e3c31bac49d8df75ff0507"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.60
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.60
new file mode 100755
index 0000000..b84db23
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.60
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.60"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="47b2422d7b8c1f37af5508678b6a8d1d28bbc50b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.61
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.61
new file mode 100755
index 0000000..f69f59a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.61
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.61"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="e746ae3def097d9dea8167927571c4719d812acb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.37
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.37
new file mode 100755
index 0000000..055053c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.37
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.37"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="cc92711d319cb629a9b8a32901ab367e1a87073a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.25
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.25
new file mode 100755
index 0000000..e31adad
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.25
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.25"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d2970680c8c97215f581a5ac78f1ab3ce04f495b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.26
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.26
new file mode 100755
index 0000000..c2d520a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.26
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.26"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="88a9e1b1cde17bffa167149d18b954ec90e7300f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.27
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.27
new file mode 100755
index 0000000..4be7118
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.27
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.27"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="91c8dad5c40b22e96a9a6b9b3abdd53f0105d058"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.28
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.28
new file mode 100755
index 0000000..6f0fde7
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.28
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.28"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3741dcb826d8cbbe79c28dc661860ace7ddba9d0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
new file mode 100755
index 0000000..80b0f8d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
@@ -0,0 +1,5 @@
+appliedkernels="3.7"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="7d7ca6af7523289da5a3018c1f3a68961030eb35"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
new file mode 100755
index 0000000..29e1719
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
@@ -0,0 +1,5 @@
+appliedkernels="3.7"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="6aaabd95c29db97a203cd7e34e58e4ca25687e18"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 51c5225..7e6a7cc 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.7
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.7.1
+LATEST_maintenance_patches_3=patch-3.7.5
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 089c8af..38be93e 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=2.0.20
+ VERSION=2.0.21
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -18,7 +18,7 @@ if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20030224
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
LICENSE[0]=LGPL2.1/LGPL2/MIT/BSD/PublicDomain
WEB_SITE=http://www.dovecot.org/
KEYWORDS="mail"
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index f49673c..bd39a09 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,7 @@
+2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.21; SECURITY_PATCH++ (fixes several
+ crashes not reported via CVEs)
+
2012-04-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 2.0.20, pigeonhole to 0.2.6
diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index c8a30fa..14e3213 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -2,15 +2,21 @@ create_account postfix &&
create_account postdrop &&
create_account mail &&
-mkdir -p "$INSTALL_ROOT/var/spool/mail" &&
-chmod 1777 "$INSTALL_ROOT/var/spool/mail" &&
-chown mail:mail "$INSTALL_ROOT/var/spool/mail" &&
-chgrp -R mail "$INSTALL_ROOT/var/spool/mail" &&
+# always correct permissions for older setups
+install -vm 2775 -d -o mail -g mail "$INSTALL_ROOT/var/spool/mail" &&
# We want blank vars
local AUXLIBS="-L$INSTALL_ROOT/usr/lib -L$INSTALL_ROOT/lib -lm" &&
local CCARGS="" &&
+if is_depends_enabled $SPELL pcre; then
+ AUXLIBS="$AUXLIBS -lpcre" &&
+ CCARGS="$CCARGS -DHAS_PCRE" &&
+ message "${MESSAGE_COLOR}PCRE requested: Using PCRE${DEFAULT_COLOR}"
+else
+ CCARGS="$CCARGS -DNO_PCRE"
+fi &&
+
if is_depends_enabled $SPELL openldap; then
AUXLIBS="$AUXLIBS -lldap -llber" &&
CCARGS="$CCARGS -DHAS_LDAP" &&
@@ -38,6 +44,14 @@ if is_depends_enabled $SPELL cyrus-sasl; then
message "${MESSAGE_COLOR}Cyrus-SASL requested: Using
Cyrus-SASL${DEFAULT_COLOR}"
fi &&
+if is_depends_enabled $SPELL db; then
+ AUXLIBS="$AUXLIBS -ldb"
+ CCARGS="$CCARGS -DHAS_DB -I$INSTALL_ROOT/usr/include" &&
+ message "${MESSAGE_COLOR}Berkeley DB requested: Using Berkeley
DB${DEFAULT_COLOR}"
+else
+ CCARGS="$CCARGS -DNO_DB"
+fi &&
+
if is_depends_enabled $SPELL sqlite; then
AUXLIBS="$AUXLIBS -lsqlite3"
CCARGS="$CCARGS -DHAS_SQLITE -I$INSTALL_ROOT/usr/include" &&
diff --git a/mail/postfix/DEPENDS b/mail/postfix/DEPENDS
index 4b23bf2..130702d 100755
--- a/mail/postfix/DEPENDS
+++ b/mail/postfix/DEPENDS
@@ -1,9 +1,14 @@
-depends db &&
-depends pcre &&
+optional_depends pcre \
+ "" "" \
+ "for PCRE tables support" &&
+
+optional_depends db \
+ "" "" \
+ "for hash and btree files support" &&
optional_depends sqlite \
"" "" \
- "for SQLite support (via patch)" &&
+ "for SQLite support" &&
optional_depends MYSQL \
"" "" \
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 7efb93e..d4072cf 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,8 +4,9 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.9.2
+ VERSION=2.9.5
PFIX_BRANCH=official
+ SECURITY_PATCH=1
fi
SOURCE=$SPELL-$VERSION.tar.gz
@@ -16,26 +17,26 @@ fi
# Source URLs
SOURCE_URL[0]=ftp://ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[1]=ftp://mirror.widexs.nl/pub/postfix/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[2]=ftp://ftp.easynet.be/postfix/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[3]=ftp://ftp.linux.lv/mirrors/ftp.postfix.org/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[4]=ftp://ftp.kfki.hu/pub/packages/mail/postfix/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[5]=ftp://ftp.cgs.pl/pub/mirror/postfix/postfix-release/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[6]=ftp://ftp.is.co.za/networking/mail/mta/postfix/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[7]=ftp://ftp.utoronto.ca/mirror/packages/postfix/$PFIX_BRANCH/$SOURCE
+
SOURCE_URL[1]=ftp://ftp.nl.uu.net/pub/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.easynet.be/$SPELL/$PFIX_BRANCH/$SOURCE
+
SOURCE_URL[3]=http://mirrors.webhostinggeeks.com/postfix-source/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[4]=http://postfix.it-austria.net/releases/$PFIX_BRANCH/$SOURCE
+
SOURCE_URL[5]=ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[6]=http://de.postfix.org/ftpmirror/$PFIX_BRANCH/$SOURCE
+
SOURCE_URL[7]=http://archive.mgm51.com/mirrors/postfix-source/$PFIX_BRANCH/$SOURCE
SOURCE_URL[8]=ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
SOURCE_URL[9]=ftp://ftp.arnes.si/packages/postfix-release/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[10]=http://mirrors.bbnx.net/postfix/source/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[11]=ftp://ftp.reverse.net/pub/postfix/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[12]=http://www.subneural.net/postfix-release/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[13]=ftp://ftp.samurai.com/pub/postfix/$PFIX_BRANCH/$SOURCE
+
SOURCE_URL[10]=ftp://ftp.fu-berlin.de/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[11]=ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[12]=http://postfix.cybermirror.org/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[13]=ftp://ftp.opennet.ru/pub/$SPELL/$PFIX_BRANCH/$SOURCE
SOURCE_URL[14]=ftp://postfix.cloud9.net/$PFIX_BRANCH/$SOURCE
SOURCE_URL[15]=http://mirror.postfix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[16]=http://postfix.bairesweb.com/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[16]=ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
SOURCE_URL[17]=http://mirror.ramix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
-
SOURCE_URL[18]=ftp://ftp.tau.ac.il/pub/unix/mail/postfix/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[18]=http://linorg.usp.br/$SPELL/release/$PFIX_BRANCH/$SOURCE
SOURCE_URL[19]=ftp://ftp.esat.net/mirrors/ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
- SOURCE_URL[20]=ftp://totem.fix.no/pub/postfix/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[20]=ftp://totem.fix.no/pub/$SPELL/$PFIX_BRANCH/$SOURCE
# Signature URLs
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index dd7b0bd..03d075b 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,13 @@
+2013-01-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, DEPENDS: made pcre optional too
+
+2013-01-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.5; renewed mirror list;
SECURITY_PATCH=1
+ * BUILD: switched to secure mode mail spool
+ * DEPENDS: added ability to drop db support
+ * PRE_BUILD: apply the patch
+ * no-db.patch: added, to properly use -DNO_DB flag
+
2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.2
diff --git a/mail/postfix/PRE_BUILD b/mail/postfix/PRE_BUILD
index 9e3ee1b..822ef9f 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+if ! is_depends_enabled $SPELL db; then
+ patch -p0 < "$SPELL_DIRECTORY/no-db.patch"
+fi &&
+
if [[ "$POSTFIX_VDA" == "y" ]] && [[ "$POSTFIX_EXP" == "n" ]]; then
verify_file 3 &&
message "${MESSAGE_COLOR}Applying VDA Patch: ${SOURCE3}${DEFAULT_COLOR}"
&&
diff --git a/mail/postfix/no-db.patch b/mail/postfix/no-db.patch
new file mode 100644
index 0000000..e6277f7
--- /dev/null
+++ b/mail/postfix/no-db.patch
@@ -0,0 +1,31 @@
+--- makedefs.orig 2012-11-30 03:53:34.000000000 +0400
++++ makedefs 2013-01-21 22:02:59.118469530 +0400
+@@ -279,14 +279,14 @@
+ elif [ -f /usr/include/db/db.h ]
+ then
+ CCARGS="$CCARGS -I/usr/include/db"
+- else
++ # else
+ # No, we're not going to try db1 db2 db3 etc.
+ # On a properly installed system, Postfix builds
+ # by including <db.h> and by linking with -ldb
+- echo "No <db.h> include file found." 1>&2
+- echo "Install the appropriate db*-devel package first."
1>&2
+- echo "See the RELEASE_NOTES file for more information."
1>&2
+- exit 1
++ # echo "No <db.h> include file found." 1>&2
++ # echo "Install the appropriate db*-devel package first."
1>&2
++ # echo "See the RELEASE_NOTES file for more information."
1>&2
++ # exit 1
+ fi
+ # GDBM locks the DBM .pag file after open. This breaks
postmap.
+ # if [ -f /usr/include/gdbm-ndbm.h ]
+@@ -298,7 +298,7 @@
+ # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ # GDBM_LIBS=gdbm
+ # fi
+- SYSLIBS="-ldb"
++ # SYSLIBS="-ldb"
+ for name in nsl resolv $GDBM_LIBS
+ do
+ for lib in /usr/lib64 /lib64 /usr/lib /lib
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index e1dc3e4..0f266cd 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -34,6 +34,7 @@ fi
./configure --prefix=${INSTALL_ROOT}/usr \
--with-user-appdir=.thunderbird \
--enable-application=mail \
+ --disable-system-cairo \
--disable-crashreporter \
$OPTS &&
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 569ddb6..8864d7b 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -8,8 +8,8 @@ depends libmng '--with-system-mng'
&&
depends perl &&
depends zip &&
depends gtk+2 '--enable-xft --disable-freetype2' &&
-depends -sub 'TEE' cairo "--enable-system-cairo \
- --enable-default-toolkit=cairo-gtk2" &&
+#depends -sub 'TEE' cairo "--enable-system-cairo \
+# --enable-default-toolkit=cairo-gtk2" &&
#
# LDAP support doesn't work (fails to build)
#
@@ -28,6 +28,11 @@ optional_depends startup-notification \
'--disable-startup-notification' \
'for startup notifications' &&
+optional_depends gconf2 \
+ '--enable-gconf' \
+ '--disable-gconf' \
+ 'for gconf support' &&
+
optional_depends 'wireless_tools' \
'--enable-necko-wifi' \
'--disable-necko-wifi' \
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 2f0c6fc..728e836 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,13 +1,13 @@
SPELL=thunderbird
- VERSION=11.0
+ VERSION=17.0.2
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=32
+ SECURITY_PATCH=33
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 1f82653..c45db6b 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,12 @@
+2013-01-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: that was a huge security bump -- SECURITY_PATCH++
+
+2013-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, thunderbird.gpg: version 17.0.2
+ * BUILD, DEPENDS: commented out dependency on cairo, this version
+ of thunderbird appears to be incompatible with our cairo
+ * DEPENDS: added optional dependency on gconf2
+
2012-03-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 11.0, SECURITY_PATCH=32
diff --git a/mail/thunderbird/thunderbird.gpg
b/mail/thunderbird/thunderbird.gpg
index c7c357c..97edd5a 100644
Binary files a/mail/thunderbird/thunderbird.gpg and
b/mail/thunderbird/thunderbird.gpg differ
diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index 0b2a312..f448eea 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.4.1
- SECURITY_PATCH=2
+ VERSION=1.4.3
+ SECURITY_PATCH=3
SOURCE=Django-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Django-$VERSION"
SOURCE_URL[0]=http://www.djangoproject.com/download/$VERSION/tarball/
-
SOURCE_HASH=sha512:1956e84c2c5131b17c76699a733801105c554d447341547c306ecf02ab1ef61371efe8fec0a8f10ddeafc9f13b61680543772678f9f1d594ad320c673669d0b2
+
SOURCE_HASH=sha512:88128f92f6b96551fafa6d19113cc3179d42f65de5da5251ef4166f51653f945280c6a9747b1984a696a936150bab8f28480f8d932c28b08ff8e95c8d28d1535
fi
WEB_SITE=http://www.djangoproject.com/
LICENSE[0]=BSD
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index 3610808..6a94d3c 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,7 @@
+2013-01-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.3; SECURITY_PATCH++
+ (security updates from 1.4.2 and 1.4.3)
+
2012-08-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.1; SECURITY_PATCH++
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index dd80218..2cef0ce 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
VERSION=4.1.4
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 118a9bf..97c01d6 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,11 @@
+2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: security update
+ * INSTALL: corrected multijob build
+ * PRE_BUILD: apply patches
+ * xsa-27-1.patch: added, to fix CVE-2012-5511
+ * xsa-33.patch: added, to fix CVE-2012-5634
+ * xsa-41{,-1}.patch: added, to fix CVE-2012-6075
+
2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.1.4
* PRE_BUILD: removed patches
diff --git a/utils/xen/INSTALL b/utils/xen/INSTALL
index a60a3c6..0e01ff7 100755
--- a/utils/xen/INSTALL
+++ b/utils/xen/INSTALL
@@ -1,13 +1,13 @@
unset LDFLAGS &&
unset CFLAGS &&
+make_single &&
make install-xen install-tools &&
if [[ $XEN_STUBDOM == y ]]; then
- make_single &&
- make install-stubdom &&
- make_normal
+ make install-stubdom
fi &&
+make_normal &&
if [[ $INIT_INSTALLED ]]; then
install_config_file "$SPELL_DIRECTORY/init.d/xend.conf" \
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index c7f9a4a..f45d57a 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,6 +1,11 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-27-1.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-33.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-41.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa-41-1.patch" &&
+
if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
fi &&
diff --git a/utils/xen/xsa-27-1.patch b/utils/xen/xsa-27-1.patch
new file mode 100644
index 0000000..4260b20
--- /dev/null
+++ b/utils/xen/xsa-27-1.patch
@@ -0,0 +1,12 @@
+--- a/xen/arch/x86/mm/paging.c Wed Jan 16 14:15:12 2013 +0000
++++ b/xen/arch/x86/mm/paging.c Thu Jan 17 11:17:32 2013 +0000
+@@ -534,7 +534,8 @@ int paging_log_dirty_range(struct domain
+
+ size = ((nr + BITS_PER_LONG - 1) / BITS_PER_LONG) * sizeof (long);
+ rv = 0;
+- for ( off = 0; !rv && off < size; off += sizeof zeroes )
++ off = 0;
++ while ( !rv && off < size )
+ {
+ int todo = min(size - off, (int) PAGE_SIZE);
+ if ( copy_to_guest_offset(dirty_bitmap, off, zeroes, todo) )
diff --git a/utils/xen/xsa-33.patch b/utils/xen/xsa-33.patch
new file mode 100644
index 0000000..d0bdeb4
--- /dev/null
+++ b/utils/xen/xsa-33.patch
@@ -0,0 +1,21 @@
+VT-d: fix interrupt remapping source validation for devices behind
+legacy bridges
+
+Using SVT_VERIFY_BUS here doesn't make sense; native Linux also
+uses SVT_VERIFY_SID_SQ here instead.
+
+This is XSA-33 / CVE-2012-5634.
+
+Signed-off-by: Jan Beulich <jbeulich AT suse.com>
+
+--- a/xen/drivers/passthrough/vtd/intremap.c
++++ b/xen/drivers/passthrough/vtd/intremap.c
+@@ -499,7 +499,7 @@ static void set_msi_source_id(struct pci_dev *pdev,
struct iremap_entry *ire)
+ set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
+ (bus << 8) | pdev->bus);
+ else if ( pdev_type(bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE )
+- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
++ set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16,
+ PCI_BDF2(bus, devfn));
+ }
+ break;
diff --git a/utils/xen/xsa-41-1.patch b/utils/xen/xsa-41-1.patch
new file mode 100644
index 0000000..4ca750b
--- /dev/null
+++ b/utils/xen/xsa-41-1.patch
@@ -0,0 +1,41 @@
+From 2c0331f4f7d241995452b99afaf0aab00493334a Mon Sep 17 00:00:00 2001
+From: Michael Contreras <michael AT inetric.com>
+Date: Wed, 5 Dec 2012 13:31:30 -0500
+Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
+
+Discard packets longer than 16384 when !SBP to match the hardware behavior.
+
+Signed-off-by: Michael Contreras <michael AT inetric.com>
+Signed-off-by: Stefan Hajnoczi <stefanha AT redhat.com>
+---
+ hw/e1000.c | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hw/e1000.c b/hw/e1000.c
+index 92fb00a..8fd1654 100644
+--- a/tools/ioemu-qemu-xen/hw/e1000.c
++++ b/tools/ioemu-qemu-xen/hw/e1000.c
+@@ -61,6 +61,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
+
+ /* this is the size past which hardware will drop packets when setting
LPE=0 */
+ #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
++/* this is the size past which hardware will drop packets when setting
LPE=1 */
++#define MAXIMUM_ETHERNET_LPE_SIZE 16384
+
+ /*
+ * HW models:
+@@ -809,8 +811,9 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
+ }
+
+ /* Discard oversized packets if !LPE and !SBP. */
+- if (size > MAXIMUM_ETHERNET_VLAN_SIZE
+- && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
++ if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
++ (size > MAXIMUM_ETHERNET_VLAN_SIZE
++ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
+ return size;
+ }
+--
+1.7.0.4
+
diff --git a/utils/xen/xsa-41.patch b/utils/xen/xsa-41.patch
new file mode 100644
index 0000000..64f60c5
--- /dev/null
+++ b/utils/xen/xsa-41.patch
@@ -0,0 +1,46 @@
+From b0d9ffcd0251161c7c92f94804dcf599dfa3edeb Mon Sep 17 00:00:00 2001
+From: Michael Contreras <michael AT inetric.com>
+Date: Sun, 2 Dec 2012 20:11:22 -0800
+Subject: [PATCH] e1000: Discard packets that are too long if !SBP and !LPE
+
+The e1000_receive function for the e1000 needs to discard packets longer than
+1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes
+this behavior and allocates memory based on this assumption.
+
+Signed-off-by: Michael Contreras <michael AT inetric.com>
+Signed-off-by: Anthony Liguori <aliguori AT us.ibm.com>
+---
+ hw/e1000.c | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/hw/e1000.c b/hw/e1000.c
+index cb7e7e8..5537ad2 100644
+--- a/tools/ioemu-qemu-xen/hw/e1000.c
++++ b/tools/ioemu-qemu-xen/hw/e1000.c
+@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
+ #define PNPMMIO_SIZE 0x20000
+ #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */
+
++/* this is the size past which hardware will drop packets when setting
LPE=0 */
++#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
++
+ /*
+ * HW models:
+ * E1000_DEV_ID_82540EM works with Windows and Linux
+@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
+ size = sizeof(min_buf);
+ }
+
++ /* Discard oversized packets if !LPE and !SBP. */
++ if (size > MAXIMUM_ETHERNET_VLAN_SIZE
++ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
++ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
++ return size;
++ }
++
+ if (!receive_filter(s, buf, size))
+ return size;
+
+--
+1.7.0.4
+
- [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (5a3b0c4fb010d3f6b71694b95ab2980d28c0425d), Vlad Glagolev, 01/28/2013
Archive powered by MHonArc 2.6.24.