commit 59cd85e9f1083533172edc57d215416e7853ee50
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live: version 2013.02.11
(cherry picked from commit 75556e1b04c4b88f9855e3e92c15e0946b1b1bb2)
commit e70ddb3c242ee3a7e5c53065da28fa7634ee58d9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video-libs/live: version 2012.10.24
(cherry picked from commit 9d5210489ae0db55e9d040acc90b2f6e2874f5c3)
commit 8f5ef037a17608070901a3d9f4bf9f0b5694286c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live: bump to 2012.09.27 (that one is obtainable)
(cherry picked from commit e8f470f21ac173cf6b66e4e75cf29d4fb0528e80)
commit 02ceec7c68789548455c7e10da7ab876e4c2f9d8
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live: updated version to 2012.08.20
(cherry picked from commit 83d2d36260c5d1f329f7859970dafd59728eae62)
commit bff799bd9949499d007c02c02ae5b9f2c5454cff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video-libs/live: version 2012.08.17
(cherry picked from commit 8451ff4dfaaa61c4cefa5590c258c167b6e3626a)
commit 3391535efc3e062443ef8644cc0ad0a237bee1cf
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live: updated version to 2012.07.14
(cherry picked from commit 564a07682481655011d8b870212f7bbe221c2f84)
commit 6e6239481073633df17f9f10ab363978c97f3f59
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live 2012.06.23
(cherry picked from commit 6537cc31a79d66c7d5c22d1acb61637755a16301)
commit 6b466a2f9e0dea20746c0f99bcb5491a4128ba9e
Author: Robin Cook <rcook AT wyrms.net>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
live: update to 2012.05.17
(cherry picked from commit f64764b69376a3468f0c163fc290d58e58e4dc6a)
commit 87091d1e589f7eb4a887271d2ba21f8151feb605
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
polarssl: => 1.2.5 SECURITY fix
(cherry picked from commit 0e4dd4c512df2038b9424f8be3a0baba8e3094f4)
commit a331d2248ed7719e08d9776b25ec69e60ea0443e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
polarssl: => 1.2.5 SECURITY_PATCH CVE-2013-0169
(cherry picked from commit b64dbfa9635cb788dde0b01e9e8e6f93b5017ba7)
commit 892382935f5483b6a39959af70e4d8ee50f4a5d2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
polarssl: => 1.2.3
(cherry picked from commit 0931c47e92317881a1fde96a900ada54c4ad7042)
commit d65b1532827d56718aaed3cc587994ca531c0e46
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
firefox 19.0, SECURITY_PATCH=61
(cherry picked from commit 897634cf28b16263e4819922b56df30804daedf1)
commit f38f440025cfba7fa064ee9b437efd5cabeff817
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 18.0.2
(cherry picked from commit 3c871ddbbf213021e8b683fbe8786683d8ff4d67)
commit d5f2522bf0b66f3e80b131638e00c13fc51154ab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
http/firefox: version 18.0.1
(cherry picked from commit caaf6ecb7be1a93bb7f54b6d3e0a9710196cda63)
commit 322cebef493faf9acf60559bd2000e3188995032
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fill-column-indicator: Fix typo in DETAILS
(cherry picked from commit aeda996b37c3192d39832bbb2a938305dc507b0a)
commit 2da0107d36e2de16216c4a15a1727739611ce7b3
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nss: fix patch apply if statement
(cherry picked from commit 680364ac850348b373c668d650aad2afceef07b7)
commit 4b4c0ec5c5cd89d66a3c0cffe4ab61cbd54d5cba
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux 3.8
(cherry picked from commit c6080ae5ebbe7093c912c6faba29945125945ec7)
commit 44075977f3ccb5a12aa7ecf00f8c579d8c425e84
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey 2.16, SECURITY_PATCH=52
(cherry picked from commit 5bc2ea38d716fa3c9b6666cad97a66d8ea2f62e3)
commit cc41369e1484a35af48eddd20f172c2d1dfb7cdf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.15.2
(cherry picked from commit e48cd7dcb9a0a000f58ea02a67a1ac069514d47e)
commit dfc0a27ac02a68469732004b685bf20a43eb432e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.15.1
(cherry picked from commit 2a7a1a1482c5bfff3db96dc29b0eb828224c6a31)
commit 2d3c1bfd79057937f626a17435d200d237309a25
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "nss 3.14.2"
This reverts commit 35467ac91a4908ce16f7ef6ebd5ed3c46df48bcf.
Conflicts:
crypto/nss/DETAILS
crypto/nss/HISTORY
diff --git a/ChangeLog b/ChangeLog
index e210286..0c2a55a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * utils/linuxconsoletools: new spell, replacement for utils/joystick
+ * utils/joystick: spell deprecated [project has been renamed]
+ * apache.gpg: updated keys, added key 9E49284A
+
2012-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* python-pypi/ctypes: spell deprecated [part of python as of version
2.5]
diff --git a/apache.gpg b/apache.gpg
index 67d54cc..6161b51 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 927790b..346b2df 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -37,11 +37,11 @@ case $NSS_BRANCH in