commit c8f3b3eabc0c78b2152f8b7b064847198a8f9e74
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
socat: => 1.7.2.1 (security)
(cherry picked from commit 9cea5dd1b9ad38df7fe855caf0763c691a35e1b9)
commit 5b806b45f626cb3483e9f37fa4d10159818441df
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
socat: => 1.7.2.0
(cherry picked from commit dea23a79188ad6fb82e08875c8f36c62f020fe96)
commit a1f4b21da1a75f157f531bf2fed893c44629eae7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: security update for legacy branch (with backported patches) to
20120526
(cherry picked from commit 9e398219ed19fe907c0b18826ef9ad89bfe564e3)
commit 4190801ce5fe9538721167ec369ef787465adaa6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php 5.3.13, SECURITY_PATCH=17
(cherry picked from commit e3a7db276a445ca8d7dd927716b824e2d015f35b)
commit 313e612cc71d8f2dfc08340464bc52c10ef1b087
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto: => 2.6 (security)
(cherry picked from commit 72334958f468fe31eb439707329850c4dc95b86d)
commit 17b06b9f16981feab36694d056293867467cb0f2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto: => 2.5
(cherry picked from commit 11e7f9d39de34cbbf01e7413967bc349af65cd89)
commit b54dff9fbe644421f86682817a47dc96cc2695ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto - depends gmp
(cherry picked from commit fd1821b5feaf2cf186ea565ecb312aa201128e65)
commit 9cae1a32524676181be2551b32254bfe79e1361b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto: => 2.4.1
(cherry picked from commit 91c8d5d72fd9885c2eb79ed5a40ca121e696bf7e)
commit 4b916d777d801727e3796f15696dfbd7762d6b5e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto: => 2.4
(cherry picked from commit 5aac9553023b95c91ad9e0696b4bb5282ad8da8d)
commit f7b8cc65e5036e993262f025fba04f00c89ef5d3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ruby-1.8: => 1.8.7-p358 (security)
(cherry picked from commit b385c09c4778ef0ad823539fddee376bebfc5191)
commit c95f3ff6cb7e0d97414f418dc468f4ae4ee720ef
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.6.8, SECURITY_PATCH=36
(cherry picked from commit e4910a63019a869e4413f714a26168f609f0b7d1)
commit 793b7ab6fece12d79674da23b5f5c04158102030
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.6.7
(cherry picked from commit 4923e8efd312c5c0ef8ec25161a8af9933a4b9bf)
commit 7967db62423daab18430e7cc39d0e060fa49a591
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tor: => 0.2.2.36 (security)
(cherry picked from commit 2ed99055bd41d71ed98dd490b8f55d23b775a960)
commit 9699663acc092840bf346e1e767a86fa2fb20211
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
net/tor.gpg: added 19F78451 public key (Roger Dingledine <arma AT mit.edu>)
(cherry picked from commit f01d8932fde3711f6b0af3d32203e0059ea697bf)
Conflicts:
ChangeLog
commit 30e44e3a99dc6329fe53fb5c4e74ef53879cf967
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxml2: => 2.8.0
(cherry picked from commit fe54b76870449f3f8f4b5823ca1a913f582f3a41)
commit 42c2c0cba0cda8edad141583c003b9e5a85463d7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.5p1 (security)
(cherry picked from commit 903c87e358647880f263077720c4d047b5bed51a)
commit 1b9519c40835d8a40f3137dcc2d067e62712b80c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.4p4
(cherry picked from commit b973cae247ee11b113d2e703bb2953f1023e57b6)
(cherry picked from commit f3aa80343a9bda834e77c056c3237d53657c1685)
commit be047ea55de9123b52fbac851cf483a467cc5752
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.4p2
(cherry picked from commit 54fad19e6d701c6c03d210b11bdb35de4ebfab15)
commit 8bfa38c3f92749f2f1abe101a8b7831643ec5c96
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.4p1
(cherry picked from commit fcf56ba2772f8098f6b45cac6799c00eecf71cf6)
commit 00b41985278110b8d45d1ded716babcdb0f144cc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.4
(cherry picked from commit 475add1edb211a76e8ca3fa9e8031b2699496c51)
diff --git a/ChangeLog b/ChangeLog
index eb046b2..8970ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,467 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/tor.gpg: added 19F78451 public key (Roger Dingledine
+ <arma AT mit.edu>)
+
2012-01-13 Thomas Orgis <sobukus AT sourcemage.org>
* kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
+2011-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * kernel.gpg: public keys added
+ 00411886 - Linus Torvalds (linux-3.1.tar.sign)
+
+2011-11-15 Arjan Bouter <abouter AT sourcemage.org>
+ * x11/unity-greeter: new spell, unity greeter for lightdm
+ * x11-libs/libindicator: new spell, indicator function library
+ * x11-libs/indicator-session: new spell, indicator session menu
+ * x11-libs/indicator-power: new spell, indicator power menu
+ * x11-libs/crowd-greeter: new spell, 3D crowd greeter for lightdm
+ * x11--libs/webkit-greeter: new spell, webkit based greeter for
lightdm
+ * x11-libs/indicator-datetime: new spell, indicator date and time
+ * x11-libs/indicator-soundmenu: new spell, indicator sound menu
+
+2011-11-15 Ladislav Hagara <hgr AT vabo.cz>
+ * gnome3-apps/aisleriot: new spell, collection of card games
+
+2011-11-13 Robin Cook <rcook AT wyrms.net>
+ * e-emotion renamed to emotion
+ * New Spell: eflwebkit - a port of webkit to e17 libraries
+ * New Spell: libeweather - library to pull weather forcasts
+ * New Spell: eweather - Enlightenment module to display weather
forcast
+ * New Spell: emap - map manager
+
+2011-11-12 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/scrapely: new spell, library for extracting structured
+ data from HTML pages
+
+2011-11-11 Arjan Bouter <abouter AT sourcemage.org>
+ * x11/lightdm: new spell, display manager
+
+2011-11-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * chat-irc/ratbox.gpg: added public key 201FF57E (Aaron Sethman
+ <androsyn AT ratbox.org>)
+
+2011-11-08 Ismael Luceno <ismael AT sourcemage.org>
+ * emacs-lisp/fill-column-indicator: new spell, An Emacs minor mode
that
+ graphically indicates the fill column
+
+2011-11-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * wm-addons/i3status: new spell, a program to generate status bar
information
+ for dzen2, xmobar, etc
+
+2011-11-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * graphics/leptonica: new spell, image procesing tools
+
+2011-11-01 Ladislav Hagara <hgr AT vabo.cz>
+ * libs/osceleton: new spell
+ sends skeleton information from the kinect sensor via osc
+ * video/animata: new spell, real-time animation software
+
+2011-10-30 Ladislav Hagara <hgr AT vabo.cz>
+ * xorg-app/xbacklight: new spell
+ adjust backlight brightness using RandR extension
+
+2011-10-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * database/libzdb: new spell, databsae access library
+
+2011-10-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * accounts, groups: added account data for redis
+ * database/redis: new spell, open source, advanced key-value store
+ * php-pear/phpredis: new spell, PHP extension for Redis
+
+2011-10-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/boto: new spell, access to Amazon's S3 cloud
+ * python-pypi/duplicity: new spell, a tool for creating encrypted
+ incremental backups
+
+2011-10-25 Ladislav Hagara <hgr AT vabo.cz>
+ * utils/usb-modeswitch: new spell
+ mode switching tool for controlling multiple mode USB devices
+ * utils/usb-modeswitch-data: new spell, data package for
usb-modeswitch
+
+2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/python-ssh: new spell, SSH2 protocol library for Python
+
+2011-10-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11-libs/libaosd: new spell, a library for on screen displays
+
+2011-10-19 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/openpyxl: new spell, A Python library to read/write
Excel 2007 xlsx/xlsm files
+
+2011-10-18 Bor Kraljič <pyrobor AT ver.si>
+ * telephony/mediastreamer: new spell, media streaming toolkit for
VoIP
+ applications
+
+2011-10-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * gnome3-libs/unico: new spell, Unico Gtk+ theming engine
+
+2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-deepseq: new spell, deep evaluation of data
structures
+ * haskell/haskell-random: new spell, a random number library
+ * python-pypi/python-lru: new spell, a LRU implementation for python
+ * fonts-x11/inconsolata: new spell, a fixed-width font
+
+2011-10-15 Ladislav Hagara <hgr AT vabo.cz>
+ * crypto/tthsum: new spell, generates or checks TTH message digests
+ * science-libs/flann: new spell
+ Fast Library for Approximate Nearest Neighbors
+ * science-libs/cminpack: new spell, C/C++ Minpack
+ * science-libs/pcl: new spell, Point Cloud Library
+
+2011-10-15 Bor Kraljič <pyrobor AT ver.si>
+ * chat-im/openwengo: removed (deprecated over 180 days ago)
+ * disk/ntfsprogs: removed (deprecated over 180 days ago)
+ * graphics/greycstoration-gimp-plugin: removed (deprecated over 180
days ago)
+ * graphics/greycstoration: removed (deprecated over 180 days ago)
+ * kde4-support/policykit-kde: removed (deprecated over 180 days ago)
+ * kde4-support/polkit-qt: removed (deprecated over 180 days ago)
+ * kernels/bluez-bluefw: removed (deprecated over 180 days ago)
+ * kernels/bluez-kernel: removed (deprecated over 180 days ago)
+ * kernels/cdemu-module: removed (deprecated over 180 days ago)
+ * latex/tetex-texmf: removed (deprecated over 180 days ago)
+ * latex/tetex: removed (deprecated over 180 days ago)
+ * libs/bluez-libs: removed (deprecated over 180 days ago)
+ * libs/bluez-sdp: removed (deprecated over 180 days ago)
+ * mobile/multisync-gui: removed (deprecated over 180 days ago)
+ * mobile/multisync: removed (deprecated over 180 days ago)
+ * mobile/synce-dccm: removed (deprecated over 180 days ago)
+ * net/bluez-pan: removed (deprecated over 180 days ago)
+ * php-pear/horde-xml_svg: removed (deprecated over 180 days ago)
+ * python-pypi/bzrk: removed (deprecated over 180 days ago)
+ * utils/bluez-utils: removed (deprecated over 180 days ago)
+ * x11-toolkits/qgtkstyle: removed (deprecated over 180 days ago)
+ * xorg-app/xphelloworld: removed (deprecated over 180 days ago)
+ * xorg-app/xplsprinters: removed (deprecated over 180 days ago)
+ * xorg-app/xprehashprinterlist: removed (deprecated over 180 days ago)
+ * xorg-lib/libxp: removed (deprecated over 180 days ago)
+ * xorg-lib/libxprintapputil: removed (deprecated over 180 days ago)
+ * xorg-lib/libxprintutil: removed (deprecated over 180 days ago)
+ * odbc-drivers/picoodbc: removed, mandatory dependency (picosql) was
removed
+ long time ago (d04ecea deprecated, 11af14b removed) (fixes #284)
+
+2011-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/tclap: new spell, a C++ command line parser library
+
+2011-10-14 Bor Kraljič <pyrobor AT ver.si>
+ * audio-players/mpdc: removed (we no longer support qt3 (qt-x11))
+ * audio-players/prokyon3: removed (we no longer support qt3 (qt-x11))
+ * audio-soft/kaconnect: removed (we no longer support qt3 (qt-x11))
+ * audio-soft/qjackconnect: removed (we no longer support qt3 (qt-x11))
+ * cluster/openmosixview: removed (we no longer support qt3 (qt-x11))
+ * crypto/qca-tls: removed (we no longer support qt3 (qt-x11))
+ * crypto/qca: removed (we no longer support qt3 (qt-x11))
+ * graphics/qcad: removed (we no longer support qt3 (qt-x11))
+ * ham/hamfax: removed (we no longer support qt3 (qt-x11))
+ * kernels/elpp: removed (we no longer support qt3 (qt-x11))
+ * net/cutecom: removed (we no longer support qt3 (qt-x11))
+ * science/genchemlab: removed (we no longer support qt3 (qt-x11))
+ * science/orsa: removed (we no longer support qt3 (qt-x11))
+ * science/qgrid: removed (we no longer support qt3 (qt-x11))
+ * science/qucs: removed (we no longer support qt3 (qt-x11))
+ * utils/qbrew: removed (we no longer support qt3 (qt-x11))
+ * video/divxcalc: removed (we no longer support qt3 (qt-x11))
+ * x11-toolkits/qtgtk: removed (we no longer support kde3)
+ * x11-toolkits/qwt: removed (we no longer support qt3 (qt-x11))
+
+2011-10-13 Bor Kraljič <pyrobor AT ver.si>
+ * audio-players/mp3kult: removed (we no longer support kde3)
+ * audio-plugins/xmmsarts: removed (we no longer support kde3)
+ * chat-irc/kmyirc: removed (we no longer support kde3)
+ * crypto/onekript: removed (we no longer support kde3)
+ * graphics/sk1: removed (we no longer support kde3)
+ * printer/epsutil: removed (we no longer support qt3 (qt-x11))
+ * shell-term-fm/yakuake: removed (we no longer support kde3)
+
+2011-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * graphics/xcalib: new spell, a tool for loading icc profiles
+
+2011-10-12 Bor Kraljič <pyrobor AT ver.si>
+ * kde-core/kdelibs: removed (we no longer support kde3)
+ * kde-core/arts: removed (we no longer support kde3)
+ * kde-core/kde-i18n: removed (we no longer support kde3)
+ * kde-core/kde-profile: removed (we no longer support kde3)
+ * kde-core/kdeaddons: removed (we no longer support kde3)
+ * kde-core/kdeadmin: removed (we no longer support kde3)
+ * kde-core/kdeartwork: removed (we no longer support kde3)
+ * kde-core/kdebase: removed (we no longer support kde3)
+ * kde-core/kdebindings: removed (we no longer support kde3)
+ * kde-core/kdeedu: removed (we no longer support kde3)
+ * kde-core/kdegames: removed (we no longer support kde3)
+ * kde-core/kdegraphics: removed (we no longer support kde3)
+ * kde-core/kdemultimedia: removed (we no longer support kde3)
+ * kde-core/kdenetwork: removed (we no longer support kde3)
+ * kde-core/kdepim: removed (we no longer support kde3)
+ * kde-core/kdesdk: removed (we no longer support kde3)
+ * kde-core/kdeutils: removed (we no longer support kde3)
+ * kde-core/kdeaccessibility: removed (we no longer support kde3)
+ * kde-core/kdetoys: removed (we no longer support kde3)
+ * kde-core/kdewebdev: removed (we no longer support kde3)
+ * kde-core/: removed section files
+ * kde-apps/akregator: removed (we no longer support kde3)
+ * kde-apps/apollon: removed (we no longer support kde3)
+ * kde-apps/basket: removed (we no longer support kde3)
+ * kde-apps/bibletime: removed (we no longer support kde3)
+ * kde-apps/cdbakeoven: removed (we no longer support kde3)
+ * kde-apps/digikam: removed (we no longer support kde3)
+ * kde-apps/f4l: removed (we no longer support kde3)
+ * kde-apps/filelight: removed (we no longer support kde3)
+ * kde-apps/gwenview: removed (we no longer support kde3)
+ * kde-apps/hayes: removed (we no longer support kde3)
+ * kde-apps/k9copy: removed (we no longer support kde3)
+ * kde-apps/kalva: removed (we no longer support kde3)
+ * kde-apps/karchiver: removed (we no longer support kde3)
+ * kde-apps/kasablanca: removed (we no longer support kde3)
+ * kde-apps/katapult: removed (we no longer support kde3)
+ * kde-apps/kbarcode: removed (we no longer support kde3)
+ * kde-apps/kbear: removed (we no longer support kde3)
+ * kde-apps/kbiff: removed (we no longer support kde3)
+ * kde-apps/kbirthday: removed (we no longer support kde3)
+ * kde-apps/kboincspy: removed (we no longer support kde3)
+ * kde-apps/kchm: removed (we no longer support kde3)
+ * kde-apps/kchmviewer: removed (we no longer support kde3)
+ * kde-apps/kconnections: removed (we no longer support kde3)
+ * kde-apps/kcpufreq: removed (we no longer support kde3)
+ * kde-apps/kdar: removed (we no longer support kde3)
+ * kde-apps/kdbg: removed (we no longer support kde3)
+ * kde-apps/kdebluetooth: removed (we no longer support kde3)
+ * kde-apps/kdepimpi: removed (we no longer support kde3)
+ * kde-apps/kdesvn: removed (we no longer support kde3)
+ * kde-apps/kdetv: removed (we no longer support kde3)
+ * kde-apps/kdevelop: removed (we no longer support kde3)
+ * kde-apps/kdevmon: removed (we no longer support kde3)
+ * kde-apps/kdiff3: removed (we no longer support kde3)
+ * kde-apps/kdsl: removed (we no longer support kde3)
+ * kde-apps/kexi: removed (we no longer support kde3)
+ * kde-apps/kftpgrabber: removed (we no longer support kde3)
+ * kde-apps/kgraphviewer: removed (we no longer support kde3)
+ * kde-apps/kguitar: removed (we no longer support kde3)
+ * kde-apps/khacc: removed (we no longer support kde3)
+ * kde-apps/kickpim: removed (we no longer support kde3)
+ * kde-apps/kid3: removed (we no longer support kde3)
+ * kde-apps/kile: removed (we no longer support kde3)
+ * kde-apps/kio_sql: removed (we no longer support kde3)
+ * kde-apps/kipi-plugins: removed (we no longer support kde3)
+ * kde-apps/kiso: removed (we no longer support kde3)
+ * kde-apps/kitchensync: removed (we no longer support kde3)
+ * kde-apps/klear: removed (we no longer support kde3)
+ * kde-apps/klibido: removed (we no longer support kde3)
+ * kde-apps/kmatrix3d: removed (we no longer support kde3)
+ * kde-apps/kmldonkey: removed (we no longer support kde3)
+ * kde-apps/kmobiletools: removed (we no longer support kde3)
+ * kde-apps/kmyfirewall: removed (we no longer support kde3)
+ * kde-apps/kmymoney2: removed (we no longer support kde3)
+ * kde-apps/knemo: removed (we no longer support kde3)
+ * kde-apps/knetfilter: removed (we no longer support kde3)
+ * kde-apps/knetstats: removed (we no longer support kde3)
+ * kde-apps/knfoviewer: removed (we no longer support kde3)
+ * kde-apps/knoda: removed (we no longer support kde3)
+ * kde-apps/koffice: removed (we no longer support kde3)
+ * kde-apps/komparator: removed (we no longer support kde3)
+ * kde-apps/kompose: removed (we no longer support kde3)
+ * kde-apps/konversation: removed (we no longer support kde3)
+ * kde-apps/konverter: removed (we no longer support kde3)
+ * kde-apps/kphotoalbum: removed (we no longer support kde3)
+ * kde-apps/kplayer: removed (we no longer support kde3)
+ * kde-apps/kpowersave: removed (we no longer support kde3)
+ * kde-apps/kradio: removed (we no longer support kde3)
+ * kde-apps/krecipes: removed (we no longer support kde3)
+ * kde-apps/krename: removed (we no longer support kde3)
+ * kde-apps/krusader: removed (we no longer support kde3)
+ * kde-apps/ksambaplugin: removed (we no longer support kde3)
+ * kde-apps/ksensors: removed (we no longer support kde3)
+ * kde-apps/ksetisaver: removed (we no longer support kde3)
+ * kde-apps/ksetiwatch: removed (we no longer support kde3)
+ * kde-apps/ksim: removed (we no longer support kde3)
+ * kde-apps/ksniffer: removed (we no longer support kde3)
+ * kde-apps/ksquirrel-libs: removed (we no longer support kde3)
+ * kde-apps/ksquirrel: removed (we no longer support kde3)
+ * kde-apps/kssh: removed (we no longer support kde3)
+ * kde-apps/ksynaptics: removed (we no longer support kde3)
+ * kde-apps/ktail: removed (we no longer support kde3)
+ * kde-apps/ktechlab: removed (we no longer support kde3)
+ * kde-apps/ktnef: removed (we no longer support kde3)
+ * kde-apps/ktorrent: removed (we no longer support kde3)
+ * kde-apps/kuftp: removed (we no longer support kde3)
+ * kde-apps/kuwc: removed (we no longer support kde3)
+ * kde-apps/kvpnc: removed (we no longer support kde3)
+ * kde-apps/kwave: removed (we no longer support kde3)
+ * kde-apps/kwlan: removed (we no longer support kde3)
+ * kde-apps/kwlaninfo: removed (we no longer support kde3)
+ * kde-apps/kxmleditor: removed (we no longer support kde3)
+ * kde-apps/libkdcraw: removed (we no longer support kde3)
+ * kde-apps/libkexif: removed (we no longer support kde3)
+ * kde-apps/libkexiv2: removed (we no longer support kde3)
+ * kde-apps/libkipi: removed (we no longer support kde3)
+ * kde-apps/lineak_kdeplugins: removed (we no longer support kde3)
+ * kde-apps/maxemumtvguide: removed (we no longer support kde3)
+ * kde-apps/pcmm: removed (we no longer support kde3)
+ * kde-apps/pixieplus: removed (we no longer support kde3)
+ * kde-apps/quantadocs: removed (we no longer support kde3)
+ * kde-apps/rotatejpg: removed (we no longer support kde3)
+ * kde-apps/soundkonverter: removed (we no longer support kde3)
+ * kde-apps/tellico: removed (we no longer support kde3)
+ * kde-apps/transkode: removed (we no longer support kde3)
+ * kde-apps/umbrello: removed (we no longer support kde3)
+ * kde-apps/wlassistant: removed (we no longer support kde3)
+ * kde-apps: removed section files
+ * kde-look/baghira: removed (we no longer support kde3)
+ * kde-look/flatknifty: removed (we no longer support kde3)
+ * kde-look/kbfx: removed (we no longer support kde3)
+ * kde-look/kdmtheme: removed (we no longer support kde3)
+ * kde-look/kfiresaver3d: removed (we no longer support kde3)
+ * kde-look/kooldock: removed (we no longer support kde3)
+ * kde-look/kside-smgl: removed (we no longer support kde3)
+ * kde-look/kxdocker: removed (we no longer support kde3)
+ * kde-look/polyester: removed (we no longer support kde3)
+ * kde-look/qtcurve-kde3: removed (we no longer support kde3)
+ * kde-look/slicker: removed (we no longer support kde3)
+ * kde-look/superkaramba: removed (we no longer support kde3)
+ * kde-look/taskbar2: removed (we no longer support kde3)
+ * kde-look/tiblit: removed (we no longer support kde3)
+ * x11-toolkits/qt-x11: removed, qt3 is no longer supported by upstream
+ * audio-creation/sonik: removed (we no longer support kde3)
+ * audio-players/amarok: removed (we no longer support kde3)
+ * chat-im/kmess: removed (we no longer support kde3)
+ * disk/arson: removed (we no longer support kde3)
+ * disk/k3b-i18n: removed (we no longer support kde3)
+ * disk/k3b: removed (we no longer support kde3)
+ * disk/mount-iso: removed (we no longer support kde3)
+ * ftp/qtella: removed (we no longer support kde3)
+ * graphics/potracegui: removed (we no longer support kde3)
+ * graphics/showimg: removed (we no longer support kde3)
+ * i18n/skim: removed (we no longer support kde3)
+ * mobile/libopensync-plugin-kdepim: removed (we no longer support
kde3)
+ * science/pgcalc2: removed (we no longer support kde3)
+ * science/qalculate-kde: removed (we no longer support kde3)
+ * smgl/ksorcery: removed (we no longer support kde3)
+ * video/kaffeine: removed (we no longer support kde3)
+ * video/kavi2svcd: removed (we no longer support kde3)
+ * video/kdenlive: removed (we no longer support kde3)
+ * video/kmenc15: removed (we no longer support kde3)
+ * video/kmplayer: removed (we no longer support kde3)
+ * video/ksubeditor: removed (we no longer support kde3)
+ * video/ksubtile: removed (we no longer support kde3)
+ * video/okle: removed (we no longer support kde3)
+ * x11-libs/lineak_xosdplugin: removed (we no longer support kde3)
+ * antivirus/klamav: removed (we no longer support kde3)
+ * {kde-look => kde4-look}/qtcurve-gtk2: changed sections
+ * kde-look/: removed section files
+ * audio-soft/annotator: removed, mandatory dependency (clam) was
removed
+ * audio-soft/clam-networkeditor: removed, mandatory dependency (clam)
was removed
+ * audio-soft/smstools: removed, mandatory dependency (clam) was
removed
+ * collab/luma: removed, mandatory dependency (pyqt) was removed
+ * doc/mnemosyne: removed, mandatory dependency (pyqt) was removed
+ * libs/pykde: removed, mandatory dependency (pyqt) was removed
+ * audio-creation/ams: removed (we no longer support qt3 (qt-x11))
+ * audio-creation/cheesetracker: removed (we no longer support qt3
(qt-x11))
+ * audio-creation/ecamegapedal: removed (we no longer support qt3
(qt-x11))
+ * audio-libs/clam: removed (we no longer support qt3 (qt-x11))
+ * audio-players/madman: removed (we no longer support qt3 (qt-x11))
+ * audio-players/mixxx: removed (we no longer support qt3 (qt-x11))
+ * audio-soft/qtid3: removed (we no longer support qt3 (qt-x11))
+ * chat-im/kadu: removed (we no longer support qt3 (qt-x11))
+ * chat-im/sim-icq: removed (we no longer support qt3 (qt-x11))
+ * devel/dbus-qt3-old: removed (we no longer support qt3 (qt-x11))
+ * devel/mysqlnavigator: removed (we no longer support qt3 (qt-x11))
+ * devel/qgit: removed (we no longer support qt3 (qt-x11))
+ * devel/xxdiff: removed (we no longer support qt3 (qt-x11))
+ * disk/qtparted: removed (we no longer support qt3 (qt-x11))
+ * editors/scribus: removed (we no longer support qt3 (qt-x11))
+ * editors/yzis: removed (we no longer support qt3 (qt-x11))
+ * graphics/mm3d: removed (we no longer support qt3 (qt-x11))
+ * http/icecat: removed (we no longer support qt3 (qt-x11))
+ * libs/pyqt: removed (we no longer support qt3 (qt-x11))
+ * mobile/moto4lin: removed (we no longer support qt3 (qt-x11))
+ * mobile/rt2500_util: removed (we no longer support qt3 (qt-x11))
+ * science/xdrawchem: removed (we no longer support qt3 (qt-x11))
+ * telephony/twinkle: removed (we no longer support qt3 (qt-x11))
+ * video/camstream: removed (we no longer support qt3 (qt-x11))
+ * video/dvbcut: removed (we no longer support qt3 (qt-x11))
+ * video/emotion: removed (we no longer support qt3 (qt-x11))
+ * video/gopedit: removed (we no longer support qt3 (qt-x11))
+ * video/xjadeo: removed (we no longer support qt3 (qt-x11))
+ * wm-addons/bbconf: removed (we no longer support qt3 (qt-x11))
+ * x11-toolkits/polymer: removed (we no longer support qt3 (qt-x11))
+ * x11/qbankmanager: removed (we no longer support qt3 (qt-x11))
+ * x11/qhacc: removed (we no longer support qt3 (qt-x11))
+ * x11/quasar: removed (we no longer support qt3 (qt-x11))
+ * x11/xglobe: removed (we no longer support qt3 (qt-x11))
+ * audio-players/xsidplay: removed (we no longer support qt3 (qt-x11))
+ * audio-creation/muse: removed (we no longer support qt3 (qt-x11))
+ * audio-creation/noteedit: removed (we no longer support kde3)
+ * chat-irc/kvirc: removed (we no longer support qt3 (qt-x11))
+ * editors/pdfedit: removed (we no longer support qt3 (qt-x11))
+ * science/kst: removed (we no longer support kde3)
+ * telephony/ihu: removed (we no longer support qt3 (qt-x11))
+
+2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/acpid2: new spell, acpid for netlink
+
+2011-10-10 Ismael Luceno <ismael AT sourcemage.org>
+ * graphics/mypaint: new spell, graphics application for digital
painters
+
+2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * gnome3-libs/pygobject3: new spell, Python bindings for the GObject
+
+2011-10-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * qgis: desktop geographic information system application
+ * grass-gdal: grass plugin for gdal
+ * grass: Geographic Resources Analysis Support System
+ * gdal: translator library for raster geospatial data formats
+ * geos: C++ spatial topology library
+ * libgeotiff: library for accessing "Geo" tags in a GeoTIFF file
+ * libwms: library to access WMS services
+ * ogdi: API for reading various raster and vector geospatial formats
+ * hdf5: HDF5 file format library and utilities
+ * hdf4: HDF4 file format library and utilities
+ * e00compr: lib to (un)compress Arc/Info Export (E00) files
+ * avcd00: lib to make Arc/Info Vector Coverages appear as E00
+
+2011-10-07 Bor Kraljič <pyrobor AT ver.si>
+ * devel/gnulib: new spell, GNU Portability Library
+
+2011-10-06 Ladislav Hagara <hgr AT vabo.cz>
+ * telephony/telepathy.gpg: added key 7DAA3C03 (telepathy-glib 0.15.7)
+ * gnome3-apps/gnome-color-manager: new spell, color profile manager
+ * gnome3-apps/caribou: new spell, virtual on-screen keyboard
+
+2011-10-06 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/logilab-common: new spell, low level functionality
+ shared among some python projects
+ * python-pypi/logilab-astng: new spell, Python Abstract Syntax Tree
+ New Generation
+ * python-pypi/pylint: new spell, Analyzes Python source code looking
+ for bugs and signs of poor quality
+
+2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/fabric: new spell, simple, Pythonic tool for remote
+ execution and deployment
+
+2011-10-03 Ladislav Hagara <hgr AT vabo.cz>
+ * x11/colord: new spell, daemon that maps devices to color profiles
+
+2011-10-01 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/dblatex: new spell, produces dvi, ps and pdf from
docbook
+
+2011-10-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * devel/qtassistantclient: new spell, some legacy files for qt4
+ * science/scidavis: new spell, an interactive plotting tool
+
+2011-09-30 Ladislav Hagara <hgr AT vabo.cz>
+ * doc/itstool: new spell, convert between XML and PO using ITS
+ * gnome2-libs/yelp-tools: scripts and utilities for Yelp documentation
+
+2011-09-29 Ladislav Hagara <hgr AT vabo.cz>
+ * gnome3-libs/cogl: new spell
+ library for using 3D graphics hardware for rendering
+ * gnome3-libs/rest: new spell, RESTful web api query library
+ * gnome3-libs/gnome-online-accounts: new spell
+ interfaces to access the user's online accounts
+ * libs/liboauth: new spell, OAuth.net API implementation
+
+2011-09-28 Bor Kraljič <pyrobor AT ver.si>
+ * ftp/puregui: removed (no upstream support & unavailable dependency)
+>>>>>>> c780c0c... kernel.gpg: 00411886 - Linus Torvalds (linux-3.1.tar.sign)
+
2011-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* doc/ebook-tools: new spell - tools for converting ebook formats
can be used by okular
diff --git a/VERSION b/VERSION
index 23251d3..413412b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-10
+0.60-11
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 8061608..2841bf4 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.2
- SECURITY_PATCH=13
+ VERSION=2.10.4
+ SECURITY_PATCH=14
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index f33d45f..3ced59a 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,9 @@
+2012-05-07 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.10.4, SECURITY_PATCH=14
+
+2012-03-26 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.10.3
+
2012-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.10.2, SECURITY_PATCH=13
* glib-2.31.patch: removed, integrated upstream
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 962c5a6..a5fefde 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -36,7 +36,8 @@ make && {
RUN_COMPILER_DIR="${RUN_COMPILER_DIR:-/var/lib/sorcery/build}" &&
PATH="${PATH//$RUN_COMPILER_DIR:/}" &&
(
- unset OPTS &&
+ OPTS="--with-ssl=openssl"
+
delve -c start BUILD wget && # this links against old
libraries still
local TEMPWGET_DIR="$BUILD_DIRECTORY/wget-$(gaze version wget |
head -n 3 | tail -n 1 | awk '{ print $4 }')" &&
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 957f795..9c5aa04 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8w
- SECURITY_PATCH=18
+ VERSION=0.9.8x
+ SECURITY_PATCH=19
;;
1.0)
- VERSION=1.0.0i
- SECURITY_PATCH=17
+ VERSION=1.0.0j
+ SECURITY_PATCH=19
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index ac44056..85a9b0d 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,10 @@
+2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19
+ http://www.openssl.org/news/secadv_20120510.txt
+
+2012-05-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed #225
+
2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8w, SECURITY_PATCH=18 http://www.openssl.org/news/secadv_20120424.txt
diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 6ac6d49..a078e4c 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,12 +1,13 @@
SPELL=mdadm
VERSION=3.1.5
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sign
+
SOURCE_HASH=sha512:6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d
+# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/raid/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+# SOURCE2_URL[0]=$SOURCE_URL.sign
+# SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
LICENSE[0]=GPL
WEB_SITE=http://neil.brown.name/blog/mdadm
KEYWORDS="disk raid"
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 84e72fe..15e8096 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: temporarily switched back to hash-checking
+
2011-10-05 Bor Kraljič <pyrobor AT ver.si>
* linux-3.0.patch: added upstream patch for kernel 3.0 support (issue
#230)
diff --git a/kernel.gpg b/kernel.gpg
index c39ded4..66e30c8 100644
Binary files a/kernel.gpg and b/kernel.gpg differ
diff --git a/kernels/module-init-tools/DETAILS
b/kernels/module-init-tools/DETAILS
index 87a5791..0a043e6 100755
--- a/kernels/module-init-tools/DETAILS
+++ b/kernels/module-init-tools/DETAILS
@@ -17,14 +17,16 @@ fi
SPELL=module-init-tools
VERSION=3.16
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://modules.wiki.kernel.org/
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/kernel/$SPELL/$SOURCE
- SOURCE3=$SOURCE.sign
- SOURCE3_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE3:UPSTREAM_KEY
- SOURCE3_IGNORE=signature
+ SOURCE_URL[0]=http://launchpad.net/$SPELL/trunk/$VERSION/+download/$SOURCE
+
SOURCE_HASH=sha512:311aa2c0da68c067ed37acd68481cd4e76b54ae9a4cfb9a301027985c52c03ffae5ab0430709788a14a9689e01738b1733b62d9d935fff103acb125345f3b620
+# SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/kernel/$SPELL/$SOURCE
+# SOURCE3=$SOURCE.sign
+# SOURCE3_URL[0]=$SOURCE_URL.sign
+# SOURCE_GPG=kernel.gpg:$SOURCE3:UPSTREAM_KEY
+# SOURCE3_IGNORE=signature
ENTERED=20030410
LICENSE[0]=GPL
LICENSE[1]=UNKNOWN
diff --git a/kernels/module-init-tools/HISTORY
b/kernels/module-init-tools/HISTORY
index b849727..8d06931 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,9 @@
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: temporarily switched back to hash-checking; quoting paths;
+ while 3.16 sources are unavailable from the original mirror and
+ other distros use their own, switched back to launchpad one, where
+ contents of tar.gz is identical to the prev tar.bz2 from 2 Jun 2011
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: use kernel.gpg instead of jcm.gpg
* m-i-t.gpg: removed, it isn't used anywhere
diff --git a/libs/libxml2/CVE-2011-0216.patch
b/libs/libxml2/CVE-2011-0216.patch
deleted file mode 100644
index dfc99d4..0000000
--- a/libs/libxml2/CVE-2011-0216.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 69f04562f75212bfcabecd190ea8b06ace28ece2
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Fri Aug 19 11:05:04 2011 +0800
-
- Fix an off by one error in encoding
-
- this off by one error doesn't seems to reproduce on linux
- but the error is real.
-
-diff --git a/encoding.c b/encoding.c
-index d1140bf..fb0c38a 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler
*handler, xmlBufferPtr out,
- if (in == NULL) return(-1);
-
- /* calculate space available */
-- written = out->size - out->use;
-+ written = out->size - out->use - 1; /* count '\0' */
- toconv = in->use;
- /*
- * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38
-@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler,
xmlBufferPtr out,
- toconv = in->use;
- if (toconv == 0)
- return (0);
-- written = out->size - out->use;
-+ written = out->size - out->use -1; /* count '\0' */
- if (toconv * 2 >= written) {
- xmlBufferGrow(out, out->size + toconv * 2);
- written = out->size - out->use - 1;
diff --git a/libs/libxml2/CVE-2011-1944.patch
b/libs/libxml2/CVE-2011-1944.patch
deleted file mode 100644
index 62dd5d2..0000000
--- a/libs/libxml2/CVE-2011-1944.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-commit d7958b21e7f8c447a26bb2436f08402b2c308be4
-Author: Chris Evans <scarybeasts AT gmail.com>
-Date: Wed Mar 23 08:13:06 2011 +0800
-
- Fix some potential problems on reallocation failures
-
- The count was incremented before the allocation
- and not fixed in case of failure
- * xpath.c: corrects a few instances where the available count of some
- structure is updated before we know the allocation actually
- succeeds
-
-diff --git a/xpath.c b/xpath.c
-index 8b56189..608fe00 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr
node, xmlNsPtr ns) {
- } else if (cur->nodeNr == cur->nodeMax) {
- xmlNodePtr *temp;
-
-- cur->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "growing nodeset\n");
- return;
- }
-+ cur->nodeMax *= 2;
- cur->nodeTab = temp;
- }
- cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
-@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur,
xmlNodePtr val) {
- } else if (cur->nodeNr == cur->nodeMax) {
- xmlNodePtr *temp;
-
-- cur->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "growing nodeset\n");
- return;
- }
- cur->nodeTab = temp;
-+ cur->nodeMax *= 2;
- }
- if (val->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) val;
-@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1,
xmlNodeSetPtr val2) {
- } else if (val1->nodeNr == val1->nodeMax) {
- xmlNodePtr *temp;
-
-- val1->nodeMax *= 2;
-- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
-+ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2
*
- sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- val1->nodeTab = temp;
-+ val1->nodeMax *= 2;
- }
- if (n2->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1,
xmlNodeSetPtr set2,
- } else if (set1->nodeNr >= set1->nodeMax) {
- xmlNodePtr *temp;
-
-- set1->nodeMax *= 2;
- temp = (xmlNodePtr *) xmlRealloc(
-- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- set1->nodeTab = temp;
-+ set1->nodeMax *= 2;
- }
- if (n2->type == XML_NAMESPACE_DECL) {
- xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr
set1, xmlNodeSetPtr set2,
- } else if (set1->nodeNr >= set1->nodeMax) {
- xmlNodePtr *temp;
-
-- set1->nodeMax *= 2;
- temp = (xmlNodePtr *) xmlRealloc(
-- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- if (temp == NULL) {
- xmlXPathErrMemory(NULL, "merging nodeset\n");
- return(NULL);
- }
- set1->nodeTab = temp;
-+ set1->nodeMax *= 2;
- }
- set1->nodeTab[set1->nodeNr++] = n2;
- }
diff --git a/libs/libxml2/CVE-2011-2834.patch
b/libs/libxml2/CVE-2011-2834.patch
deleted file mode 100644
index cfc61e0..0000000
--- a/libs/libxml2/CVE-2011-2834.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Tue Oct 11 16:34:34 2011 +0800
-
- Fix missing error status in XPath evaluation
-
- Started by Chris Evans, I added a few more place where the
- error should have been set in the evaluation context.
-
-diff --git a/xpath.c b/xpath.c
-index bcee2ea..d9d902c 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt,
xmlXPathObjectPtr value)
- sizeof(ctxt->valueTab[0]));
- if (tmp == NULL) {
- xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
-+ ctxt->error = XPATH_MEMORY_ERROR;
- return (0);
- }
- ctxt->valueMax *= 2;
-@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
- if ( (ch & 0xc0) != 0xc0 ) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+ /* not asserting an XPath error is probably better */
- break;
- }
- /* then skip over remaining bytes for this char */
-@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
- if ( (*cptr++ & 0xc0) != 0x80 ) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathTranslateFunction: Invalid UTF8
string\n");
-+ /* not asserting an XPath error is probably better
*/
- break;
- }
- if (ch & 0x80) /* must have had error encountered */
-@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: variable %s bound to undefined prefix
%s\n",
- (char *) op->value4, (char
*)op->value5);
-+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
- return (total);
- }
- val = xmlXPathVariableLookupNS(ctxt->context,
-@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
- (char *)op->value4, (char *)op->value5);
- xmlXPathPopFrame(ctxt, frame);
-+ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
- return (total);
- }
- func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- }
- xmlGenericError(xmlGenericErrorContext,
- "XPath: unknown precompiled operation %d\n", op->op);
-+ ctxt->error = XPATH_INVALID_OPERAND;
- return (total);
- }
-
diff --git a/libs/libxml2/CVE-2011-3102.patch
b/libs/libxml2/CVE-2011-3102.patch
deleted file mode 100644
index ca3715c..0000000
--- a/libs/libxml2/CVE-2011-3102.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 39ef0e0c0a73d19d63a731525ce1f9de0c4a7d92 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Wed, 23 May 2012 09:57:06 +0200
-Subject: [PATCH] fix CVE-2011-3102
-
----
- xpointer.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/xpointer.c b/xpointer.c
-index 37afa3a..d37f0b1 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1007,21 +1007,14 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContextPtr ctxt,
xmlChar *name) {
- NEXT;
- break;
- }
-- *cur++ = CUR;
- } else if (CUR == '(') {
- level++;
-- *cur++ = CUR;
- } else if (CUR == '^') {
-- NEXT;
-- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
-- *cur++ = CUR;
-- } else {
-- *cur++ = '^';
-- *cur++ = CUR;
-- }
-- } else {
-- *cur++ = CUR;
-+ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
-+ NEXT;
-+ }
- }
-+ *cur++ = CUR;
- NEXT;
- }
- *cur = 0;
---
-1.7.10.1
-
diff --git a/libs/libxml2/CVE-2011-3905.patch
b/libs/libxml2/CVE-2011-3905.patch
deleted file mode 100644
index 53373b7..0000000
--- a/libs/libxml2/CVE-2011-3905.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 77404b8b69bc122d12231807abf1a837d121b551
-Author: Chris Evans <scarybeasts AT gmail.com>
-Date: Wed Dec 14 16:18:25 2011 +0800
-
- Make sure the parser returns when getting a Stop order
-
- patch backported from chromiun bug fixes, assuming author is Chris
-
-diff --git a/parser.c b/parser.c
-index 21d7aa3..4e5dcb9 100644
---- a/parser.c
-+++ b/parser.c
-@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- (ctxt->sax->processingInstruction != NULL))
- ctxt->sax->processingInstruction(ctxt->userData,
- target, NULL);
-- ctxt->instate = state;
-+ if (ctxt->instate != XML_PARSER_EOF)
-+ ctxt->instate = state;
- return;
- }
- buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
-@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- } else {
- xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL);
- }
-- ctxt->instate = state;
-+ if (ctxt->instate != XML_PARSER_EOF)
-+ ctxt->instate = state;
- }
- }
-
-@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
- else
- name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+ if (ctxt->instate == XML_PARSER_EOF)
-+ return;
- if (name == NULL) {
- spacePop(ctxt);
- return;
-@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
- else
- name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+ if (ctxt->instate == XML_PARSER_EOF)
-+ goto done;
- if (name == NULL) {
- spacePop(ctxt);
- ctxt->instate = XML_PARSER_EOF;
-@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
- else
- xmlParseEndTag1(ctxt, 0);
- #endif /* LIBXML_SAX1_ENABLED */
-- if (ctxt->nameNr == 0) {
-+ if (ctxt->instate == XML_PARSER_EOF) {
-+ /* Nothing */
-+ } else if (ctxt->nameNr == 0) {
- ctxt->instate = XML_PARSER_EPILOG;
- } else {
- ctxt->instate = XML_PARSER_CONTENT;
diff --git a/libs/libxml2/CVE-2011-3919.patch
b/libs/libxml2/CVE-2011-3919.patch
deleted file mode 100644
index b307e57..0000000
--- a/libs/libxml2/CVE-2011-3919.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5bd3c061823a8499b27422aee04ea20aae24f03e
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Fri Dec 16 18:53:35 2011 +0800
-
- Fix an allocation error when copying entities
-
-diff --git a/parser.c b/parser.c
-index 4e5dcb9..c55e41d 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt,
const xmlChar *str, int len,
-
- buffer[nbchars++] = '&';
- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- }
- for (;i > 0;i--)
- buffer[nbchars++] = *cur++;
diff --git a/libs/libxml2/DEPENDS b/libs/libxml2/DEPENDS
index 14e1e4b..65e7151 100755
--- a/libs/libxml2/DEPENDS
+++ b/libs/libxml2/DEPENDS
@@ -1,13 +1,18 @@
optional_depends icu \
- "--with-icu" \
- "--without-icu" \
- "Unicode support" &&
+ "--with-icu" \
+ "--without-icu" \
+ "Unicode support" &&