Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (ba359448a61cc287b369ccec48a371309d737128)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ba359448a61cc287b369ccec48a371309d737128)
  • Date: Thu, 5 Jul 2012 15:20:48 -0500

GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

VERSION | 2
cluster/atlas/HISTORY | 6
cluster/atlas/INSTALL | 14
cluster/atlas/PRE_BUILD | 6
cluster/atlas/no_fortran.patch | 16
database/mysql/BUILD | 43 -
database/mysql/CONFIGURE | 3
database/mysql/HISTORY | 7
devel/ddd/HISTORY | 4
devel/ddd/PRE_BUILD | 4
devel/ddd/gcc-4.4.patch | 10
devel/gdb/DEPENDS | 7
devel/gdb/DETAILS | 2
devel/gdb/HISTORY | 7
disk/cdrdao/HISTORY | 4
disk/cdrdao/PRE_BUILD | 6
disk/cdrdao/stat.patch | 13
gnome2-apps/giggle/HISTORY | 5
gnome2-apps/giggle/PRE_BUILD | 3
gnome2-apps/giggle/gmodule.patch | 10
gnome2-libs/mutter/BUILD | 4
gnome2-libs/mutter/DEPENDS | 8
gnome2-libs/mutter/HISTORY | 6
gnome2-libs/unique/HISTORY | 5
gnome2-libs/unique/PRE_BUILD | 3
gnome2-libs/unique/glib.patch | 117 +++++
graphics-libs/babl/BUILD | 2
graphics-libs/babl/DEPENDS | 2
graphics-libs/babl/HISTORY | 12
graphics-libs/babl/PRE_BUILD | 8
graphics-libs/babl/babl-0.1.10-gir-build-fix.patch | 13
graphics-libs/babl/babl-introspection.patch | 28 +
graphics-libs/mesalib/CONFIGURE | 3
graphics-libs/mesalib/DEPENDS | 9
graphics-libs/mesalib/DETAILS | 1
graphics-libs/mesalib/HISTORY | 8
graphics-libs/mesalib/PROVIDES | 1
graphics-libs/tiff/DETAILS | 6
graphics-libs/tiff/HISTORY | 3
http/firefox/DETAILS | 6
http/firefox/HISTORY | 3
http/nginx/CONFIGURE | 5
http/nginx/HISTORY | 3
kernels/linux/HISTORY | 44 ++
kernels/linux/info/kernels/3.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4 | 5
kernels/linux/latest.defaults | 4
libs/gksu/HISTORY | 5
libs/gksu/PRE_BUILD | 4
libs/gksu/glib.patch | 11
net/dhcp/BUILD | 5
net/dhcp/CONFIGURE | 1
net/dhcp/DEPENDS | 18
net/dhcp/DETAILS | 9
net/dhcp/HISTORY | 16
net/dhcp/INSTALL | 3
net/dhcp/PRE_BUILD | 7
net/dhcp/SUB_DEPENDS | 7
net/dhcp/dhcp-3.0.3-dhclient-dbus.patch | 84 ---
net/dhcp/dhcp-3.0.3-x-option.patch | 216
----------
net/dhcp/init.d/dhcp | 6
net/dhcp/init.d/dhcp.conf | 7
net/wicd/DETAILS | 1
net/wicd/HISTORY | 6
net/wicd/PRE_BUILD | 4
net/wicd/secure.patch | 15
science-libs/eigen2/DETAILS | 4
science-libs/eigen2/HISTORY | 3
security/shadow/DEPENDS | 17
security/shadow/DETAILS | 4
security/shadow/HISTORY | 7
security/shadow/PRE_BUILD | 4
security/shadow/copydir.c.patch | 10
shell-term-fm/rdesktop/DEPENDS | 1
shell-term-fm/rdesktop/HISTORY | 3
video-libs/libunicap/DETAILS | 2
video-libs/libunicap/HISTORY | 4
video-libs/libunicap/PRE_BUILD | 2
video/vlc/DETAILS | 6
video/vlc/HISTORY | 4
video/vlc/PRE_BUILD | 4
video/vlc/glx.patch | 13
126 files changed, 631 insertions(+), 588 deletions(-)

New commits:
commit ba359448a61cc287b369ccec48a371309d737128
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

VERSION: 0.61-1

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

linux: => 3.0.36 (lts)
(cherry picked from commit 57638cd7eab430e0790b3fcacd3a3171cea0fb16)

commit 6621bc24e95906a2415f6b136056fbbeac215e9c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.4.4
(cherry picked from commit 6fd7f7b515ff3314708c51b3cc1355e2926090d2)

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

linux: => 3.0.35 (lts)
(cherry picked from commit 7d96bf2b2214b9e1e6ad060b72dbeb3608e826b6)

commit 5e8f41d2d5f023db304fe56fa274f08654ba3d84
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.4.3
(cherry picked from commit 92084d20f6c04bd18e84930cdcea6d1eff7bdec1)

commit f92bc205bd71115349eb4f8d8d7713d13d329eea
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.4.2
(cherry picked from commit 27862ec8f74f50683ec5c0cbb1203a2c5412230b)

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

linux: => 3.0.34 (lts)
(cherry picked from commit c08b3ab4dc925acffcce0a67a106f478a0f6523d)

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

linux: => 3.1.10 (eol)
(cherry picked from commit 86dbba402737efd054fdb241212869d403e0bf6a)

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

linux: => 3.3.8 (lts)
(cherry picked from commit 96dc1d2825109c36e0e2d89a51cf23718013d262)

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

linux: => 3.2.19 (lts)
(cherry picked from commit 3e016dd8334c5f75a4082d63e85a0f3698eb5101)

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

linux: => 3.0.33 (lts)
(cherry picked from commit 3f9e4561000b1b3572b42b8b7e06092ad80d75a7)

commit 374d1fa06608caaeaa457d1c5195c418981cb530
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.4.1
(cherry picked from commit 793908a55587e1a42b5f73ec2d27cfd3dfafadc8)

commit b724605fb507973ca964e8be1c1ceb9aa8dd38e9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux LATEST_3=3.4
(cherry picked from commit b77d9c503bc72a9fc0d0c29c1afc2a26814247e3)

commit accdeb178671318a63218b56dd2cd1a91068aa4a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.4
(cherry picked from commit deb46cc73fe6741d37e0fc96962f6e30f8beedae)

commit 73253350f17ed9e12515a551c4088c902429ac5b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.3.6
(cherry picked from commit 6ba88136f06a5a356989bd0f276bfea884d9b617)

commit b0ae9313c0b6f0d79f7f6b41e390f890fa15bb13
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

giggle: added patch to address upstream bug 667350
(cherry picked from commit b45956d43d06c9a362441ee3d89ad90cf00f0a9d)

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

dhcp: => 4.2.4
(cherry picked from commit 6263f900bfcc37e1b34e50c7fe94d0c173bfdffe)

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

wicd: fixed setting keys for secured networks
(cherry picked from commit 81311e5ec0cd9472a18aaff85a8952ac4ba1184f)

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

nginx: added support for http_realip_module
(cherry picked from commit b0714fb888bf180fbfdbab3106801f9de303e87b)

commit b203258892a5c5c399dddf78dc9d70f3ef1f2162
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

shadow 4.1.5.1
(cherry picked from commit 632825c4ffca80c261599ea1c62930692ed10e6b)

commit bfa8a683c2f08eb1f80e37c7d50691c0ce7d9c15
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

vlc 2.0.2, SECURITY_PATCH=24
(cherry picked from commit 67801a12cc621d9d60ad842ca66ae7d379d37519)

commit f983896cca67668897da46ec7e66ddb74f0ac769
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libunicap - fix obsolete syntax in udev rules
(cherry picked from commit f4a67845a8191b62e9604d331d332f7fdabd0797)

commit 41c78c91eaf110c5a6cf640bbab66a250fd9f283
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mysql: Cleanup MSQL_ENGINES

After a while (or a bug a while ago), MSQL_ENGINES looks like:
[[ What additional storage engines to build? -> 'FEDERATED FEDERATED
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB InnoDB
InnoDB InnoDB ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster
ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster
ndbcluster ndbcluster ndbcluster ndbcluster ndbcluster' ]]
(cherry picked from commit 47fef12ac73593d85e1741762a1546a4ec42021f)

commit ab98ba6a50c626110e7239cb79dcb42bc23bf358
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mysql: ndbcluster requires ndb-test for API
Some plugins fail with -Wl,--as-needed (e.g. ndbcluster)
(cherry picked from commit 21c9131384878c6c10f8071d76bc59c215018bea)

commit aeacdfa82bb10ac1396e65652e33526ceed72812
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mysql: Fix plugin configure flags

configure: WARNING: unrecognized options: --with-ndbcluster,
--with-innodb,
--with-federated-storage-engine, --without-example-storage-engine,
--without-blackhole-storage-engine, --without-archive-storage-engine

Some plugins do not have disables:
archive, blackhole, example
(cherry picked from commit 062e0c437a721eef3c8cd7769ee9d0f9473bfb2e)

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

mesalib: incremented PATCHLEVEL
(cherry picked from commit b5ed972ea8f39d3d519b27160e1608e4e847716b)

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

mesalib: fixed GLU[T] mess
(cherry picked from commit da2f6addec53ee460732ed23a7e71815295c1d05)

commit ad6d8968a282dd00968485b2e66f66135b15dc59
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

security/shadow: correct date in HISTORY

Somehow got the wrong date by accident on my previous commit.
(cherry picked from commit 358396eed8ad9d486abad7e36b8b6894d72f7479)

commit 3ce03876d62387e097c00920f1093bc9195b03f1
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

security/shadow: add missing dependencies

Some optional dependencies for shadow were missing from its DEPENDS
file, notably acl, attr, and audit. These have now been added and
accounted for.
(cherry picked from commit 11bb0bad4699c7503a473d340d2df2f8cc025475)

commit dfaa7fb1fc071c1b10e79c77a1b06cb5fc714806
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

cdrdao: fix compilation of stable branch by adding stat headers
* PRE_BUILD: added, to apply patch for stable branch
* stat.patch: added, add stat headers to fix compilation
(cherry picked from commit 89aafa4ffc771fa5744a44393aeebecdf20bc340)

commit bd30e787c4aca4ae631065e4de7255275775bd8a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

shell-term-fm/rdesktop: add dependency on libx11
(cherry picked from commit e0627eb675fa564908808b6fed82dc3d3c875005)

commit 620cd2761ac35a62c5f4ca867303c29b7d4e6609
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

babl: Fix compilation with gobject-introspection
* babl-0.1.10-gir-build-fix.patch: Fix compilation with
gobject-introspection.
See https://bugs.gentoo.org/show_bug.cgi?id=413663
* babl-introspection.patch: Fix .gir and .typelib
See https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
* Broken with vala, disable
See https://bugs.gentoo.org/show_bug.cgi?id=413663#c20
(cherry picked from commit 0bbe772874dac5e1e93890aa50b1599777d4f328)

commit 7877c09f4d4091cf8b1281531c41aa551fe87335
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mutter: add flag to treat warnings as warnings, not errors

DEPENDS: Updated gobject-introspection flags.
Removed gconf2 flags as they are no longer valid, but gconf2 is
still optional.
(cherry picked from commit aa09cb86ed7e12599473dd22312078ecf44af9f1)

commit ee027aee3003da4a0696b37965f2901b6893e51a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

unique: fix compilation with glib >= 2.31
(cherry picked from commit acac9f46ca4112f555ff5709ace805f010d6ad5a)

commit ef207193142e77b364e79aa53dffc3a2d6f31512
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gksu: fix compilation of nautilus plugin with glib >= 2.31
(cherry picked from commit 8ab3b8bd447a3d40e44c567f65ee35804cefebc3)

commit e0f33483cd904e0c739b5dc59c3d5cd375c1e41b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tiff 4.0.2, SECURITY_PATCH=4, CVE-2012-1173, CVE-2012-2113
(cherry picked from commit e4744a68370d9a23c2932a3ca6f6ba24c4c36837)

commit de1a5053e3f12a5ce9a1822a2c17042420af4426
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

atlas: fixed HISTORY
if fortran is enabled, apply patch to not compile fortran libs -> if
fortran is NOT enabled, apply patch to not compile fortran libs
(cherry picked from commit fbb9b31f07e5cd3a89320f72aa9843112f5f7f75)

commit 16387a9472a8c41ba4ecb3d918d13299d1a249e7
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

atlas: if fortran is enabled, apply patch to not compile fortran libs
(fixes #161)
* no_fortran.patch: added, patch to not compile fortran libs
* BUILD: Only install fortran libs if optional fortran depends is enabled
(cherry picked from commit d10688beb6d969f01e9127f97d32e50363140fc8)

commit e9cf581009938c320019dafa4dd19e4a14c35528
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

eigen2: updated sha512 and fixed SOURCE_DIRECTORY
(cherry picked from commit 01a223f59afd6007bf5d70f0d9808e820c397078)

commit 4aed00033b1243e27c08cb71ac117c5517ce7a73
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ddd: fix compilation on gcc >= 4.4
PRE_BUILD - added to apply patch
gcc-4.4.patch - added, fixes compilation on gcc >= 4.4
(cherry picked from commit 9332a16c5c28c3187cde951440ce537bf729e8c4)

commit 7c96f34b665db2ea9809f7759d48487f66ed5d3c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gdb: removed optional_depends tk as gdbtk is a separate project (insight)
(fixes #249)
(cherry picked from commit 7530eb6fecf6e6e638142c480640727619bd5b3b)

commit d9f2455c38f0a7d0ff4e243bc1de5d9cd813a58e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gdb: => 7.4.1
(cherry picked from commit d0f80695d8a97b3d0f4b6e9b6ab864db9bcdde26)

commit 120a37a458c05177f7421674abf15546fd9b181c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox 13.0.1, SECURITY_PATCH=50
(cherry picked from commit efef8dc114975748f7de987f613e0498e40834f1)

diff --git a/VERSION b/VERSION
index fd92f28..efbad72 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-0
+0.61-1
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 5495ff6..fb4ea9d 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+2012-06-22 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: if optional fortran depends is not enabled, apply
+ patch to not compile fortran libs
+ * no_fortran.patch: added, patch to not compile fortran libs
+ * BUILD: Only install fortran libs if optional fortran depends is
enabled
+
2011-05-15 Peng Chang (Charels) <chp AT sourcemage.org>
* BUILD: fat_shared is still not prevailing, added make check and
make time,
these takes only 2 min, but definitely worth keeping record
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index 3fe412b..b18db84 100755
--- a/cluster/atlas/INSTALL
+++ b/cluster/atlas/INSTALL
@@ -1,13 +1,17 @@
make install &&

if [ $PT_LIB == y ]; then
- mv -v lib/libptf77blas.so lib/libf77blas.so &&
mv -v lib/libptcblas.so lib/libcblas.so &&
- mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a
$INSTALL_ROOT/usr/lib/libf77blas.a &&
- mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
+ mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
&&
+ if is_depends_enabled $SPELL fortran; then
+ mv -v lib/libptf77blas.so lib/libf77blas.so &&
+ mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a
$INSTALL_ROOT/usr/lib/libf77blas.a
+ fi
else
- rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a &&
- rm -v $INSTALL_ROOT/usr/lib/libptcblas.a
+ rm -v $INSTALL_ROOT/usr/lib/libptcblas.a &&
+ if is_depends_enabled $SPELL fortran; then
+ rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a
+ fi
fi &&

cp -v lib/*.so $INSTALL_ROOT/usr/lib
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index 9dbaf8f..09f47f3 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -3,4 +3,8 @@ mkdir $SOURCE_DIRECTORY/bld &&

cd $SOURCE_DIRECTORY &&
patch configure $SPELL_DIRECTORY/configure.patch &&
-patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch
+patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch &&
+
+if ! is_depends_enabled $SPELL fortran; then
+ patch -p1 < $SPELL_DIRECTORY/no_fortran.patch
+fi
diff --git a/cluster/atlas/no_fortran.patch b/cluster/atlas/no_fortran.patch
new file mode 100644
index 0000000..05cf400
--- /dev/null
+++ b/cluster/atlas/no_fortran.patch
@@ -0,0 +1,16 @@
+--- ATLAS.o/makes/Make.lib 2011-05-14 13:33:24.000000000 -0400
++++ ATLAS/makes/Make.lib 2012-06-22 14:40:42.068787951 -0400
+@@ -33,11 +33,11 @@
+
+ ptshared :
+ - rm -f libatlas.so liblapack.so
+- $(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
++ $(MAKE) libatlas.so liblapack.so \
+ libptcblas.so libcblas.so liblapack.so
+ shared :
+ - rm -f libatlas.so liblapack.so
+- $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so
liblapack.so
++ $(MAKE) libatlas.so liblapack.so libcblas.so liblapack.so
+ cptshared :
+ - rm -f libatlas.so libclapack.so
+ $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
diff --git a/database/mysql/BUILD b/database/mysql/BUILD
index 2b60912..0d92aae 100755
--- a/database/mysql/BUILD
+++ b/database/mysql/BUILD
@@ -1,51 +1,48 @@
OPTS="--with-charset=$MSQL_CHARSET $OPTS" &&

if list_find "$MSQL_ENGINES" "none" ; then
- OPTS="--without-archive-storage-engine \
- --without-berkeley-db \
- --without-blackhole-storage-engine \
- --without-example-storage-engine \
- --without-federated-storage-engine \
- --without-innodb \
- --without-ndbcluster \
+ OPTS="--without-berkeley-db \
+ --without-plugin-federated \
+ --without-plugin-innodb_plugin \
+ --without-plugin-ndbcluster \
$OPTS"
else
+ LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
+
+ # Cleanup MSQL_ENGINES
+ MSQL_ENGINES=$(echo $MSQL_ENGINES | tr ' ' '\n' | awk '!_[$0]++' | tr
'$\n' ' ')
+
if list_find "$MSQL_ENGINES" "ARCHIVE" ; then
- OPTS="--with-archive-storage-engine $OPTS"
- else
- OPTS="--without-archive-storage-engine $OPTS"
+ PLUGINS="$PLUGINS,archive"
fi &&
if ! list_find "$MSQL_ENGINES" "BerkeleyDB" ; then
OPTS="--without-berkeley-db $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "BLACKHOLE" ; then
- OPTS="--with-blackhole-storage-engine $OPTS"
- else
- OPTS="--without-blackhole-storage-engine $OPTS"
+ PLUGINS="$PLUGINS,blackhole"
fi &&
if list_find "$MSQL_ENGINES" "EXAMPLE" ; then
- OPTS="--with-example-storage-engine $OPTS"
- else
- OPTS="--without-example-storage-engine $OPTS"
+ PLUGINS="$PLUGINS,example"
fi &&
if list_find "$MSQL_ENGINES" "FEDERATED" ; then
- OPTS="--with-federated-storage-engine $OPTS"
+ PLUGINS="$PLUGINS,federated"
else
- OPTS="--without-federated-storage-engine $OPTS"
+ OPTS="--without-plugin-federated $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "InnoDB" ; then
- OPTS="--with-innodb $OPTS"
+ PLUGINS="$PLUGINS,innodb_plugin"
else
- OPTS="--without-innodb $OPTS"
+ OPTS="--without-plugin-innodb_plugin $OPTS"
fi &&
if list_find "$MSQL_ENGINES" "ndbcluster" ; then
- OPTS="--with-ndbcluster $OPTS"
+ PLUGINS="$PLUGINS,ndbcluster" &&
+ OPTS="--with-ndb-test $OPTS"
else
- OPTS="--without-ndbcluster $OPTS"
+ OPTS="--without-plugin-ndbcluster $OPTS"
fi
fi &&

-OPTS="$MSQL_SERVER $MSQL_EMBED $OPTS" &&
+OPTS="$MSQL_SERVER $MSQL_EMBED --with-plugins=$PLUGINS $OPTS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&

create_account mysql &&
diff --git a/database/mysql/CONFIGURE b/database/mysql/CONFIGURE
index 442582b..d6960b6 100755
--- a/database/mysql/CONFIGURE
+++ b/database/mysql/CONFIGURE
@@ -59,6 +59,9 @@ config_query_multi MSQL_ENGINES
\
if list_find "$MSQL_ENGINES" "all"
then
MSQL_ENGINES="ARCHIVE BerkeleyDB BLACKHOLE EXAMPLE FEDERATED InnoDB
ndbcluster"
+elif list_find "$MSQL_ENGINES" "none"
+then
+ MSQL_ENGINES="none"
fi &&

config_query_option MSQL_EMBED \
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index a9e56e0..2a9dba1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,10 @@
+2012-06-26 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Cleanup MSQL_ENGINES for "none"
+ * BUILD: Fix plugin configure flags
+ ndbcluster requires ndb-test for testing
+ Disable LDFLAGS -Wl,--as-needed when building plugins
+ Cleanup MSQL_ENGINES after everything is defined
+
2012-03-02 Arjan Bouter <abouter AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: added NDB for ndbcluster

diff --git a/devel/ddd/HISTORY b/devel/ddd/HISTORY
index cb4af32..b4a3763 100644
--- a/devel/ddd/HISTORY
+++ b/devel/ddd/HISTORY
@@ -1,3 +1,7 @@
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply gcc patch
+ * gcc-4.4.patch: added, fix compilation on gcc >= 4.4
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* E5158D1A.gpg: added gpg keyring
diff --git a/devel/ddd/PRE_BUILD b/devel/ddd/PRE_BUILD
new file mode 100755
index 0000000..e038d92
--- /dev/null
+++ b/devel/ddd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/gcc-4.4.patch
diff --git a/devel/ddd/gcc-4.4.patch b/devel/ddd/gcc-4.4.patch
new file mode 100644
index 0000000..d644044
--- /dev/null
+++ b/devel/ddd/gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- ddd/strclass.C 2011-10-04 17:49:36.428744325 -0700
++++ ddd/strclass.C-new 2011-10-04 17:49:29.016546965 -0700
+@@ -39,6 +39,7 @@ extern "C" int malloc_verify();
+ #include <limits.h>
+ #include <new>
+ #include <stdlib.h>
++#include <cstdio>
+
+ void string::error(const char* msg) const
+ {
diff --git a/devel/gdb/DEPENDS b/devel/gdb/DEPENDS
index 0dc6280..744620c 100755
--- a/devel/gdb/DEPENDS
+++ b/devel/gdb/DEPENDS
@@ -40,9 +40,4 @@ optional_depends expat \
optional_depends python \
"--with-python" \
"--without-python" \
- "to include Python support" &&
-
-optional_depends tk \
- "--enable-gdbtk" \
- "--disable-gdbtk" \
- "for graphical user interface"
+ "to include Python support"
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index b39edc9..84dc8b9 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdb
- VERSION=7.4
+ VERSION=7.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index bd190aa..8a436e2 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,10 @@
+2012-06-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: removed optional_depends tk as gdbtk is
+ a separate project (insight) (fixes #249)
+
+2012-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.4.1
+
2012-02-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.4

diff --git a/disk/cdrdao/HISTORY b/disk/cdrdao/HISTORY
index bca480f..c38c65d 100644
--- a/disk/cdrdao/HISTORY
+++ b/disk/cdrdao/HISTORY
@@ -1,3 +1,7 @@
+2012-06-27 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch for stable branch
+ * stat.patch: added, add stat headers to fix compilation
+
2012-03-04 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: removed as patch no longer needed for scm build

diff --git a/disk/cdrdao/PRE_BUILD b/disk/cdrdao/PRE_BUILD
new file mode 100755
index 0000000..7a7823c
--- /dev/null
+++ b/disk/cdrdao/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ "$CDRDAO_BRANCH" == "stable" ]]; then
+ patch -p1 < $SPELL_DIRECTORY/stat.patch
+fi
diff --git a/disk/cdrdao/stat.patch b/disk/cdrdao/stat.patch
new file mode 100644
index 0000000..4d9c24c
--- /dev/null
+++ b/disk/cdrdao/stat.patch
@@ -0,0 +1,13 @@
+--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000
+0100
++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100
+@@ -19,6 +19,9 @@
+
+ #include <config.h>
+
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+
diff --git a/gnome2-apps/giggle/HISTORY b/gnome2-apps/giggle/HISTORY
index 14549aa..5b32df6 100644
--- a/gnome2-apps/giggle/HISTORY
+++ b/gnome2-apps/giggle/HISTORY
@@ -1,3 +1,8 @@
+2012-07-04 Tommy Boatman <tboatman AT sourcemage.org>
+ * PRE_BUILD: add gmodule.patch to address GNOME bug 667350
+ https://bugzilla.gnome.org/show_bug.cgi?id=667350 - gmodule-2.0 no
+ longer in pkg-config files for GTK+. 0.6.2 will fix when released
+
2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.1

diff --git a/gnome2-apps/giggle/PRE_BUILD b/gnome2-apps/giggle/PRE_BUILD
new file mode 100755
index 0000000..bdf18f2
--- /dev/null
+++ b/gnome2-apps/giggle/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/gmodule.patch
diff --git a/gnome2-apps/giggle/gmodule.patch
b/gnome2-apps/giggle/gmodule.patch
new file mode 100644
index 0000000..40099c1
--- /dev/null
+++ b/gnome2-apps/giggle/gmodule.patch
@@ -0,0 +1,10 @@
+--- configure.ac~ 2011-10-24 07:56:10.000000000 -0500
++++ configure.ac 2012-07-04 20:08:45.000000000 -0500
+@@ -57,6 +57,7 @@
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gthread-2.0 >= $GLIB_REQUIRED_VERSION
++ gmodule-2.0 >= $GLIB_REQUIRED_VERSION
+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION
+ gdk-3.0 >= $GTK_REQUIRED_VERSION
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
diff --git a/gnome2-libs/mutter/BUILD b/gnome2-libs/mutter/BUILD
new file mode 100755
index 0000000..e324b29
--- /dev/null
+++ b/gnome2-libs/mutter/BUILD
@@ -0,0 +1,4 @@
+# treat warnings as warnings, not errors
+OPTS="$OPTS --enable-compile-warnings=maximum" &&
+
+default_build
diff --git a/gnome2-libs/mutter/DEPENDS b/gnome2-libs/mutter/DEPENDS
index 193e357..41b5751 100755
--- a/gnome2-libs/mutter/DEPENDS
+++ b/gnome2-libs/mutter/DEPENDS
@@ -25,8 +25,8 @@ optional_depends libxinerama
\
"Enable use of the Xinerama extension?" &&

optional_depends gconf2 \
- '--enable-gconf' \
- '--disable-gconf' \
+ '' \
+ '' \
'for GNOME configuration settings' &&

optional_depends startup-notification \
@@ -40,6 +40,6 @@ optional_depends rarian
\
'register help docs with rarian?' &&

optional_depends gobject-introspection \
- '--with-introspection' \
- '--without-introspection' \
+ '--enable-introspection=yes' \
+ '--enable-introspection=no' \
'use gobject binding'
diff --git a/gnome2-libs/mutter/HISTORY b/gnome2-libs/mutter/HISTORY
index af86f9f..d669156 100644
--- a/gnome2-libs/mutter/HISTORY
+++ b/gnome2-libs/mutter/HISTORY
@@ -1,3 +1,9 @@
+2012-06-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: Updated gobject-introspection flags.
+ Removed gconf2 flags as they are no longer valid, but gconf2
+ is still optional.
+ * BUILD: added, add flag to treat warnings as warnings not errors.
+
2012-04-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.1

diff --git a/gnome2-libs/unique/HISTORY b/gnome2-libs/unique/HISTORY
index d5def6c..10a5f21 100644
--- a/gnome2-libs/unique/HISTORY
+++ b/gnome2-libs/unique/HISTORY
@@ -1,3 +1,8 @@
+2012-06-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: apply glib.patch
+ * glib.patch: added, remove depreciated G_CONST_RETURN
+ from Arch Linux
+
2011-08-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: added to apply patch to remove -Werror

diff --git a/gnome2-libs/unique/PRE_BUILD b/gnome2-libs/unique/PRE_BUILD
index f9ee958..b565962 100755
--- a/gnome2-libs/unique/PRE_BUILD
+++ b/gnome2-libs/unique/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/Werror.patch
+patch -p1 < $SPELL_DIRECTORY/Werror.patch &&
+patch -p1 < $SPELL_DIRECTORY/glib.patch
diff --git a/gnome2-libs/unique/glib.patch b/gnome2-libs/unique/glib.patch
new file mode 100644
index 0000000..8a72e7d
--- /dev/null
+++ b/gnome2-libs/unique/glib.patch
@@ -0,0 +1,117 @@
+diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c
libunique-1.1.6/unique/uniqueapp.c
+--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298
+0000
++++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000
+@@ -781,7 +781,7 @@
+ }
+
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_command_to_string (UniqueApp *app,
+ gint command)
+ {
+@@ -863,7 +863,7 @@
+ return retval;
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_response_to_string (UniqueResponse response)
+ {
+ GEnumClass *enum_class;
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c
libunique-1.1.6/unique/uniquebackend.c
+--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950
+0000
+@@ -111,7 +111,7 @@
+ *
+ * Return value: FIXME
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_name (UniqueBackend *backend)
+ {
+ g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+@@ -154,7 +154,7 @@
+ *
+ * Return value: FIXME
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_startup_id (UniqueBackend *backend)
+ {
+ g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h
libunique-1.1.6/unique/uniquebackend.h
+--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492
+0000
+@@ -94,10 +94,10 @@
+
+ UniqueBackend * unique_backend_create (void);
+
+-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend
*backend);
++const gchar *unique_backend_get_name (UniqueBackend *backend);
+ void unique_backend_set_name (UniqueBackend
*backend,
+ const gchar
*name);
+-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend
*backend);
++const gchar *unique_backend_get_startup_id (UniqueBackend *backend);
+ void unique_backend_set_startup_id (UniqueBackend
*backend,
+ const gchar
*startup_id);
+ GdkScreen * unique_backend_get_screen (UniqueBackend
*backend);
+diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h
libunique-1.1.6/unique/uniqueinternals.h
+--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914
+0000
+@@ -44,11 +44,11 @@
+ * and then back into an id
+ */
+ UniqueResponse unique_response_from_string (const gchar
*response);
+-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse
response);
++const gchar *unique_response_to_string (UniqueResponse response);
+
+ gint unique_command_from_string (UniqueApp *app,
+ const gchar
*command);
+-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
++const gchar *unique_command_to_string (UniqueApp *app,
+ gint
command);
+
+ G_END_DECLS
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c
libunique-1.1.6/unique/uniquemessage.c
+--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713
+0000
+@@ -185,7 +185,7 @@
+ *
+ * Since: 1.0.2
+ */
+-G_CONST_RETURN guchar *
++const guchar *
+ unique_message_data_get (UniqueMessageData *message_data,
+ gsize *length)
+ {
+@@ -525,7 +525,7 @@
+ * owned by the #UniqueMessageData structure and should not be
+ * modified or freed
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_message_data_get_startup_id (UniqueMessageData *message_data)
+ {
+ g_return_val_if_fail (message_data != NULL, NULL);
+diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h
libunique-1.1.6/unique/uniquemessage.h
+--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01
07:38:17.748122298 +0000
++++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565
+0000
+@@ -48,7 +48,7 @@
+ void unique_message_data_set
(UniqueMessageData *message_data,
+ const guchar
*data,
+ gsize
length);
+-G_CONST_RETURN guchar *unique_message_data_get
(UniqueMessageData *message_data,
++const guchar *unique_message_data_get (UniqueMessageData
*message_data,
+ gsize
*length);
+
+ gboolean unique_message_data_set_text
(UniqueMessageData *message_data,
+@@ -63,7 +63,7 @@
+ gchar * unique_message_data_get_filename
(UniqueMessageData *message_data);
+
+ GdkScreen * unique_message_data_get_screen
(UniqueMessageData *message_data);
+-G_CONST_RETURN gchar * unique_message_data_get_startup_id
(UniqueMessageData *message_data);
++const gchar * unique_message_data_get_startup_id (UniqueMessageData
*message_data);
+ guint unique_message_data_get_workspace
(UniqueMessageData *message_data);
+
+ G_END_DECLS
diff --git a/graphics-libs/babl/BUILD b/graphics-libs/babl/BUILD
new file mode 100755
index 0000000..b177ff8
--- /dev/null
+++ b/graphics-libs/babl/BUILD
@@ -0,0 +1,2 @@
+OPTS="--without-vala ${OPTS}" &&
+default_build
diff --git a/graphics-libs/babl/DEPENDS b/graphics-libs/babl/DEPENDS
index 8c8b469..66eea8e 100755
--- a/graphics-libs/babl/DEPENDS
+++ b/graphics-libs/babl/DEPENDS
@@ -1,3 +1,5 @@
+depends autoconf &&
+
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
diff --git a/graphics-libs/babl/HISTORY b/graphics-libs/babl/HISTORY
index ab3425c..1612f7e 100644
--- a/graphics-libs/babl/HISTORY
+++ b/graphics-libs/babl/HISTORY
@@ -1,3 +1,15 @@
+2012-06-14 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on autoconf for `autoreconf`
+ * PRE_BUILD: Apply babl-0.1.10-gir-build-fix.patch and
+ babl-introspection.patch
+ * BUILD: Broken with vala, disable
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663#c20
+ * babl-0.1.10-gir-build-fix.patch: Fix compilation with
+ gobject-introspection.
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663
+ * babl-introspection.patch: Fix .gir and .typelib
+ See https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
+
2012-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.1.10

diff --git a/graphics-libs/babl/PRE_BUILD b/graphics-libs/babl/PRE_BUILD
new file mode 100755
index 0000000..d802155
--- /dev/null
+++ b/graphics-libs/babl/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Apply gobject-introspection
patches...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/babl/Makefile.am \
+ "${SPELL_DIRECTORY}"/babl-introspection.patch &&
+patch "${SOURCE_DIRECTORY}"/babl/Makefile.am \
+ "${SPELL_DIRECTORY}"/babl-0.1.10-gir-build-fix.patch &&
+cd "${SOURCE_DIRECTORY}" &&
+autoreconf
diff --git a/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
b/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
new file mode 100644
index 0000000..149b14d
--- /dev/null
+++ b/graphics-libs/babl/babl-0.1.10-gir-build-fix.patch
@@ -0,0 +1,13 @@
+# Modified from https://bugs.gentoo.org/show_bug.cgi?id=413663#c19
+
+diff -Naur babl-0.1.10.orig/babl/Makefile.am babl-0.1.10/babl/Makefile.am
+--- babl-0.1.10.orig/babl/Makefile.am 2012-06-14 12:20:51.181049347 -0700
++++ babl-0.1.10/babl/Makefile.am 2012-06-14 12:21:11.045048179 -0700
+@@ -95,6 +95,7 @@
+ if HAVE_INTROSPECTION
+ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am
+ $(INTROSPECTION_SCANNER) -v --namespace Babl
--nsversion=$(BABL_API_VERSION) \
++ --identifier-prefix= --symbol-prefix=babl \
+ --add-include-path=$(srcdir) --add-include-path=. \
+ --library=babl-$(BABL_API_VERSION) \
+ --libtool="$(LIBTOOL)" \
diff --git a/graphics-libs/babl/babl-introspection.patch
b/graphics-libs/babl/babl-introspection.patch
new file mode 100644
index 0000000..bced992
--- /dev/null
+++ b/graphics-libs/babl/babl-introspection.patch
@@ -0,0 +1,28 @@
+# From
http://git.gnome.org/browse/babl/commit/?id=c024c89f95de4a8fa95ba96790dac61768d11a17
+# as noted in https://bugs.gentoo.org/show_bug.cgi?id=413663#c3
+
+From c024c89f95de4a8fa95ba96790dac61768d11a17 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar AT opensuse.org>
+Date: Tue, 10 Jan 2012 16:32:50 +0000
+Subject: gobject-introspection: fix build of the .gir and .typelib files.
+
+---
+diff --git a/babl/Makefile.am b/babl/Makefile.am
+index cefab57..03115a3 100644
+--- a/babl/Makefile.am
++++ b/babl/Makefile.am
+@@ -93,10 +93,10 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+ if HAVE_INTROSPECTION
+-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am
++Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS)
$(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
+ $(INTROSPECTION_SCANNER) -v --namespace Babl
--nsversion=$(BABL_API_VERSION) \
+ --add-include-path=$(srcdir) --add-include-path=. \
+- --library=babl-$(BABL_API_VERSION) \
++ --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
+ --libtool="$(LIBTOOL)" \
+ --output $@ \
+ -DBABL_IS_BEING_COMPILED \
+--
+cgit v0.9.0.2
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 8a59422..55d87de 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -64,9 +64,6 @@ config_query_option MESALIB_OPTS "enable OpenGL Utility
library?" y \
config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
"--enable-glw" "--disable-glw" &&

-# config_query_option MESALIB_OPTS "enable GLUT library" y \
-# "--enable-glut" "--disable-glut"
-
case "$MESALIB_BRANCH" in
scm|development)
config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?"
n \
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 50ec31d..f63f9d7 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -19,10 +19,17 @@ depends talloc &&
depends libxml2 &&
sub_depends libxml2 PYTHON &&

-if list_find "--enable-glw" $MESALIB_OPTS; then
+if list_find "$MESALIB_OPTS" "--enable-glw"; then
depends libxt
fi &&

+if list_find "$MESALIB_OPTS" "--enable-glu"; then
+ optional_depends GLUT \
+ "--enable-glut" \
+ "--disable-glut" \
+ "to enable GLUT library"
+fi &&
+
optional_depends libxcb \
'--enable-xcb' \
'--disable-xcb' \
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index a2b1c2e..7a9bca1 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -36,6 +36,7 @@ else
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
fi
+ PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=http://www.mesa3d.org/
KEYWORDS="graphics libs"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index fd6b3a7..37e5ac4 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,11 @@
+2012-06-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * CONFIGURE: removed commented flags (moved to DEPENDS)
+ * PROVIDES: removed GLUT, mesalib can't provide GLUT since it doesn't
+ install GL/glut.h header, but requires it; plus GLU != GLUT
+ * DEPENDS: added missing optional dependency on GLUT if GLU had been
+ enabled; corrected list_find
+
2011-11-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Latest development is 7.11.1
Spell "development" correctly (and match PREPARE)
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3721e17..3fc56f6 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1,2 +1 @@
OPENGL
-GLUT
diff --git a/graphics-libs/tiff/DETAILS b/graphics-libs/tiff/DETAILS
index a4b2899..5a5488a 100755
--- a/graphics-libs/tiff/DETAILS
+++ b/graphics-libs/tiff/DETAILS
@@ -1,12 +1,12 @@
SPELL=tiff
- VERSION=4.0.1
-
SOURCE_HASH=sha512:a2f22285a936784043a66273986016cba8afaa58d50b2fd51de7f5e358901412fccbfb308e4b939a6a7aea91715278519ecbd73e5cd7e14b93e2edcf48f3f5ed
+ VERSION=4.0.2
+
SOURCE_HASH=sha512:bfc82b2780f2a7d89b1cd6d73ba45091fc74de996b2dad616cfdba59770b192449d6a9effba305f478a8e527d7246443a4e2bc1c5e2e6673a0037972f4a13413
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.remotesensing.org/pub/libtiff/$SOURCE
WEB_SITE=http://www.remotesensing.org/libtiff/
ENTERED=20010922
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=LGPL
KEYWORDS="graphics libs"
SHORT="tiff provides support for the Tag Image File Format."
diff --git a/graphics-libs/tiff/HISTORY b/graphics-libs/tiff/HISTORY
index c3deed7..93aba27 100644
--- a/graphics-libs/tiff/HISTORY
+++ b/graphics-libs/tiff/HISTORY
@@ -1,3 +1,6 @@
+2012-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.0.2, SECURITY_PATCH=4, CVE-2012-1173, CVE-2012-2113
+
2012-02-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.0.1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 22d6e7d..38b8161 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=13.0
+ VERSION=13.0.1
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=13.0
+ VERSION=13.0.1
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=49
+ SECURITY_PATCH=50
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a673d2c..93d567c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 13.0.1, SECURITY_PATCH=50
+
2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 13.0, SECURITY_PATCH=49
* PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
diff --git a/http/nginx/CONFIGURE b/http/nginx/CONFIGURE
index 79893db..b38722e 100755
--- a/http/nginx/CONFIGURE
+++ b/http/nginx/CONFIGURE
@@ -8,4 +8,7 @@ else
fi &&

config_query_option NGINX_OPTS "Build with mail support?" n \
- "--with-mail" ""
+ "--with-mail" "" &&
+
+config_query_option NGINX_OPTS "Enable HTTP Real IP module?" n \
+ "--with-http_realip_module" ""
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 9c04720..c32fe80 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,6 @@
+2012-07-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added support for http_realip_module
+
2012-04-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.15 (stable), 1.1.19 (devel) [security]
* sysoev.gpg: renamed to nginx.gpg
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 5995a15..071eeb8 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,47 @@
+2012-06-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.36: added
+
+2012-06-22 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.4
+ * info/patches/maintenance_patches_3/patch-3.4.4: added
+
+2012-06-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.35: added
+
+2012-06-17 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.3
+ * info/patches/maintenance_patches_3/patch-3.4.3: added
+
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.2
+ * info/patches/maintenance_patches_3/patch-3.4.2: added
+
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.34: added
+
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.33: added
+ * info/patches/maintenance_patches_3/patch-3.0.{21-31}: dropped
+ * info/patches/maintenance_patches_3/patch-3.2.19: added
+ * info/patches/maintenance_patches_3/patch-3.2.{1-11}: dropped
+ * info/patches/maintenance_patches_3/patch-3.3.8: added
+ * info/patches/maintenance_patches_3/patch-3.3.{1-6}: dropped
+ * info/patches/maintenance_patches_3/patch-3.1.10: added
+ * info/patches/maintenance_patches_3/patch-3.1.{1-7}: dropped
+
+2012-06-04 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.1
+ * info/patches/maintenance_patches_3/patch-3.4.1: added
+
+2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.4, LATEST_3=3.4
+ * info/kernels/3.4: added
+ * info/patches/maintenance_patches_3/patch-3.4: added
+
+2012-05-13 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.3.6
+ * info/patches/maintenance_patches_3/patch-3.3.6: added
+
2012-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.31: added

diff --git a/kernels/linux/info/kernels/3.4 b/kernels/linux/info/kernels/3.4
new file mode 100755
index 0000000..f3f67d5
--- /dev/null
+++ b/kernels/linux/info/kernels/3.4
@@ -0,0 +1,5 @@
+version="3.4"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
deleted file mode 100755
index 72112aa..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.21"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="9a571b350d0e1f7623ea895d5a5601377b112156"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
deleted file mode 100755
index 8ce45b8..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.22"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="c44a8c69d5911ba342f7037a5307e234b9ecfcb6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
deleted file mode 100755
index 999c7af..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.23"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="14569e179edf5dd676d9edd2126e35c5847bd106"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
deleted file mode 100755
index f9f9cc1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.24"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="7b59963afe3f978fe71a7cb7c31e6a9087a51ea2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
deleted file mode 100755
index 311cdc3..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.25"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="1c59db4bdcf2c11e10ccaf6482a1667a24faea4c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
deleted file mode 100755
index 1ab4fd9..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.26"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="eb3c114353fc9df31b98c55214fd746cfdb0ca69"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
deleted file mode 100755
index 1365bee..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.27"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="bc79cd3320529eeb8a5659682afff30875b8b9fb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
deleted file mode 100755
index 52cfeaf..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.28"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="cc86692a30633e42fa78967057ac3e2839d258f1"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
deleted file mode 100755
index 6830ad1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.29"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="ef7f2b601a498d3217740603a7251f33f07e3ec0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
deleted file mode 100755
index 7cfcf77..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.30"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="ac1e25b38f443a2c6b7b06e3651434471d5eb346"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
deleted file mode 100755
index b3f1118..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.31"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="6cb49bd2e933bb3c40aaa2c88444513047fabcee"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
new file mode 100755
index 0000000..16624fc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.33"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="d2a7ff310446873f624d2bc08013849dea0c551c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
new file mode 100755
index 0000000..7214ffb
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.34"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="cf1814bacf8eed57e0b4383ac19a9de9df797b2c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
new file mode 100755
index 0000000..3ac1087
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.35
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.35"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6706ac9c09a93531dfe9292da470074aab13b21e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
new file mode 100755
index 0000000..4c3c037
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.36
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.36"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6262b28bca22d8d8498c0173d52c708fa749e5eb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
deleted file mode 100755
index 5c807af..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="95a55c8147ea7f893e091e8c0c3bd44821dff4c3"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
new file mode 100755
index 0000000..45c3dd8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
@@ -0,0 +1,5 @@
+appliedkernels="3.1"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f15223f34c6fb1a78db55a993591cad7b4dd7d63"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
deleted file mode 100755
index e38e8ce..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="9d9348cb4e1fed7fcf8accdbb921d09b92da136a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
deleted file mode 100755
index 6f34e53..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.3"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="1337ab3adbf36035918628ea0f0ce07bbf3273bb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
deleted file mode 100755
index 7556543..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5fdc91a2c1a6204f6e0366e637d23faccdf84e01"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
deleted file mode 100755
index d1bee35..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="ae0b91c518a30633b55f104a4d3920f7ecf108e0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
deleted file mode 100755
index a674314..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="c906930339d73538031cc7ffa9f7aa40232c7997"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
deleted file mode 100755
index d0b2092..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.7"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="b77f1a4b1ca2d278c82bc551b094befce3388cd4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
deleted file mode 100755
index b63160a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="3e6dbebd459f21d03e542f933f2d391281871fd6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
deleted file mode 100755
index 908a56a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.10"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="a0f28e0fdcdc2782610513bb4128ae183f609a3f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
deleted file mode 100755
index 4f56004..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.11"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="4b6b027080b114f5f2ba7aa07d4fac95088d6c44"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
new file mode 100755
index 0000000..9356d47
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="95f9349f434dd73bd7d36fc5d538aff1ec6b37c3"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
deleted file mode 100755
index f1e0c50..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="9e503b4f6d00fa65a3da472373f5c0f2072b6a64"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
deleted file mode 100755
index 8547fd2..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="c21baa3d83d59fa2e87dea5834e6034bd3245d00"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
deleted file mode 100755
index 3e4265a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="402563b8d7d7efd9b4da3f1da5f1a2a922ef8d71"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
deleted file mode 100755
index 4f892c1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5ed014b62c0ebd8d9c3d20953ea5da2b88aeea4a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
deleted file mode 100755
index d74c4a1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.7"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="59d629be5c7acf2de644fe6a89468d6d67203420"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
deleted file mode 100755
index 7b02174..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.8"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="83dbb2a93e827614008ff0074c95e1d5cdcdaa6b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
deleted file mode 100755
index 05ac05d..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.9"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="f279f2c393942f3b59f655e83f4b91951ddf60da"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
deleted file mode 100755
index 803ecdf..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="19f7d30b990132d1c125b6676de6011983be80d0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
deleted file mode 100755
index adbe193..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5e9b2ba27aa612715575d037b07580e8310f1d9b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
deleted file mode 100755
index c76209b..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.3"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="67c8b4529c8b956349e2bfe5b86f30b24e208479"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
deleted file mode 100755
index bcb7558..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="e7ce334db46ec222e7a4c976c5307f43f5761e35"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
deleted file mode 100755
index f90bf55..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="933a0eec5feae941d8740666e32b40ba44ff0bf7"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
new file mode 100755
index 0000000..ca22c34
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
@@ -0,0 +1,5 @@
+appliedkernels="3.3"
+patchversion="${appliedkernels}.8"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="9470171a7dcd2da10efa174b23c568a061901a3a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
new file mode 100755
index 0000000..036f057
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
@@ -0,0 +1,5 @@
+patchversion="3.4.0"
+source=""
+source_url=""
+appliedkernels="3.4"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
new file mode 100755
index 0000000..bab6b4a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d4f39b4f204fa1b4da98dd8fe8a798fd2507693e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
new file mode 100755
index 0000000..679d277
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3b38df9159c44cab8c34675950d9c2594ee4dcc2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
new file mode 100755
index 0000000..455df98
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.3
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8585de4b59b6f8aeb510cd28a748be78bb8b24bb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
new file mode 100755
index 0000000..ea70dbc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.4
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8427d8827822e3f1dead50c73817dfc992b50d4f"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index e7b8d70..0478a86 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.3
+LATEST_3=3.4
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.3.5
+LATEST_maintenance_patches_3=patch-3.4.4
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/libs/gksu/HISTORY b/libs/gksu/HISTORY
index d504bee..280c98f 100644
--- a/libs/gksu/HISTORY
+++ b/libs/gksu/HISTORY
@@ -1,3 +1,8 @@
+2012-06-24 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * glib.patch: added, fix compilation of nautilus plugin with
+ glib >= 2.31
+
2009-07-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.2

diff --git a/libs/gksu/PRE_BUILD b/libs/gksu/PRE_BUILD
new file mode 100755
index 0000000..4a5b046
--- /dev/null
+++ b/libs/gksu/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/glib.patch
diff --git a/libs/gksu/glib.patch b/libs/gksu/glib.patch
new file mode 100644
index 0000000..31c724b
--- /dev/null
+++ b/libs/gksu/glib.patch
@@ -0,0 +1,11 @@
+--- a/nautilus-gksu/libnautilus-gksu.c
++++ b/nautilus-gksu/libnautilus-gksu.c
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <pthread.h>
+
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
diff --git a/net/dhcp/BUILD b/net/dhcp/BUILD
new file mode 100755
index 0000000..9d4a7ed
--- /dev/null
+++ b/net/dhcp/BUILD
@@ -0,0 +1,5 @@
+OPTS="$DHCP_OPTS $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/net/dhcp/CONFIGURE b/net/dhcp/CONFIGURE
deleted file mode 100755
index 2982532..0000000
--- a/net/dhcp/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DHCP_DBUS "Do you want to apply the dbus patches for dhcdbd?" n
diff --git a/net/dhcp/DEPENDS b/net/dhcp/DEPENDS
index 46eeddb..cff9be0 100755
--- a/net/dhcp/DEPENDS
+++ b/net/dhcp/DEPENDS
@@ -1,6 +1,14 @@
depends groff &&
-if [[ "$DHCP_DBUS" == "y" ]]
-then
-depends dbus &&
-depends dbus-glib
-fi
+
+optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for OpenLDAP support in dhcpd" &&
+
+if is_depends_enabled $SPELL openldap; then
+ config_query_option DHCP_OPTS "Enable OpenLDAP crypto support in dhcpd
(needs openldap compiled with TLS/SSL)?" n \
+ "--with-ldapcrypto" \
+ "--without-ldapcrypto"
+fi &&
+
+suggest_depends dbus "" "" "for D-Bus support in DHCP client"
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 9e0aa53..379b72a 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,10 +1,11 @@
SPELL=dhcp
- VERSION=4.1.1
+ VERSION=4.2.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE2
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.isc.org/products/DHCP
LICENSE=http://www.isc.org/products/DHCP/dhcp-copyright.html
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 9f96e7c..72c5a23 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,19 @@
+2012-07-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.4; SECURITY_PATCH++ (several CVEs
since
+ 4.1.1); updated source urls; quoting paths
+ * CONFIGURE: dropped; dbus support for dhclient was added by upstream
+ * dhcp-3.0.3-dhclient-dbus.patch, dhcp-3.0.3-x-option.patch: removed
+ deprecated patches
+ * PRE_BUILD: dropped, not needed anymore
+ * DEPENDS: added missing openldap optional dependency; removed
dbus-glib
+ * INSTALL: use INSTALL_ROOT
+ * SUB_DEPENDS: only dbus is required to check here
+ * BUILD: added, to use DHCP_OPTS and fix multijob build
+ * init.d/dhcp: corrected leases path; added DHCPD_ARGS; force -q flag
+ (suppresses printing copyright message and other useless info for
init)
+ * init.d/dhcp.conf: added DHCPD_ARGS; corrected description (multiple
+ interfaces can be used)
+
2010-05-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* isc.gpg: removed, as it was still incomplete and there is a section
level one
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 464282e..67f5531 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,3 +1,4 @@
-make LIBDIR=/usr/lib INCDIR=/usr/include install &&
+make LIBDIR="$INSTALL_ROOT/usr/lib" \
+ INCDIR="$INSTALL_ROOT/usr/include" install &&
install -m 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
install -m 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/net/dhcp/PRE_BUILD b/net/dhcp/PRE_BUILD
deleted file mode 100755
index e2f74c8..0000000
--- a/net/dhcp/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $DHCP_DBUS == y ]] ||
- [[ $DHCP_DBUS1 == y ]]; then
-patch -p0 < $SPELL_DIRECTORY/dhcp-3.0.3-dhclient-dbus.patch &&
-patch -p1 < $SPELL_DIRECTORY/dhcp-3.0.3-x-option.patch
-fi
diff --git a/net/dhcp/SUB_DEPENDS b/net/dhcp/SUB_DEPENDS
index 9df58ba..411d255 100755
--- a/net/dhcp/SUB_DEPENDS
+++ b/net/dhcp/SUB_DEPENDS
@@ -1,9 +1,6 @@
-persistent_add DHCP_DBUS1
case "$THIS_SUB_DEPENDS" in
- DBUS) message "Requested sub_depends"
- DHCP_DBUS1=y &&
- depends dbus &&
- depends dbus-glib
+ DBUS) message "Requested sub_depends" &&
+ depends dbus
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
diff --git a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
b/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
deleted file mode 100644
index 579d72f..0000000
--- a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- client/scripts/bsdos
-+++ client/scripts/bsdos
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/freebsd
-+++ client/scripts/freebsd
-@@ -57,6 +57,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -69,6 +69,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/netbsd
-+++ client/scripts/netbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/openbsd
-+++ client/scripts/openbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/solaris
-+++ client/scripts/solaris
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
diff --git a/net/dhcp/dhcp-3.0.3-x-option.patch
b/net/dhcp/dhcp-3.0.3-x-option.patch
deleted file mode 100644
index 5f5c1a8..0000000
--- a/net/dhcp/dhcp-3.0.3-x-option.patch
+++ /dev/null
@@ -1,216 +0,0 @@
---- dhcp-3.0.2/common/parse.c.extended_option_environment 2005-04-05
17:49:36.513062562 -0400
-+++ dhcp-3.0.2/common/parse.c 2005-04-05 17:49:36.580052656 -0400
-@@ -1270,6 +1270,10 @@
- option_hash_add (option -> universe -> hash,
- (const char *)option -> name,
- 0, option, MDL);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( new_option_info_tree != 0L )
-+ add_new_option_info( option );
-+#endif
- return 1;
- }
-
---- dhcp-3.0.2/common/tables.c.extended_option_environment 2004-09-01
13:06:35.000000000 -0400
-+++ dhcp-3.0.2/common/tables.c 2005-04-05 18:04:23.915838623 -0400
-@@ -1238,3 +1238,40 @@
- fqdn_universe.name, 0,
- &fqdn_universe, MDL);
- }
-+
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#include <search.h>
-+
-+void *new_option_info_tree = 0L;
-+
-+static int new_option_info_comparator( const void* p1, const void *p2 )
-+{
-+ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8)
-+ |(((const struct option*)p1)->code),
-+ ocode2 = (((const struct option*)p2)->universe->index << 8)
-+ |(((const struct option*)p2)->code);
-+ return( (ocode1 == ocode2)
-+ ? 0
-+ :( ( ocode1 > ocode2 )
-+ ? 1
-+ : -1
-+ )
-+ );
-+}
-+
-+void *add_new_option_info( struct option *option )
-+{
-+ if ( option->universe->index >= fqdn_universe.index )
-+ return 0L;
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ new_option_info_tree = (void*)0L;
-+ return tsearch( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+
-+void *lookup_new_option_info( struct option *option )
-+{
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ return 0L;
-+ return tfind( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+#endif
---- dhcp-3.0.2/includes/dhcpd.h.extended_option_environment 2004-11-24
12:39:16.000000000 -0500
-+++ dhcp-3.0.2/includes/dhcpd.h 2005-04-05 17:49:36.613047777 -0400
-@@ -1800,6 +1800,13 @@
- void initialize_common_option_spaces PROTO ((void));
- struct universe *config_universe;
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#define GENERATE_NEW_OPTION_INFO ((void*)1)
-+extern void *new_option_info_tree;
-+extern void *add_new_option_info( struct option*);
-+extern void *lookup_new_option_info( struct option *);
-+#endif
-+
- /* stables.c */
- #if defined (FAILOVER_PROTOCOL)
- extern failover_option_t null_failover_option;
---- dhcp-3.0.2/client/dhclient.c.extended_option_environment 2005-04-05
17:49:36.566054726 -0400
-+++ dhcp-3.0.2/client/dhclient.c 2005-04-05 17:49:36.617047185 -0400
-@@ -74,7 +74,9 @@
- int onetry=0;
- int quiet=0;
- int nowait=0;
--
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+int extended_option_environment = 0;
-+#endif
- static void usage PROTO ((void));
-
- void do_release(struct client_state *);
-@@ -204,6 +206,11 @@
- } else if (!strcmp (argv [i], "--version")) {
- log_info ("isc-dhclient-%s", DHCP_VERSION);
- exit (0);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ } else if (!strcmp (argv [i], "-x")) {
-+ extended_option_environment = 1;
-+ new_option_info_tree = GENERATE_NEW_OPTION_INFO;
-+#endif
- } else if (argv [i][0] == '-') {
- usage ();
- } else {
-@@ -572,7 +579,11 @@
- log_info (arr);
- log_info (url);
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
-+#else
- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
-+#endif
- "[-s server]");
- log_error (" [-cf config-file] [-lf lease-file]%s",
- "[-pf pid-file] [-e VAR=val]");
-@@ -2529,8 +2540,28 @@
- struct envadd_state {
- struct client_state *client;
- const char *prefix;
-+ struct universe *universe;
- };
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+static
-+void build_universe_info_envvar
-+( struct option_cache *oc,
-+ struct packet *p, struct lease *l,
-+ struct client_state *client,
-+ struct option_state *in_o,
-+ struct option_state *cf_o,
-+ struct binding_scope **scope,
-+ struct universe *u, void *es
-+)
-+{
-+ char info_name[512], info_data[512];
-+ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name);
-+ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format);
-+ client_envadd( client, info_name, oc->option->name, info_data );
-+}
-+#endif
-+
- void client_option_envadd (struct option_cache *oc,
- struct packet *packet, struct lease *lease,
- struct client_state *client_state,
-@@ -2547,6 +2578,31 @@
- in_options, cfg_options, scope, oc, MDL)) {
- if (data.len) {
- char name [256];
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( extended_option_environment )
-+ {
-+ if( ( oc->option->universe != &dhcp_universe
)
-+ &&( oc->option->universe->index >
fqdn_universe.index )
-+ &&( es->universe != oc->option->universe )
-+ )
-+ {
-+ es->universe = oc->option->universe;
-+ (*(es->universe->foreach))
-+ ( (struct packet *)0, (struct
lease *)0,
-+ client_state,
-+ in_options, cfg_options,
-+ scope, es->universe, es,
-+ build_universe_info_envvar
-+ );
-+ }else
-+ if ( lookup_new_option_info(oc->option) != 0L
)
-+ build_universe_info_envvar
-+ ( oc, packet, lease,
client_state,
-+ in_options, cfg_options,
scope,
-+ oc->option->universe, es
-+ );
-+ }
-+#endif
- if (dhcp_option_ev_name (name, sizeof name,
- oc -> option)) {
- client_envadd (es -> client, es -> prefix,
-@@ -2575,6 +2631,7 @@
-
- es.client = client;
- es.prefix = prefix;
-+ es.universe = 0L;
-
- client_envadd (client,
- prefix, "ip_address", "%s", piaddr (lease -> address));
-@@ -2788,7 +2845,14 @@
- s = option -> name;
- if (j + 1 == buflen)
- return 0;
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( ! extended_option_environment )
-+ buf [j++] = '_';
-+ else
-+ buf [j++] = '.';
-+#else
- buf [j++] = '_';
-+#endif
- }
- ++i;
- } while (i != 2);
---- dhcp-3.0.2/client/dhclient.8.extended_option_environment 2004-09-29
19:01:46.000000000 -0400
-+++ dhcp-3.0.2/client/dhclient.8 2005-04-05 17:49:36.619046889 -0400
-@@ -78,6 +78,9 @@
- .B -w
- ]
- [
-+.B -x
-+]
-+[
- .I if0
- [
- .I ...ifN
-@@ -252,6 +255,10 @@
- supplying the
- .B -nw
- flag.
-+.PP
-+The -x argument enables eXtended option information to be created in the
-+-s dhclient-script environment, which would allow applications running
-+in that environment to handle options they do not know about in advance.
- .SH CONFIGURATION
- The syntax of the dhclient.conf(5) file is discussed separately.
- .SH OMAPI
diff --git a/net/dhcp/init.d/dhcp b/net/dhcp/init.d/dhcp
index 0890691..4607cc1 100644
--- a/net/dhcp/init.d/dhcp
+++ b/net/dhcp/init.d/dhcp
@@ -4,11 +4,11 @@

RUNLEVEL=3
PROGRAM=/usr/sbin/dhcpd
-ARGS="$DEVICE"
+ARGS="-q $DHCPD_ARGS $DEVICE"
NEEDS="+network +remote_fs"

. /etc/init.d/smgl_init

-if [ ! -f /var/state/dhcp/dhcpd.leases ] ; then
- touch /var/state/dhcp/dhcpd.leases
+if [ ! -f /var/db/dhcpd.leases ] ; then
+ touch /var/db/dhcpd.leases
fi
diff --git a/net/dhcp/init.d/dhcp.conf b/net/dhcp/init.d/dhcp.conf
index 61a2b07..1a0898c 100644
--- a/net/dhcp/init.d/dhcp.conf
+++ b/net/dhcp/init.d/dhcp.conf
@@ -1,3 +1,6 @@
-# Device which you want the DHCP server to listen on
+# Device(s) which you want the DHCP server to listen on
# Leave blank if you want to listen on all devices
-DEVICE=eth1
+DEVICE="eth1"
+
+# For the arguments and description see dhcpd(8)
+DHCPD_ARGS=""
diff --git a/net/wicd/DETAILS b/net/wicd/DETAILS
index a0045b3..bde571f 100755
--- a/net/wicd/DETAILS
+++ b/net/wicd/DETAILS
@@ -1,6 +1,7 @@
SPELL=wicd
VERSION=1.7.2.4
SECURITY_PATCH=1
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d. -f1,2`
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/${SPELL}/${BRANCH}/${VERSION}/+download/${SOURCE}
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index 9feec53..17005ae 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,3 +1,9 @@
+2012-07-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to apply the patch
+ * secure.patch: added, to fix GUI bug about setting keys for secured
+ networks (fixes #993912 upstream bug)
+
2012-05-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2.4; renewed source url;
SECURITY_PATCH++ (CVE-2012-2095)
diff --git a/net/wicd/PRE_BUILD b/net/wicd/PRE_BUILD
new file mode 100755
index 0000000..72440cf
--- /dev/null
+++ b/net/wicd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/secure.patch"
diff --git a/net/wicd/secure.patch b/net/wicd/secure.patch
new file mode 100644
index 0000000..36ab1d4
--- /dev/null
+++ b/net/wicd/secure.patch
@@ -0,0 +1,15 @@
+--- wicd/misc.py 2012-04-30 19:20:47 +0000
++++ wicd/misc.py 2012-05-03 16:01:49 +0000
+@@ -430,7 +430,10 @@
+ """ Sanitize property names to be used in config-files. """
+ allowed = string.ascii_letters + '_' + string.digits
+ table = string.maketrans(allowed, ' ' * len(allowed))
+- return s.translate(None, table)
++
++ # s is a dbus.String -- since we don't allow unicode property keys,
++ # make it simple.
++ return str(s).translate(None, table)
+
+ def sanitize_escaped(s):
+ """ Sanitize double-escaped unicode strings. """
+
diff --git a/science-libs/eigen2/DETAILS b/science-libs/eigen2/DETAILS
index b27971d..c46fd90 100755
--- a/science-libs/eigen2/DETAILS
+++ b/science-libs/eigen2/DETAILS
@@ -1,9 +1,9 @@
SPELL=eigen2
SPELLX=eigen
VERSION=2.0.17
-
SOURCE_HASH=sha512:3c03f6c98ac6a60b5afd1ff4820158a72eb9391084609ac8254cc901305457c163b788782b7f8d01b5d9359775c427dc58b8999c2638d18fcb808d81bc477869
+
SOURCE_HASH=sha512:8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72
SOURCE=$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/eigen-eigen-b23437e61a07
SOURCE_URL[0]=http://bitbucket.org/$SPELLX/$SPELLX/get/$SOURCE
WEB_SITE=http://eigen.tuxfamily.org
LICENSE[0]=GPL
diff --git a/science-libs/eigen2/HISTORY b/science-libs/eigen2/HISTORY
index e83a0c5..b45e152 100644
--- a/science-libs/eigen2/HISTORY
+++ b/science-libs/eigen2/HISTORY
@@ -1,3 +1,6 @@
+2012-06-21 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated sha512 and fixed SOURCE_DIRECTORY
+
2011-12-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.17

diff --git a/security/shadow/DEPENDS b/security/shadow/DEPENDS
index e2d6ff9..1a31341 100755
--- a/security/shadow/DEPENDS
+++ b/security/shadow/DEPENDS
@@ -20,4 +20,19 @@ optional_depends cracklib \
optional_depends libselinux \
'--with-selinux' \
'--without-selinux' \
- 'for selinux support'
+ 'for selinux support' &&
+
+optional_depends attr \
+ '--with-attr=yes' \
+ '--with-attr=no' \
+ 'support extended attributes' &&
+
+optional_depends acl \
+ '--with-acl' \
+ '--without-acl' \
+ 'for filesystem access control list support' &&
+
+optional_depends audit \
+ '--with-audit' \
+ '--without-audit' \
+ 'support the audit system'
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index b5eb739..6fc6641 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,6 +1,6 @@
SPELL=shadow
- VERSION=4.1.5
-
SOURCE_HASH=sha512:c830958bf25f633ac41273acac62a62d755ab8fa4e9d01b9498fe4701890797bf81fef6a8bd5cabbd052ca33a9b8fb20072f40f97dcb9efbbf8ae0e1cccf8df8
+ VERSION=4.1.5.1
+
SOURCE_HASH=sha512:c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pkg-shadow.alioth.debian.org/releases/$SOURCE
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 1393838..dcf3afc 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,10 @@
+2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.5.1
+ * PRE_BUILD, copydir.c.patch: patch removed
+
+2012-06-28 Justin Boffemmyer <flux AT sourcemage.org>
+ * DEPENDS: add missing optional dependencies
+
2012-02-15 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, copydir.c.patch: upstream patch added

diff --git a/security/shadow/PRE_BUILD b/security/shadow/PRE_BUILD
deleted file mode 100755
index 2d7980c..0000000
--- a/security/shadow/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p2 < "$SPELL_DIRECTORY/copydir.c.patch"
diff --git a/security/shadow/copydir.c.patch b/security/shadow/copydir.c.patch
deleted file mode 100644
index 57fef5f..0000000
--- a/security/shadow/copydir.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- upstream/trunk/libmisc/copydir.c 2011/12/09 22:13:02 3655
-+++ upstream/trunk/libmisc/copydir.c 2012/02/13 19:16:29 3706
-@@ -46,6 +46,7 @@
- #include <selinux/selinux.h>
- #endif /* WITH_SELINUX */
- #if defined(WITH_ACL) || defined(WITH_ATTR)
-+#include <stdarg.h>
- #include <attr/error_context.h>
- #endif /* WITH_ACL || WITH_ATTR */
- #ifdef WITH_ACL
diff --git a/shell-term-fm/rdesktop/DEPENDS b/shell-term-fm/rdesktop/DEPENDS
index f517441..1b1b0de 100755
--- a/shell-term-fm/rdesktop/DEPENDS
+++ b/shell-term-fm/rdesktop/DEPENDS
@@ -1,4 +1,5 @@
depends openssl &&
+depends libx11 &&
if list_find $RDESKTOP_SOUND alsa; then
depends alsa-lib
elif list_find $RDESKTOP_SOUND libao; then
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index e52b415..324e9d4 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,6 @@
+2012-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on libx11
+
2012-01-22 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added libvncserver optional dependency
* PRE_BUILD: added, to apply the patch
diff --git a/video-libs/libunicap/DETAILS b/video-libs/libunicap/DETAILS
index 840ba78..41d812c 100755
--- a/video-libs/libunicap/DETAILS
+++ b/video-libs/libunicap/DETAILS
@@ -1,6 +1,6 @@
SPELL=libunicap
VERSION=0.9.12
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:9111ddf196b3a6087a6b94a6c5e4bd841e416e4d0079b6481f770f361963db95e1d463b62d58ef599242ab15e4a58ef840932ab5c73df735ef5821f873db14fb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/video-libs/libunicap/HISTORY b/video-libs/libunicap/HISTORY
index 4b75d68..6595e46 100644
--- a/video-libs/libunicap/HISTORY
+++ b/video-libs/libunicap/HISTORY
@@ -1,3 +1,7 @@
+2012-06-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: fix obsolete syntax in udev rules
+
2011-08-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: PATCHLEVEL=1
* DEPENDS: optional_depends libv4l -> depends libv4l
diff --git a/video-libs/libunicap/PRE_BUILD b/video-libs/libunicap/PRE_BUILD
index 2ebd39b..a222c18 100755
--- a/video-libs/libunicap/PRE_BUILD
+++ b/video-libs/libunicap/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# fix obsolete synatax for udev rules
+sed -i 's/SYSFS/ATTRS/g' data/50-euvccam.rules
patch -p1 < $SPELL_DIRECTORY/libunicap.patch &&
bzcat $SPELL_DIRECTORY/bazaar-88.patch.bz2 | patch -p1
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index ea285ea..94161fa 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,7 +1,7 @@
SPELL=vlc
- VERSION=2.0.1
+ VERSION=2.0.2
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:12d583daa1062ce78a3d842b978b78ae9c8805dedfcf0e8ae4ad1272984c1170e8a4f3ac0e6c8511cf016626a450cf9d763998d156e70460abba781d6599a6cd
+
SOURCE_HASH=sha512:a680632f669fd85edf8a4bd6ae57951c8bcc4fe1c5cac039b839b7409b2e432722057c588cae1a23eec41b1cce17edff97375da584bfcb3514da3ed528b72c3d
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=23
+ SECURITY_PATCH=24
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 0749da8..8c007d4 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.2, SECURITY_PATCH=24
+ * PRE_BUILD, glx.patch: patch removed
+
2012-04-18 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD, glx.patch: added to fix xcb build error, Bug #366
from vlc git repo, should be fixed on next update
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 50fd9d3..02c2ea1 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -8,6 +8,4 @@ elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey;
then
sedit 's:$(libdir)/mozilla:$(libdir)/seamonkey:' $MOZ_MAKEFILE
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
sedit 's:$(libdir)/mozilla:$(libdir)/xulrunner:' $MOZ_MAKEFILE
-fi &&
-
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/glx.patch
+fi
diff --git a/video/vlc/glx.patch b/video/vlc/glx.patch
deleted file mode 100644
index 69b2ca6..0000000
--- a/video/vlc/glx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/modules/video_output/xcb/glx.c
-+++ b/modules/video_output/xcb/glx.c
-@@ -381,7 +381,10 @@ static int Open (vlc_object_t *obj)
- if (HasExtension (glx_extensions, "GLX_EXT_swap_control")) {
- PFNGLXSWAPINTERVALEXTPROC SwapIntervalEXT =
(PFNGLXSWAPINTERVALEXTPROC)GetProcAddress (NULL, "glXSwapIntervalEXT");
- if (!is_swap_interval_set && SwapIntervalEXT)
-- is_swap_interval_set = !SwapIntervalEXT (dpy, sys->glwin, 1);
-+ {
-+ SwapIntervalEXT (dpy, sys->glwin, 1);
-+ is_swap_interval_set = true;
-+ }
- }
- #endif



  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (ba359448a61cc287b369ccec48a371309d737128), Vlad Glagolev, 07/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page