summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2012-10-28 15:01:28 +0100
committerLadislav Hagara2012-10-28 15:01:28 +0100
commitda473fe843de3118e98897f14747ec72549710a2 (patch)
tree616d2e0d51182492baef7fae2d01ce39fb05cf92
parent5ad13db086622e0f706fe90b8702af777c61ec60 (diff)
parent58b79be5b50596a1d02338ac1fbf15d4fabeabb7 (diff)
Merge branch 'master' into devel-gnome-3.6.0devel-gnome-3.6.0
Conflicts: ChangeLog I don't like conflicts. I hope I merged Changelog OK.
-rw-r--r--ChangeLog45
-rwxr-xr-xFUNCTIONS6
-rwxr-xr-xaudio-players/audacious/BUILD2
-rwxr-xr-xaudio-players/audacious/CONFIGURE2
-rwxr-xr-xaudio-players/audacious/DEPENDS20
-rwxr-xr-xaudio-players/audacious/DETAILS2
-rw-r--r--audio-players/audacious/HISTORY7
-rw-r--r--audio-players/audacious/LC_ALL-fix.patch12
-rwxr-xr-xaudio-players/audacious/PRE_BUILD4
-rw-r--r--audio-players/audacious/audacious-3.2.3.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--audio-players/audacious/audacious-3.3.2.tar.bz2.sigbin0 -> 543 bytes
-rw-r--r--audio-players/moc/HISTORY4
-rwxr-xr-xaudio-players/moc/PREPARE3
-rwxr-xr-xaudio-plugins/audacious-plugins/BUILD4
-rwxr-xr-xaudio-plugins/audacious-plugins/CONFIGURE43
-rwxr-xr-xaudio-plugins/audacious-plugins/DEPENDS97
-rwxr-xr-xaudio-plugins/audacious-plugins/DETAILS2
-rw-r--r--audio-plugins/audacious-plugins/HISTORY6
-rw-r--r--audio-plugins/audacious-plugins/audacious-plugins-3.2.3.tar.bz2.sigbin543 -> 0 bytes
-rw-r--r--audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xchat-im/amsn/DEPENDS2
-rw-r--r--chat-im/amsn/HISTORY4
-rwxr-xr-xchat-im/licq/DETAILS2
-rw-r--r--chat-im/licq/HISTORY3
-rwxr-xr-xchat-im/pidgin/BUILD2
-rw-r--r--chat-im/pidgin/HISTORY3
-rwxr-xr-xchat-irc/weechat/DEPENDS4
-rw-r--r--chat-irc/weechat/HISTORY3
-rw-r--r--collab/subversion/16A0DE01.gpgbin0 -> 5979 bytes
-rwxr-xr-xcollab/subversion/DETAILS4
-rw-r--r--collab/subversion/ED1A599C.gpgbin17699 -> 0 bytes
-rw-r--r--collab/subversion/HISTORY6
-rwxr-xr-xdevel/ctemplate/DETAILS8
-rw-r--r--devel/ctemplate/HISTORY5
-rwxr-xr-xdevel/ctemplate/PRE_BUILD6
-rwxr-xr-xdevel/git/DETAILS8
-rw-r--r--devel/git/HISTORY3
-rwxr-xr-xdevel/guile/DETAILS2
-rw-r--r--devel/guile/HISTORY3
-rwxr-xr-xdevel/nodejs/DETAILS4
-rw-r--r--devel/nodejs/HISTORY3
-rwxr-xr-xdevel/python3/CONFIGURE1
-rwxr-xr-xdevel/python3/CONFLICTS1
-rwxr-xr-xdevel/python3/DETAILS3
-rw-r--r--devel/python3/HISTORY5
-rwxr-xr-xdevel/python3/INSTALL14
-rwxr-xr-xdevel/python3/PRE_BUILD4
-rwxr-xr-xdevel/qt-creator/DETAILS2
-rw-r--r--devel/qt-creator/HISTORY3
-rw-r--r--devel/strace/HISTORY4
-rwxr-xr-xdevel/strace/PRE_BUILD3
-rw-r--r--devel/strace/glibc-2.15.patch53
-rwxr-xr-xdevel/tig/DETAILS4
-rw-r--r--devel/tig/HISTORY3
-rw-r--r--disk/grub2/HISTORY5
-rwxr-xr-xdisk/grub2/PRE_BUILD5
-rw-r--r--disk/grub2/glibc-2.16.patch16
-rwxr-xr-xdisk/partclone/DETAILS4
-rw-r--r--disk/partclone/HISTORY3
-rwxr-xr-xdisk/sg3_utils/DETAILS4
-rw-r--r--disk/sg3_utils/HISTORY3
-rwxr-xr-xdoc/man-pages/DETAILS4
-rw-r--r--doc/man-pages/HISTORY3
-rwxr-xr-xe-16/e16/BUILD4
-rwxr-xr-xe-16/e16/DETAILS4
-rw-r--r--e-16/e16/HISTORY4
-rwxr-xr-xe-16/epplet-base/BUILD3
-rwxr-xr-xe-16/epplet-base/DETAILS4
-rw-r--r--e-16/epplet-base/HISTORY4
-rwxr-xr-xe-17/e_dbus/DEPENDS3
-rw-r--r--e-17/e_dbus/HISTORY3
-rwxr-xr-xe-17/ecore/DEPENDS1
-rw-r--r--e-17/ecore/HISTORY3
-rwxr-xr-xe-17/efreet/DEPENDS3
-rw-r--r--e-17/efreet/HISTORY3
-rwxr-xr-xe-17/eobj/DEPENDS9
-rwxr-xr-xe-17/eobj/DETAILS18
-rw-r--r--e-17/eobj/HISTORY5
-rwxr-xr-xe-17/eobj/PREPARE2
-rwxr-xr-xe-17/eobj/PRE_BUILD4
-rwxr-xr-xe-17/evas/DEPENDS1
-rw-r--r--e-17/evas/HISTORY3
-rwxr-xr-xeditors/elvis/CONFIGURE5
-rw-r--r--editors/elvis/HISTORY3
-rwxr-xr-xftp/curl/DETAILS2
-rw-r--r--ftp/curl/HISTORY3
-rwxr-xr-xftp/uget/DETAILS6
-rw-r--r--ftp/uget/HISTORY3
-rwxr-xr-xgnome1-libs/orbit/PRE_BUILD2
-rwxr-xr-xgnome2-libs/gnome-colors/BUILD1
-rwxr-xr-xgnome2-libs/gnome-colors/DETAILS13
-rw-r--r--gnome2-libs/gnome-colors/HISTORY3
-rwxr-xr-xgnome2-libs/gnome-colors/PRE_BUILD3
-rwxr-xr-xgnome2-libs/gtkhtml2/BUILD4
-rwxr-xr-xgnome2-libs/gtkhtml2/DETAILS4
-rw-r--r--gnome2-libs/gtkhtml2/HISTORY6
-rw-r--r--gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gtkhtml2/gtkhtml-4.6.0.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/librsvg2/DETAILS4
-rw-r--r--gnome2-libs/librsvg2/HISTORY3
-rwxr-xr-xgnome2-libs/mx/DEPENDS3
-rw-r--r--gnome2-libs/mx/HISTORY3
-rwxr-xr-xgnome2-libs/pangox-compat/DEPENDS1
-rwxr-xr-xgnome2-libs/pangox-compat/DETAILS16
-rw-r--r--gnome2-libs/pangox-compat/HISTORY2
-rw-r--r--gnome2-libs/pangox-compat/pangox-compat-0.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/shiki-colors/BUILD1
-rwxr-xr-xgnome2-libs/shiki-colors/DEPENDS3
-rwxr-xr-xgnome2-libs/shiki-colors/DETAILS17
-rw-r--r--gnome2-libs/shiki-colors/HISTORY3
-rwxr-xr-xgnome2-libs/shiki-colors/PRE_BUILD3
-rwxr-xr-xgnome3-libs/libzeitgeist/DEPENDS1
-rwxr-xr-xgnome3-libs/libzeitgeist/DETAILS13
-rw-r--r--gnome3-libs/libzeitgeist/HISTORY2
-rwxr-xr-xgnome3-libs/zeitgeist/DEPENDS2
-rwxr-xr-xgnome3-libs/zeitgeist/DETAILS17
-rw-r--r--gnome3-libs/zeitgeist/HISTORY2
-rwxr-xr-x[-rw-r--r--]graphics-libs/ftgl/BUILD7
-rwxr-xr-xgraphics-libs/ftgl/DEPENDS8
-rw-r--r--graphics-libs/ftgl/HISTORY4
-rwxr-xr-xgraphics-libs/gegl/DEPENDS2
-rw-r--r--graphics-libs/gegl/HISTORY4
-rwxr-xr-xgraphics-libs/harfbuzz/DETAILS8
-rw-r--r--graphics-libs/harfbuzz/HISTORY3
-rwxr-xr-xgraphics-libs/harfbuzz/PREPARE5
-rwxr-xr-xgraphics-libs/harfbuzz/PRE_BUILD8
-rw-r--r--graphics-libs/harfbuzz/harfbuzz-0.9.4.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics-libs/ilmbase/DETAILS9
-rw-r--r--graphics-libs/ilmbase/HISTORY3
-rwxr-xr-xgraphics-libs/libopenraw/DEPENDS16
-rwxr-xr-xgraphics-libs/libopenraw/DETAILS19
-rw-r--r--graphics-libs/libopenraw/HISTORY3
-rwxr-xr-xgraphics-libs/libwacom/DETAILS6
-rw-r--r--graphics-libs/libwacom/HISTORY3
-rw-r--r--graphics-libs/libwacom/libwacom-0.4.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--graphics-libs/libwacom/libwacom-0.6.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics-libs/opencv/DEPENDS2
-rw-r--r--graphics-libs/opencv/HISTORY4
-rwxr-xr-xgraphics-libs/poppler-data/DETAILS4
-rw-r--r--graphics-libs/poppler-data/HISTORY3
-rwxr-xr-xgraphics-libs/poppler/DETAILS8
-rw-r--r--graphics-libs/poppler/HISTORY3
-rwxr-xr-xgraphics-libs/vips/DEPENDS2
-rw-r--r--graphics-libs/vips/HISTORY4
-rw-r--r--graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch25
-rwxr-xr-xgraphics/autopano-sift-c/DETAILS4
-rw-r--r--graphics/autopano-sift-c/HISTORY5
-rwxr-xr-xgraphics/autopano-sift-c/PRE_BUILD3
-rwxr-xr-xgraphics/cinepaint/DEPENDS26
-rwxr-xr-xgraphics/cinepaint/DETAILS11
-rw-r--r--graphics/cinepaint/HISTORY8
-rwxr-xr-xgraphics/cinepaint/PRE_BUILD6
-rw-r--r--graphics/cinepaint/cinepaint-0.21-2.tar.gz.sigbin280 -> 0 bytes
-rw-r--r--graphics/cinepaint/cinepaint-missing-include.patch11
-rwxr-xr-xgraphics/darktable/DETAILS2
-rw-r--r--graphics/darktable/HISTORY7
-rwxr-xr-xgraphics/darktable/PRE_BUILD5
-rw-r--r--graphics/darktable/rsvg.patch24
-rwxr-xr-xgraphics/enblend/BUILD1
-rw-r--r--graphics/enblend/HISTORY3
-rwxr-xr-xgraphics/geeqie/DEPENDS12
-rw-r--r--graphics/geeqie/HISTORY4
-rw-r--r--graphics/hugin/0001-add-missing-header.patch31
-rw-r--r--graphics/hugin/0002-access-extract-through-this-pointer.patch34
-rwxr-xr-xgraphics/hugin/DETAILS4
-rw-r--r--graphics/hugin/HISTORY5
-rwxr-xr-xgraphics/hugin/PRE_BUILD4
-rwxr-xr-xgraphics/leptonica/DETAILS4
-rw-r--r--graphics/leptonica/HISTORY3
-rwxr-xr-xgraphics/meshlab/BUILD10
-rwxr-xr-xgraphics/meshlab/DEPENDS1
-rwxr-xr-xgraphics/meshlab/DETAILS15
-rw-r--r--graphics/meshlab/HISTORY3
-rwxr-xr-xgraphics/meshlab/INSTALL4
-rwxr-xr-xgraphics/meshlab/PRE_BUILD6
-rw-r--r--graphics/meshlab/gcc-4.7.patch38
-rw-r--r--graphics/meshlab/rpath.patch36
-rw-r--r--graphics/openexr/0001-add-missing-header.patch24
-rwxr-xr-xgraphics/openexr/DETAILS7
-rw-r--r--graphics/openexr/HISTORY5
-rwxr-xr-xgraphics/openexr/PRE_BUILD2
-rw-r--r--graphics/openexr/gcc43.patch26
-rwxr-xr-xgraphics/rawtherapee/BUILD1
-rwxr-xr-xgraphics/rawtherapee/DEPENDS24
-rwxr-xr-xgraphics/rawtherapee/DETAILS13
-rw-r--r--graphics/rawtherapee/HISTORY3
-rwxr-xr-xhttp/firefox/DETAILS6
-rw-r--r--http/firefox/HISTORY11
-rwxr-xr-xhttp/firefox/PRE_BUILD3
-rw-r--r--http/firefox/install_dir.patch56
-rw-r--r--http/firefox/installer.patch112
-rwxr-xr-xhttp/seamonkey/DEPENDS6
-rwxr-xr-xhttp/seamonkey/DETAILS6
-rw-r--r--http/seamonkey/HISTORY9
-rw-r--r--http/tinyproxy/HISTORY3
-rwxr-xr-xhttp/tinyproxy/PRE_BUILD2
-rwxr-xr-xi18n/ibus-anthy/DETAILS5
-rw-r--r--i18n/ibus-anthy/HISTORY3
-rw-r--r--i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xi18n/ibus-pinyin/BUILD2
-rwxr-xr-xi18n/ibus-pinyin/DEPENDS13
-rwxr-xr-xi18n/ibus-pinyin/DETAILS5
-rw-r--r--i18n/ibus-pinyin/HISTORY6
-rw-r--r--i18n/ibus-pinyin/ibus-pinyin-1.4.0.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xi18n/ibus/DETAILS5
-rw-r--r--i18n/ibus/HISTORY4
-rw-r--r--i18n/ibus/ibus-1.4.99.20121006.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xjava/icedtea6/DETAILS2
-rw-r--r--java/icedtea6/HISTORY3
-rw-r--r--java/icedtea6/icedtea6-1.11.4.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--java/icedtea6/icedtea6-1.11.5.tar.gz.sigbin0 -> 543 bytes
-rwxr-xr-xkde4-apps/tellico2/DEPENDS2
-rw-r--r--kde4-apps/tellico2/HISTORY4
-rwxr-xr-xkde4-bindings/pykde4/DETAILS5
-rw-r--r--kde4-bindings/pykde4/HISTORY6
-rwxr-xr-xkde4-bindings/pykde4/PRE_BUILD4
-rw-r--r--kde4-bindings/pykde4/pykde4-4.9.2.tar.xz.sigbin0 -> 287 bytes
-rw-r--r--kde4-bindings/pykde4/sip-4.14.patch69
-rwxr-xr-xkde4/kdenetwork4/DEPENDS2
-rw-r--r--kde4/kdenetwork4/HISTORY4
-rw-r--r--kernels/linux/HISTORY30
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.0.455
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.0.465
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.2.315
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.4.135
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.4.145
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.5.65
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.5.75
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.6.15
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.6.25
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.6.35
-rw-r--r--kernels/linux/latest.defaults2
-rwxr-xr-xlibs/freexl/DETAILS24
-rw-r--r--libs/freexl/HISTORY3
-rw-r--r--libs/gettext/HISTORY3
-rwxr-xr-xlibs/gettext/PRE_BUILD4
-rwxr-xr-xlibs/libevent/DETAILS2
-rw-r--r--libs/libevent/HISTORY3
-rwxr-xr-xlibs/libguess/DETAILS13
-rw-r--r--libs/libguess/HISTORY4
-rw-r--r--libs/libguess/libguess-1.1.tar.gz.sigbin0 -> 543 bytes
-rwxr-xr-xlibs/libspatialindex/DEPENDS1
-rwxr-xr-xlibs/libspatialindex/DETAILS25
-rw-r--r--libs/libspatialindex/HISTORY3
-rwxr-xr-xlibs/libspatialite/DEPENDS4
-rwxr-xr-xlibs/libspatialite/DETAILS17
-rw-r--r--libs/libspatialite/HISTORY3
-rwxr-xr-xlibs/libtasn1/DETAILS2
-rw-r--r--libs/libtasn1/HISTORY3
-rwxr-xr-xlibs/libvirt/DEPENDS1
-rwxr-xr-xlibs/libvirt/DETAILS2
-rw-r--r--libs/libvirt/HISTORY4
-rw-r--r--libs/libvirt/libvirt-0.10.2.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--libs/libvirt/libvirt-0.9.9.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xlibs/libxml2/DETAILS4
-rw-r--r--libs/libxml2/HISTORY4
-rwxr-xr-xlibs/libxml2/PRE_BUILD4
-rw-r--r--libs/libxml2/bufsize.patch.gzbin2905 -> 0 bytes
-rwxr-xr-xlibs/ncurses/BUILD2
-rwxr-xr-xlibs/ncurses/DETAILS1
-rw-r--r--libs/ncurses/HISTORY4
-rwxr-xr-xlibs/pyqt4/DETAILS6
-rw-r--r--libs/pyqt4/HISTORY3
-rwxr-xr-xlibs/sip/DETAILS7
-rw-r--r--libs/sip/HISTORY3
-rwxr-xr-xlibs/skeltrack/DETAILS6
-rw-r--r--libs/skeltrack/HISTORY3
-rwxr-xr-xlibs/tzdata/DETAILS4
-rw-r--r--libs/tzdata/HISTORY3
-rwxr-xr-xlibs/upower/DETAILS4
-rw-r--r--libs/upower/HISTORY3
-rwxr-xr-xlibs/xapian-core/DETAILS4
-rw-r--r--libs/xapian-core/HISTORY3
-rwxr-xr-xmobile/geoclue/DETAILS7
-rw-r--r--mobile/geoclue/HISTORY5
-rwxr-xr-xmobile/geoclue/PRE_BUILD3
-rw-r--r--mobile/geoclue/geoclue-0.12.99.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--mobile/geoclue/geoclue-gcc46.patch23
-rwxr-xr-xnet/bind-tools/DETAILS4
-rw-r--r--net/bind-tools/HISTORY3
-rwxr-xr-xnet/hostapd/DETAILS1
-rw-r--r--net/hostapd/HISTORY5
-rwxr-xr-xnet/hostapd/PRE_BUILD2
-rw-r--r--net/hostapd/eap-tls.patch48
-rwxr-xr-xnet/nfs-utils/DETAILS2
-rw-r--r--net/nfs-utils/HISTORY5
-rw-r--r--net/nfs-utils/init.d/nfs6
-rwxr-xr-xperl-cpan/image-exiftool/DETAILS4
-rw-r--r--perl-cpan/image-exiftool/HISTORY3
-rwxr-xr-xpython-pypi/fdb/DETAILS4
-rw-r--r--python-pypi/fdb/HISTORY6
-rwxr-xr-xpython-pypi/hatta/DEPENDS1
-rwxr-xr-xpython-pypi/hatta/DETAILS10
-rw-r--r--python-pypi/hatta/HISTORY4
-rwxr-xr-xpython-pypi/lxml/DETAILS2
-rw-r--r--python-pypi/lxml/HISTORY3
-rwxr-xr-xpython-pypi/mercurial/DETAILS4
-rw-r--r--python-pypi/mercurial/HISTORY3
-rwxr-xr-xpython-pypi/scipy/DETAILS4
-rw-r--r--python-pypi/scipy/HISTORY5
-rwxr-xr-xpython-pypi/virtinst/DETAILS2
-rw-r--r--python-pypi/virtinst/HISTORY3
-rw-r--r--python-pypi/virtinst/virtinst-0.600.0.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--python-pypi/virtinst/virtinst-0.600.3.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xruby-raa/ruby-1.9/DETAILS6
-rw-r--r--ruby-raa/ruby-1.9/HISTORY3
-rwxr-xr-xscience-libs/flann/DETAILS4
-rw-r--r--science-libs/flann/HISTORY3
-rwxr-xr-xscience-libs/mrpt/BUILD1
-rw-r--r--science-libs/mrpt/CNetworkOfPoses.h.patch11
-rwxr-xr-xscience-libs/mrpt/DEPENDS2
-rwxr-xr-xscience-libs/mrpt/DETAILS20
-rw-r--r--science-libs/mrpt/HISTORY3
-rwxr-xr-xscience-libs/mrpt/PRE_BUILD4
-rwxr-xr-xscience-libs/pcl/DETAILS6
-rw-r--r--science-libs/pcl/HISTORY3
-rwxr-xr-xscience-libs/vtk-data/DETAILS6
-rw-r--r--science-libs/vtk-data/HISTORY3
-rwxr-xr-xscience-libs/vtk/DETAILS6
-rw-r--r--science-libs/vtk/HISTORY3
-rwxr-xr-xscience/grass/DETAILS4
-rw-r--r--science/grass/HISTORY4
-rwxr-xr-xscience/grass/PRE_BUILD4
-rw-r--r--science/grass/iostream_cpp470116
-rwxr-xr-xscience/qgis/DEPENDS10
-rwxr-xr-xscience/qgis/DETAILS4
-rw-r--r--science/qgis/HISTORY5
-rwxr-xr-xscience/qhull/DETAILS4
-rw-r--r--science/qhull/HISTORY3
-rwxr-xr-xscience/splitter/BUILD3
-rwxr-xr-xscience/splitter/DEPENDS2
-rwxr-xr-xscience/splitter/DETAILS19
-rw-r--r--science/splitter/HISTORY3
-rwxr-xr-xscience/splitter/INSTALL3
-rw-r--r--science/splitter/splitter3
-rwxr-xr-xsecurity-libs/cracklib/DETAILS4
-rw-r--r--security-libs/cracklib/HISTORY3
-rwxr-xr-xsecurity-libs/libpwquality/DEPENDS1
-rwxr-xr-xsecurity-libs/libpwquality/DETAILS13
-rw-r--r--security-libs/libpwquality/HISTORY2
-rwxr-xr-xsecurity-libs/linux-pam/DETAILS5
-rw-r--r--security-libs/linux-pam/HISTORY10
-rw-r--r--security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xshell-term-fm/bash/DETAILS1
-rw-r--r--shell-term-fm/bash/HISTORY4
-rwxr-xr-xshell-term-fm/bash/PRE_BUILD5
-rw-r--r--shell-term-fm/bash/patches/bash42-00178
-rw-r--r--shell-term-fm/bash/patches/bash42-00260
-rw-r--r--shell-term-fm/bash/patches/bash42-003318
-rw-r--r--shell-term-fm/bash/patches/bash42-00453
-rw-r--r--shell-term-fm/bash/patches/bash42-005131
-rw-r--r--shell-term-fm/bash/patches/bash42-00646
-rw-r--r--shell-term-fm/bash/patches/bash42-00746
-rw-r--r--shell-term-fm/bash/patches/bash42-00874
-rw-r--r--shell-term-fm/bash/patches/bash42-00982
-rw-r--r--shell-term-fm/bash/patches/bash42-01061
-rw-r--r--shell-term-fm/bash/patches/bash42-01146
-rw-r--r--shell-term-fm/bash/patches/bash42-012151
-rw-r--r--shell-term-fm/bash/patches/bash42-01352
-rw-r--r--shell-term-fm/bash/patches/bash42-01447
-rw-r--r--shell-term-fm/bash/patches/bash42-01581
-rw-r--r--shell-term-fm/bash/patches/bash42-01646
-rw-r--r--shell-term-fm/bash/patches/bash42-01747
-rw-r--r--shell-term-fm/bash/patches/bash42-01874
-rw-r--r--shell-term-fm/bash/patches/bash42-01947
-rw-r--r--shell-term-fm/bash/patches/bash42-02060
-rw-r--r--shell-term-fm/bash/patches/bash42-02161
-rw-r--r--shell-term-fm/bash/patches/bash42-02261
-rw-r--r--shell-term-fm/bash/patches/bash42-02362
-rw-r--r--shell-term-fm/bash/patches/bash42-02445
-rw-r--r--shell-term-fm/bash/patches/bash42-025143
-rw-r--r--shell-term-fm/bash/patches/bash42-02658
-rw-r--r--shell-term-fm/bash/patches/bash42-02747
-rw-r--r--shell-term-fm/bash/patches/bash42-02852
-rw-r--r--shell-term-fm/bash/patches/bash42-029524
-rw-r--r--shell-term-fm/bash/patches/bash42-030178
-rw-r--r--shell-term-fm/bash/patches/bash42-03180
-rw-r--r--shell-term-fm/bash/patches/bash42-03275
-rw-r--r--shell-term-fm/bash/patches/bash42-03357
-rw-r--r--shell-term-fm/bash/patches/bash42-03446
-rw-r--r--shell-term-fm/bash/patches/bash42-03566
-rw-r--r--shell-term-fm/bash/patches/bash42-03692
-rw-r--r--shell-term-fm/bash/patches/bash42-037112
-rwxr-xr-xshell-term-fm/vifm/DEPENDS5
-rwxr-xr-xshell-term-fm/vifm/DETAILS4
-rw-r--r--shell-term-fm/vifm/HISTORY9
-rwxr-xr-xutils/accountsservice/DETAILS2
-rw-r--r--utils/accountsservice/HISTORY3
-rw-r--r--utils/accountsservice/accountsservice-0.6.12.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--utils/accountsservice/accountsservice-0.6.25.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xutils/grep/DETAILS2
-rw-r--r--utils/grep/HISTORY11
-rwxr-xr-xutils/grep/PRE_BUILD5
-rwxr-xr-xutils/metalog/DETAILS4
-rw-r--r--utils/metalog/HISTORY3
-rw-r--r--utils/strigi/HISTORY7
-rwxr-xr-xutils/strigi/PRE_BUILD3
-rwxr-xr-xutils/usbview/DEPENDS2
-rwxr-xr-xutils/usbview/DETAILS4
-rw-r--r--utils/usbview/HISTORY4
-rwxr-xr-xutils/util-linux/CONFIGURE29
-rw-r--r--utils/util-linux/HISTORY7
-rwxr-xr-xutils/util-linux/PREPARE33
-rwxr-xr-xutils/virt-manager/DETAILS2
-rw-r--r--utils/virt-manager/HISTORY3
-rw-r--r--utils/virt-manager/virt-manager-0.9.0.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--utils/virt-manager/virt-manager-0.9.4.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-libav-1.0/DETAILS2
-rw-r--r--video-libs/gst-libav-1.0/HISTORY3
-rw-r--r--video-libs/gst-libav-1.0/gst-libav-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-libav-1.0/gst-libav-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-plugins-bad-1.0/DETAILS2
-rw-r--r--video-libs/gst-plugins-bad-1.0/HISTORY3
-rw-r--r--video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-plugins-base-1.0/DETAILS2
-rw-r--r--video-libs/gst-plugins-base-1.0/HISTORY3
-rw-r--r--video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-plugins-good-1.0/DETAILS2
-rw-r--r--video-libs/gst-plugins-good-1.0/HISTORY3
-rw-r--r--video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gst-plugins-ugly-1.0/DETAILS2
-rw-r--r--video-libs/gst-plugins-ugly-1.0/HISTORY3
-rw-r--r--video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/gstreamer-1.0/DETAILS2
-rw-r--r--video-libs/gstreamer-1.0/HISTORY3
-rw-r--r--video-libs/gstreamer-1.0/gstreamer-1.0.0.tar.xz.sigbin287 -> 0 bytes
-rw-r--r--video-libs/gstreamer-1.0/gstreamer-1.0.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xvideo-libs/libdvdnav/DETAILS9
-rw-r--r--video-libs/libdvdnav/HISTORY3
-rwxr-xr-xvideo-libs/libdvdread/DETAILS8
-rw-r--r--video-libs/libdvdread/HISTORY5
-rwxr-xr-xvideo-libs/libdvdread/UP_TRIGGERS4
-rw-r--r--video-libs/libdvdread/libdvdread-4.1.3.tar.bz2.sigbin287 -> 0 bytes
-rwxr-xr-xvideo-libs/libunicap/DEPENDS2
-rw-r--r--video-libs/libunicap/HISTORY4
-rwxr-xr-xvideo-libs/libv4l/BUILD2
-rwxr-xr-xvideo-libs/libv4l/CONFLICTS1
-rwxr-xr-xvideo-libs/libv4l/DETAILS25
-rwxr-xr-xvideo-libs/libv4l/DOWNLOAD1
-rw-r--r--video-libs/libv4l/HISTORY54
-rwxr-xr-xvideo-libs/libv4l/INSTALL2
-rwxr-xr-xvideo-libs/libv4l/PRE_BUILD1
-rwxr-xr-xvideo-libs/libv4l/UP_TRIGGERS1
-rwxr-xr-xvideo-libs/live/DETAILS4
-rw-r--r--video-libs/live/HISTORY3
-rwxr-xr-xvideo-libs/xine-lib/DEPENDS2
-rw-r--r--video-libs/xine-lib/HISTORY4
-rwxr-xr-xvideo/bino/DETAILS4
-rw-r--r--video/bino/HISTORY3
-rwxr-xr-xvideo/guvcview/DEPENDS2
-rw-r--r--video/guvcview/HISTORY4
-rwxr-xr-xvideo/kamerka/DEPENDS2
-rw-r--r--video/kamerka/HISTORY3
-rwxr-xr-xvideo/transcode/DEPENDS2
-rw-r--r--video/transcode/HISTORY4
-rwxr-xr-xvideo/v4l-utils/BUILD1
-rwxr-xr-xvideo/v4l-utils/CONFLICTS1
-rwxr-xr-xvideo/v4l-utils/DEPENDS5
-rwxr-xr-xvideo/v4l-utils/DETAILS4
-rw-r--r--video/v4l-utils/HISTORY6
-rwxr-xr-xvideo/v4l-utils/INSTALL1
-rwxr-xr-xvideo/vlc/DEPENDS2
-rwxr-xr-xvideo/vlc/DETAILS4
-rw-r--r--video/vlc/HISTORY7
-rwxr-xr-xwm-addons/cairo-dock-plugins/DETAILS2
-rw-r--r--wm-addons/cairo-dock-plugins/HISTORY3
-rwxr-xr-xwm-addons/cairo-dock/DETAILS2
-rw-r--r--wm-addons/cairo-dock/HISTORY3
-rwxr-xr-xwm-addons/razor-qt/DETAILS6
-rw-r--r--wm-addons/razor-qt/HISTORY6
-rwxr-xr-xx11-libs/cairo/DETAILS8
-rw-r--r--x11-libs/cairo/HISTORY6
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY3
-rwxr-xr-xx11-toolkits/qscintilla/BUILD2
-rwxr-xr-xx11-toolkits/qscintilla/DETAILS6
-rw-r--r--x11-toolkits/qscintilla/HISTORY4
-rwxr-xr-xx11/easystroke/DETAILS2
-rw-r--r--x11/easystroke/HISTORY3
-rw-r--r--x11/easystroke/easystroke-0.5.5.1.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--x11/easystroke/easystroke-0.5.6.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xx11/gtk-vnc/DEPENDS17
-rwxr-xr-xx11/gtk-vnc/DETAILS4
-rw-r--r--x11/gtk-vnc/HISTORY7
-rw-r--r--x11/gtk-vnc/gtk-vnc-0.4.4.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--x11/gtk-vnc/gtk-vnc-0.5.1.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xx11/virt-viewer/DETAILS5
-rw-r--r--x11/virt-viewer/HISTORY3
-rw-r--r--x11/virt-viewer/virt-viewer-0.5.4.tar.gz.sigbin0 -> 287 bytes
493 files changed, 5563 insertions, 686 deletions
diff --git a/ChangeLog b/ChangeLog
index cc4cf1dd2d..a23248fd1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * graphics-libs/libopenraw: new spell, a RAW decoder
+
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * gnome3-libs/zeitgeist: new spell
+ service to log activities and present to other apps
+ * gnome3-libs/libzeitgeist: new spell, zeitgeist client library
+
+2012-10-24 Ladislav Hagara <hgr@vabo.cz>
+ * science-libs/mrpt: new spell, Mobile Robot Programming Toolkit
+
+2012-10-22 Ladislav Hagara <hgr@vabo.cz>
+ * security-libs/libpwquality: new spell, Library for password quality
+ checking and generating random passwords.
+
+2012-10-20 Treeve Jelbert <treeve@sourcemage.org>
+ * FUNCTIONS: explicity use python2
+
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * libs/libguess: new spell, high-speed character detection library
+
+2012-10-18 Ladislav Hagara <hgr@vabo.cz>
+ * gnome2-libs/pangox-compat: new spell, pangox compatibility library
+
+2012-10-16 Ladislav Hagara <hgr@vabo.cz>
+ * graphics/meshlab: new spell, advanced mesh processing system
+
+2012-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * graphics/rawtherapee: new spell, a RAW image developmer
+
+2012-10-14 Ladislav Hagara <hgr@vabo.cz>
+ * e-17/eobj: new spell, EFL's generic object system library
+
+2012-10-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * gnome2-libs/gnome-colors: new spell, icon themes for gnome
+ * gnome2-libs/shiki-colors: new spell, a set of gtk2 themes
+
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * libs/libspatialindex: new spell, a spatial indexing framework
+ * libs/freexl: new spell, a library for reading excel files
+ * libs/libspatialite: new spell, spatial SQL support for sqlite
+
2012-10-06 Sukneet Basuta <sukneet@sourcemage.org>
* freedesktop.gpg: added, for freedesktop software
added FA970E17 "Richard Hughes <richard@hughsie.com>"
@@ -24,6 +66,9 @@
* gnome3-libs/libsecret: new spell, a library for storing and
retrieving passwords and other secrets. Replaces libgnome-keyring
+2012-09-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * science/splitter: new spell, a splitter for openstreetmap data
+
2012-09-26 Eric Sandall <sandalle@sourcemage.org>
* graphics/advancecomp: Added a collection of recompression utilities
diff --git a/FUNCTIONS b/FUNCTIONS
index c0fc73cf66..2fbe0f1a9a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -426,10 +426,10 @@ function unpack_file() {
}
#-------------------------------------------------------------------------
-## Default build for Python spell.
+## Default build for Python2 spell.
#-------------------------------------------------------------------------
function default_build_python() {
- python setup.py build "$@"
+ python2 setup.py build "$@"
}
#-------------------------------------------------------------------------
@@ -443,7 +443,7 @@ function default_build_python3() {
## Default install for Python spell.
#-------------------------------------------------------------------------
function default_install_python() {
- python setup.py install --root "$INSTALL_ROOT/" "$@"
+ python2 setup.py install --root "$INSTALL_ROOT/" "$@"
}
#-------------------------------------------------------------------------
diff --git a/audio-players/audacious/BUILD b/audio-players/audacious/BUILD
deleted file mode 100755
index 3f0e2f2dc3..0000000000
--- a/audio-players/audacious/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="${AUDACIOUS_IPV6} --enable-chardet $OPTS" &&
-default_build
diff --git a/audio-players/audacious/CONFIGURE b/audio-players/audacious/CONFIGURE
deleted file mode 100755
index c95492cdb9..0000000000
--- a/audio-players/audacious/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option AUDACIOUS_IPV6 "Enable IPv6 support?" n \
- "--enable-ipv6" "--disable-ipv6"
diff --git a/audio-players/audacious/DEPENDS b/audio-players/audacious/DEPENDS
index 4799d9d609..c9e85778f0 100755
--- a/audio-players/audacious/DEPENDS
+++ b/audio-players/audacious/DEPENDS
@@ -1,22 +1,16 @@
-depends gtk+2 &&
-depends libglade2 &&
-depends libmcs &&
-depends libmowgli &&
+depends glib2 &&
depends pango &&
depends cairo &&
+depends gtk+3 &&
-optional_depends gtk+3 \
- "" "--disable-gtk3" \
- "to use GTK3 instead of GTK2" &&
+optional_depends libguess \
+ "--enable-chardet" "--disable-chardet" \
+ "Enable libguess character set detection?" &&
-optional_depends libsamplerate \
- "--enable-samplerate" \
- "--disable-samplerate" \
- "support for samplerate" &&
optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
+ "--enable-dbus" "--disable-dbus" \
"support for dbus notifications" &&
+
optional_depends pcre \
"--with-regexlib=pcre" \
"--with-regexlib=gnu" \
diff --git a/audio-players/audacious/DETAILS b/audio-players/audacious/DETAILS
index f4135c0b1e..1f16b1542d 100755
--- a/audio-players/audacious/DETAILS
+++ b/audio-players/audacious/DETAILS
@@ -1,5 +1,5 @@
SPELL=audacious
- VERSION=3.2.3
+ VERSION=3.3.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/audio-players/audacious/HISTORY b/audio-players/audacious/HISTORY
index fcc5bc2cc2..e40ec0e232 100644
--- a/audio-players/audacious/HISTORY
+++ b/audio-players/audacious/HISTORY
@@ -1,3 +1,10 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.3.2
+ * DEPENDS: updated with changed depends
+ * BUILD: removed
+ * CONFIGURE: removed
+ * PRE_BUILD: added to apply patch
+
2012-07-26 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added missing gtk+3 dependency
diff --git a/audio-players/audacious/LC_ALL-fix.patch b/audio-players/audacious/LC_ALL-fix.patch
new file mode 100644
index 0000000000..e43ccd4486
--- /dev/null
+++ b/audio-players/audacious/LC_ALL-fix.patch
@@ -0,0 +1,12 @@
+diff -ur audacious-orig/src/audacious/main.c audacious-3.3.2/src/audacious/main.c
+--- audacious-orig/src/audacious/main.c 2012-10-19 20:21:07.223245571 -0500
++++ audacious-3.3.2/src/audacious/main.c 2012-10-19 20:21:57.147245213 -0500
+@@ -439,7 +439,7 @@
+ init_paths ();
+ make_dirs ();
+
+- setlocale (LC_ALL, "");
++// setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, aud_paths[AUD_PATH_LOCALE_DIR]);
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ bindtextdomain (PACKAGE "-plugins", aud_paths[AUD_PATH_LOCALE_DIR]);
diff --git a/audio-players/audacious/PRE_BUILD b/audio-players/audacious/PRE_BUILD
new file mode 100755
index 0000000000..9544f90ffa
--- /dev/null
+++ b/audio-players/audacious/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/LC_ALL-fix.patch
diff --git a/audio-players/audacious/audacious-3.2.3.tar.bz2.sig b/audio-players/audacious/audacious-3.2.3.tar.bz2.sig
deleted file mode 100644
index b93ed298ab..0000000000
--- a/audio-players/audacious/audacious-3.2.3.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/audio-players/audacious/audacious-3.3.2.tar.bz2.sig b/audio-players/audacious/audacious-3.3.2.tar.bz2.sig
new file mode 100644
index 0000000000..067a6605b5
--- /dev/null
+++ b/audio-players/audacious/audacious-3.3.2.tar.bz2.sig
Binary files differ
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index af78b2e448..951c7b05b6 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,7 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: added unstable version 2.5.0-beta1
+ * PREPARE: use prepare_select_branch
+
2012-03-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD, PREPARE, CONFIGURE: switched to subversion since the
stable as well as the unstable upstream version are very old and segfault
diff --git a/audio-players/moc/PREPARE b/audio-players/moc/PREPARE
index 1da4eee4f5..cd5a621676 100755
--- a/audio-players/moc/PREPARE
+++ b/audio-players/moc/PREPARE
@@ -1 +1,2 @@
-config_query MOC_SVN_AUTOUPDATE "Automatically update ${SPELL} on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch unstable scm
diff --git a/audio-plugins/audacious-plugins/BUILD b/audio-plugins/audacious-plugins/BUILD
index 9a99e9f750..84b3ceb240 100755
--- a/audio-plugins/audacious-plugins/BUILD
+++ b/audio-plugins/audacious-plugins/BUILD
@@ -1,2 +1,4 @@
-OPTS="--enable-chardet $AUDACIOUS_IPV6 $AUDACIOUS_STATUS $AUDACIOUS_OSD $AUDACIOUS_COSD $OPTS" &&
+OPTS="$AUDACIOUS_IPV6 $AUDACIOUS_STATUS $AUDACIOUS_OSD $AUDACIOUS_COSD $OPTS" &&
+OPTS="$AUDACIOUS_SONGCHANGE $AUDACIOUS_HOTKEY $AUDACIOUS_MPRIS $OPTS" &&
+OPTS="$AUDACIOUS_AD $AUDACIOUS_GTKUI $AUDACIOUS_SKINS $AUDACIOUS_LYRIC $OPTS" &&
default_build
diff --git a/audio-plugins/audacious-plugins/CONFIGURE b/audio-plugins/audacious-plugins/CONFIGURE
index 69ab67e36a..468b97c721 100755
--- a/audio-plugins/audacious-plugins/CONFIGURE
+++ b/audio-plugins/audacious-plugins/CONFIGURE
@@ -1,11 +1,13 @@
config_query_option AUDACIOUS_IPV6 \
- 'for IPv6 support' n \
+ 'Enable IPv6 support?' n \
'--enable-ipv6' \
'--disable-ipv6' &&
+
config_query_option AUDACIOUS_STATUS \
- 'for a status icon' y \
+ 'Enable X11 Status Icon plugin?' y \
'--enable-statusicon' \
'--disable-statusicon' &&
+
config_query_option AUDACIOUS_OSD \
'for OSD plugin' y \
'--enable-aosd' \
@@ -15,4 +17,39 @@ if [[ "$AUDACIOUS_OSD" == '--enable-aosd' ]]; then
'for X Composite OSD plugin' y \
'--enable-aosd-xcomp' \
'--disable-aosd-xcomp'
-fi
+fi &&
+
+config_query_option AUDACIOUS_SONGCHANGE \
+ "Enable Song Change Plugin?" y \
+ "--enable-songchange" \
+ "--disable-songchange" &&
+
+config_query_option AUDACIOUS_HOTKEY \
+ "Enable global hotkey plugin?" y \
+ "--enable-hotkey" \
+ "--disable-hotkey" &&
+
+config_query_option AUDACIOUS_MPRIS \
+ "Enable mpris2 plugin?" y \
+ "--enable-mpris2" \
+ "--disable-mpris2" &&
+
+config_query_option AUDACIOUS_AD \
+ "Enable AdPlug plugin?" y \
+ "--enable-adplug" \
+ "--disable-adplug" &&
+
+config_query_option AUDACIOUS_GTKUI \
+ "Enable GTK Interface?" y \
+ "--enable-gtkui" \
+ "--disable-gtkui" &&
+
+config_query_option AUDACIOUS_SKINS \
+ "Enable Winamp Classic interface?" y \
+ "--enable-skins" \
+ "--disable-skins" &&
+
+config_query_option AUDACIOUS_LYRIC \
+ "Enable LyricWiki plugin?" y \
+ "--enable-lyricwiki" \
+ "--disable-lyricwiki"
diff --git a/audio-plugins/audacious-plugins/DEPENDS b/audio-plugins/audacious-plugins/DEPENDS
index b9b07bafcf..5c58a86580 100755
--- a/audio-plugins/audacious-plugins/DEPENDS
+++ b/audio-plugins/audacious-plugins/DEPENDS
@@ -1,98 +1,129 @@
+depends glib2 &&
+depends pango &&
+depends cairo &&
+depends gtk+3 &&
depends audacious &&
# control plugins
-optional_depends xf86-input-evdev \
- "--enable-evdevplug" \
- "--disable-evdevplug" \
- "for evdev support" &&
optional_depends lirc \
"" \
"--disable-lirc" \
"for lirc support" &&
+
# output plugins
optional_depends alsa-lib \
"" \
"--disable-alsa" \
"for alsa support" &&
-optional_depends esound \
- "" \
- "--disable-esd" \
- "for esound support" &&
+
optional_depends pulseaudio \
"" \
"--disable-pulse" \
"for pulseaudio support" &&
+
optional_depends JACK-DRIVER \
"" \
"--disable-jack" \
- "support for jack (note: jack2 may not work here yet!)" &&
+ "support for jack" &&
+
# filetype plugins
optional_depends LIBAVCODEC \
- "" \
- "--disable-wma" \
- "for WMA support" &&
+ "--enable-ffaudio" \
+ "--disable-ffaudio" \
+ "for ffmpeg WMA support" &&
+
optional_depends libvorbis \
"" \
"--disable-vorbis --disable-filewriter_vorbis" \
"for vorbis support" &&
+
optional_depends libogg \
"" \
"" \
"for ogg support" &&
+
optional_depends flac \
"" \
"--disable-flacng --disable-filewriter_flac" \
"for flac support" &&
+
optional_depends mpg123 \
"" \
"--disable-mp3" \
"for reading MP3 files" &&
+
optional_depends lame \
"" \
"--disable-filewriter_mp3" \
"for MP3 filewriter" &&
+
optional_depends wavpack \
"" \
"--disable-wavpack" \
"for wavpack support" &&
+
optional_depends faad2 \
"" \
"--disable-aac" \
"for aac support" &&
+
optional_depends libsndfile \
"" \
"--disable-sndfile" \
"sndfile support" &&
+
optional_depends libmodplug \
"" \
"--disable-modplug" \
"support for modplug" &&
-optional_depends musepack-tools \
- "" \
- "--disable-musepack" \
- "support for musepack" &&
+
optional_depends sidplay-libs \
"" \
"--disable-sid" \
"support for sid" &&
-optional_depends timidity \
- "" \
- "--disable-timidity" \
- "play midi files through timidity" &&
-optional_depends ttaenc \
- "" \
- "--disable-tta" \
- "support for TrueAudio" &&
+
# other plugins
optional_depends neon \
"--enable-neon" \
"--disable-neon" \
- "for HTTP(s) transport (required for Icecast/Shoutcast) (EXPERIMENTAL)" &&
-optional_depends dbus \
- "--enable-dbus" \
- "--disable-dbus" \
- "for D-BUS support" &&
-optional_depends libmtp \
- "" \
- "--disable-mtp_up" \
- "support for Media Transfer Protocol"
+ "Enable Neon HTTP support?" &&
+
+optional_depends curl \
+ "--enable-scrobbler" \
+ "--disable-scrobbler" \
+ "Enable Scrobbler plugin?" &&
+
+optional_depends libnotify \
+ "--enable-notify" \
+ "--disable-notify" \
+ "Enable notify plugin?" &&
+
+optional_depends sdl \
+ "--enable-sdlout" \
+ "--disable-sdlout" \
+ "Enable SDL output plugin?" &&
+
+optional_depends libcdio \
+ "--enable-cdaudio" \
+ "--disable-cdaudio" \
+ "Enable CD Audio Plugin?" &&
+
+optional_depends libcddb \
+ "" "" \
+ "Needed for CD Audio plugin?" &&
+
+optional_depends libmms \
+ "--enable-mms" \
+ "--disable-mms" \
+ "Enable MMS support?" &&
+
+optional_depends libcue \
+ "--enable-cue" \
+ "--disable-cue" \
+ "Enable CUE support?" &&
+
+optional_depends libsamplerate \
+ "--enable-resample --enable-speedpitch" \
+ "--disable-resample --disable-speedpitch" \
+ "Enable Resample Effect and Speed and Pitch plugins?"
+
diff --git a/audio-plugins/audacious-plugins/DETAILS b/audio-plugins/audacious-plugins/DETAILS
index e1d0186dcf..219c30eedd 100755
--- a/audio-plugins/audacious-plugins/DETAILS
+++ b/audio-plugins/audacious-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=audacious-plugins
- VERSION=3.2.3
+ VERSION=3.3.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=http://distfiles.audacious-media-player.org/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/audio-plugins/audacious-plugins/HISTORY b/audio-plugins/audacious-plugins/HISTORY
index 05b5b4fa27..afa8d7e9e7 100644
--- a/audio-plugins/audacious-plugins/HISTORY
+++ b/audio-plugins/audacious-plugins/HISTORY
@@ -1,3 +1,9 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.3.2
+ * DEPENDS: updated with new depends
+ * CONFIGURE: updated with new configure options
+ * BUILD: applied new configure options
+
2012-07-26 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: faac isn't AAC decoder, but AAC encoder;
mpg123 is required for MP3 support, not libmad;
diff --git a/audio-plugins/audacious-plugins/audacious-plugins-3.2.3.tar.bz2.sig b/audio-plugins/audacious-plugins/audacious-plugins-3.2.3.tar.bz2.sig
deleted file mode 100644
index 3dd7e28737..0000000000
--- a/audio-plugins/audacious-plugins/audacious-plugins-3.2.3.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig b/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig
new file mode 100644
index 0000000000..0ea820e44f
--- /dev/null
+++ b/audio-plugins/audacious-plugins/audacious-plugins-3.3.2.tar.bz2.sig
Binary files differ
diff --git a/chat-im/amsn/DEPENDS b/chat-im/amsn/DEPENDS
index ca9017e28a..33818abfa7 100755
--- a/chat-im/amsn/DEPENDS
+++ b/chat-im/amsn/DEPENDS
@@ -2,7 +2,7 @@ depends tk &&
depends imagemagick &&
depends -sub CXX gcc &&
optional_depends tls "" "" "for secure connection using SSL, for MSNP9" &&
-optional_depends libv4l "" "--disable-libv4l" \
+optional_depends v4l-utils "" "--disable-libv4l" \
"for webcam and audio support via v4l" &&
optional_depends gupnp-igd "" "--disable-upnp" "for UPNP support" &&
optional_depends farsight2 "" "" "for farsight video support, for webcam"
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index fff8e77dc6..784aba2579 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2011-09-20 Ismael Luceno <ismael@sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch
-
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index dbecb5b85b..3e0d89cb77 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -10,7 +10,7 @@ if [[ "$LICQ_BRANCH" == "scm" ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git/$SPELL
else
- VERSION=1.6.1
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index 6858b4b118..f4f6d80902 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.0
+
2012-06-16 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.1
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index a5297e24b9..537b402baf 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -3,7 +3,7 @@ CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include" &&
if is_depends_enabled $SPELL gtk+2; then
LIBS="$LIBS -lX11"
-endif &&
+fi &&
export LIBS="${LIBS} -lm" &&
export PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr" &&
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 69743ce493..96bcee30c8 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD: endif -> fi
+
2012-10-01 Ismael Luceno <ismael.luceno@gmail.com>
* BUILD: explicitly link against libX11
diff --git a/chat-irc/weechat/DEPENDS b/chat-irc/weechat/DEPENDS
index 49c822b4f7..1ab86ee1b7 100755
--- a/chat-irc/weechat/DEPENDS
+++ b/chat-irc/weechat/DEPENDS
@@ -11,11 +11,13 @@ fi &&
if [[ $WEECHAT_CMAKE == y ]]; then
depends cmake
fi &&
+
depends ncurses &&
+depends libgcrypt &&
+
optional_depends gnutls "" "--disable-gnutls" "Turn on gnutls support" &&
optional_depends perl "" "--disable-perl" "Turns on Perl script plugin" &&
optional_depends python "" "--disable-python" "Turns on Python script plugin" &&
optional_depends RUBY "" "--disable-ruby" "Turns on Ruby script plugin" &&
optional_depends LUA "" "--disable-lua" "Turn on Lua script plugin" &&
optional_depends aspell "" "--disable-aspell" "Turn on Aspell plugin"
-
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index 4f75ce412e..8e58ea806f 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,6 @@
+2012-10-08 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: libgcrypt is required now
+
2012-09-29 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: stable updated to 0.3.9
readded devel branch info
diff --git a/collab/subversion/16A0DE01.gpg b/collab/subversion/16A0DE01.gpg
new file mode 100644
index 0000000000..4d5b0878bb
--- /dev/null
+++ b/collab/subversion/16A0DE01.gpg
Binary files differ
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index e1fa5595f0..70f961b04c 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.7.5
+ VERSION=1.7.7
SECURITY_PATCH=2
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -12,7 +12,7 @@ else
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.apache.org/dist/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=ED1A599C.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=16A0DE01.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/collab/subversion/ED1A599C.gpg b/collab/subversion/ED1A599C.gpg
deleted file mode 100644
index d26579dfed..0000000000
--- a/collab/subversion/ED1A599C.gpg
+++ /dev/null
Binary files differ
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 1aa9991b5e..0ba5f5ffc5 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,9 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.7.7
+ use 16A0DE01 key
+ * 16A0DE01.gpg: (Ben Reser) added
+ * ED1A599C.gpg: deleted
+
2012-06-26 David C. Haley <khoralin@gmail.com>
* DEPENDS: zlib optional_depends -> depends
diff --git a/devel/ctemplate/DETAILS b/devel/ctemplate/DETAILS
index 2c109c101e..75cd1e9a03 100755
--- a/devel/ctemplate/DETAILS
+++ b/devel/ctemplate/DETAILS
@@ -1,10 +1,10 @@
SPELL=ctemplate
- VERSION=0.99
- SOURCE_HASH=sha512:46e91c80b7c24d0845c74304140f8b3a266ae9d459f4f6b009141f486635aff418af6f1761c6b7da76496e9f5f2a92f01b720b0221c52c47dd1701cc92ca1c37
+ VERSION=2.2
+ SOURCE_HASH=sha512:b8f2cbebb3988ce5248ef3b4c224a02626bbc77e3ab4cff8d2fb967f421000048c0923c8410cc800ed29f5fa68e1172aefcfde1e2a610372462018cb1b6809bb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://code.google.com/p/google-ctemplate
- SOURCE_URL[0]=http://google-ctemplate.googlecode.com/files/$SOURCE
+ WEB_SITE=http://code.google.com/p/ctemplate
+ SOURCE_URL[0]=http://ctemplate.googlecode.com/files/$SOURCE
LICENSE[0]=BSD
ENTERED=20100112
KEYWORDS="c++ devel"
diff --git a/devel/ctemplate/HISTORY b/devel/ctemplate/HISTORY
index b0b3b671c3..cc1e765468 100644
--- a/devel/ctemplate/HISTORY
+++ b/devel/ctemplate/HISTORY
@@ -1,3 +1,8 @@
+2012-10-07 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.2
+ enw URL & WEBSITE
+ * PRE_BUILD: deleted
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/devel/ctemplate/PRE_BUILD b/devel/ctemplate/PRE_BUILD
deleted file mode 100755
index 97c3c53153..0000000000
--- a/devel/ctemplate/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix for gcc-4.6.0
-sed -i '/<string/ i\
-#include <cstddef>
-' src/ctemplate/template.h.in src/ctemplate/template_dictionary.h.in
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 9d258a4001..d2ae497bfc 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.7.12
+ VERSION=1.8.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
- SOURCE_HASH=sha512:1353eca72d664bcceb900bbe90003ceb2b8f73db8e3a402e8f2c142f3e933fc19f95c4c5118a1c57221d6513dba3e1912f40169cf36ff8abea97dbf2f8e84502
+ SOURCE_HASH=sha512:9b251a77db39eb17a670c4b9673d20d256744edabfdd304656b083c523f9e41d063ada9002f399a81ddc8b7684af788ded59e1362affa15f7b56ccc5db15fd51
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
- SOURCE3_HASH=sha512:bc407311884e343a550f3280fd48efc8acf63d7682ad9b787c79f64de6268da3183ad9fb09d8354b3c1b8b76539e28d40aee595a5a49cfe9f6c1c147e52ba1be
+ SOURCE3_HASH=sha512:651b876c3c9253b1b8e7e9209af448d04606b67cf1933d5509ca9c91833477e4b6f620a775fbd961d90bed371aba3ce3976d6316c0cb904df11e210f9f9f3096
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
- SOURCE5_HASH=sha512:6f76f5a2b1bccaddf2ff48a0454c8710c74a197d1ff60bd081fbd67c8c0b3baf21ee2d6c6c27b9cfdc975ce14550be3482241540da6cafa0761c291fd40cc46d
+ SOURCE5_HASH=sha512:bb3315640595e384b206af2e40aa82b80e50327da1792e72536754892aa6037b7624681e5a1142461019f5382a60247f1c4480e0a049bdd8d5308fa5ec1588a1
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index a67e766e76..15bed0bb9d 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-10-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.0
+
2012-08-24 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.7.12
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 8e5222175f..f445ecdd63 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -1,5 +1,5 @@
SPELL=guile
- VERSION=2.0.5
+ VERSION=2.0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 8a84c881f3..7682984a0c 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.0.6
+
2012-02-02 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.5
diff --git a/devel/nodejs/DETAILS b/devel/nodejs/DETAILS
index d90111feae..58ea65aba2 100755
--- a/devel/nodejs/DETAILS
+++ b/devel/nodejs/DETAILS
@@ -1,6 +1,6 @@
SPELL=nodejs
- VERSION=0.6.10
- SOURCE_HASH=sha512:0fc485a0ebefbcfb52fa83f8471d9c1102d2552c2dc1b859d907d72bd940af40343eb7e1c2308a821c2cf0171ebe6761302dca3b16a9dc1942c349459e0abfba
+ VERSION=0.8.12
+ SOURCE_HASH=sha512:27eb75c785e32b1faf417aea09f849679ff2c22f94253961574d171b1f599297550770849dd3b6faca853e26a2320619477ac7d7ea57b9a3be817cfa49e8afd2
SOURCE=node-v$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/node-v$VERSION
SOURCE_URL[0]=http://nodejs.org/dist/v$VERSION/$SOURCE
diff --git a/devel/nodejs/HISTORY b/devel/nodejs/HISTORY
index 64c659bf54..9d7a98bb0f 100644
--- a/devel/nodejs/HISTORY
+++ b/devel/nodejs/HISTORY
@@ -1,2 +1,5 @@
+2012-10-15 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.8.12
+
2012-02-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 0.6.10
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index 81a0a337d7..dfbe08cd95 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -1,4 +1,5 @@
config_query PY3K "Use Python 3 as primary version on the system?" n &&
+config_query SYMLINK "create symlinks for python -> python3" n &&
config_query_option PYTHON3_OPTS \
"Enable IPv6?" y \
diff --git a/devel/python3/CONFLICTS b/devel/python3/CONFLICTS
index ef99b71eee..4a8ea12562 100755
--- a/devel/python3/CONFLICTS
+++ b/devel/python3/CONFLICTS
@@ -1 +1,2 @@
conflicts python3000 y
+conflicts faulthandler y
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index be02097d9b..3a3f8a00ff 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,7 +1,6 @@
SPELL=python3
- VERSION=3.2.3
+ VERSION=3.3.0
SECURITY_PATCH=1
- PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 775ed53cf0..fdbfa25762 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2012-10-19 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.3.0
+ * CONFIGURE, INSTALL: make symlinks optional
+ * CONFLICTS: add faulthandler ( now included in python3)
+
2012-04-24 Treeve Jelbert <treeve@sourcemage.org>
* INSTALL: add some symlinks
* DETAILS: PATCHLEVEL=1
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 4d52c1ef69..5d05a765a2 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,24 +1,16 @@
-cp -Rv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
-
-local PYVER=`echo ${VERSION}|cut -d . -f 1,2`
-
-if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
-else
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
-fi &&
# help some stupid installer scripts
local PV=`echo ${VERSION}|cut -c-3` &&
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m ${INSTALL_ROOT}/usr/include/python${PV} &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
+ if [[ $SYMLINK == y ]];then
ln -sf ${TRACK_ROOT}/usr/bin/python3 ${INSTALL_ROOT}/usr/bin/python &&
ln -sf ${TRACK_ROOT}/usr/bin/python3-config ${INSTALL_ROOT}/usr/bin/python-config &&
ln -sf ${TRACK_ROOT}/usr/lib/pkgconfig/python-${PV}.pc ${INSTALL_ROOT}/usr/lib/pkgconfig/python.pc
+ fi
fi
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
deleted file mode 100755
index ee53ba4f3b..0000000000
--- a/devel/python3/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/Lib &&
-
-cp -R plat-linux2 plat-linux3
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
index 72c504d485..fac897234f 100755
--- a/devel/qt-creator/DETAILS
+++ b/devel/qt-creator/DETAILS
@@ -15,6 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
KEYWORDS="qt4 ide"
SHORT="cross-platform integrated development environment for use with Qt"
cat << EOF
-Qt® Creator is a new cross-platform integrated development environment for
+Qt® Creator is a new cross-platform integrated development environment for
use with Qt.
EOF
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index 843455daaa..6d09c331bb 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2012-10-27 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+ * DETAILS: fixe screwy (r)
+
2012-09-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: devel 2.6.0-beta, stable 2.5.2
diff --git a/devel/strace/HISTORY b/devel/strace/HISTORY
index 04aee0a09f..325c2aabf7 100644
--- a/devel/strace/HISTORY
+++ b/devel/strace/HISTORY
@@ -1,3 +1,7 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.15.patch
+ * glibc-2.15.patch: Patch to fix compilation against newer glibc
+
2012-05-09 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.7
diff --git a/devel/strace/PRE_BUILD b/devel/strace/PRE_BUILD
index 6f545045d8..fea6ead610 100755
--- a/devel/strace/PRE_BUILD
+++ b/devel/strace/PRE_BUILD
@@ -2,4 +2,7 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+message "${MESSAGE_COLOR}Fixing compilation with newer glibc...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/util.c \
+ "${SCRIPT_DIRECTORY}"/glibc-2.15.patch &&
cd $SOURCE_DIRECTORY
diff --git a/devel/strace/glibc-2.15.patch b/devel/strace/glibc-2.15.patch
new file mode 100644
index 0000000000..be6c4fdf07
--- /dev/null
+++ b/devel/strace/glibc-2.15.patch
@@ -0,0 +1,53 @@
+# From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/strace/files/strace-4.7-glibc-2.15.patch?revision=1.1
+https://bugs.gentoo.org/414637
+
+From 302e8ec6cd62912a3cd6494ce6702f4ad8dae0e2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 4 May 2012 19:30:59 -0400
+Subject: [PATCH] util: fix building when glibc has a stub process_vm_readv
+
+If you have a newer glibc which provides process_vm_readv, but it is built
+against older kernel headers which lack __NR_process_vm_readv, the library
+will contain a stub implementation that just returns ENOSYS. Autoconf
+checks for this case explicitly and will declare it as unavailable. So we
+end up in a case where the headers provide the prototype, but autoconf has
+not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again:
+
+util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration
+/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here
+
+So rename our local function to something unique, and add a define so the
+callers all hit the right place.
+
+* util.c (strace_process_vm_readv): Rename from process_vm_readv.
+(process_vm_readv): Define to strace_process_vm_readv.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index d347bd8..f27acdf 100644
+--- a/util.c
++++ b/util.c
+@@ -735,7 +735,8 @@ static bool process_vm_readv_not_supported = 0;
+
+ #if defined(__NR_process_vm_readv)
+ static bool process_vm_readv_not_supported = 0;
+-static ssize_t process_vm_readv(pid_t pid,
++/* Have to avoid duplicating with the C library headers. */
++static ssize_t strace_process_vm_readv(pid_t pid,
+ const struct iovec *lvec,
+ unsigned long liovcnt,
+ const struct iovec *rvec,
+@@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pid,
+ {
+ return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags);
+ }
++#define process_vm_readv strace_process_vm_readv
+ #else
+ static bool process_vm_readv_not_supported = 1;
+ # define process_vm_readv(...) (errno = ENOSYS, -1)
+--
+1.7.9.7
diff --git a/devel/tig/DETAILS b/devel/tig/DETAILS
index 24769528f8..b9a2340819 100755
--- a/devel/tig/DETAILS
+++ b/devel/tig/DETAILS
@@ -1,8 +1,8 @@
SPELL=tig
- VERSION=1.0
+ VERSION=1.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://jonas.nitro.dk/${SPELL}/releases/${SOURCE}
- SOURCE_HASH=sha512:3ac55a7efda34806499950eeee99909afcb4a3328fb60829b658e226915014e844cb0d872b661959d13fc08bef542f5eb635d3dcb695251e4de18ad30371e379
+ SOURCE_HASH=sha512:c6cd2598aeed4a7abf3e4b191a97957c9e20056066cdc82235058e994faf665f7b953e4e04497daa0daac26e1f5d08876155cebee0d0beafc02aa4d96ce633b1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://jonas.nitro.dk/tig/"
LICENSE[0]=GPL
diff --git a/devel/tig/HISTORY b/devel/tig/HISTORY
index dfff0c98f6..d4ff1510d0 100644
--- a/devel/tig/HISTORY
+++ b/devel/tig/HISTORY
@@ -1,3 +1,6 @@
+2012-10-15 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.1
+
2012-05-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.0
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index 334fd19438..883a698ad5 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2012-10-09 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.16.patch
+ * glibc-2.16.patch: Fix compilation with glibc 2.16+ (gets removed from GNU
+ libc, see http://permalink.gmane.org/gmane.comp.lib.gnulib.bugs/30292)
+
2012-06-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.00
less versbosity
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e6e8..ceb321f63e 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,4 +1,9 @@
default_pre_build &&
+
+message "${MESSAGE_COLOR}Fix compilation with glibc 2.16+${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/grub-core/gnulib/stdio.in.h \
+ "${SPELL_DIRECTORY}"/glibc-2.16.patch &&
+
cd ${SOURCE_DIRECTORY} &&
if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
diff --git a/disk/grub2/glibc-2.16.patch b/disk/grub2/glibc-2.16.patch
new file mode 100644
index 0000000000..92db8402b4
--- /dev/null
+++ b/disk/grub2/glibc-2.16.patch
@@ -0,0 +1,16 @@
+diff -Naur grub-2.00.orig/grub-core/gnulib/stdio.in.h grub-2.00/grub-core/gnulib/stdio.in.h
+--- grub-2.00.orig/grub-core/gnulib/stdio.in.h 2012-10-09 13:25:40.346175444 -0700
++++ grub-2.00/grub-core/gnulib/stdio.in.h 2012-10-09 13:26:23.112172937 -0700
+@@ -137,12 +137,6 @@
+ "use gnulib module fflush for portable POSIX compliance");
+ #endif
+
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index b299f93a80..79e7ad03fb 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.54
- SOURCE_HASH=sha512:a874d02ae2b049dd4408344f922b0651f123bf4c068a78b74b6e083fb64e6398986e686a23792d8fbf32777b5908c951f5579fe4a63ae9ff95a06d04570cc7ae
+ VERSION=0.2.55
+ SOURCE_HASH=sha512:ee001e5764035e525c382c6d789fb956daf8f2c495f3bb85e726f7066443b8751949bbe36d0802cb860981191e26cec5be388cc88fc000b547cb44bfb50e4a9b
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 676305c0ad..e7b179316b 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2012-10-11 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.2.55
+
2012-10-02 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.2.54
diff --git a/disk/sg3_utils/DETAILS b/disk/sg3_utils/DETAILS
index 2ea654f3b9..8d97ec6cae 100755
--- a/disk/sg3_utils/DETAILS
+++ b/disk/sg3_utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=sg3_utils
- VERSION=1.33
- SOURCE_HASH=sha512:3973f91a0d9d28425ed9f9a01b1b17276914be9fd96c1314fcc49044478901bc885245bd1e8dcd3e86a271293d90efd2a66cb7746d0c0d1166ae82a7f3ae8c69
+ VERSION=1.34
+ SOURCE_HASH=sha512:df03b4046f522bff26f775fd73bd0c3adbdd95eed880c795702f1a67922646d4d50ce361dfb9924c111674db5b4956c87003b35aef5502291dd9daedb67a9ba3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sg3_utils/HISTORY b/disk/sg3_utils/HISTORY
index abeb9ce542..13f00df8b8 100644
--- a/disk/sg3_utils/HISTORY
+++ b/disk/sg3_utils/HISTORY
@@ -1,3 +1,6 @@
+2012-10-15 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.34
+
2012-01-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.33
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 78062189ac..70e9109b70 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,6 +1,6 @@
SPELL=man-pages
- VERSION=3.41
- SOURCE_HASH=sha512:fe083132d083c940a9de4c299e5aa82ef7cdab56430ab45f2f6b1993cee08e61c954003311eeaa44913e716ebe726ee0a4e49e7066d0493e22303450a5f8610b
+ VERSION=3.43
+ SOURCE_HASH=sha512:4db44ac25de99c20194a9188b49a71a630074dc34e449a65126f38106c916fe4720aa403a38183cdd1f61ff32a35cf37b84fe2a1c1840b83ca13376fcd7a204c
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index b0f4e1ec14..3df76f253c 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2012-10-15 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.43
+
2012-05-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.41
diff --git a/e-16/e16/BUILD b/e-16/e16/BUILD
deleted file mode 100755
index dba4f04d4b..0000000000
--- a/e-16/e16/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-OPTS="--enable-fsstd \
- $OPTS" &&
-
-default_build
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index 6140da2785..64bfbd2bce 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
SOURCE_IGNORE=volatile
else
- VERSION=1.0.10
+ VERSION=1.0.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
- SOURCE_HASH=sha512:52b7f66f06247f7f0bbe0873e6d36733d02bff34188ec3345511333b967c8b5710bcc335727eb656bfa26b6ead07f549d30258303880dadcd2b465491e9795a4
+ SOURCE_HASH=sha512:01a323bbcdbf2ae63179c78423aadd59fe15eed2425abe3b5546c0d2bf9e6458dec0cee75d0704592839d742467d580a018449faab81dfa57ff45aa6d4a56c54
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index 11719017f7..7776348e81 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,7 @@
+2012-10-07 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.11
+ * BUILD: removed
+
2012-04-09 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.0.10
diff --git a/e-16/epplet-base/BUILD b/e-16/epplet-base/BUILD
deleted file mode 100755
index f06f8e99a3..0000000000
--- a/e-16/epplet-base/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-OPTS="--enable-fsstd \
- $OPTS" &&
-default_build
diff --git a/e-16/epplet-base/DETAILS b/e-16/epplet-base/DETAILS
index fb3932d7f5..1083ea8b26 100755
--- a/e-16/epplet-base/DETAILS
+++ b/e-16/epplet-base/DETAILS
@@ -1,9 +1,9 @@
SPELL=epplet-base
- VERSION=0.13
+ VERSION=0.14
SOURCE=epplets-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/epplets-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
- SOURCE_HASH=sha512:0bb782d9790e9b2699b76cd31e71092f80b4e37b030e6314598e87a5b61dd66cc5357997fe97f94c5beacf0be367522537359f93ce07ee183e236d32a7aa8686
+ SOURCE_HASH=sha512:d83d60521fe06497f109c3fbb5c2e10abd36a43b050c10787a68d9f9f8c2866f57d78a8559a482654d9bb0eaaf3ce791e4839bb0fda88ccbf026d8ec5dc93824
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=BSD
KEYWORDS="enlightenment e16 wm window-manager library"
diff --git a/e-16/epplet-base/HISTORY b/e-16/epplet-base/HISTORY
index cc05314024..11fe3f6c5e 100644
--- a/e-16/epplet-base/HISTORY
+++ b/e-16/epplet-base/HISTORY
@@ -1,3 +1,7 @@
+2012-10-07 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.14
+ * BUILD: removed
+
2010-06-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.13
diff --git a/e-17/e_dbus/DEPENDS b/e-17/e_dbus/DEPENDS
index 8930116289..6459e4e361 100755
--- a/e-17/e_dbus/DEPENDS
+++ b/e-17/e_dbus/DEPENDS
@@ -1,4 +1,5 @@
depends dbus &&
depends eina &&
depends evas &&
-depends ecore
+depends ecore &&
+depends eobj
diff --git a/e-17/e_dbus/HISTORY b/e-17/e_dbus/HISTORY
index 3ce7babaa9..b84fdff82a 100644
--- a/e-17/e_dbus/HISTORY
+++ b/e-17/e_dbus/HISTORY
@@ -1,3 +1,6 @@
+2012-10-17 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Depends on eobj
+
2011-11-12 Robin Cook <rcook@wyrms.net>
* CONFIGURE: remove no longer valid options and added new options
* BUILD: removed no longe valid options and added new options
diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index 78bcee457f..87baab178d 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,6 +1,7 @@
depends curl '--enable-curl' &&
depends dbus &&
depends eina &&
+depends eobj &&
depends evas &&
if [ "$ECORE_BRANCH" = "scm" ]; then
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index afc215afbc..1d9c9190b5 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,6 @@
+2012-10-17 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Depends on eobj
+
2011-11-12 Robin Cook <rcook@wyrms.net>
* BUILD: remove no longer used options, added ECORE_FB, ECORE_IPV6,
ECORE_CRYPTO, ECORE_OPENGL_SDL, ECORE_PTHREADS, ECORE_TREADS_SAFETY
diff --git a/e-17/efreet/DEPENDS b/e-17/efreet/DEPENDS
index 1a6604834a..7129ec9807 100755
--- a/e-17/efreet/DEPENDS
+++ b/e-17/efreet/DEPENDS
@@ -1,3 +1,4 @@
depends subversion &&
depends eina &&
-depends ecore
+depends ecore &&
+depends eobj
diff --git a/e-17/efreet/HISTORY b/e-17/efreet/HISTORY
index 3f408740f6..1a1c9fd0f1 100644
--- a/e-17/efreet/HISTORY
+++ b/e-17/efreet/HISTORY
@@ -1,3 +1,6 @@
+2012-10-17 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Depends on eobj
+
2011-11-03 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.0.1
diff --git a/e-17/eobj/DEPENDS b/e-17/eobj/DEPENDS
new file mode 100755
index 0000000000..0f59051458
--- /dev/null
+++ b/e-17/eobj/DEPENDS
@@ -0,0 +1,9 @@
+depends subversion
+depends eina
+
+optional_depends check "" "" "Use check?" &&
+
+optional_depends doxygen \
+ "--enable-doc" \
+ "--disable-doc" \
+ "Build documentation?"
diff --git a/e-17/eobj/DETAILS b/e-17/eobj/DETAILS
new file mode 100755
index 0000000000..8539204924
--- /dev/null
+++ b/e-17/eobj/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=eobj
+if [[ $EOBJ_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+ SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/PROTO/$SPELL:$SPELL
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+ WEB_SITE=http://www.enlightenment.org/
+ ENTERED=20121014
+ LICENSE[0]=BSD
+ SHORT="EFL's generic object system library"
+cat << EOF
+EFL's generic object system library.
+EOF
diff --git a/e-17/eobj/HISTORY b/e-17/eobj/HISTORY
new file mode 100644
index 0000000000..9e8b0b17e9
--- /dev/null
+++ b/e-17/eobj/HISTORY
@@ -0,0 +1,5 @@
+2012-10-14 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: added eina and optional check and doxygen
+
+2012-10-14 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/eobj/PREPARE b/e-17/eobj/PREPARE
new file mode 100755
index 0000000000..f8b7d7e3e2
--- /dev/null
+++ b/e-17/eobj/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/eobj/PRE_BUILD b/e-17/eobj/PRE_BUILD
new file mode 100755
index 0000000000..1af1b7759f
--- /dev/null
+++ b/e-17/eobj/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+NOCONFIGURE=ON ./autogen.sh
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index 07a45703a0..a562d12174 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -5,6 +5,7 @@ depends freetype2 &&
if [[ "$EVAS_BRANCH" == "scm" ]]; then
depends subversion
+ depends eobj
fi &&
optional_depends fontconfig \
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index f09afd2d82..c9bedd8d5b 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2012-10-14 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: added eobj as scm depends
+
2012-07-12 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: configure options updated
diff --git a/editors/elvis/CONFIGURE b/editors/elvis/CONFIGURE
index 23d189e785..4cc297b17d 100755
--- a/editors/elvis/CONFIGURE
+++ b/editors/elvis/CONFIGURE
@@ -1,6 +1,7 @@
-config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink to /usr/bin/elvis?" n
+config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink to /usr/bin/elvis?" n &&
+
if [ "${MAKE_SYMLINK}" == "y" ] ; then
- if [ -e /usr/bin/vi ] ; then
+ if [ -e /usr/bin/vi ] && `readlink -f "/usr/bin/vi" | grep -viq "elvis"`; then
echo "VI is already provided by vim." &&
echo "To have elvis as provider of vi, recast vim with the vi symlink option disabled, then recast elvis." &&
MAKE_SYMLINK="n"
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index 3744c61c92..f214ecf8f1 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFIGURE: corrected symlink check
+
2012-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: removed UPDATED; quoting paths
* DEPENDS: killed xorg-libs, see #14699 on old bug tracker; added
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 0f9407a3b0..5038d724c4 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.27.0
+ VERSION=7.28.0
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 59388fe783..7071a611a3 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2012-10-11 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 7.28.0
+
2012-07-28 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 7.27.0
diff --git a/ftp/uget/DETAILS b/ftp/uget/DETAILS
index 1505cb84fe..5fd75ccc36 100755
--- a/ftp/uget/DETAILS
+++ b/ftp/uget/DETAILS
@@ -1,8 +1,8 @@
SPELL=uget
- VERSION=1.10
- SOURCE=$SPELL-$VERSION-2.tar.gz
+ VERSION=1.10.2
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/urlget/$SOURCE
- SOURCE_HASH=sha512:1c37f26988c2137ea1f6904e2761e366bfe7252269f0029862619134928f603dd14087eb425ac6aad25a30d7a2574c172c03dc4d9f5f5e993684acd40f28b84c
+ SOURCE_HASH=sha512:5cc3270409b7783e13ba4e4aaa32b898594dd0b2a7c86d1ba669401d3d3c4be655c790a16c24dab4027d5d811ea35ce5ebd00dbaff86d9378c88e849a47e7764
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://uget.visuex.com/
LICENSE[0]=LGPL
diff --git a/ftp/uget/HISTORY b/ftp/uget/HISTORY
index 0a403bd644..f4971a5cfb 100644
--- a/ftp/uget/HISTORY
+++ b/ftp/uget/HISTORY
@@ -1,3 +1,6 @@
+2012-10-09 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.10.2
+
2012-09-06 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.10-2
diff --git a/gnome1-libs/orbit/PRE_BUILD b/gnome1-libs/orbit/PRE_BUILD
new file mode 100755
index 0000000000..d7cbde0ca0
--- /dev/null
+++ b/gnome1-libs/orbit/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sed -i 's:@GT_YES@::g' "${SOURCE_DIRECTORY}"/popt/intl/Makefile.in
diff --git a/gnome2-libs/gnome-colors/BUILD b/gnome2-libs/gnome-colors/BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/gnome2-libs/gnome-colors/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/gnome-colors/DETAILS b/gnome2-libs/gnome-colors/DETAILS
new file mode 100755
index 0000000000..1cb3e91f68
--- /dev/null
+++ b/gnome2-libs/gnome-colors/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=gnome-colors
+ VERSION=5.5.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+ SOURCE_HASH=sha512:23d1fb9b96cd4287acc0f540c8a7abed1b9f16d7e2bc952beedc365cfd71a3a0134382a7f4bb1c01c62dc376acb6aaf81332167869ec6e8c036679e89d325ff3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/"
+ WEB_SITE="http://code.google.com/p/gnome-colors/"
+ LICENSE[0]=GPL
+ ENTERED=20121008
+ SHORT="a set of GNOME icon themes"
+cat << EOF
+A set of GNOME icon themes.
+EOF
diff --git a/gnome2-libs/gnome-colors/HISTORY b/gnome2-libs/gnome-colors/HISTORY
new file mode 100644
index 0000000000..1b8f97f751
--- /dev/null
+++ b/gnome2-libs/gnome-colors/HISTORY
@@ -0,0 +1,3 @@
+2012-10-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS, PRE_BUILD: spell created
+
diff --git a/gnome2-libs/gnome-colors/PRE_BUILD b/gnome2-libs/gnome-colors/PRE_BUILD
new file mode 100755
index 0000000000..50a27f8b87
--- /dev/null
+++ b/gnome2-libs/gnome-colors/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir ${SOURCE_DIRECTORY} &&
+cd ${SOURCE_DIRECTORY} &&
+unpack_file
diff --git a/gnome2-libs/gtkhtml2/BUILD b/gnome2-libs/gtkhtml2/BUILD
deleted file mode 100755
index b0812eccd2..0000000000
--- a/gnome2-libs/gtkhtml2/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-make_single &&
-OPTS="--disable-deprecated-warning-flags $OPTS" &&
-default_build &&
-make_normal
diff --git a/gnome2-libs/gtkhtml2/DETAILS b/gnome2-libs/gtkhtml2/DETAILS
index fecdcde612..398358c773 100755
--- a/gnome2-libs/gtkhtml2/DETAILS
+++ b/gnome2-libs/gtkhtml2/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtkhtml2
- VERSION=4.4.1
+ VERSION=4.6.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtkhtml-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtkhtml-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/gtkhtml/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
LICENSE[0]=GPL
LICENSE[1]=LGPL
MAKE_NJOBS=1
diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index 07bee6bebc..9e4bcd97bf 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,9 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 4.6.0
+ SOURCE matches upstream posted SHA256
+ * BUILD: No more --disable-deprecated-warning-flags
+ Removed, supports parallel make now
+
2012-04-16 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.4.1
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig b/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig
deleted file mode 100644
index 80212ac4ce..0000000000
--- a/gnome2-libs/gtkhtml2/gtkhtml-4.4.1.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gtkhtml2/gtkhtml-4.6.0.tar.xz.sig b/gnome2-libs/gtkhtml2/gtkhtml-4.6.0.tar.xz.sig
new file mode 100644
index 0000000000..44e555f195
--- /dev/null
+++ b/gnome2-libs/gtkhtml2/gtkhtml-4.6.0.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index baa1a8b5fd..e01ab7daa3 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,6 +1,6 @@
SPELL=librsvg2
- VERSION=2.36.3
- SOURCE_HASH=sha512:265160168fefcebeace6ecd964487277756fc01fcd70d40fff06ac35903b47c2dc65fcb90d21f48610bc79a6bfe2c946bbff5644c14a5cdcf94364adf0b9400a
+ VERSION=2.36.4
+ SOURCE_HASH=sha512:447435b2fab0ca7147b68c02a622df8049d56844360e8e361bf5abfbec12c33d46393bad3c099c2819f68d1b7595616d1f35d2cea58ee94d873c1c34e9362d37
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SECURITY_PATCH=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 87622809c1..59e34ed37f 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,6 @@
+2012-10-21 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.36.4
+
2012-09-16 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.36.3
diff --git a/gnome2-libs/mx/DEPENDS b/gnome2-libs/mx/DEPENDS
index 87124d3849..1e02efcb86 100755
--- a/gnome2-libs/mx/DEPENDS
+++ b/gnome2-libs/mx/DEPENDS
@@ -1 +1,2 @@
-depends clutter
+depends clutter &&
+depends xcb-util
diff --git a/gnome2-libs/mx/HISTORY b/gnome2-libs/mx/HISTORY
index 1a6b68882b..859b7969b8 100644
--- a/gnome2-libs/mx/HISTORY
+++ b/gnome2-libs/mx/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Depends on xcb-util
+
2012-05-17 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 1.4.6
diff --git a/gnome2-libs/pangox-compat/DEPENDS b/gnome2-libs/pangox-compat/DEPENDS
new file mode 100755
index 0000000000..3e250a710e
--- /dev/null
+++ b/gnome2-libs/pangox-compat/DEPENDS
@@ -0,0 +1 @@
+depends pango
diff --git a/gnome2-libs/pangox-compat/DETAILS b/gnome2-libs/pangox-compat/DETAILS
new file mode 100755
index 0000000000..27ac610ee7
--- /dev/null
+++ b/gnome2-libs/pangox-compat/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=pangox-compat
+ VERSION=0.0.2
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$SPELL-$VERSION.tar.xz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ LICENSE[0]=LGPL
+ WEB_SITE=http://www.pango.org/
+ ENTERED=20121018
+ SHORT="pangox compatibility library"
+cat << EOF
+This is a compatibility library providing the obsolete pangox library
+that is not shipped by Pango itself anymore. If you are still using
+pangox, well, really, get a life...
+EOF
diff --git a/gnome2-libs/pangox-compat/HISTORY b/gnome2-libs/pangox-compat/HISTORY
new file mode 100644
index 0000000000..e4cf985df6
--- /dev/null
+++ b/gnome2-libs/pangox-compat/HISTORY
@@ -0,0 +1,2 @@
+2012-10-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.0.2
diff --git a/gnome2-libs/pangox-compat/pangox-compat-0.0.2.tar.xz.sig b/gnome2-libs/pangox-compat/pangox-compat-0.0.2.tar.xz.sig
new file mode 100644
index 0000000000..7c1a33beb7
--- /dev/null
+++ b/gnome2-libs/pangox-compat/pangox-compat-0.0.2.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/shiki-colors/BUILD b/gnome2-libs/shiki-colors/BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/gnome2-libs/shiki-colors/BUILD
@@ -0,0 +1 @@
+true
diff --git a/gnome2-libs/shiki-colors/DEPENDS b/gnome2-libs/shiki-colors/DEPENDS
new file mode 100755
index 0000000000..f9c3ce076b
--- /dev/null
+++ b/gnome2-libs/shiki-colors/DEPENDS
@@ -0,0 +1,3 @@
+depends gnome-colors &&
+depends gtk+2 &&
+depends gtk-engines2
diff --git a/gnome2-libs/shiki-colors/DETAILS b/gnome2-libs/shiki-colors/DETAILS
new file mode 100755
index 0000000000..2d31aec975
--- /dev/null
+++ b/gnome2-libs/shiki-colors/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=shiki-colors
+ VERSION=4.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://gnome-colors.googlecode.com/files/${SOURCE}
+ SOURCE_HASH=sha512:862ac3f904b012d602b3ec624563bf57b5622c571819e55b2c37f9708c50e21e5a575d75863d3cc89a69c6594732fac6a961d981c4da8ed8dc1bb46d81313156
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Shiki"
+ WEB_SITE="http://code.google.com/p/gnome-colors/"
+ LICENSE[0]=GPL
+ ENTERED=20121007
+ SHORT="a set of themes for gtk2"
+cat << EOF
+Shiki-Colors mixes the elegance of a dark theme with the usability of a light
+theme, resulting in a hybrid theme. Shiki is designed to be fast and stable.
+
+There are 7 color variations (Orange, Blue, Green, Purple, Red, Chocolate,
+Pink).
+EOF
diff --git a/gnome2-libs/shiki-colors/HISTORY b/gnome2-libs/shiki-colors/HISTORY
new file mode 100644
index 0000000000..cf24fed3e9
--- /dev/null
+++ b/gnome2-libs/shiki-colors/HISTORY
@@ -0,0 +1,3 @@
+2012-10-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
+
diff --git a/gnome2-libs/shiki-colors/PRE_BUILD b/gnome2-libs/shiki-colors/PRE_BUILD
new file mode 100755
index 0000000000..50a27f8b87
--- /dev/null
+++ b/gnome2-libs/shiki-colors/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir ${SOURCE_DIRECTORY} &&
+cd ${SOURCE_DIRECTORY} &&
+unpack_file
diff --git a/gnome3-libs/libzeitgeist/DEPENDS b/gnome3-libs/libzeitgeist/DEPENDS
new file mode 100755
index 0000000000..a9ef0da650
--- /dev/null
+++ b/gnome3-libs/libzeitgeist/DEPENDS
@@ -0,0 +1 @@
+depends zeitgeist
diff --git a/gnome3-libs/libzeitgeist/DETAILS b/gnome3-libs/libzeitgeist/DETAILS
new file mode 100755
index 0000000000..1c405ab0c0
--- /dev/null
+++ b/gnome3-libs/libzeitgeist/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=libzeitgeist
+ VERSION=0.3.18
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=https://launchpad.net/libzeitgeist/0.3/$VERSION/+download/$SOURCE
+ SOURCE_HASH=sha512:6ad3f0ed74935c20ce23d80208c5a787e4db2e2d58ae5036c6681c3d531e20cc0981be961d66a408a7e1b03909af0212693feddc515240d724acbd5ac5c8cf6e
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]=LGPL
+ WEB_SITE=https://launchpad.net/libzeitgeist
+ ENTERED=20121027
+ SHORT="zeitgeist client library"
+cat << EOF
+Zeitgeist client library.
+EOF
diff --git a/gnome3-libs/libzeitgeist/HISTORY b/gnome3-libs/libzeitgeist/HISTORY
new file mode 100644
index 0000000000..52369bc229
--- /dev/null
+++ b/gnome3-libs/libzeitgeist/HISTORY
@@ -0,0 +1,2 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.9.5
diff --git a/gnome3-libs/zeitgeist/DEPENDS b/gnome3-libs/zeitgeist/DEPENDS
new file mode 100755
index 0000000000..c9a1737798
--- /dev/null
+++ b/gnome3-libs/zeitgeist/DEPENDS
@@ -0,0 +1,2 @@
+depends xapian-core &&
+depends rdflib
diff --git a/gnome3-libs/zeitgeist/DETAILS b/gnome3-libs/zeitgeist/DETAILS
new file mode 100755
index 0000000000..bdefaaa17e
--- /dev/null
+++ b/gnome3-libs/zeitgeist/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=zeitgeist
+ VERSION=0.9.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=https://launchpad.net/zeitgeist/0.9/$VERSION/+download/$SOURCE
+ SOURCE_HASH=sha512:26fc041721a9ba99875db7f5bd3cdf91555a3006d0f82186a95b269462334e53f58284d988f0fb9ae39b11679ba08a2992625d3646f697762005803069f1b7ab
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]=LGPL
+ WEB_SITE=http://zeitgeist-project.com/
+ ENTERED=20121027
+ SHORT="service to log activities and present to other apps"
+cat << EOF
+Zeitgeist is a service which logs the users' activities and events,
+anywhere from files opened to websites visited and conversations had.
+It makes this information readily available for other applications to use.
+It is able to establish relationships between items based on similarity
+and usage patterns.
+EOF
diff --git a/gnome3-libs/zeitgeist/HISTORY b/gnome3-libs/zeitgeist/HISTORY
new file mode 100644
index 0000000000..52369bc229
--- /dev/null
+++ b/gnome3-libs/zeitgeist/HISTORY
@@ -0,0 +1,2 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 0.9.5
diff --git a/graphics-libs/ftgl/BUILD b/graphics-libs/ftgl/BUILD
index 40c2e219c5..7063ee56ea 100644..100755
--- a/graphics-libs/ftgl/BUILD
+++ b/graphics-libs/ftgl/BUILD
@@ -1,5 +1,2 @@
-cd docs &&
-tar xfz html.tar.gz -C ../unix/docs &&
-cd $SOURCE_DIRECTORY/unix &&
-sedit 's/ $(INSTALL)/\t$(INSTALL)/' src/Makefile &&
-default_build
+OPTS+=" --with-gl-inc=/usr/include" &&
+LIBS+=" -lm" default_build
diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS
index 38d861891b..0ae9e4c0bc 100755
--- a/graphics-libs/ftgl/DEPENDS
+++ b/graphics-libs/ftgl/DEPENDS
@@ -1,3 +1,7 @@
-depends -sub CXX gcc &&
-depends freetype2 &&
+depends bzip2 &&
+depends -sub CXX gcc &&
+depends freetype2 &&
+depends libxext &&
+depends texlive &&
+depends zlib &&
optional_depends GLUT "" "" "for a demo program"
diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY
index 7c12b9a970..7a40daa40a 100644
--- a/graphics-libs/ftgl/HISTORY
+++ b/graphics-libs/ftgl/HISTORY
@@ -1,3 +1,7 @@
+2012-10-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on texlive, bzip2, libxext, zlib
+ * BUILD: fix build error
+
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/graphics-libs/gegl/DEPENDS b/graphics-libs/gegl/DEPENDS
index ffba6f0ee3..8d7cae0d00 100755
--- a/graphics-libs/gegl/DEPENDS
+++ b/graphics-libs/gegl/DEPENDS
@@ -73,7 +73,7 @@ optional_depends LIBAVCODEC \
"--without-libavformat" \
"for ffmpeg support" &&
-optional_depends libv4l \
+optional_depends v4l-utils \
"--with-libv4l" \
"--without-libv4l" \
"for video4linux support" &&
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index 712d7f82f6..91efae3960 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-04-12 Julien "_kaze_" ROZO <julien@rozo.org>
* UP_TRIGGERS: fixed libgegl detection (0.0 -> 0.1)
-
2012-04-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.2.0
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index bf46445f4b..6733708572 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -1,4 +1,5 @@
SPELL=harfbuzz
+if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
if [ "$HARFBUZZ_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
@@ -9,6 +10,13 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_URL[0]=git://anongit.freedesktop.org/harfbuzz:harfbuzz-git
SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
SOURCE_IGNORE=volatile
+else
+ VERSION=0.9.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+fi
WEB_SITE=http://www.freedesktop.org/wiki/Software/HarfBuzz
ENTERED=20111217
LICENSE[0]=MIT
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 67759f8164..d6c94fd69a 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,2 +1,5 @@
+2012-10-09 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, PREPARE, PRE_BUILD: 0.9.4
+
2011-12-17 Robin Cook <rcook@wyrms.net>
* New Spell: DETAILS, DEPENDS, PREPARE, PRE_BUILD
diff --git a/graphics-libs/harfbuzz/PREPARE b/graphics-libs/harfbuzz/PREPARE
index 0491cfdac1..98d27e41ff 100755
--- a/graphics-libs/harfbuzz/PREPARE
+++ b/graphics-libs/harfbuzz/PREPARE
@@ -1,3 +1,2 @@
-config_query HARFBUZZ_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics-libs/harfbuzz/PRE_BUILD b/graphics-libs/harfbuzz/PRE_BUILD
index 945d8bcb4f..5d1215e5b5 100755
--- a/graphics-libs/harfbuzz/PRE_BUILD
+++ b/graphics-libs/harfbuzz/PRE_BUILD
@@ -1,4 +1,6 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
-NOCONFIGURE=y ./autogen.sh
+if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=y ./autogen.sh
+fi
diff --git a/graphics-libs/harfbuzz/harfbuzz-0.9.4.tar.bz2.sig b/graphics-libs/harfbuzz/harfbuzz-0.9.4.tar.bz2.sig
new file mode 100644
index 0000000000..289446dbce
--- /dev/null
+++ b/graphics-libs/harfbuzz/harfbuzz-0.9.4.tar.bz2.sig
Binary files differ
diff --git a/graphics-libs/ilmbase/DETAILS b/graphics-libs/ilmbase/DETAILS
index 4ba2cee9b5..50da5fe9d0 100755
--- a/graphics-libs/ilmbase/DETAILS
+++ b/graphics-libs/ilmbase/DETAILS
@@ -1,13 +1,10 @@
SPELL=ilmbase
- VERSION=1.0.1
+ VERSION=1.0.2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/openexr/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE_URL[0]=http://download.savannah.nongnu.org/releases/openexr/${SOURCE}
+ SOURCE_HASH[0]=sha512:5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openexr.com/
- SOURCE_GPG=openexr.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
ENTERED=20071208
SHORT="High dynamic-range (HDR) image file format library and tools"
diff --git a/graphics-libs/ilmbase/HISTORY b/graphics-libs/ilmbase/HISTORY
index 1a6415b084..05509be967 100644
--- a/graphics-libs/ilmbase/HISTORY
+++ b/graphics-libs/ilmbase/HISTORY
@@ -1,2 +1,5 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.2
+
2007-12-08 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: spell created
diff --git a/graphics-libs/libopenraw/DEPENDS b/graphics-libs/libopenraw/DEPENDS
new file mode 100755
index 0000000000..7eab27fd6d
--- /dev/null
+++ b/graphics-libs/libopenraw/DEPENDS
@@ -0,0 +1,16 @@
+depends boost &&
+depends -sub CXX gcc &&
+depends JPEG &&
+
+optional_depends gdk-pixbuf2 \
+ "--enable-gnome" \
+ "--disable-gnome" \
+ "for GNOME support" &&
+
+if is_depends_enabled $SPELL gdk-pixbuf2; then
+ depends glib2 &&
+ depends libffi &&
+ depends libpng &&
+ depends pcre &&
+ depends zlib
+fi
diff --git a/graphics-libs/libopenraw/DETAILS b/graphics-libs/libopenraw/DETAILS
new file mode 100755
index 0000000000..3de3ff8acc
--- /dev/null
+++ b/graphics-libs/libopenraw/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=libopenraw
+ VERSION=0.0.9
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://${SPELL}.freedesktop.org/download/${SOURCE}
+ SOURCE_HASH=sha512:88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://libopenraw.freedesktop.org/wiki/"
+ LICENSE[0]=GPL
+ ENTERED=20121028
+ SHORT="a library for camera RAW files decoding"
+cat << EOF
+libopenraw is an ongoing project to provide a free software implementation
+for camera RAW files decoding. One of the main reason is that dcraw is not
+suited for easy integration into applications, and there is a need for an
+easy to use API to build free software digital image processing application.
+
+It also has the goal to address missing feature from dcraw like meta-data
+decoding and easy thumbnail extraction.
+EOF
diff --git a/graphics-libs/libopenraw/HISTORY b/graphics-libs/libopenraw/HISTORY
new file mode 100644
index 0000000000..4a324c33f7
--- /dev/null
+++ b/graphics-libs/libopenraw/HISTORY
@@ -0,0 +1,3 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/graphics-libs/libwacom/DETAILS b/graphics-libs/libwacom/DETAILS
index 2d4931430c..ecd6e939d4 100755
--- a/graphics-libs/libwacom/DETAILS
+++ b/graphics-libs/libwacom/DETAILS
@@ -1,9 +1,9 @@
SPELL=libwacom
- VERSION=0.4
+ VERSION=0.6
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
- SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/linuxwacom/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
WEB_SITE=http://linuxwacom.sourceforge.net/
diff --git a/graphics-libs/libwacom/HISTORY b/graphics-libs/libwacom/HISTORY
index 9570af758e..0f2ad6f46a 100644
--- a/graphics-libs/libwacom/HISTORY
+++ b/graphics-libs/libwacom/HISTORY
@@ -1,2 +1,5 @@
+2012-10-07 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.6, xz -> bz2, SOURCE_URL updated
+
2012-03-28 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: spell created, version 0.4
diff --git a/graphics-libs/libwacom/libwacom-0.4.tar.xz.sig b/graphics-libs/libwacom/libwacom-0.4.tar.xz.sig
deleted file mode 100644
index 9745b64ba0..0000000000
--- a/graphics-libs/libwacom/libwacom-0.4.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/graphics-libs/libwacom/libwacom-0.6.tar.bz2.sig b/graphics-libs/libwacom/libwacom-0.6.tar.bz2.sig
new file mode 100644
index 0000000000..83bb5125ff
--- /dev/null
+++ b/graphics-libs/libwacom/libwacom-0.6.tar.bz2.sig
Binary files differ
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 793767b2e8..9ef4c41ce3 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -10,7 +10,7 @@ elif [[ $FFM = libquicktime ]];then
depends libquicktime
fi &&
depends bzip2 &&
-optional_depends libv4l '-DWITH_V4L=1' '-DWITH_V4L=0' 'V4L support' &&
+optional_depends v4l-utils '-DWITH_V4L=1' '-DWITH_V4L=0' 'V4L support' &&
optional_depends JPEG '-DWITH_JPEG=1' '-DWITH_JPEG=0' 'JPEG support' &&
optional_depends jasper '-DWITH_JASPER=1' '-DWITH_JASPER=0' 'JPEG-2000 support' &&
optional_depends tiff '-DWITH_TIFF=1' '-DWITH_TIFF=1' 'TIFF support' &&
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 933c3e9004..8f21a311fa 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.4.2
-
2012-06-03 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 2.4.1
diff --git a/graphics-libs/poppler-data/DETAILS b/graphics-libs/poppler-data/DETAILS
index a36cc1387f..5bc091e798 100755
--- a/graphics-libs/poppler-data/DETAILS
+++ b/graphics-libs/poppler-data/DETAILS
@@ -1,6 +1,6 @@
SPELL=poppler-data
- VERSION=0.4.5
- SOURCE_HASH=sha512:0120f4261597be8aa11b687a4dedacb865e125bd1142093de3c213d82f36c5ed7fb29c830bf7b327c49c4544d91462e9daeaa59fd813c15d3c0bc3dcb42ce067
+ VERSION=0.4.6
+ SOURCE_HASH=sha512:5e5f5302c475d3630961b7a89a2e8c8b77884ee99289d97b626d9f1daee54314f4b1d070397c8f3dce0c420a71960d4663c56637eb9ba54de2eec3e481636035
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
diff --git a/graphics-libs/poppler-data/HISTORY b/graphics-libs/poppler-data/HISTORY
index baf7b2682f..d212e3b8be 100644
--- a/graphics-libs/poppler-data/HISTORY
+++ b/graphics-libs/poppler-data/HISTORY
@@ -1,3 +1,6 @@
+2012-10-21 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.4.6
+
2011-09-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.4.5
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 1636386a54..5c1e8a202f 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.20.2
- SOURCE_HASH=sha512:7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed
+ VERSION=0.20.5
+ SOURCE_HASH=sha512:2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01
else
- VERSION=0.20.2
- SOURCE_HASH=sha512:7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed
+ VERSION=0.20.5
+ SOURCE_HASH=sha512:2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 32a498b765..bacef5d245 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-10-12 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.20.5
+
2012-07-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.20.2
diff --git a/graphics-libs/vips/DEPENDS b/graphics-libs/vips/DEPENDS
index 482874ad99..477ea1b505 100755
--- a/graphics-libs/vips/DEPENDS
+++ b/graphics-libs/vips/DEPENDS
@@ -12,7 +12,7 @@ optional_depends JPEG "--with-jpeg" "--without-jpeg" "For JPEG
optional_depends libpng "--with-png" "--without-png" "For PNG support" &&
optional_depends tiff "--with-tiff" "--without-tiff" "For TIFF support" &&
optional_depends openexr "--with-OpenEXR" "--without-OpenEXR" "For openexr support" &&
-optional_depends libv4l "--with-v4l" "--without-v4l" "For v4l support" &&
+optional_depends v4l-utils "--with-v4l" "--without-v4l" "For v4l support" &&
optional_depends imagemagick "--with-magick" "--without-magick" "For ImageMagic support" &&
optional_depends lcms2 "--with-lcms" "--without-lcms" "For LCMS support" &&
optional_depends fftw "--with-fftw" "--without-fftw" "For FFT support" &&
diff --git a/graphics-libs/vips/HISTORY b/graphics-libs/vips/HISTORY
index cfb508497d..2629172514 100644
--- a/graphics-libs/vips/HISTORY
+++ b/graphics-libs/vips/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-09-19 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 7.30.2 (required for nips 7.30.x)
- * DEPENDS: ./configure doesn't know --with-openexr, --without-cimg,
--with-liboil, nor --with-lcms2 anymore
*-openexr -> *-OpenEXR
Removed cimg optional dependency
diff --git a/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch b/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch
new file mode 100644
index 0000000000..60cc3e5abb
--- /dev/null
+++ b/graphics/autopano-sift-c/0001-add-missing-lm-to-libs.patch
@@ -0,0 +1,25 @@
+From 0b58850877cb12dd1469c05d63fe5f85d15db7db Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 21:42:30 +0200
+Subject: [PATCH] add missing -lm to libs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2364ad5..63e1bae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ SET(LIBSIFT_SOURCES LoweDetector.c RANSAC.c GaussianConvolution.c
+ ADD_LIBRARY(libsift STATIC ${LIBSIFT_SOURCES})
+
+ set(all_libs libsift ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}
+- ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${PANO13_LIBRARIES} ${LIBXML2_LIBRARIES})
++ ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${PANO13_LIBRARIES} ${LIBXML2_LIBRARIES} -lm)
+
+ add_executable(generatekeys GenerateKeys.c)
+ TARGET_LINK_LIBRARIES(generatekeys ${all_libs})
+--
+1.8.0
+
diff --git a/graphics/autopano-sift-c/DETAILS b/graphics/autopano-sift-c/DETAILS
index 154a5dff65..bbabb5bafe 100755
--- a/graphics/autopano-sift-c/DETAILS
+++ b/graphics/autopano-sift-c/DETAILS
@@ -11,10 +11,10 @@ if [ "$ASC_DEVEL" == "y" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=2.5.0
+ VERSION=2.5.1
SOURCE=autopano-sift-C-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
- SOURCE_HASH=sha512:779bf6c74201228fb1821d5d52eeaa67f50b4844624a56ad449aaae807b0577f9a287bc3edf9ec9a0905574c22d52a424f67b850e376b42c6bb62bf78dc95713
+ SOURCE_HASH=sha512:4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
SOURCE_DIRECTORY=$BUILD_DIRECTORY/autopano-sift-C-$VERSION
fi
diff --git a/graphics/autopano-sift-c/HISTORY b/graphics/autopano-sift-c/HISTORY
index 83d7e8989d..a05d1358c3 100644
--- a/graphics/autopano-sift-c/HISTORY
+++ b/graphics/autopano-sift-c/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.1
+ * 0001-add-missing-lm-to-libs.patch, PRE_BUILD: added patch to avoid
+ linker error
+
2010-11-03 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: jpeg -> JPEG
diff --git a/graphics/autopano-sift-c/PRE_BUILD b/graphics/autopano-sift-c/PRE_BUILD
new file mode 100755
index 0000000000..0a2e2fcd7e
--- /dev/null
+++ b/graphics/autopano-sift-c/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-add-missing-lm-to-libs.patch
diff --git a/graphics/cinepaint/DEPENDS b/graphics/cinepaint/DEPENDS
index 052f4060dc..5a7a9bb796 100755
--- a/graphics/cinepaint/DEPENDS
+++ b/graphics/cinepaint/DEPENDS
@@ -1,13 +1,19 @@
-depends zlib &&
-depends tiff &&
-depends JPEG &&
-if [[ $CINEPAINT_CVS = "y" ]]; then
- depends gtk+2 "--enable-gtk2"
-else
- depends gtk+
-fi &&
-depends lcms &&
-depends openexr &&
+depends autoconf &&
+depends automake &&
+depends flex &&
+depends fltk &&
+depends ftgl &&
+depends gtk+2 "--enable-gtk2" &&
+depends JPEG &&
+depends lcms &&
+depends libpng &&
+depends libtool &&
+depends libxmu &&
+depends libxpm &&
+depends libxxf86vm &&
+depends openexr &&
+depends tiff &&
+depends zlib &&
optional_depends gutenprint \
'--enable-print' \
diff --git a/graphics/cinepaint/DETAILS b/graphics/cinepaint/DETAILS
index e88ee5c29d..e75a1b286f 100755
--- a/graphics/cinepaint/DETAILS
+++ b/graphics/cinepaint/DETAILS
@@ -11,11 +11,12 @@ if [[ "${CINEPAINT_CVS}" == "y" ]] ; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/cinepaint-cvs
FORCE_DOWNLOAD=on
else
- VERSION=0.21-2
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=1.3
+ SOURCE=$SPELL-$VERSION.tgz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/CinePaint/CinePaint-${VERSION}/$SOURCE
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_HASH=sha512:2f548af6d54ce246d4b6786d7d7aa6024d76c31b9d7ec2e073e780b3da8ec8c32fabc8efe50b3c640ca09a0302c1cc2e737b2013f4e07b6ba24d51c7a1c6c37d
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
fi
WEB_SITE=http://cinepaint.sourceforge.net/
ENTERED=20021031
diff --git a/graphics/cinepaint/HISTORY b/graphics/cinepaint/HISTORY
index 2361bc32bb..69f552c83f 100644
--- a/graphics/cinepaint/HISTORY
+++ b/graphics/cinepaint/HISTORY
@@ -1,3 +1,11 @@
+2012-10-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3
+ * PRE_BUILD, cinepaint-missing-include.patch: add patch from
+ archlinux to prevent build error
+ * PRE_BUILD: always call autogen.sh
+ * DEPENDS: added missing dependencies on autoconf, automake,
+ flex, fltk, ftgl, libpng, libtool, libxmu, libxpm, libxxf86vm
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/graphics/cinepaint/PRE_BUILD b/graphics/cinepaint/PRE_BUILD
index 58c4885513..dd5f366a26 100755
--- a/graphics/cinepaint/PRE_BUILD
+++ b/graphics/cinepaint/PRE_BUILD
@@ -1,6 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-if [[ $CINEPAINT_CVS = "y" ]]; then
- cd cinepaint &&
- sh autogen.sh
-fi
+patch -p1 < ${SPELL_DIRECTORY}/cinepaint-missing-include.patch &&
+sh autogen.sh
diff --git a/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig b/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig
deleted file mode 100644
index 2e8a76afd0..0000000000
--- a/graphics/cinepaint/cinepaint-0.21-2.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/graphics/cinepaint/cinepaint-missing-include.patch b/graphics/cinepaint/cinepaint-missing-include.patch
new file mode 100644
index 0000000000..ed159213aa
--- /dev/null
+++ b/graphics/cinepaint/cinepaint-missing-include.patch
@@ -0,0 +1,11 @@
+diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400
++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400
+@@ -32,6 +32,7 @@
+
+ #include <list>
+ #include <string>
++#include <unistd.h>
+
+ #include "icc_modell_beobachter.h"
+
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index d8f25ef629..fed0949d5f 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -14,7 +14,7 @@ fi
FORCE_DOWNLOAD=on
SOURCE="${SPELL}-git.tar.bz2"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
- SOURCE_URL[0]=git://darktable.git.sourceforge.net/gitroot/darktable/darktable
+ SOURCE_URL[0]=git://github.com/darktable-org/darktable.git
SOURCE_IGNORE=volatile
fi
WEB_SITE="http://www.darktable.org"
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 3ccc298339..462f335d6b 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,10 @@
+2012-10-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * rsvg.patch, PRE_BUILD: add patch from upstream to prevent
+ compile error
+
+2012-10-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: fix source_url for scm version
+
2012-07-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.5
diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000000..4a45c23ed8
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
+ patch -p1 < ${SPELL_DIRECTORY}/rsvg.patch
+fi
diff --git a/graphics/darktable/rsvg.patch b/graphics/darktable/rsvg.patch
new file mode 100644
index 0000000000..2ad46d27ae
--- /dev/null
+++ b/graphics/darktable/rsvg.patch
@@ -0,0 +1,24 @@
+diff --git a/src/iop/watermark.c b/src/iop/watermark.c
+index bcd65d6..e3da730 100644
+--- a/src/iop/watermark.c
++++ b/src/iop/watermark.c
+@@ -36,7 +36,10 @@
+ #include <inttypes.h>
+
+ #include <librsvg/rsvg.h>
++// ugh, ugly hack. why do people break stuff all the time?
++#ifndef RSVG_CAIRO_H
+ #include <librsvg/rsvg-cairo.h>
++#endif
+
+ #include "common/metadata.h"
+ #include "common/utility.h"
+@@ -712,7 +715,7 @@ static void refresh_watermarks( dt_iop_module_t *self )
+ snprintf(filename, DT_MAX_PATH_LEN, "%s/%s", configdir, d_name);
+ gtk_combo_box_append_text( g->combobox1, d_name );
+ count++;
+- }
++ }
+ g_dir_close(dir) ;
+ }
+
diff --git a/graphics/enblend/BUILD b/graphics/enblend/BUILD
new file mode 100755
index 0000000000..a2ff7305ca
--- /dev/null
+++ b/graphics/enblend/BUILD
@@ -0,0 +1 @@
+LIBS+="-lboost_filesystem" default_build
diff --git a/graphics/enblend/HISTORY b/graphics/enblend/HISTORY
index 6a7ce7c1b5..2a42560730 100644
--- a/graphics/enblend/HISTORY
+++ b/graphics/enblend/HISTORY
@@ -1,3 +1,6 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlagnen.de>
+ * BUILD: added missing library to LIBS
+
2011-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 4.0
diff --git a/graphics/geeqie/DEPENDS b/graphics/geeqie/DEPENDS
index edfddaaa9a..7add568b9d 100755
--- a/graphics/geeqie/DEPENDS
+++ b/graphics/geeqie/DEPENDS
@@ -1,4 +1,14 @@
-depends gtk+2 &&
+depends atk &&
+depends cairo &&
+depends fontconfig &&
+depends freetype2 &&
+depends gdk-pixbuf2 &&
+depends glib2 &&
+depends gtk+2 &&
+depends JPEG &&
+depends pango &&
+depends tiff &&
+
optional_depends exiv2 \
"--enable-exiv2" \
"--disable-exiv2" \
diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY
index cd2b9d65c9..dfe9228cb1 100644
--- a/graphics/geeqie/HISTORY
+++ b/graphics/geeqie/HISTORY
@@ -1,3 +1,7 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependencies on atk, cairo, fontconfig,
+ freetype2, gdk-pixbuf2, glib2, JPEG, pango and tiff
+
2012-08-14 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.1
diff --git a/graphics/hugin/0001-add-missing-header.patch b/graphics/hugin/0001-add-missing-header.patch
new file mode 100644
index 0000000000..c03d0d609f
--- /dev/null
+++ b/graphics/hugin/0001-add-missing-header.patch
@@ -0,0 +1,31 @@
+From 1a05cd9d1d5dd743416aa3554408a118a832aa51 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:22:51 +0200
+Subject: [PATCH 1/2] add missing header
+
+---
+ src/celeste/Utilities.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/celeste/Utilities.cpp b/src/celeste/Utilities.cpp
+index 56bb2f7..6e6c2e6 100755
+--- a/src/celeste/Utilities.cpp
++++ b/src/celeste/Utilities.cpp
+@@ -27,6 +27,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling
+
+ #include <math.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include "Utilities.h"
+
+ using namespace std;
+@@ -285,4 +286,4 @@ int SafeAbs( int val )
+ else return val;
+ }
+
+-}; // namespace
+\ No newline at end of file
++}; // namespace
+--
+1.8.0
+
diff --git a/graphics/hugin/0002-access-extract-through-this-pointer.patch b/graphics/hugin/0002-access-extract-through-this-pointer.patch
new file mode 100644
index 0000000000..c29b5bef06
--- /dev/null
+++ b/graphics/hugin/0002-access-extract-through-this-pointer.patch
@@ -0,0 +1,34 @@
+From 345bb4349b2c37e3193378347db557abf6d200aa Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 22:24:43 +0200
+Subject: [PATCH 2/2] access extract through this pointer
+
+---
+ src/foreign/zthread/include/zthread/Guard.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/foreign/zthread/include/zthread/Guard.h b/src/foreign/zthread/include/zthread/Guard.h
+index abcd92c..e690a5b 100755
+--- a/src/foreign/zthread/include/zthread/Guard.h
++++ b/src/foreign/zthread/include/zthread/Guard.h
+@@ -428,7 +428,7 @@ public:
+ template <class U, class V>
+ Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+
+- LockingPolicy::shareScope(*this, extract(g));
++ LockingPolicy::shareScope(*this, this->extract(g));
+
+ }
+
+@@ -458,7 +458,7 @@ public:
+ template <class U, class V>
+ Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+
+- LockingPolicy::transferScope(*this, extract(g));
++ LockingPolicy::transferScope(*this, this->extract(g));
+
+ }
+
+--
+1.8.0
+
diff --git a/graphics/hugin/DETAILS b/graphics/hugin/DETAILS
index cf2f44274d..94e9a67267 100755
--- a/graphics/hugin/DETAILS
+++ b/graphics/hugin/DETAILS
@@ -1,8 +1,8 @@
SPELL=hugin
- VERSION=2011.2.0
+ VERSION=2011.4.0
SOURCE="$SPELL-$VERSION.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/hugin/$SOURCE
- SOURCE_HASH=sha512:00352855f5bf9d96580d100a83322f4bb374e89da418ae2a9e97653a0e3c1598c28cbaa99f310bdbdb955e637ffbd5f7d47810052e455a6ecbc752c4e8b1eac5
+ SOURCE_HASH=sha512:13f2e1d72e1bc7e3c3871dd845ec3cd7aefe9dc1bf108808996b9dccdfff6a10a8dba2935f1a20c898385e97bdf8f08e9f77bb315e73ae5240eb594bfbc55803
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://hugin.sourceforge.net/"
LICENSE[0]=GPL
diff --git a/graphics/hugin/HISTORY b/graphics/hugin/HISTORY
index e9e6bc616e..8c074062a7 100644
--- a/graphics/hugin/HISTORY
+++ b/graphics/hugin/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2011.4.0
+ * 0001-add-missing-header.patch, 0002-access-extract-through-this-pointer.patch,
+ PRE_BUILD: added patches to prevent compile errors
+
2010-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 2011.2.0
* DEPENDS: added dependency on tclap
diff --git a/graphics/hugin/PRE_BUILD b/graphics/hugin/PRE_BUILD
new file mode 100755
index 0000000000..c3b88b62eb
--- /dev/null
+++ b/graphics/hugin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-header.patch &&
+patch -p1 < $SPELL_DIRECTORY/0002-access-extract-through-this-pointer.patch
diff --git a/graphics/leptonica/DETAILS b/graphics/leptonica/DETAILS
index d1b44b86ff..54bbdb0551 100755
--- a/graphics/leptonica/DETAILS
+++ b/graphics/leptonica/DETAILS
@@ -1,6 +1,6 @@
SPELL=leptonica
- VERSION=1.68
- SOURCE_HASH=sha512:3dad38279c328e671f65018d86c04da59a6dff481ff48530a6341505abbd3e2a526a5825a0995d77c690f54acbaa0818832bd44dd4246a87d726862e0c31d82b
+ VERSION=1.69
+ SOURCE_HASH=sha512:4939408d3908729c9ef39d9e9fb001115d19260aa1282b448a2b44cb2ce3dada92c36b98611d597f054534b59bbd8a988374372223430b9b83b195716f165e42
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/$SPELL
diff --git a/graphics/leptonica/HISTORY b/graphics/leptonica/HISTORY
index 14c149dc95..bdb0002b4d 100644
--- a/graphics/leptonica/HISTORY
+++ b/graphics/leptonica/HISTORY
@@ -1,3 +1,6 @@
+2012-10-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.69
+
2011-11-02 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.68
spell created
diff --git a/graphics/meshlab/BUILD b/graphics/meshlab/BUILD
new file mode 100755
index 0000000000..8845c7f859
--- /dev/null
+++ b/graphics/meshlab/BUILD
@@ -0,0 +1,10 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+
+cd meshlab/src/external &&
+qmake PREFIX=$INSTALL_ROOT/usr -recursive external.pro &&
+make &&
+
+cd .. &&
+qmake PREFIX=$INSTALL_ROOT/usr -recursive meshlab_full.pro &&
+make
diff --git a/graphics/meshlab/DEPENDS b/graphics/meshlab/DEPENDS
new file mode 100755
index 0000000000..428f269928
--- /dev/null
+++ b/graphics/meshlab/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/graphics/meshlab/DETAILS b/graphics/meshlab/DETAILS
new file mode 100755
index 0000000000..b1657cf3ac
--- /dev/null
+++ b/graphics/meshlab/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=meshlab
+ VERSION=1.3.2
+ SOURCE=MeshLabSrc_AllInc_v${VERSION//.}.tgz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://meshlab.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20121016
+ SHORT="advanced mesh processing system"
+cat << EOF
+MeshLab is a advanced mesh processing system, for the automatic and user
+assisted editing, cleaning, filtering converting and rendering of large
+unstructured 3D triangular meshes.
+EOF
diff --git a/graphics/meshlab/HISTORY b/graphics/meshlab/HISTORY
new file mode 100644
index 0000000000..da23d9fe08
--- /dev/null
+++ b/graphics/meshlab/HISTORY
@@ -0,0 +1,3 @@
+2012-10-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL, gcc-4.7.patch,
+ rpath.patch: spell created, version 1.3.2, patches from Arch
diff --git a/graphics/meshlab/INSTALL b/graphics/meshlab/INSTALL
new file mode 100755
index 0000000000..00d51944e4
--- /dev/null
+++ b/graphics/meshlab/INSTALL
@@ -0,0 +1,4 @@
+mkdir -p /opt/meshlab &&
+cp -a distrib /opt/meshlab &&
+ln -s /opt/meshlab/distrib/meshlab /usr/bin/meshlab &&
+ln -s /opt/meshlab/distrib/meshlabserver /usr/bin/meshlabserver
diff --git a/graphics/meshlab/PRE_BUILD b/graphics/meshlab/PRE_BUILD
new file mode 100755
index 0000000000..4a5f0e6f44
--- /dev/null
+++ b/graphics/meshlab/PRE_BUILD
@@ -0,0 +1,6 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc-4.7.patch &&
+patch -p0 < $SPELL_DIRECTORY/rpath.patch
diff --git a/graphics/meshlab/gcc-4.7.patch b/graphics/meshlab/gcc-4.7.patch
new file mode 100644
index 0000000000..07dc1a08af
--- /dev/null
+++ b/graphics/meshlab/gcc-4.7.patch
@@ -0,0 +1,38 @@
+diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+index 2351b2a..90c6d76 100644
+--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
++++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+@@ -40,7 +40,7 @@ public:
+
+ //! Reset histogram data.
+ void Clear() {
+- this->::Clear();
++ Histogram<ScalarType>::Clear();
+ CV.clear();
+ }
+ /*
+diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
+index 5d40404..ab9d0aa 100644
+--- a/vcglib/wrap/gl/trimesh.h
++++ b/vcglib/wrap/gl/trimesh.h
+@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
+ }
+ }
+
+- m.vert.math::Swap(newvert);
++ m.vert.math.Swap(newvert);
+ m.vn=m.vert.size();
+ }
+
+diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
+index 3e41e63..4af9508 100644
+--- a/vcglib/wrap/ply/plystuff.h
++++ b/vcglib/wrap/ply/plystuff.h
+@@ -75,6 +75,7 @@ using namespace vcg;
+ #define pb_close _close
+ #define DIR_SEP "\\"
+ #else
++#include <unistd.h>
+ #define pb_mkdir(n) mkdir(n,0755)
+ #define pb_access access
+ #define pb_stat stat
diff --git a/graphics/meshlab/rpath.patch b/graphics/meshlab/rpath.patch
new file mode 100644
index 0000000000..07e91a0298
--- /dev/null
+++ b/graphics/meshlab/rpath.patch
@@ -0,0 +1,36 @@
+diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
+--- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000
++++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000
+@@ -130,11 +130,11 @@
+ #}
+
+ linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
+-linux-g++:QMAKE_RPATHDIR += ../distrib
++linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+
+ # uncomment in your local copy only in emergency cases.
+ # We should never be too permissive
+diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro
+--- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100
++++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000
+@@ -26,11 +26,11 @@
+ win32-msvc2010: LIBS += -L../distrib -lcommon
+ win32-g++: LIBS += -L../distrib -lcommon
+ linux-g++: LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
++linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-32: LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-64: LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ #CONFIG (release,debug | release) {
+ # win32-msvc2005:release: LIBS += -L../common/release -lcommon
+ # win32-msvc2008:release: LIBS += -L../common/release -lcommon
diff --git a/graphics/openexr/0001-add-missing-header.patch b/graphics/openexr/0001-add-missing-header.patch
new file mode 100644
index 0000000000..d1f6a11bf1
--- /dev/null
+++ b/graphics/openexr/0001-add-missing-header.patch
@@ -0,0 +1,24 @@
+From 72441c32e66131d5a880f5a2804f2b3c075cd59d Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Fri, 26 Oct 2012 21:21:56 +0200
+Subject: [PATCH] add missing header
+
+---
+ exrenvmap/blurImage.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/exrenvmap/blurImage.cpp b/exrenvmap/blurImage.cpp
+index 04edb8d..9700914 100644
+--- a/exrenvmap/blurImage.cpp
++++ b/exrenvmap/blurImage.cpp
+@@ -45,6 +45,7 @@
+ #include "Iex.h"
+ #include <iostream>
+ #include <algorithm>
++#include <string.h>
+
+ using namespace std;
+ using namespace Imf;
+--
+1.8.0
+
diff --git a/graphics/openexr/DETAILS b/graphics/openexr/DETAILS
index 6d3b051dd4..0515ee8e1b 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -1,13 +1,10 @@
SPELL=openexr
- VERSION=1.6.1
+ VERSION=1.7.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://savannah.nongnu.org/download/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_URL[1]=http://www.openexr.com/downloads/$SOURCE
- SOURCE_GPG=openexr.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ SOURCE_HASH[0]=sha512:1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
WEB_SITE=http://www.openexr.com/
ENTERED=20030123
LICENSE[0]=http://www.ilm.com/opensource/ilm-bsd-lic.html
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 5329503934..c00e89f937 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,8 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.0
+ * 0001-add-missing-header.patch, PRE_BUILD: added patch to avoid compile error
+ * gcc43.patch: removed
+
2008-09-16 Elisamuel Resto <ryuji@sourcemage.org>
* BUILD: -lpthread appended to LDFLAGS, PTHREAD_LIBS is no more
diff --git a/graphics/openexr/PRE_BUILD b/graphics/openexr/PRE_BUILD
index 75284671ae..f485a00429 100755
--- a/graphics/openexr/PRE_BUILD
+++ b/graphics/openexr/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
+patch -p1 < $SCRIPT_DIRECTORY/0001-add-missing-header.patch
diff --git a/graphics/openexr/gcc43.patch b/graphics/openexr/gcc43.patch
deleted file mode 100644
index 47d39fdab2..0000000000
--- a/graphics/openexr/gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# From http://bugs.gentoo.org/show_bug.cgi?id=212435
-#
-diff -Naur openexr-1.6.1-orig/exrenvmap/main.cpp openexr-1.6.1/exrenvmap/main.cpp
---- openexr-1.6.1-orig/exrenvmap/main.cpp 2007-04-24 19:07:51.000000000 -0600
-+++ openexr-1.6.1/exrenvmap/main.cpp 2008-01-12 20:28:56.000000000 -0600
-@@ -43,6 +43,7 @@
- #include <makeLatLongMap.h>
- #include <ImfEnvmap.h>
- #include <iostream>
-+#include <cstring>
- #include <exception>
- #include <stdlib.h>
-
-diff -Naur openexr-1.6.1-orig/exrmaketiled/main.cpp openexr-1.6.1/exrmaketiled/main.cpp
---- openexr-1.6.1-orig/exrmaketiled/main.cpp 2007-04-24 19:08:45.000000000 -0600
-+++ openexr-1.6.1/exrmaketiled/main.cpp 2008-01-12 20:28:14.000000000 -0600
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <string>
-+#include <cstring>
- #include <stdlib.h>
-
- using namespace Imf;
-
diff --git a/graphics/rawtherapee/BUILD b/graphics/rawtherapee/BUILD
new file mode 100755
index 0000000000..e013b8d866
--- /dev/null
+++ b/graphics/rawtherapee/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/graphics/rawtherapee/DEPENDS b/graphics/rawtherapee/DEPENDS
new file mode 100755
index 0000000000..4a0739e224
--- /dev/null
+++ b/graphics/rawtherapee/DEPENDS
@@ -0,0 +1,24 @@
+depends atkmm &&
+depends JPEG &&
+depends bzip2 &&
+depends cairo &&
+depends cairomm &&
+depends expat &&
+depends fontconfig &&
+depends freetype2 &&
+depends -sub CXX gcc &&
+depends gdk-pixbuf2 &&
+depends glib2 &&
+depends glibmm &&
+depends gtk+2 &&
+depends gtkmm2 &&
+depends lcms2 &&
+depends libiptcdata &&
+depends libpng &&
+depends libsigc++3 &&
+depends pango &&
+depends pangomm &&
+depends pkgconfig &&
+depends tiff &&
+depends xz-utils &&
+depends zlib
diff --git a/graphics/rawtherapee/DETAILS b/graphics/rawtherapee/DETAILS
new file mode 100755
index 0000000000..15a23ac0df
--- /dev/null
+++ b/graphics/rawtherapee/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=rawtherapee
+ VERSION=4.0.9
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=https://${SPELL}.googlecode.com/files/${SOURCE}
+ SOURCE_HASH=sha512:885414f0becfaa174b6e0d5689259e88cccf779d25bb92e1015fdb562c57eb70621e952681309aa66f05295b249ba39cca9c73459e6c0ad3266c57389e3c9ab9
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://rawtherapee.com/"
+ LICENSE[0]=GPL
+ ENTERED=20121014
+ SHORT="a tool for developing RAW images"
+cat << EOF
+A powerful cross-platform raw image processing program.
+EOF
diff --git a/graphics/rawtherapee/HISTORY b/graphics/rawtherapee/HISTORY
new file mode 100644
index 0000000000..7d0dcef1b9
--- /dev/null
+++ b/graphics/rawtherapee/HISTORY
@@ -0,0 +1,3 @@
+2012-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 467054702c..abc472ced8 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=15.0.1
+ VERSION=16.0.2
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=15.0.1
+ VERSION=16.0.2
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else
SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=53
+ SECURITY_PATCH=56
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 5f3c8bea73..a7ec542c31 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,14 @@
+2012-10-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 16.0.2, SECURITY_PATCH=56
+
+2012-10-12 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 16.0.1, SECURITY_PATCH=55
+
+2012-10-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 16.0, SECURITY_PATCH=54
+ * install_dir.patch: updated, from Arch
+ * PRE_BUILD, installer.patch: patch removed
+
2012-09-16 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 15.0.1, SECURITY_PATCH=53
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index c993d21aaf..1ed86c5fd8 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,9 +11,6 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
# http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
-# fixes https://bugzilla.mozilla.org/show_bug.cgi?id=752895
-patch -p1 < $SPELL_DIRECTORY/installer.patch &&
-
cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&
if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
index b6f9700b37..9c115f0ebe 100644
--- a/http/firefox/install_dir.patch
+++ b/http/firefox/install_dir.patch
@@ -1,28 +1,30 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000
-+++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000
-@@ -68,8 +68,8 @@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
-
- TOP_DIST = @TOP_DIST@
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff --git a/http/firefox/installer.patch b/http/firefox/installer.patch
deleted file mode 100644
index d3232b58ef..0000000000
--- a/http/firefox/installer.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# HG changeset patch
-# User Andrew Benton <b3nton@gmail.com>
-# Date 1339485009 -7200
-# Node ID ede54971747f10b50e7d87e6236fe777ac12a070
-# Parent 253d5996845e9fd994dc9ee542d293fbc412ec56
-Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries.
-r=glandium
-
-diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
---- a/browser/installer/Makefile.in
-+++ b/browser/installer/Makefile.in
-@@ -39,16 +39,24 @@ endif
- ifdef MOZ_ENABLE_GNOME_COMPONENT
- DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
- endif
-
- ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
-
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
-
- ifdef _MSC_VER
- DEFINES += -D_MSC_VER=$(_MSC_VER)
- endif
-
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -53,19 +53,21 @@
- #endif
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- #ifdef MOZ_SHARED_MOZGLUE
- @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
- #endif
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
- @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
- #endif
- #ifdef XP_MACOSX
- @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
-@@ -104,17 +106,19 @@
- @BINPATH@/@MOZ_APP_NAME@
- #endif
- @BINPATH@/application.ini
- #ifdef MOZ_UPDATER
- @BINPATH@/update-settings.ini
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
- @BINPATH@/blocklist.xml
- #ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
- #ifndef XP_MACOSX
- @BINPATH@/mozilla-xremote-client
-@@ -578,26 +582,28 @@
- @BINPATH@/components/dom_svg.xpt
- @BINPATH@/components/dom_smil.xpt
-
- ; [Personal Security Manager]
- ;
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
- @BINPATH@/components/pipnss.xpt
- @BINPATH@/components/pippki.xpt
-
- ; for Solaris SPARC
- #ifdef SOLARIS
-
-
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 6a71a7a68e..0744963637 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -6,19 +6,19 @@ depends libidl &&
depends libxft &&
depends nspr &&
-if spell_ok nspr && is_version_less $(installed_version nspr) 4.9; then
+if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.2; then
force_depends nspr
fi &&
depends -sub 3.13.x nss &&
-if spell_ok nss && is_version_less $(installed_version nss) 3.13.2; then
+if spell_ok nss && is_version_less $(installed_version nss) 3.13.5; then
force_depends nss
fi &&
depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&
-if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.12.1; then
+if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.13; then
force_depends sqlite
fi &&
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 7aaee8029c..ff45b9d331 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.12.1
+ VERSION=2.13.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
- SOURCE_HASH=sha512:f4fa9179d1ef15396dea188279f69342082d99fae5dbfb7c3eb9f5de61638d737342c8d267ed2f51e9f2de7a8629702081385c1930984239d695fc6989c20dbc
+ SOURCE_HASH=sha512:4eb68800337cbf53e9f341ae3b2eed86781a07633f954b5b3657bebdbd629455c66b590a75a1c5917728fa91164336f8077648519b124caceea3e980eebf9f71
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=46
+ SECURITY_PATCH=48
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d5b287f3af..0d4f98a2ce 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,12 @@
+2012-10-15 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: added check for nspr <4.9.2, nss <3.13.5 and sqlite <3.7.13
+
+2012-10-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.13.1; SECURITY_PATCH++
+
+2012-10-10 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.13, SECURITY_PATCH=47
+
2012-09-18 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.12.1; SECURITY_PATCH++
* DEPENDS: added check for minimum sqlite version
diff --git a/http/tinyproxy/HISTORY b/http/tinyproxy/HISTORY
index 132efc2ba2..d19814139f 100644
--- a/http/tinyproxy/HISTORY
+++ b/http/tinyproxy/HISTORY
@@ -1,3 +1,6 @@
+2012-10-08 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: fixed install with automake 1.12
+
2011-08-31 Vlad Glagolev <stealth@sourcemage.org>
* BUILD, INSTALL: don't trash config file on installwatch-based setups
diff --git a/http/tinyproxy/PRE_BUILD b/http/tinyproxy/PRE_BUILD
index 9a7fc9e84b..e01c65dd01 100755
--- a/http/tinyproxy/PRE_BUILD
+++ b/http/tinyproxy/PRE_BUILD
@@ -4,6 +4,8 @@ cd "$SOURCE_DIRECTORY" &&
# correct default group name
sed -i "s:Group nobody:Group nogroup:" etc/tinyproxy.conf.in &&
+autoreconf -fi &&
+
if [[ $TINYPROXY_DOCS == n ]]; then
sed -i "s:dummy a2x:dummy true:" configure &&
diff --git a/i18n/ibus-anthy/DETAILS b/i18n/ibus-anthy/DETAILS
index 1bc6eb990b..99620ed9f6 100755
--- a/i18n/ibus-anthy/DETAILS
+++ b/i18n/ibus-anthy/DETAILS
@@ -1,8 +1,9 @@
SPELL=ibus-anthy
- VERSION=1.2.1
+ VERSION=1.2.7
SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:38815571c6421207c91e0af1406fb1a83ad3a9d7e31de9f0c3267e16cde41038fda179f07efae42da8208608fb0bebbe2ae310bbff110cbf0f0744d282b9e3a3
SOURCE_URL[0]=http://ibus.googlecode.com/files/${SOURCE}
- SOURCE_HASH=sha512:38815571c6421207c91e0af1406fb1a83ad3a9d7e31de9f0c3267e16cde41038fda179f07efae42da8208608fb0bebbe2ae310bbff110cbf0f0744d282b9e3a3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/ibus/"
LICENSE[0]=LGPL
diff --git a/i18n/ibus-anthy/HISTORY b/i18n/ibus-anthy/HISTORY
index 0a801a6bc9..fc71d68564 100644
--- a/i18n/ibus-anthy/HISTORY
+++ b/i18n/ibus-anthy/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.2.7
+
2010-05-04 Peng Chang (Charles) <chp@sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.2.1
diff --git a/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig b/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig
new file mode 100644
index 0000000000..0361acb87c
--- /dev/null
+++ b/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig
Binary files differ
diff --git a/i18n/ibus-pinyin/BUILD b/i18n/ibus-pinyin/BUILD
new file mode 100755
index 0000000000..b4832e17bc
--- /dev/null
+++ b/i18n/ibus-pinyin/BUILD
@@ -0,0 +1,2 @@
+LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
+default_build
diff --git a/i18n/ibus-pinyin/DEPENDS b/i18n/ibus-pinyin/DEPENDS
index 27ea310c70..0e8ca36714 100755
--- a/i18n/ibus-pinyin/DEPENDS
+++ b/i18n/ibus-pinyin/DEPENDS
@@ -1,2 +1,11 @@
-depends ibus &&
-depends boost
+depends ibus &&
+
+optional_depends boost \
+ '--enable-boost' \
+ '--disable-boost' \
+ 'to replace stdc++0x with the version from boost' &&
+
+optional_depends LUA \
+ '--enable-lua-extension' \
+ '--disable-lua-extension' \
+ 'for lua scripting extension'
diff --git a/i18n/ibus-pinyin/DETAILS b/i18n/ibus-pinyin/DETAILS
index 7b0e3243e1..543aa5401d 100755
--- a/i18n/ibus-pinyin/DETAILS
+++ b/i18n/ibus-pinyin/DETAILS
@@ -1,8 +1,9 @@
SPELL=ibus-pinyin
- VERSION=1.3.11
+ VERSION=1.4.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:0a5276edc68d86ca82592a96b7526cc40c24559235d69ae90dd2c2c3dbed1bcc03f21b2af8e4f79d553ee31e1c0e5d945a14433f20ae4562b8c24b0b8e622e4c
SOURCE_URL[0]=http://ibus.googlecode.com/files/${SOURCE}
- SOURCE_HASH=sha512:0a5276edc68d86ca82592a96b7526cc40c24559235d69ae90dd2c2c3dbed1bcc03f21b2af8e4f79d553ee31e1c0e5d945a14433f20ae4562b8c24b0b8e622e4c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/ibus/"
LICENSE[0]=LGPL
diff --git a/i18n/ibus-pinyin/HISTORY b/i18n/ibus-pinyin/HISTORY
index 4d0a77be15..0a9d219d22 100644
--- a/i18n/ibus-pinyin/HISTORY
+++ b/i18n/ibus-pinyin/HISTORY
@@ -1,3 +1,9 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.4.0
+ * DEPENDS: boost is optional
+ Optionally depends on LUA
+ * BUILD: Disable -Wl,--as-needed in LDFLAGS, breaks linking lua
+
2010-11-02 Peng Chang (Charles) <chp@sourcemage.org>
* DETAILS: updated spell to 1.3.11
diff --git a/i18n/ibus-pinyin/ibus-pinyin-1.4.0.tar.gz.sig b/i18n/ibus-pinyin/ibus-pinyin-1.4.0.tar.gz.sig
new file mode 100644
index 0000000000..9a53536351
--- /dev/null
+++ b/i18n/ibus-pinyin/ibus-pinyin-1.4.0.tar.gz.sig
Binary files differ
diff --git a/i18n/ibus/DETAILS b/i18n/ibus/DETAILS
index 940e8afa31..e9c9767c6a 100755
--- a/i18n/ibus/DETAILS
+++ b/i18n/ibus/DETAILS
@@ -1,8 +1,9 @@
SPELL=ibus
- VERSION=1.3.8
+ VERSION=1.4.99.20121006
SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:b7467a522aae99b15f76a05d17db5da14f01e6a17393c86888c0956223ba6563886e78c7ea9126d51d097b0d552eeebd3f7a1ce7d8230fa047848f81196307e1
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
- SOURCE_HASH=sha512:b7467a522aae99b15f76a05d17db5da14f01e6a17393c86888c0956223ba6563886e78c7ea9126d51d097b0d552eeebd3f7a1ce7d8230fa047848f81196307e1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/ibus/"
LICENSE[0]=LGPL
diff --git a/i18n/ibus/HISTORY b/i18n/ibus/HISTORY
index b4bf93751f..4c4db7224d 100644
--- a/i18n/ibus/HISTORY
+++ b/i18n/ibus/HISTORY
@@ -1,3 +1,7 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.4.99.20121006 (for gnome-settings-daemon 3.6.1)
+ Nothing else currently uses ibus
+
2010-11-02 Peng Chang (Charles) <chp@sourcemage.org>
* DETAILS: updated spell to 1.3.8
diff --git a/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig b/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig
new file mode 100644
index 0000000000..e6b673a86e
--- /dev/null
+++ b/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig
Binary files differ
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
index 220090e221..c972fe34ef 100755
--- a/java/icedtea6/DETAILS
+++ b/java/icedtea6/DETAILS
@@ -1,5 +1,5 @@
SPELL=icedtea6
- VERSION=1.11.4
+ VERSION=1.11.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index d8d3e18b1d..043b9c54af 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 1.11.5
+
2012-09-05 Robin Cook <rcook@wyrms.net>
* DETAILS: updated to 1.11.4
diff --git a/java/icedtea6/icedtea6-1.11.4.tar.gz.sig b/java/icedtea6/icedtea6-1.11.4.tar.gz.sig
deleted file mode 100644
index b84f179406..0000000000
--- a/java/icedtea6/icedtea6-1.11.4.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/java/icedtea6/icedtea6-1.11.5.tar.gz.sig b/java/icedtea6/icedtea6-1.11.5.tar.gz.sig
new file mode 100644
index 0000000000..c5a8b4a171
--- /dev/null
+++ b/java/icedtea6/icedtea6-1.11.5.tar.gz.sig
Binary files differ
diff --git a/kde4-apps/tellico2/DEPENDS b/kde4-apps/tellico2/DEPENDS
index 0c8327f83e..95ce1a0c3c 100755
--- a/kde4-apps/tellico2/DEPENDS
+++ b/kde4-apps/tellico2/DEPENDS
@@ -4,7 +4,7 @@ depends libxslt &&
optional_depends kdemultimedia4 '' '' 'for fetching CDDB information' &&
optional_depends kdepimlibs4 '' '' 'address book & calendar support' &&
optional_depends libksane '' '' 'scanning images' &&
-optional_depends libv4l '' '' 'barcode scanning' &&
+optional_depends v4l-utils '' '' 'barcode scanning' &&
optional_depends poppler '' '' 'reading PDF files' &&
optional_depends exempi '' '' 'for reading PDF/XMP metadata' &&
optional_depends taglib '' '' 'for reading audio files'
diff --git a/kde4-apps/tellico2/HISTORY b/kde4-apps/tellico2/HISTORY
index 8b07cd0c4b..d7d2326e1a 100644
--- a/kde4-apps/tellico2/HISTORY
+++ b/kde4-apps/tellico2/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2011-09-28 Bor Kraljič <pyrobor@ver.si>
* DEPENDS: added exempi as optional dependency
-
2011-09-26 Bor Kraljič <pyrobor@ver.si>
* DETAILS: updated spell to 2.3.4
diff --git a/kde4-bindings/pykde4/DETAILS b/kde4-bindings/pykde4/DETAILS
index d21c9e3ffb..490d018dbb 100755
--- a/kde4-bindings/pykde4/DETAILS
+++ b/kde4-bindings/pykde4/DETAILS
@@ -1,7 +1,8 @@
SPELL=pykde4
- VERSION=4.9.1
+ VERSION=4.9.2
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_HASH=sha512:a195af622395ab71f283797b1a8c0c79502b3a3ce1f28d4f124876404d17b9bfec146081d8897df903c987bed8abdf47a7d7f27e83b1559fa9b515b95fae88d5
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:a195af622395ab71f283797b1a8c0c79502b3a3ce1f28d4f124876404d17b9bfec146081d8897df903c987bed8abdf47a7d7f27e83b1559fa9b515b95fae88d5
SOURCE_URL=$KDE_URL/stable/$VERSION/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.kde.org
diff --git a/kde4-bindings/pykde4/HISTORY b/kde4-bindings/pykde4/HISTORY
index df775ac0e6..b7f46a560e 100644
--- a/kde4-bindings/pykde4/HISTORY
+++ b/kde4-bindings/pykde4/HISTORY
@@ -1,3 +1,9 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 4.9.2
+ * PRE_BUILD: Apply sip-4.14.patch
+ * sip-4.14.patch: Fix compilation with sip 4.14+ (affects pykde4
+ 4.9.1 as well).
+
2012-09-07 Tommy Boatman <tboatman@sourcemage.org>
* DETAILS: 4.9.1
diff --git a/kde4-bindings/pykde4/PRE_BUILD b/kde4-bindings/pykde4/PRE_BUILD
new file mode 100755
index 0000000000..c72fc80ca5
--- /dev/null
+++ b/kde4-bindings/pykde4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Fix compilation with sip 4.14+...${DEFAULT_COLOR}" &&
+patch -p1 < "${SCRIPT_DIRECTORY}"/sip-4.14.patch
diff --git a/kde4-bindings/pykde4/pykde4-4.9.2.tar.xz.sig b/kde4-bindings/pykde4/pykde4-4.9.2.tar.xz.sig
new file mode 100644
index 0000000000..4610e787d6
--- /dev/null
+++ b/kde4-bindings/pykde4/pykde4-4.9.2.tar.xz.sig
Binary files differ
diff --git a/kde4-bindings/pykde4/sip-4.14.patch b/kde4-bindings/pykde4/sip-4.14.patch
new file mode 100644
index 0000000000..cb328555a9
--- /dev/null
+++ b/kde4-bindings/pykde4/sip-4.14.patch
@@ -0,0 +1,69 @@
+# See http://python.6.n6.nabble.com/latest-pykde4-4-9-2-build-fails-against-new-sip-4-14-PyQt-4-9-5-td4990652.html
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80e0fde..c5bb90d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,15 +26,16 @@ FIND_PACKAGE(PythonLibrary REQUIRED)
+ INCLUDE(PythonMacros)
+
+ FIND_PACKAGE(SIP REQUIRED)
+-IF(SIP_VERSION STRLESS "040d01") # These version numbers also appear in ../CMakeLists.txt
+- MESSAGE(FATAL_ERROR "The version of SIP found is too old. 4.13.1 or later is needed.")
+-ENDIF(SIP_VERSION STRLESS "040d01")
++IF(SIP_VERSION STRLESS "040e00") # These version numbers also appear in ../CMakeLists.txt
++ MESSAGE(FATAL_ERROR "The version of SIP found is too old. 4.14 or later is needed.")
++ENDIF(SIP_VERSION STRLESS "040e00")
+ INCLUDE(SIPMacros)
+
+ FIND_PACKAGE(PyQt4 REQUIRED)
+-IF(PYQT4_VERSION STRLESS "040900") # These version numbers also appear in ../CMakeLists.txt
++IF(PYQT4_VERSION STRLESS "040905") # These version numbers also appear in ../CMakeLists.txt
+ MESSAGE(FATAL_ERROR "The version of PyQt found is too old. 4.9 or later is required.")
+-ENDIF(PYQT4_VERSION STRLESS "040900")
++ENDIF(PYQT4_VERSION STRLESS "040905")
++
+
+
+ SET(SOPRANO_MIN_VERSION "2.0")
+@@ -93,9 +94,19 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
+
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)
+- SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
++ IF(PYQT4_VERSION STRGREATER "040904")
++ # Disable for newer PyQt
++ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3)
++ ELSE (PYQT4_VERSION STRGREATER "040904")
++ SET(SIP_EXTRA_OPTIONS -g -x Py_v3)
++ ENDIF(PYQT4_VERSION STRGREATER "040904")
+ ELSE (PYTHON_3)
+- SET(SIP_EXTRA_OPTIONS -g)
++ IF(PYQT4_VERSION STRGREATER "040904")
++ # Disable for newer PyQt
++ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector)
++ ELSE (PYQT4_VERSION STRGREATER "040904")
++ SET(SIP_EXTRA_OPTIONS -g)
++ ENDIF(PYQT4_VERSION STRGREATER "040904")
+ ENDIF (PYTHON_3)
+
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
+index 5a0a080..af53f85 100644
+--- a/sip/kdecore/typedefs.sip
++++ b/sip/kdecore/typedefs.sip
+@@ -951,6 +951,9 @@ template <TYPE1>
+ %End
+ };
+
++%Feature PyKDE_QVector
++
++%If(PyKDE_QVector)
+ %MappedType QVector<int>
+ {
+ %TypeHeaderCode
+@@ -1025,3 +1028,4 @@ template <TYPE1>
+ return sipGetState(sipTransferObj);
+ %End
+ };
++%End
+\ No newline at end of file
diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index 05de531d2e..11f26f3b0a 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -1,6 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends kdepimlibs4 &&
-depends libv4l &&
+depends v4l-utils &&
depends jasper &&
depends qca2 &&
optional_depends gmp '' '' 'KGet Torrent support' &&
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index a6e588bda2..9c1214266f 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-09-06 Tommy Boatman <tboatman@sourcemage.org>
* DETAILS: 4.9.1
-
2012-08-16 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.9.0
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index a07ca09778..b23f1911a5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,33 @@
+2012-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * latest_defaults: LATEST_maintenance_patches_3=patch-3.6.1
+ 3.6.2 and 3.6.3 contain a bug that may cause corruption on ext4 filesystems,
+ cf. http://lwn.net/Articles/521024/
+
+2012-10-21 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.3
+ * info/patches/maintenance_patches_3/patch-3.6.3: added
+
+2012-10-13 Vlad Glagolev <stealth@sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.46: added
+ * info/patches/maintenance_patches_3/patch-3.4.14: added
+ * info/patches/maintenance_patches_3/patch-3.5.7: added
+
+2012-10-13 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.2
+ * info/patches/maintenance_patches_3/patch-3.6.2: added
+
+2012-10-10 Vlad Glagolev <stealth@sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.2.31: added
+
+2012-10-08 Vlad Glagolev <stealth@sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.5.6: added
+ * info/patches/maintenance_patches_3/patch-3.4.13: added
+ * info/patches/maintenance_patches_3/patch-3.0.45: added
+
+2012-10-08 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.1
+ * info/patches/maintenance_patches_3/patch-3.6.1: added
+
2012-10-03 Vlad Glagolev <stealth@sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.5.5: added
* info/patches/maintenance_patches_3/patch-3.4.{11,12}: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45
new file mode 100755
index 0000000000..bd30561e0b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.45
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.45"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="ea3fb3e5e4c4188f1c04a702400d96060e9c96e7"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46
new file mode 100755
index 0000000000..dbf344d3de
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.46
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.46"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="004d0d6a8d062c3029e97aa09cef8281dfbc684a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
new file mode 100755
index 0000000000..7ce5b22fe5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.31
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.31"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f8a87eaeaf3c3976564e39449bd959023b6ead6f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13
new file mode 100755
index 0000000000..63bc88d5d4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.13
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.13"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2d804ac4014d0c9be5fa8f184ffeb675280d7882"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14
new file mode 100755
index 0000000000..8303548e8e
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.14
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.14"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2203a346a1d137f6cdfe3742df748e0f689d0a94"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6
new file mode 100755
index 0000000000..e3f2f10cbd
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.6
@@ -0,0 +1,5 @@
+appliedkernels="3.5"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="631d7ea41ec8031f6d4e80d21c0d8a5218bdd2bf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7
new file mode 100755
index 0000000000..97e986dc9e
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.7
@@ -0,0 +1,5 @@
+appliedkernels="3.5"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="63fbe3f50d0ccbc5bb8560246c4807bae5337fbf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1
new file mode 100755
index 0000000000..e57306d7fc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.1
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="43c3179302720e2fa4064556906bf70ccef09f60"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2
new file mode 100755
index 0000000000..d93963bbfd
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.2
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1c21e61be8c786949ac929d77c8d7074119dea58"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.3 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.3
new file mode 100755
index 0000000000..8a0b310071
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.3
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="eaefab2b6749e3b9fab6ea7d076259f672ca6807"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 2cdc622541..d60bb8512c 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.6
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.6
+LATEST_maintenance_patches_3=patch-3.6.1
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/freexl/DETAILS b/libs/freexl/DETAILS
new file mode 100755
index 0000000000..64de9d3a2f
--- /dev/null
+++ b/libs/freexl/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=freexl
+ VERSION=1.0.0d
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.gaia-gis.it/gaia-sins/${SOURCE}
+ SOURCE_HASH=sha512:22d76592ff6f575ccb7dde1c36e535f7439f9f99a2fbf433a6f0f9dcc8105f637c47f0415e0cf2dc4c30f6b9ce5c2f82a58defd1256472771fdddbb47ea0030a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://www.gaia-gis.it/fossil/freexl/index"
+ LICENSE[0]=MOZILLA
+ ENTERED=20121006
+ SHORT="an open source library to extract valid data from within an Excel (.xls) spreadsheet"
+cat << EOF
+FreeXL is an open source library to extract valid data from within an Excel
+(.xls) spreadsheet.
+
+FreeXL design goals:
+
+* to be simple and lightweight * to be stable, robust and efficient * to be
+easily and universally portable * completely ignoring any GUI-related oddity
+
+Note that the final goal means that FreeXL ignores at all fonts, sizes and
+alignments, and most formats. It ignores Pivot Table, Charts, Formulas, Visual
+Basic macros and so on. FreeXL is structurally simple and quite light-weight
+(typically 40-80K of object code, stripped).
+EOF
diff --git a/libs/freexl/HISTORY b/libs/freexl/HISTORY
new file mode 100644
index 0000000000..9122d5989b
--- /dev/null
+++ b/libs/freexl/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: spell created
+
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 0d7e38ed79..5f9b20f56e 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2012-10-08 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: added, to fix build with glibc 2.16
+
2012-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: force internal glib2, so basesystem can be glib2-free, which
diff --git a/libs/gettext/PRE_BUILD b/libs/gettext/PRE_BUILD
new file mode 100755
index 0000000000..32353b6ce5
--- /dev/null
+++ b/libs/gettext/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h
diff --git a/libs/libevent/DETAILS b/libs/libevent/DETAILS
index 24dfa14ea3..ac62e753c5 100755
--- a/libs/libevent/DETAILS
+++ b/libs/libevent/DETAILS
@@ -1,5 +1,5 @@
SPELL=libevent
- VERSION=2.0.19
+ VERSION=2.0.20
SOURCE=$SPELL-$VERSION-stable.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/libevent/HISTORY b/libs/libevent/HISTORY
index 38426e6bbb..e391e5bf87 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.0.20
+
2012-06-09 Vlad Glagolev <stealth@sourcemage.org>
* UP_TRIGGERS: don't compare when spell isn't installed
diff --git a/libs/libguess/DETAILS b/libs/libguess/DETAILS
new file mode 100755
index 0000000000..13c64e3096
--- /dev/null
+++ b/libs/libguess/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=libguess
+ VERSION=1.1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://distfiles.atheme.org/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.atheme.org/project/libguess"
+ LICENSE[0]=BSD?
+ ENTERED=20121019
+ SHORT="High-speed character set detection"
+cat << EOF
+High-speed character set detection library
+EOF
diff --git a/libs/libguess/HISTORY b/libs/libguess/HISTORY
new file mode 100644
index 0000000000..60beb8e807
--- /dev/null
+++ b/libs/libguess/HISTORY
@@ -0,0 +1,4 @@
+2012-10-19 Robin Cook <rcook@wyrms.net>
+ * NEW SPELL: DETAILS
+
+
diff --git a/libs/libguess/libguess-1.1.tar.gz.sig b/libs/libguess/libguess-1.1.tar.gz.sig
new file mode 100644
index 0000000000..f4cc85b05d
--- /dev/null
+++ b/libs/libguess/libguess-1.1.tar.gz.sig
Binary files differ
diff --git a/libs/libspatialindex/DEPENDS b/libs/libspatialindex/DEPENDS
new file mode 100755
index 0000000000..f148724504
--- /dev/null
+++ b/libs/libspatialindex/DEPENDS
@@ -0,0 +1 @@
+depends -sub CXX gcc
diff --git a/libs/libspatialindex/DETAILS b/libs/libspatialindex/DETAILS
new file mode 100755
index 0000000000..bbc9a86966
--- /dev/null
+++ b/libs/libspatialindex/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=libspatialindex
+ VERSION=1.7.1
+ SOURCE="spatialindex-src-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:18bdeabae3c2698a1a88cd3e526f730e4fd0535c2ffb7af0e5f8dd514427fefc664e3e1977f6e1455ed2d35475868afece5d6730fb6f98acc3822baa3984af6a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/spatialindex-src-${VERSION}"
+ WEB_SITE="http://libspatialindex.github.com/"
+ LICENSE[0]=GPL
+ ENTERED=20121006
+ SHORT="a framework for spatial indexing"
+cat << EOF
+The purpose of this library is to provide:
+
+1. An extensible framework that will support robust spatial indexing methods.
+2. Support for sophisticated spatial queries. Range, point location, nearest
+ neighbor and k-nearest neighbor as well as parametric queries (defined
+ by spatial constraints) should be easy to deploy and run.
+3. Easy to use interfaces for inserting, deleting and updating information.
+4. Wide variety of customization capabilities. Basic index and storage
+ characteristics like the page size, node capacity, minimum fan-out,
+ splitting algorithm, etc. should be easy to customize.
+5. Index persistence. Internal memory and external memory structures should be
+ supported. Clustered and non-clustered indices should be easy to be
+ persisted.
+EOF
diff --git a/libs/libspatialindex/HISTORY b/libs/libspatialindex/HISTORY
new file mode 100644
index 0000000000..df32ae31be
--- /dev/null
+++ b/libs/libspatialindex/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: spell created
+
diff --git a/libs/libspatialite/DEPENDS b/libs/libspatialite/DEPENDS
new file mode 100755
index 0000000000..77f73e9d07
--- /dev/null
+++ b/libs/libspatialite/DEPENDS
@@ -0,0 +1,4 @@
+depends sqlite &&
+depends geos &&
+depends proj &&
+optional_depends freexl "--enable-freexl" "--disable-freexl" "support for reading xls files"
diff --git a/libs/libspatialite/DETAILS b/libs/libspatialite/DETAILS
new file mode 100755
index 0000000000..70262c8014
--- /dev/null
+++ b/libs/libspatialite/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libspatialite
+ VERSION=3.0.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.gaia-gis.it/gaia-sins/${SOURCE}
+ SOURCE_HASH=sha512:604e5fcb3ac17eb3c69aff5dbf8c77660aecbddc81ab1faa63b0ce069253e3d1c5b6001bd2f2fde5d2f60de9c3758d0d871b9cbcaf1a6d18ceebc0788c166d94
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://www.gaia-gis.it/fossil/libspatialite/index"
+ LICENSE[0]=MOZILLA
+ ENTERED=20121006
+ SHORT="an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities"
+cat << EOF
+SpatiaLite is smoothly integrated into SQLite to provide a complete and
+powerful Spatial DBMS (mostly OGC-SFS compliant).
+
+Using SQLite + SpatiaLite you can effectively deploy an alternative open
+source Spatial DBMS roughly equivalent to PostgreSQL + PostGIS.
+EOF
diff --git a/libs/libspatialite/HISTORY b/libs/libspatialite/HISTORY
new file mode 100644
index 0000000000..5cd4628897
--- /dev/null
+++ b/libs/libspatialite/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/libs/libtasn1/DETAILS b/libs/libtasn1/DETAILS
index f44094927d..835c43a33b 100755
--- a/libs/libtasn1/DETAILS
+++ b/libs/libtasn1/DETAILS
@@ -1,5 +1,5 @@
SPELL=libtasn1
- VERSION=2.12
+ VERSION=2.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/libtasn1/HISTORY b/libs/libtasn1/HISTORY
index 6d693b673e..f71cdca0d3 100644
--- a/libs/libtasn1/HISTORY
+++ b/libs/libtasn1/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 2.14
+
2012-03-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.12
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index c7c777942e..efbdd1fa1a 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -5,6 +5,7 @@ depends curl &&
depends glib2 &&
depends gnutls &&
depends libpciaccess &&
+depends yajl &&
depends -sub "LVM_FULL" lvm '--with-storage-lvm' &&
diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index c0880e4d65..d5f04567dd 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
SPELL=libvirt
- VERSION=0.9.9
+ VERSION=0.10.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 7e414601a0..94350a83c6 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,7 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.10.2
+ * DEPENDS: Depends on yajl
+
2012-01-10 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Remove dependency on libnl
* BUILD: Disable macvtap (even with libnl uninstalled, tries to build
diff --git a/libs/libvirt/libvirt-0.10.2.tar.gz.sig b/libs/libvirt/libvirt-0.10.2.tar.gz.sig
new file mode 100644
index 0000000000..8df2f78f64
--- /dev/null
+++ b/libs/libvirt/libvirt-0.10.2.tar.gz.sig
Binary files differ
diff --git a/libs/libvirt/libvirt-0.9.9.tar.gz.sig b/libs/libvirt/libvirt-0.9.9.tar.gz.sig
deleted file mode 100644
index 0a07cb3c6b..0000000000
--- a/libs/libvirt/libvirt-0.9.9.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index d0561614ab..0703bec2e7 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libxml2
- VERSION=2.8.0
+ VERSION=2.9.0
+ SOURCE_HASH=sha512:b13268ea3725a8b534974ece33981b001324164e5687df94b0d15c77189070e2a5d9f08c1646e5492e70a607ca0adf00788772fcf300ac2d4a110e9bf57d4afe
SECURITY_PATCH=8
- SOURCE_HASH=sha512:e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 37bb42eed5..88726645ac 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,7 @@
+2012-10-11 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.9.0
+ * PRE_BUILD, bufsize.patch.gz: deleted - applied upstream
+
2012-08-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: SECURITY_PATCH++ (CVE-2012-2807)
* PRE_BUILD: added, to apply the patch
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index c7262aaa95..0000000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-zcat "$SPELL_DIRECTORY/bufsize.patch.gz" | patch -p1
diff --git a/libs/libxml2/bufsize.patch.gz b/libs/libxml2/bufsize.patch.gz
deleted file mode 100644
index 5106ed6d94..0000000000
--- a/libs/libxml2/bufsize.patch.gz
+++ /dev/null
Binary files differ
diff --git a/libs/ncurses/BUILD b/libs/ncurses/BUILD
index c3d5e9c4f4..7774b9c8c9 100755
--- a/libs/ncurses/BUILD
+++ b/libs/ncurses/BUILD
@@ -4,7 +4,7 @@ OPTS="$OPTS --build=${BUILD}"
if [[ $UTF8 == y ]]; then
OPTS="$OPTS --enable-widec"
fi &&
-OPTS="$OPTS --with-shared --libdir=${TRACK_ROOT}/lib" &&
+OPTS="$OPTS --with-shared --libdir=${TRACK_ROOT}/lib --enable-pc-files" &&
make_single &&
./configure --prefix=${TRACK_ROOT}/usr \
--sysconfdir=${TRACK_ROOT}/etc \
diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index 43c24133f2..c689dc9ad0 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,5 +1,6 @@
SPELL=ncurses
VERSION=5.9
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 33ae856a21..afd923aa5a 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2012-10-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: --enable-pc-files added
+
2011-09-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 5.9
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 49a89d92bc..c9e873bbd9 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,11 +1,11 @@
SPELL=pyqt4
SPELLX=PyQt-x11-gpl
- VERSION=4.9.4
- SOURCE_HASH=sha512:719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3
+ VERSION=4.9.5
+ SOURCE_HASH=sha512:27891944f35c66476b045cc5398e32d8566bc25d95e893a17f518f85f3a8b0ccbf1b56e148d086f5563259c76cf89e63057f9c77e16876343643235a930b0856
URI=PyQt4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/PyQt4/PyQt-${VERSION}/${SOURCE}
WEB_SITE=http://www.riverbankcomputing.co.uk/software/pyqt/
ENTERED=20070614
LICENSE[0]=GPL
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 7812e2c35a..b0df8fa3c6 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.9.5
+
2012-07-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.9.4
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 090399fe94..e2979b5da6 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,11 +1,10 @@
SPELL=sip
- VERSION=4.13.3
- SOURCE_HASH=sha512:2e27bfbb79285e420c8989f620dca52b7bf5f0c70377c4e50def20f3440bae60c5a4cd12d03ec40f1270ddcce4f2137b3b1accd6f6646292855c8b344afd9059
+ VERSION=4.14
+ SOURCE_HASH=sha512:ac6d98f2e4f7094e5065a32e107dc7ffce28fac5fa805407c1b670192a9438235a5235dee52833fb9667e1e0a12c29b571d1fa8f315a96fa2728a8b08d08c405
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
- SOURCE_URL[1]=http://ring.u-toyama.ac.jp/archives/NetBSD/packages/distfiles/$SOURCE
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/pyqt/$SPELL/$SPELL-$VERSION/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.riverbankcomputing.co.uk/software/$SPELL
ENTERED=20020721
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index e5ffeace9e..ae7fee4566 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.14
+
2012-07-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.13.3
diff --git a/libs/skeltrack/DETAILS b/libs/skeltrack/DETAILS
index f34881da89..8c09686a2d 100755
--- a/libs/skeltrack/DETAILS
+++ b/libs/skeltrack/DETAILS
@@ -1,9 +1,9 @@
SPELL=skeltrack
- VERSION=0.1.8
+ VERSION=0.1.10
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/joaquimrocha-Skeltrack-79f8260
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/joaquimrocha-Skeltrack-2c0a97f
SOURCE_URL[0]=https://github.com/joaquimrocha/Skeltrack/tarball/$VERSION
- SOURCE_HASH=sha512:706ffbfd915dd9cef1fb96871ec1dc9ea703c71bc86cf0dd1c34c235f1c97a82aed581988e6341543baea0fd4c6162da44cb05c4554245b8820692a120e86da8
+ SOURCE_HASH=sha512:b0b3966508c866bff61e6090ef62887ffeef2341311b3023a6550cb3c4caf0d06d1e53f1d68b4915037d088ff0d23a140349f38c8e4f79688dc07436603865ab
WEBSITE=https://github.com/joaquimrocha/Skeltrack
ENTERED=20120909
LICENSE[0]=GPL
diff --git a/libs/skeltrack/HISTORY b/libs/skeltrack/HISTORY
index 54a49770ef..9c6421adb6 100644
--- a/libs/skeltrack/HISTORY
+++ b/libs/skeltrack/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.1.10
+
2012-09-09 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, PRE_BUILD: spell created, version 0.1.8
diff --git a/libs/tzdata/DETAILS b/libs/tzdata/DETAILS
index bdb87d89c9..6fb82ae4ad 100755
--- a/libs/tzdata/DETAILS
+++ b/libs/tzdata/DETAILS
@@ -1,10 +1,10 @@
SPELL=tzdata
- VERSION=2012e
+ VERSION=2012f
+ SOURCE_HASH=sha512:b8db53f82967472c3aa191a04f0a97473d4331c72d03834749a0c8a9d9a934fb1285917e3f5b6fc7a166a39371913650501feb88ebfc40bc6a64e3393d0ead5d
SOURCE="${SPELL}${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.iana.org/time-zones/repository/releases/${SOURCE}
SOURCE_URL[1]=ftp://ftp.iana.org/tz/releases/${SOURCE}
#SOURCE_URL[2]=ftp://munnari.oz.au/pub/oldtz/${SOURCE}
- SOURCE_HASH=sha512:66ab7bcf7070a0a6d9ba2c5ef9d5c0f0992462fa43a09998a36c9a64049b10164fb6bf73d66ab5d2fbb90e07aa5e4e636221266a69b7590eccfcd6b1acffbd98
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.iana.org/time-zones"
LICENSE[0]="GPL"
diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index 1d8c1530c0..6b133fd5f8 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,6 @@
+2012-10-09 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2012f
+
2012-08-03 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 2012e
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 665eb28a49..1169bf2fbb 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.17
- SOURCE_HASH=sha512:f8a279d3da048164bb7bc720bb0cd590bd00ef79e1b56f211b5025acbf46016fcabc39c91ae8a16577b8c383a751c43204a49893bdbd64adb0a6259aa1e2bccd
+ VERSION=0.9.18
+ SOURCE_HASH=sha512:3630aa15ca9d62f3b1abb9c2f2a9d3b3493aa402b9352cb1c291ad2f59d7dcb40b8a44e17c47c1d07c0c317940bbd89cd321b5c6902624e211dda5d3544a28ca
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index e0fdc5985c..2eadde7069 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.9.18
+
2012-07-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.17
diff --git a/libs/xapian-core/DETAILS b/libs/xapian-core/DETAILS
index faf7217a43..243828e9be 100755
--- a/libs/xapian-core/DETAILS
+++ b/libs/xapian-core/DETAILS
@@ -1,6 +1,6 @@
SPELL=xapian-core
- VERSION=1.2.10
- SOURCE_HASH=sha512:2f7d52bacd4638676d53e7201b64e3731bc2051e1de6fbafe3799ace56f218df0786d3cf409154a8028c49906b2873e3949cd4db9d46583a50f557eee130cd7a
+ VERSION=1.2.12
+ SOURCE_HASH=sha512:10f1c36f457cd6d044da31a8360c054c0df5d4ee7061d8d30db6989549d9ab85960696342f582486927dc56db81071cf6d24436193edcd55b564aabf9c39ad78
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://oligarchy.co.uk/xapian/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/xapian-core/HISTORY b/libs/xapian-core/HISTORY
index e4aeb2248a..119cf28f56 100644
--- a/libs/xapian-core/HISTORY
+++ b/libs/xapian-core/HISTORY
@@ -1,3 +1,6 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.2.12
+
2012-05-25 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.2.10
* DEPENDS: add zlib
diff --git a/mobile/geoclue/DETAILS b/mobile/geoclue/DETAILS
index bf63a1549a..ec6c891415 100755
--- a/mobile/geoclue/DETAILS
+++ b/mobile/geoclue/DETAILS
@@ -1,11 +1,12 @@
SPELL=geoclue
- VERSION=0.12.0
- SOURCE_HASH=sha512:c65fef518fea5708067def3595a57b2e3cb4c04a3d1c367ac02c4802386a6c8420b3d20f5194896d8e0fdeee6cc6af2744cc920af1ab680a3ca197cb5a5bfab5
+ VERSION=0.12.99
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:c65fef518fea5708067def3595a57b2e3cb4c04a3d1c367ac02c4802386a6c8420b3d20f5194896d8e0fdeee6cc6af2744cc920af1ab680a3ca197cb5a5bfab5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://www.freedesktop.org/wiki/Software/GeoClue
- SOURCE_URL[0]=https://launchpad.net/geoclue/trunk/0.12/+download/$SOURCE
+ SOURCE_URL[0]=http://people.freedesktop.org/~hadess/$SOURCE
LICENSE[0]=LGPL
ENTERED=20090705
KEYWORDS=""
diff --git a/mobile/geoclue/HISTORY b/mobile/geoclue/HISTORY
index ba1f2677cc..a5e8cffeca 100644
--- a/mobile/geoclue/HISTORY
+++ b/mobile/geoclue/HISTORY
@@ -1,3 +1,8 @@
+2012-10-17 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.12.99 (works with glib2 2.34.1)
+ * PRE_BUILD: No longer needed
+ * geoclue-gcc46.patch: Removed, included in release
+
2012-04-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.12.0, SOURCE_URL[0] updated
* PRE_BUILD, geoclue-gcc46.patch: added patch from Arch
diff --git a/mobile/geoclue/PRE_BUILD b/mobile/geoclue/PRE_BUILD
deleted file mode 100755
index b203760ab4..0000000000
--- a/mobile/geoclue/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/geoclue-gcc46.patch
diff --git a/mobile/geoclue/geoclue-0.12.99.tar.gz.sig b/mobile/geoclue/geoclue-0.12.99.tar.gz.sig
new file mode 100644
index 0000000000..3b479a46ee
--- /dev/null
+++ b/mobile/geoclue/geoclue-0.12.99.tar.gz.sig
Binary files differ
diff --git a/mobile/geoclue/geoclue-gcc46.patch b/mobile/geoclue/geoclue-gcc46.patch
deleted file mode 100644
index 11bf48547e..0000000000
--- a/mobile/geoclue/geoclue-gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 07 Mar 2011 23:46:15 +0000
-Subject: master: Fix warning with GCC 4.6
-
----
-diff --git a/src/master-provider.c b/src/master-provider.c
-index 790c043..e4ea053 100644
---- a/src/master-provider.c
-+++ b/src/master-provider.c
-@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider)
- static gboolean
- gc_master_provider_initialize (GcMasterProvider *provider)
- {
-- GcMasterProviderPrivate *priv;
--
-- priv = GET_PRIVATE (provider);
--
- if (!gc_master_provider_initialize_interfaces (provider)) {
- return FALSE;
- }
---
-cgit v0.8.3-6-g21f6
diff --git a/net/bind-tools/DETAILS b/net/bind-tools/DETAILS
index 2cc83da05d..07145c7414 100755
--- a/net/bind-tools/DETAILS
+++ b/net/bind-tools/DETAILS
@@ -1,12 +1,12 @@
SPELL=bind-tools
- VERSION=9.9.1-P3
+ VERSION=9.9.1-P4
SOURCE=bind-$VERSION.tar.gz
SOURCE2=$SOURCE.sha512.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/bind-$VERSION"
SOURCE_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE
SOURCE2_URL[0]=ftp://ftp.isc.org/isc/bind9/$VERSION/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=ISC
KEYWORDS="net"
diff --git a/net/bind-tools/HISTORY b/net/bind-tools/HISTORY
index 1dc88024d7..f064c2d460 100644
--- a/net/bind-tools/HISTORY
+++ b/net/bind-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 9.9.1-P4; SECURITY_PATCH++
+
2012-09-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 9.9.1-P3; SECURITY_PATCH++
diff --git a/net/hostapd/DETAILS b/net/hostapd/DETAILS
index 9529ff5d75..ff82790dd9 100755
--- a/net/hostapd/DETAILS
+++ b/net/hostapd/DETAILS
@@ -1,5 +1,6 @@
SPELL=hostapd
VERSION=1.0
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/hostapd/HISTORY b/net/hostapd/HISTORY
index 7a610d316f..2cb45aa3c1 100644
--- a/net/hostapd/HISTORY
+++ b/net/hostapd/HISTORY
@@ -1,3 +1,8 @@
+2012-10-10 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * PRE_BUILD: apply the patch
+ * eap-tls.patch: added, to fix CVE-2012-4445
+
2012-07-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, {PRE_,}BUILD, CONFIGURE, DEPENDS, FINAL, INSTALL,
init.d/hostapd{,.conf}: spell created
diff --git a/net/hostapd/PRE_BUILD b/net/hostapd/PRE_BUILD
index 8053703b79..0d0643502d 100755
--- a/net/hostapd/PRE_BUILD
+++ b/net/hostapd/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY/eap-tls.patch" &&
+
# /etc/hostapd.* -> /etc/hostapd/hostapd.*
sedit "s:/etc/hostapd:/etc/hostapd/hostapd:g" hostapd/hostapd.conf &&
diff --git a/net/hostapd/eap-tls.patch b/net/hostapd/eap-tls.patch
new file mode 100644
index 0000000000..bda92cf405
--- /dev/null
+++ b/net/hostapd/eap-tls.patch
@@ -0,0 +1,48 @@
+From 586c446e0ff42ae00315b014924ec669023bd8de Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Sun, 7 Oct 2012 20:06:29 +0300
+Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
+
+EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
+Message Length value properly and could end up trying to store more
+information into the message buffer than the allocated size if the first
+fragment is longer than the indicated size. This could result in hostapd
+process terminating in wpabuf length validation. Fix this by rejecting
+messages that have invalid TLS Message Length value.
+
+This would affect cases that use the internal EAP authentication server
+in hostapd either directly with IEEE 802.1X or when using hostapd as a
+RADIUS authentication server and when receiving an incorrectly
+constructed EAP-TLS message. Cases where hostapd uses an external
+authentication are not affected.
+
+Thanks to Timo Warns for finding and reporting this issue.
+
+Signed-hostap: Jouni Malinen <j@w1.fi>
+intended-for: hostap-1
+---
+ src/eap_server/eap_server_tls_common.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
+index 31be2ec..46f282b 100644
+--- a/src/eap_server/eap_server_tls_common.c
++++ b/src/eap_server/eap_server_tls_common.c
+@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
+ return -1;
+ }
+
++ if (len > message_length) {
++ wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
++ "first fragment of frame (TLS Message "
++ "Length %d bytes)",
++ (int) len, (int) message_length);
++ return -1;
++ }
++
+ data->tls_in = wpabuf_alloc(message_length);
+ if (data->tls_in == NULL) {
+ wpa_printf(MSG_DEBUG, "SSL: No memory for message");
+--
+1.7.4-rc1
+
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index a73e24a537..fdb0d94b99 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=1.1.6
- PATCHLEVEL=2
+ PATCHLEVEL=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 8cce150f9c..837bb9ef75 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,8 @@
+2012-10-06 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * init.d/nfs: nfsd proc filesystem has nothing to do with NFS4-only;
+ corrected umount for pipefs
+
2012-05-16 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: PATCHLEVEL+=1
* volatiles: moved "/var/lib/nfs/xtab" here from global volatiles
diff --git a/net/nfs-utils/init.d/nfs b/net/nfs-utils/init.d/nfs
index 8dacdd2dd8..8cea6acddf 100644
--- a/net/nfs-utils/init.d/nfs
+++ b/net/nfs-utils/init.d/nfs
@@ -88,9 +88,9 @@ start()
echo "Starting NFS services (client & server)"
bins="statd nfsd mountd"
+ mount_nfsd
if [[ ! -z $HASNFS4 ]]; then
mknfsdirs
- mount_nfsd
mount_pipefs
bins="${bins} idmapd"
fi
@@ -137,9 +137,9 @@ stop()
evaluate_retval
bins="statd nfsd mountd"
+ umount_nfsd
if [[ ! -z $HASNFS4 ]]; then
- umount pipefs
- umount_nfsd
+ umount_pipefs
bins="${bins} idmapd"
fi
diff --git a/perl-cpan/image-exiftool/DETAILS b/perl-cpan/image-exiftool/DETAILS
index 795def779b..75c6c30b42 100755
--- a/perl-cpan/image-exiftool/DETAILS
+++ b/perl-cpan/image-exiftool/DETAILS
@@ -1,8 +1,8 @@
SPELL=image-exiftool
- VERSION=8.25
+ VERSION=9.03
SOURCE="Image-ExifTool-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.sno.phy.queensu.ca/~phil/exiftool/${SOURCE}
- SOURCE_HASH=sha512:8d86b039047a890effffabf23f84ed9700142aff32dc4510a211f21b92a6ef68d2a8f211308771269c08e4980a12754f7129adff9a074d98837f7947255d112a
+ SOURCE_HASH=sha512:e8f56077dab9699a35d2492125b64e8e4bb1609eab3eaf6fa58408dc6bd8394371281b3481a271bbff862562538489be8ae1ce7df545261940442305521ae078
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Image-ExifTool-${VERSION}"
WEB_SITE="http://www.sno.phy.queensu.ca/~phil/exiftool/"
LICENSE[0]=PERL
diff --git a/perl-cpan/image-exiftool/HISTORY b/perl-cpan/image-exiftool/HISTORY
index 5f57f048c7..a6d1f60d46 100644
--- a/perl-cpan/image-exiftool/HISTORY
+++ b/perl-cpan/image-exiftool/HISTORY
@@ -1,3 +1,6 @@
+2012-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 9.03
+
2010-08-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 8.25
diff --git a/python-pypi/fdb/DETAILS b/python-pypi/fdb/DETAILS
index 81a5719ada..decb66259c 100755
--- a/python-pypi/fdb/DETAILS
+++ b/python-pypi/fdb/DETAILS
@@ -1,6 +1,6 @@
SPELL=fdb
- VERSION=0.8.5
- SOURCE_HASH=sha512:7dcc037e9f6036909475c429ee67b7724c8af1f40929c09ad874ab2d0e348a5a43d1463322f19ce79ef31a976055e075efc6a20e8843c6eb87a96a088a19b3ba
+ VERSION=0.9.1
+ SOURCE_HASH=sha512:1fffefc09eb5f756506364883269b708935f0101f0e2b1cefaf59715e41cfaa631f6f4269e53b984f848a2f6e9788ffe3c9d61053af15687eb11b2282ad48191
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/fdb/HISTORY b/python-pypi/fdb/HISTORY
index dcf9a7716d..b10b664e1a 100644
--- a/python-pypi/fdb/HISTORY
+++ b/python-pypi/fdb/HISTORY
@@ -1,3 +1,9 @@
+2012-10-08 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.1
+
+2012-10-06 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9
+
2012-06-28 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.8.5
diff --git a/python-pypi/hatta/DEPENDS b/python-pypi/hatta/DEPENDS
index 7410d2eda9..e1efbac2a4 100755
--- a/python-pypi/hatta/DEPENDS
+++ b/python-pypi/hatta/DEPENDS
@@ -1,5 +1,6 @@
depends -sub SQLITE python &&
depends werkzeug &&
depends mercurial &&
+depends jinja2 &&
suggest_depends pil "" "" "for thumbnails rendering support"
diff --git a/python-pypi/hatta/DETAILS b/python-pypi/hatta/DETAILS
index b1605e1bba..d4dda78a87 100755
--- a/python-pypi/hatta/DETAILS
+++ b/python-pypi/hatta/DETAILS
@@ -1,9 +1,9 @@
SPELL=hatta
- VERSION=1.4.5
- SOURCE=$VERSION.zip
- SOURCE_URL[0]=http://hg.hatta-wiki.org/$SPELL/archive/$SOURCE
- SOURCE_HASH=sha512:c328b07f128b51a1fdfcd1326f2b56973309e181f55e8447a4349748160c37f4aa8e693a22c0811cf73745d162e95f04f310b7a9dd4e6994e44c6d8c7de03fb6
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Hatta-Wiki-${VERSION}"
+ VERSION=1.5.1
+ SOURCE=Hatta-${VERSION}.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/H/Hatta/$SOURCE
+ SOURCE_HASH=sha512:3f92a19f818211f759008c7beef81e52c833c63c57e002d766b4a3148493e661ae5f1765cf156fafb895697b61e0efcc66e69eea1cf5d7b11f397f3908037b3d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Hatta-${VERSION}"
WEB_SITE=http://hatta-wiki.org/
LICENSE[0]=GPL
ENTERED=20100815
diff --git a/python-pypi/hatta/HISTORY b/python-pypi/hatta/HISTORY
index 778fced52a..878583e1b8 100644
--- a/python-pypi/hatta/HISTORY
+++ b/python-pypi/hatta/HISTORY
@@ -1,3 +1,7 @@
+2012-10-15 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.5.1
+ * DEPENDS: jinja2 is required now
+
2012-04-06 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: renewed hash for reuploaded zipball
diff --git a/python-pypi/lxml/DETAILS b/python-pypi/lxml/DETAILS
index efcba72093..076bf19d33 100755
--- a/python-pypi/lxml/DETAILS
+++ b/python-pypi/lxml/DETAILS
@@ -1,5 +1,5 @@
SPELL=lxml
- VERSION=2.3.5
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://pypi.python.org/packages/source/l/$SPELL/$SOURCE
diff --git a/python-pypi/lxml/HISTORY b/python-pypi/lxml/HISTORY
index 7d80fdcfde..125eb74579 100644
--- a/python-pypi/lxml/HISTORY
+++ b/python-pypi/lxml/HISTORY
@@ -1,3 +1,6 @@
+2012-10-15 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.0.1
+
2012-07-31 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.3.5
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 00215b4d96..2c44256ad0 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.3.1
- SOURCE_HASH=sha512:026772f5b48cc6bcf50fe2ec5c1bfbcda96f8cc31e89f9cc8de6a76c736f820617ff15b61612ae6c7729693dbba088273d8a2a613a8015a66c6d5c76ac364af9
+ VERSION=2.3.2
+ SOURCE_HASH=sha512:3661be0fc6e90134b781b3709d7ea33ed6f81502c9980a7d3f6ab4b0c30e14ee75406207ab8a213c46906f27a4a015bde7b6ce6583238aec4b240763d8a3d9ae
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 8c5398e823..a982c0e026 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2012-10-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.3.2
+
2012-09-09 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.3.1
diff --git a/python-pypi/scipy/DETAILS b/python-pypi/scipy/DETAILS
index dc717234f4..61185bb0a2 100755
--- a/python-pypi/scipy/DETAILS
+++ b/python-pypi/scipy/DETAILS
@@ -1,6 +1,6 @@
SPELL=scipy
- VERSION=0.10.0
- SOURCE_HASH=sha512:7ff9f7865d0a94cd295389f1b6296433d3307f246a35fec386eb824d8f619d0ed4e1673f5d83cb75c13578addc5ea64ee304af677c3be0a9693c232fe16057ba
+ VERSION=0.11.0
+ SOURCE_HASH=sha512:d4fdd62f2db5285cd133649bd1bfa5175cb9da8304323abd74e0ef1207d55e6152f0f944da1da75f73e9dafb0f3bb14efba3c0526c732c348a653e0bd223ccfa
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
diff --git a/python-pypi/scipy/HISTORY b/python-pypi/scipy/HISTORY
index dc970acec3..9e144b10e5 100644
--- a/python-pypi/scipy/HISTORY
+++ b/python-pypi/scipy/HISTORY
@@ -1,5 +1,8 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.0
+
2012-02-27 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 0.19.0
+ * DETAILS: version 0.10.0
extra url
* DEPENDS: cleanup
diff --git a/python-pypi/virtinst/DETAILS b/python-pypi/virtinst/DETAILS
index 9a52ff86ac..b30631d65d 100755
--- a/python-pypi/virtinst/DETAILS
+++ b/python-pypi/virtinst/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtinst
- VERSION=0.600.0
+ VERSION=0.600.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/virtinst/HISTORY b/python-pypi/virtinst/HISTORY
index bf894bf0a1..06dfb55c06 100644
--- a/python-pypi/virtinst/HISTORY
+++ b/python-pypi/virtinst/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.600.3
+
2012-01-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.600.0
diff --git a/python-pypi/virtinst/virtinst-0.600.0.tar.gz.sig b/python-pypi/virtinst/virtinst-0.600.0.tar.gz.sig
deleted file mode 100644
index ea162876a3..0000000000
--- a/python-pypi/virtinst/virtinst-0.600.0.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/python-pypi/virtinst/virtinst-0.600.3.tar.gz.sig b/python-pypi/virtinst/virtinst-0.600.3.tar.gz.sig
new file mode 100644
index 0000000000..eaee5c0f97
--- /dev/null
+++ b/python-pypi/virtinst/virtinst-0.600.3.tar.gz.sig
Binary files differ
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index 26660f7cab..3d75415c0b 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,9 +1,9 @@
SPELL=ruby-1.9
PACKAGE=ruby
- VERSION=1.9.3-p194
- SOURCE_HASH=sha512:4b7ec49e21f9d8c51fcc1dec146e7d8c02ff63309484ea02d476820dba7e8fe6b6aed5fb74242614cf21552fbf4ac18f8583ca7138edb169ddbd336056ff4d62
+ VERSION=1.9.3-p286
+ SOURCE_HASH=sha512:513e6b3fbfde129499292104da4ee919f3a5aa5769dfe8070da257c69792454b005e0f7d21ab452cdd5226c9d66990b9a73f343d6ca3f6c19530ea1d1e3cd4ea
SOURCE=$PACKAGE-$VERSION.tar.gz
- SECURITY_PATCH=5
+ SECURITY_PATCH=6
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKAGE-$VERSION
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 9b1b23650f..ce333d8b86 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2012-10-12 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p286; SECURITY_PATCH++
+
2012-08-13 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added optional depends on libyaml
diff --git a/science-libs/flann/DETAILS b/science-libs/flann/DETAILS
index 89dd4a4c53..964b97b098 100755
--- a/science-libs/flann/DETAILS
+++ b/science-libs/flann/DETAILS
@@ -1,8 +1,8 @@
SPELL=flann
- VERSION=1.6.11
+ VERSION=1.7.1
SOURCE=$SPELL-$VERSION-src.zip
SOURCE_URL[0]=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/$SOURCE
- SOURCE_HASH=sha512:7da66255480ded6078b5b1332d01e09da2edd0c7adfe012d92fbf77b05d7a52e0d66d9b72f7373581cd37fdbcaf0c6d0ac6026c0f4f82de91b15605b0bbb41d0
+ SOURCE_HASH=sha512:a94f6acb6a23603c8f7e5347b317d15d50de134707389f27f22896ec99f4a0ae576fbeb56203cd1bff57707d4353f7fb98c85f1a2e976810734506049068efb0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-src
WEB_SITE=http://people.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
LICENSE[0]=BSD
diff --git a/science-libs/flann/HISTORY b/science-libs/flann/HISTORY
index e1ddb5914a..34e1280355 100644
--- a/science-libs/flann/HISTORY
+++ b/science-libs/flann/HISTORY
@@ -1,2 +1,5 @@
+2012-10-15 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.7.1
+
2011-10-15 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, BUILD: spell created, version 1.6.11
diff --git a/science-libs/mrpt/BUILD b/science-libs/mrpt/BUILD
new file mode 100755
index 0000000000..e013b8d866
--- /dev/null
+++ b/science-libs/mrpt/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/science-libs/mrpt/CNetworkOfPoses.h.patch b/science-libs/mrpt/CNetworkOfPoses.h.patch
new file mode 100644
index 0000000000..2b0c08be43
--- /dev/null
+++ b/science-libs/mrpt/CNetworkOfPoses.h.patch
@@ -0,0 +1,11 @@
+--- CNetworkOfPoses.h.ori 2012-10-24 21:04:24.000000000 +0200
++++ CNetworkOfPoses.h 2012-10-24 21:56:48.000000000 +0200
+@@ -49,8 +49,6 @@
+ #include <mrpt/utils/traits_map.h>
+ #include <mrpt/utils/stl_extensions.h>
+
+-#include <mrpt/graphs/link_pragmas.h>
+-
+ // The main class in this file is CNetworkOfPoses, a generic basic template for
+ // predefined 2D/3D graphs of pose contraints.
+ namespace mrpt
diff --git a/science-libs/mrpt/DEPENDS b/science-libs/mrpt/DEPENDS
new file mode 100755
index 0000000000..648ab8a44a
--- /dev/null
+++ b/science-libs/mrpt/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+depends opencv
diff --git a/science-libs/mrpt/DETAILS b/science-libs/mrpt/DETAILS
new file mode 100755
index 0000000000..731746ce4f
--- /dev/null
+++ b/science-libs/mrpt/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=mrpt
+ VERSION=scm
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=svn_http://mrpt.googlecode.com/svn/trunk/:mrpt-scm
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://mrpt.org/
+ LICENSE[0]=GPL
+ ENTERED=20121024
+ SHORT="Mobile Robot Programming Toolkit"
+cat << EOF
+Mobile Robot Programming Toolkit (MRPT).
+The MRPT project comprises of libraries and tools aimed to help researchers
+in the areas of mobile robots and computer vision in the development of
+efficient implementations with reusability of code as a priority.
+It includes classes for easily managing 3D(6D) geometry, probability density
+functions (pdfs) over many predefined variables (points,landmarks,poses,maps,...),
+Bayesian inference (Kalman filters, particle filters), image processing, obstacle
+avoidance, etc...
+EOF
diff --git a/science-libs/mrpt/HISTORY b/science-libs/mrpt/HISTORY
new file mode 100644
index 0000000000..e85ae11443
--- /dev/null
+++ b/science-libs/mrpt/HISTORY
@@ -0,0 +1,3 @@
+2012-10-24 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, CNetworkOfPoses.h.patch:
+ spell created
diff --git a/science-libs/mrpt/PRE_BUILD b/science-libs/mrpt/PRE_BUILD
new file mode 100755
index 0000000000..cc418481e7
--- /dev/null
+++ b/science-libs/mrpt/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch libs/graphs/include/mrpt/graphs/CNetworkOfPoses.h < $SPELL_DIRECTORY/CNetworkOfPoses.h.patch
diff --git a/science-libs/pcl/DETAILS b/science-libs/pcl/DETAILS
index f31c936c21..d13ea3ecf6 100755
--- a/science-libs/pcl/DETAILS
+++ b/science-libs/pcl/DETAILS
@@ -1,8 +1,8 @@
SPELL=pcl
- VERSION=1.2.0
+ VERSION=1.6.0
SOURCE=PCL-$VERSION-Source.tar.bz2
- SOURCE_URL[0]=http://dev.pointclouds.org/attachments/download/442/$SOURCE
- SOURCE_HASH=sha512:9cb4e9fa63fc5776d90d1a87142eb14c9e29fa2d062f0b456abd7c135f661a2cd8c085472a5dd40c385da4656823d597a6dad4c85d213d778071f99eade55615
+ SOURCE_URL[0]=http://www.pointclouds.org/assets/files/$VERSION/$SOURCE
+ SOURCE_HASH=sha512:d0837ed1dc3edb3fc864668250224968a927793c25bb7fbfe6f186f8dee97a76d81bb233f1186bbbb8548b134c07fb08a013191531a0e22dc3e43ae6cc4b9c1e
SOURCE_DIRECTORY=$BUILD_DIRECTORY/PCL-$VERSION-Source
WEB_SITE=http://pointclouds.org/
LICENSE[0]=BSD
diff --git a/science-libs/pcl/HISTORY b/science-libs/pcl/HISTORY
index 2412998b62..5271a0d555 100644
--- a/science-libs/pcl/HISTORY
+++ b/science-libs/pcl/HISTORY
@@ -1,2 +1,5 @@
+2012-10-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.0, SOURCE_URL[0] updated
+
2011-10-15 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 1.2.0
diff --git a/science-libs/vtk-data/DETAILS b/science-libs/vtk-data/DETAILS
index bce02d4d9c..97cf4dc509 100755
--- a/science-libs/vtk-data/DETAILS
+++ b/science-libs/vtk-data/DETAILS
@@ -1,11 +1,11 @@
SPELL=vtk-data
- VERSION=5.8.0
+ VERSION=5.10.0
SOURCE=vtkdata-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTKData
- SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:3}/$SOURCE
+ SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:4}/$SOURCE
WEB_SITE=http://public.kitware.com/VTK
LICENSE[0]=http://public.kitware.com/VTK/copyright.php
- SOURCE_HASH=sha512:10fc5c999dab6fc12892d7e6587b155b462915d431e9a4c31d3a05dd0370d4bd28d73e47bae50262ed27b59a19b050adf2c43764c6e47e47eb7f126a460772b8
+ SOURCE_HASH=sha512:2b0bbd00ad57e27a085f24340900a1b9791936bb91267cdf38b35c01723910714c07679af03d1e4ac68f557c3abcb1e3a18af10526763a91a69e238fb2b40443
ENTERED=20020606
ARCHIVE=off
KEYWORDS="science libs"
diff --git a/science-libs/vtk-data/HISTORY b/science-libs/vtk-data/HISTORY
index 1046896a32..add14fe6d0 100644
--- a/science-libs/vtk-data/HISTORY
+++ b/science-libs/vtk-data/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 5.10.0
+
2011-10-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 5.8.0, UPDATED removed, SOURCE_URL[0] updated
diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS
index ffe3171959..57ae1f6ec5 100755
--- a/science-libs/vtk/DETAILS
+++ b/science-libs/vtk/DETAILS
@@ -1,11 +1,11 @@
SPELL=vtk
- VERSION=5.8.0
+ VERSION=5.10.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK
- SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:3}/$SOURCE
+ SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION:0:4}/$SOURCE
WEB_SITE=http://public.kitware.com/VTK
LICENSE[0]=http://public.kitware.com/VTK/copyright.php
- SOURCE_HASH=sha512:71d116b7bd0d7b485ab20d84749e24a6421cc66c9d2ac41b90a0d8b6621a6c1042ab83cad0103140f5da4c24f6dcefbaa812b64f8ae1da3b3046740443c5e328
+ SOURCE_HASH=sha512:8603098fa316fa86f624cf05eed3882158aaf098fe371754fec93fe96ebbf965a5315b3bfc34784f8adb0b46a545bd326c80e11e11157f3f96d33b36fb177554
ENTERED=20020606
KEYWORDS="science libs"
SHORT="library for visualization, image processing, 3D graphics"
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index 7f31b0d742..a62468bae4 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 5.10.0
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/science/grass/DETAILS b/science/grass/DETAILS
index ea681303b7..74f25cadcf 100755
--- a/science/grass/DETAILS
+++ b/science/grass/DETAILS
@@ -1,8 +1,8 @@
SPELL=grass
- VERSION=6.4.1
+ VERSION=6.4.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.osgeo.org/${SPELL}64/source/${SOURCE}
- SOURCE_HASH=sha512:97a2a81dd5699307ea09745da3be44be7269cdc36b42dfafb29b7fd9dec9c1d31e648f713efc9c66cdcdcd98a85276bc06a7eaeec21c8ae3c155ec867d0159bf
+ SOURCE_HASH=sha512:537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://grass.osgeo.org"
LICENSE[0]="GPL"
diff --git a/science/grass/HISTORY b/science/grass/HISTORY
index 5376df017d..6bedb8f07a 100644
--- a/science/grass/HISTORY
+++ b/science/grass/HISTORY
@@ -1,3 +1,7 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.4.1
+ * PRE_BUILD, iostream_cpp470: add patch from ubuntu to fix compile error
+
2011-10-07 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: 6.4.1
* DEPENDS: fixed various dependencies
diff --git a/science/grass/PRE_BUILD b/science/grass/PRE_BUILD
new file mode 100755
index 0000000000..d4f429e2d6
--- /dev/null
+++ b/science/grass/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/iostream_cpp470
diff --git a/science/grass/iostream_cpp470 b/science/grass/iostream_cpp470
new file mode 100644
index 0000000000..35b1b12c58
--- /dev/null
+++ b/science/grass/iostream_cpp470
@@ -0,0 +1,116 @@
+Index: grass/lib/iostream/mm.cc
+===================================================================
+--- grass.orig/lib/iostream/mm.cc (revision 48704)
++++ grass/lib/iostream/mm.cc (revision 51638)
+@@ -254,11 +254,11 @@
+ }
+
+
+
+ /* ************************************************************ */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout << "new: sz=" << sz << ", register "
+ << sz+SIZE_SPACE << "B ,";
+
+@@ -305,11 +305,11 @@
+ }
+
+
+
+ /* ************************************************************ */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout << "new: sz=" << sz << ", register "
+ << sz+SIZE_SPACE << "B ,";
+
+@@ -357,11 +357,11 @@
+
+
+
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete (void *ptr) {
++void operator delete (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout << "delete: ptr=" << ptr << ",";
+
+@@ -397,11 +397,11 @@
+
+
+
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout << "delete[]: ptr=" << ptr << ",";
+
+Index: grass/include/iostream/mm.h
+===================================================================
+--- grass.orig/include/iostream/mm.h (revision 32629)
++++ grass/include/iostream/mm.h (revision 51638)
+@@ -108,14 +108,14 @@
+ int space_overhead ();
+
+ void print();
+
+ friend class mm_register_init;
+- friend void * operator new(size_t);
+- friend void * operator new[](size_t);
+- friend void operator delete(void *);
+- friend void operator delete[](void *);
++ friend void * operator new(size_t) throw(std::bad_alloc);
++ friend void * operator new[](size_t) throw(std::bad_alloc);
++ friend void operator delete(void *) throw();
++ friend void operator delete[](void *) throw();
+ };
+
+
+
+
+Index: grass/include/iostream/minmaxheap.h
+===================================================================
+--- grass.orig/include/iostream/minmaxheap.h (revision 41531)
++++ grass/include/iostream/minmaxheap.h (revision 51638)
+@@ -742,11 +742,11 @@
+ HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {
+ HeapIndex i;
+ //heap must be empty
+ assert(this->size()==0);
+ for (i = 0; !full() && i<n; i++) {
+- insert(arr[i]);
++ this->insert(arr[i]);
+ }
+ if (i < n) {
+ assert(i == this->maxsize);
+ return n - i;
+ } else {
+@@ -775,17 +775,17 @@
+
+ assert(this->maxsize > 0);
+
+ if(old) {
+ HeapIndex n = this->size();
+- this->A = allocateHeap(this->maxsize); /* allocate a new array */
++ this->A = this->allocateHeap(this->maxsize); /* allocate a new array */
+ /* copy over the old values */
+ assert(this->maxsize > n);
+ for(HeapIndex i=0; i<=n; i++) { /* why extra value? -RW */
+ this->A[i] = old[i];
+ }
+- freeHeap(old); /* free up old storage */
++ this->freeHeap(old); /* free up old storage */
+ }
+
+ }
+
+
diff --git a/science/qgis/DEPENDS b/science/qgis/DEPENDS
index e644801df5..ed6249a904 100755
--- a/science/qgis/DEPENDS
+++ b/science/qgis/DEPENDS
@@ -7,6 +7,8 @@ depends qwt5 && # will work with qwt6 too
depends sqlite "-DWITH_INTERNAL_SQLITE3=FALSE" &&
depends bison &&
depends cmake &&
+depends libspatialindex &&
+depends libspatialite &&
optional_depends postgresql \
"-DWITH_POSTGRESQL=TRUE" \
"-DWITH_POSTGRESQL=FALSE" \
@@ -15,6 +17,9 @@ optional_depends expat \
"" \
"" \
"GPS importer plugin" &&
+if is_depends_enabled expat; then
+ depends gpsbabel
+fi &&
optional_depends gsl \
"" \
"" \
@@ -28,8 +33,5 @@ optional_depends python \
"-DWITH_BINDINGS=FALSE" \
"Python plugins support and PyQGIS(extra query)" &&
if is_depends_enabled python ; then
- optional_depends pyqt4 \
- "" \
- "" \
- "PyQGIS support"
+ depends pyqt4
fi
diff --git a/science/qgis/DETAILS b/science/qgis/DETAILS
index b483ba0701..c350c13d7f 100755
--- a/science/qgis/DETAILS
+++ b/science/qgis/DETAILS
@@ -1,9 +1,9 @@
SPELL=qgis
- VERSION=1.7.1
+ VERSION=1.8.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://qgis.org/downloads/$SOURCE
SOURCE_URL[1]=http://download.osgeo.org/${SPELL}/src/${SOURCE}
- SOURCE_HASH=sha512:1e37cd3ce00aff7aca2795dbb39d3e9585df79703c4688dcb442dfeb8d8a3f71d7cf5a2556d749657c12789976c2fbb9eba426d92ece20ab8a565fea22bea0fe
+ SOURCE_HASH=sha512:475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://qgis.org"
LICENSE[0]="GPL"
diff --git a/science/qgis/HISTORY b/science/qgis/HISTORY
index 9bca992cd1..5a5dd6b88f 100644
--- a/science/qgis/HISTORY
+++ b/science/qgis/HISTORY
@@ -1,3 +1,8 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.0
+ * DEPENDS: added dependencies on libspatialite, libspatialindex, gpsbabel,
+ made dependency on pyqt4 mandatory if python is enabled as dependency
+
2011-10-07 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: 1.7.1
* DEPENDS: more, removed redundant sip
diff --git a/science/qhull/DETAILS b/science/qhull/DETAILS
index 5ee8e50c4b..32a2b47ab0 100755
--- a/science/qhull/DETAILS
+++ b/science/qhull/DETAILS
@@ -1,6 +1,6 @@
SPELL=qhull
- VERSION=2011.1
- SOURCE_HASH=sha512:b08161af2551a0d6b63c9c48925ff5e0d0de7da69c28599d58e9f8c40638666b1a453d208b74d3b6ad6821e1be09d1d2154dbfd8e8982d15bb66d1a97f89b154
+ VERSION=2012.1
+ SOURCE_HASH=sha512:e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.qhull.org/download/$SOURCE
diff --git a/science/qhull/HISTORY b/science/qhull/HISTORY
index 7a7ac6ce5c..ea797ddc9a 100644
--- a/science/qhull/HISTORY
+++ b/science/qhull/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2012.1
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/science/splitter/BUILD b/science/splitter/BUILD
new file mode 100755
index 0000000000..c080dbd2de
--- /dev/null
+++ b/science/splitter/BUILD
@@ -0,0 +1,3 @@
+. $INSTALL_ROOT/etc/profile.d/ant.sh &&
+. $INSTALL_ROOT/etc/profile.d/java.sh &&
+ant
diff --git a/science/splitter/DEPENDS b/science/splitter/DEPENDS
new file mode 100755
index 0000000000..108a8e5400
--- /dev/null
+++ b/science/splitter/DEPENDS
@@ -0,0 +1,2 @@
+depends JDK &&
+depends ant
diff --git a/science/splitter/DETAILS b/science/splitter/DETAILS
new file mode 100755
index 0000000000..94bdeb5e8c
--- /dev/null
+++ b/science/splitter/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=splitter
+ VERSION=r200
+ SOURCE="${SPELL}-${VERSION}-src.tar.gz"
+ SOURCE_URL[0]=http://www.mkgmap.org.uk/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:4257d2eb7a1cced4a263e38f84111f3758df6d94120f785f53069f7704102945ddba07b7e7ec8d6eb00e873e8a1005f05a10b6f9334d1f7f8cd572e3d350fce5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.mkgmap.org.uk/page/tile-splitter"
+ LICENSE[0]=GPL
+ ENTERED=20120929
+ SHORT="a splitter for openstreetmap data"
+cat << EOF
+The format used for Garmin maps has, in effect, a maximum size, meaning that
+you have to split an .osm file that contains large well mapped regions into
+a number of smaller tiles. This program does that. There are two stages of
+processing required. The first stage is to calculate what area each tile
+should cover, based on the distribution of nodes. The second stage writes
+out the nodes, ways and relations from the original .osm file into separate
+smaller .osm files, one for each area that was calculated in stage one.
+EOF
diff --git a/science/splitter/HISTORY b/science/splitter/HISTORY
new file mode 100644
index 0000000000..3f8f7f8af5
--- /dev/null
+++ b/science/splitter/HISTORY
@@ -0,0 +1,3 @@
+2012-09-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, splitter: spell created
+
diff --git a/science/splitter/INSTALL b/science/splitter/INSTALL
new file mode 100755
index 0000000000..c08e23b08c
--- /dev/null
+++ b/science/splitter/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/splitter &&
+install -m644 ${SOURCE_DIRECTORY}/dist/splitter.jar ${INSTALL_ROOT}/usr/share/splitter/ &&
+install -m755 ${SCRIPT_DIRECTORY}/splitter ${INSTALL_ROOT}/usr/bin/
diff --git a/science/splitter/splitter b/science/splitter/splitter
new file mode 100644
index 0000000000..e73316e675
--- /dev/null
+++ b/science/splitter/splitter
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -jar /usr/share/splitter/splitter.jar "$@"
diff --git a/security-libs/cracklib/DETAILS b/security-libs/cracklib/DETAILS
index ea084e6ba3..54731af7a3 100755
--- a/security-libs/cracklib/DETAILS
+++ b/security-libs/cracklib/DETAILS
@@ -1,5 +1,5 @@
SPELL=cracklib
- VERSION=2.8.18
+ VERSION=2.8.19
VERSIONWORDS=20080507
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-words-$VERSIONWORDS.gz
@@ -7,7 +7,7 @@
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- SOURCE_HASH=sha512:f9a754598f9be16507cb4e16a35720da71796dcda664bcfb36038b842ab9f5a1f4bbcdf4c9f64ef0981781ab91dc80117a531cd1651b29def2054be66e485725
+ SOURCE_HASH=sha512:64fa9c9d53e9d7f82fa8de9708096b6d6ad4704c4a89c42e113395612af1a82385a7de5f8678fe521016960ebfd0ed4258041afe3a5e4d15bd50ec76bb76fc2c
SOURCE2_HASH='sha512:d21055d6439a2b92b23ab6fd31222d9330315a0b44f53fae308ce5749a9fcb33b7df982f85ca8e2d6d2f9cc4c7264dfc3ed454edbccecd76289713df09fd633e'
WEB_SITE=http://sf.net/projects/$SPELL
ENTERED=20050310
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index 6ae22211a8..d3c46d797a 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,6 @@
+2012-10-20 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: 2.8.19
+
2012-04-22 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: python => PYTHON
add zlib
diff --git a/security-libs/libpwquality/DEPENDS b/security-libs/libpwquality/DEPENDS
new file mode 100755
index 0000000000..934140594d
--- /dev/null
+++ b/security-libs/libpwquality/DEPENDS
@@ -0,0 +1 @@
+depends cracklib
diff --git a/security-libs/libpwquality/DETAILS b/security-libs/libpwquality/DETAILS
new file mode 100755
index 0000000000..790ae7ce65
--- /dev/null
+++ b/security-libs/libpwquality/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=libpwquality
+ VERSION=1.2.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=https://fedorahosted.org/releases/l/i/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:b125448dc26f904abe9bacfd1f61505220152a4a27c6b468a49724c875c27250ab4040ac2ffc21faac1326b70fe20eafb005b618ff0125f292cce1bd66ea25aa
+ WEB_SITE=https://fedorahosted.org/libpwquality/
+ ENTERED=20121022
+ LICENSE[0]=GPL
+ SHORT="password quality checking library"
+cat << EOF
+Library for password quality checking and generating random passwords.
+EOF
diff --git a/security-libs/libpwquality/HISTORY b/security-libs/libpwquality/HISTORY
new file mode 100644
index 0000000000..f1fafe8ba1
--- /dev/null
+++ b/security-libs/libpwquality/HISTORY
@@ -0,0 +1,2 @@
+2012-10-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS: spell created, version 1.2.0
diff --git a/security-libs/linux-pam/DETAILS b/security-libs/linux-pam/DETAILS
index a3153c1ad9..d3d63eff5e 100755
--- a/security-libs/linux-pam/DETAILS
+++ b/security-libs/linux-pam/DETAILS
@@ -1,7 +1,9 @@
SPELL=linux-pam
- VERSION=1.1.5
+ VERSION=1.1.6
SECURITY_PATCH=3
SOURCE=Linux-PAM-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Linux-PAM-$VERSION
SOURCE_URL[0]=http://fedorahosted.org/releases/l/i/linux-pam/$SOURCE
# SOURCE_URL[0]=$KERNEL_URL/pub/linux/libs/pam/library/$SOURCE
@@ -11,7 +13,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Linux-PAM-$VERSION
# SOURCE2_URL[0]=$KERNEL_URL/pub/linux/libs/pam/library/$SOURCE2
# SOURCE2_URL[1]=ftp://ftp.kernel.org/pub/linux/libs/pam/library/$SOURCE2
- SOURCE_HASH=sha512:c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0
# SOURCE_GPG=kernel.gpg:$SOURCE2
# SOURCE2_IGNORE=signature
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index de5fc5c271..2215f18c59 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,9 +1,13 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.1.6
+ Upstream MD5/SHA1 not posted for 1.1.6
+
2012-07-07 Sukneet Basuta <sukneet@sourcemage.org>
* CONFIGURE: remove config_query for SELINUX
- * DEPENDS: switch to optional_depends for selinux to pass proper flags
- * INSTALL: fix commented out check for libselinux in case
+ * DEPENDS: switch to optional_depends for selinux to pass proper flags
+ * INSTALL: fix commented out check for libselinux in case
someone needs it
-
+
2011-12-25 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.1.5, SECURITY_PATCH=3
http://www.redhat.com/archives/pam-list/2011-October/msg00019.html
diff --git a/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig b/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig
new file mode 100644
index 0000000000..4707a7ba80
--- /dev/null
+++ b/security-libs/linux-pam/Linux-PAM-1.1.6.tar.bz2.sig
Binary files differ
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index f89c236dc4..495618e14c 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,5 +1,6 @@
SPELL=bash
VERSION=4.2
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=$SPELL-doc-3.2.tar.gz
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index b866f7b269..1476f43704 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2012-10-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: SECURITY_PATCH=1, CVE-2012-3410
+ * PRE_BUILD, patches/bash42-{001..037}: added 4.2 patches
+
2011-03-27 Remko van der Vossen <wich@sourcemage.org>
* INSTALL: test for presence of texinfo before installing info pages
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index c88be2a16a..59fb9dc06f 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -2,6 +2,11 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 3 &&
+for i in $(seq -w 1 037); do
+ message "${MESSAGE_COLOR}applying patch bash42-$i ...${DEFAULT_COLOR}" &&
+ patch -p0 < $SPELL_DIRECTORY/patches/bash42-$i
+done &&
+
if [[ "$BASH_NI_LOGIN" == y ]]; then
message "${MESSAGE_COLOR}Defining NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
sed -i 's/\/\* \(#define NON_INTERACTIVE_LOGIN_SHELLS\) \*\//\1/' config-top.h
diff --git a/shell-term-fm/bash/patches/bash42-001 b/shell-term-fm/bash/patches/bash42-001
new file mode 100644
index 0000000000..547aaa06f3
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-001
@@ -0,0 +1,78 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-001
+
+Bug-Reported-by: Juergen Daubert <jue@jue.li>
+Bug-Reference-ID: <20110214175132.GA19813@jue.netz>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html
+
+Bug-Description:
+
+When running in Posix mode, bash does not correctly expand the right-hand
+side of a double-quoted word expansion containing single quotes.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500
+--- subst.c 2011-02-19 00:00:00.000000000 -0500
+***************
+*** 1380,1387 ****
+
+ /* The handling of dolbrace_state needs to agree with the code in parse.y:
+! parse_matched_pair() */
+! dolbrace_state = 0;
+! if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+! dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM;
+
+ i = *sindex;
+--- 1380,1389 ----
+
+ /* The handling of dolbrace_state needs to agree with the code in parse.y:
+! parse_matched_pair(). The different initial value is to handle the
+! case where this function is called to parse the word in
+! ${param op word} (SX_WORD). */
+! dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM;
+! if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP))
+! dolbrace_state = DOLBRACE_QUOTE;
+
+ i = *sindex;
+***************
+*** 7177,7181 ****
+ /* Extract the contents of the ${ ... } expansion
+ according to the Posix.2 rules. */
+! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0);
+ if (string[sindex] == RBRACE)
+ sindex++;
+--- 7181,7185 ----
+ /* Extract the contents of the ${ ... } expansion
+ according to the Posix.2 rules. */
+! value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD);
+ if (string[sindex] == RBRACE)
+ sindex++;
+*** ../bash-4.2-patched/subst.h 2010-12-02 20:21:29.000000000 -0500
+--- subst.h 2011-02-16 21:12:09.000000000 -0500
+***************
+*** 57,60 ****
+--- 57,61 ----
+ #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */
+ #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */
++ #define SX_WORD 0x0200 /* extracting word in ${param op word} */
+
+ /* Remove backslashes which are quoting backquotes from STRING. Modifies
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-002 b/shell-term-fm/bash/patches/bash42-002
new file mode 100644
index 0000000000..077c7e0f85
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-002
@@ -0,0 +1,60 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-002
+
+Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
+
+Bug-Description:
+
+The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
+entire line.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/vi_mode.c 2010-11-20 19:51:39.000000000 -0500
+--- lib/readline/vi_mode.c 2011-02-17 20:24:25.000000000 -0500
+***************
+*** 1115,1119 ****
+ _rl_vi_last_motion = c;
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
+! return (0);
+ }
+ #if defined (READLINE_CALLBACKS)
+--- 1115,1119 ----
+ _rl_vi_last_motion = c;
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
+! return (vidomove_dispatch (m));
+ }
+ #if defined (READLINE_CALLBACKS)
+*** ../bash-4.2-patched/lib/readline/callback.c 2010-06-06 12:18:58.000000000 -0400
+--- lib/readline/callback.c 2011-02-17 20:43:28.000000000 -0500
+***************
+*** 149,152 ****
+--- 149,155 ----
+ /* Should handle everything, including cleanup, numeric arguments,
+ and turning off RL_STATE_VIMOTION */
++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
++ _rl_internal_char_cleanup ();
++
+ return;
+ }
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+
diff --git a/shell-term-fm/bash/patches/bash42-003 b/shell-term-fm/bash/patches/bash42-003
new file mode 100644
index 0000000000..c488e96b2d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-003
@@ -0,0 +1,318 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-003
+
+Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID: <AANLkTikZ_rVV-frR8Fh0PzhXnMKnm5XsUR-F3qtPPs5G@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html
+
+Bug-Description:
+
+When using the pattern replacement and pattern removal word expansions, bash
+miscalculates the possible match length in the presence of an unescaped left
+bracket without a closing right bracket, resulting in a failure to match
+the pattern.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500
+--- lib/glob/gmisc.c 2011-02-18 23:53:42.000000000 -0500
+***************
+*** 78,83 ****
+ size_t wmax;
+ {
+! wchar_t wc, *wbrack;
+! int matlen, t, in_cclass, in_collsym, in_equiv;
+
+ if (*wpat == 0)
+--- 78,83 ----
+ size_t wmax;
+ {
+! wchar_t wc;
+! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+
+ if (*wpat == 0)
+***************
+*** 119,123 ****
+ case L'[':
+ /* scan for ending `]', skipping over embedded [:...:] */
+! wbrack = wpat;
+ wc = *wpat++;
+ do
+--- 119,123 ----
+ case L'[':
+ /* scan for ending `]', skipping over embedded [:...:] */
+! bracklen = 1;
+ wc = *wpat++;
+ do
+***************
+*** 125,140 ****
+ if (wc == 0)
+ {
+! matlen += wpat - wbrack - 1; /* incremented below */
+! break;
+ }
+ else if (wc == L'\\')
+ {
+! wc = *wpat++;
+! if (*wpat == 0)
+! break;
+ }
+ else if (wc == L'[' && *wpat == L':') /* character class */
+ {
+ wpat++;
+ in_cclass = 1;
+ }
+--- 125,148 ----
+ if (wc == 0)
+ {
+! wpat--; /* back up to NUL */
+! matlen += bracklen;
+! goto bad_bracket;
+ }
+ else if (wc == L'\\')
+ {
+! /* *wpat == backslash-escaped character */
+! bracklen++;
+! /* If the backslash or backslash-escape ends the string,
+! bail. The ++wpat skips over the backslash escape */
+! if (*wpat == 0 || *++wpat == 0)
+! {
+! matlen += bracklen;
+! goto bad_bracket;
+! }
+ }
+ else if (wc == L'[' && *wpat == L':') /* character class */
+ {
+ wpat++;
++ bracklen++;
+ in_cclass = 1;
+ }
+***************
+*** 142,145 ****
+--- 150,154 ----
+ {
+ wpat++;
++ bracklen++;
+ in_cclass = 0;
+ }
+***************
+*** 147,152 ****
+ {
+ wpat++;
+ if (*wpat == L']') /* right bracket can appear as collating symbol */
+! wpat++;
+ in_collsym = 1;
+ }
+--- 156,165 ----
+ {
+ wpat++;
++ bracklen++;
+ if (*wpat == L']') /* right bracket can appear as collating symbol */
+! {
+! wpat++;
+! bracklen++;
+! }
+ in_collsym = 1;
+ }
+***************
+*** 154,157 ****
+--- 167,171 ----
+ {
+ wpat++;
++ bracklen++;
+ in_collsym = 0;
+ }
+***************
+*** 159,164 ****
+ {
+ wpat++;
+ if (*wpat == L']') /* right bracket can appear as equivalence class */
+! wpat++;
+ in_equiv = 1;
+ }
+--- 173,182 ----
+ {
+ wpat++;
++ bracklen++;
+ if (*wpat == L']') /* right bracket can appear as equivalence class */
+! {
+! wpat++;
+! bracklen++;
+! }
+ in_equiv = 1;
+ }
+***************
+*** 166,174 ****
+--- 184,196 ----
+ {
+ wpat++;
++ bracklen++;
+ in_equiv = 0;
+ }
++ else
++ bracklen++;
+ }
+ while ((wc = *wpat++) != L']');
+ matlen++; /* bracket expression can only match one char */
++ bad_bracket:
+ break;
+ }
+***************
+*** 214,219 ****
+ size_t max;
+ {
+! char c, *brack;
+! int matlen, t, in_cclass, in_collsym, in_equiv;
+
+ if (*pat == 0)
+--- 236,241 ----
+ size_t max;
+ {
+! char c;
+! int matlen, bracklen, t, in_cclass, in_collsym, in_equiv;
+
+ if (*pat == 0)
+***************
+*** 255,259 ****
+ case '[':
+ /* scan for ending `]', skipping over embedded [:...:] */
+! brack = pat;
+ c = *pat++;
+ do
+--- 277,281 ----
+ case '[':
+ /* scan for ending `]', skipping over embedded [:...:] */
+! bracklen = 1;
+ c = *pat++;
+ do
+***************
+*** 261,276 ****
+ if (c == 0)
+ {
+! matlen += pat - brack - 1; /* incremented below */
+! break;
+ }
+ else if (c == '\\')
+ {
+! c = *pat++;
+! if (*pat == 0)
+! break;
+ }
+ else if (c == '[' && *pat == ':') /* character class */
+ {
+ pat++;
+ in_cclass = 1;
+ }
+--- 283,306 ----
+ if (c == 0)
+ {
+! pat--; /* back up to NUL */
+! matlen += bracklen;
+! goto bad_bracket;
+ }
+ else if (c == '\\')
+ {
+! /* *pat == backslash-escaped character */
+! bracklen++;
+! /* If the backslash or backslash-escape ends the string,
+! bail. The ++pat skips over the backslash escape */
+! if (*pat == 0 || *++pat == 0)
+! {
+! matlen += bracklen;
+! goto bad_bracket;
+! }
+ }
+ else if (c == '[' && *pat == ':') /* character class */
+ {
+ pat++;
++ bracklen++;
+ in_cclass = 1;
+ }
+***************
+*** 278,281 ****
+--- 308,312 ----
+ {
+ pat++;
++ bracklen++;
+ in_cclass = 0;
+ }
+***************
+*** 283,288 ****
+ {
+ pat++;
+ if (*pat == ']') /* right bracket can appear as collating symbol */
+! pat++;
+ in_collsym = 1;
+ }
+--- 314,323 ----
+ {
+ pat++;
++ bracklen++;
+ if (*pat == ']') /* right bracket can appear as collating symbol */
+! {
+! pat++;
+! bracklen++;
+! }
+ in_collsym = 1;
+ }
+***************
+*** 290,293 ****
+--- 325,329 ----
+ {
+ pat++;
++ bracklen++;
+ in_collsym = 0;
+ }
+***************
+*** 295,300 ****
+ {
+ pat++;
+ if (*pat == ']') /* right bracket can appear as equivalence class */
+! pat++;
+ in_equiv = 1;
+ }
+--- 331,340 ----
+ {
+ pat++;
++ bracklen++;
+ if (*pat == ']') /* right bracket can appear as equivalence class */
+! {
+! pat++;
+! bracklen++;
+! }
+ in_equiv = 1;
+ }
+***************
+*** 302,310 ****
+--- 342,354 ----
+ {
+ pat++;
++ bracklen++;
+ in_equiv = 0;
+ }
++ else
++ bracklen++;
+ }
+ while ((c = *pat++) != ']');
+ matlen++; /* bracket expression can only match one char */
++ bad_bracket:
+ break;
+ }
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-004 b/shell-term-fm/bash/patches/bash42-004
new file mode 100644
index 0000000000..fe29f82c7d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-004
@@ -0,0 +1,53 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-004
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html
+
+Bug-Description:
+
+When used in contexts where word splitting and quote removal were not
+performed, such as pattern removal or pattern substitution, empty strings
+(either literal or resulting from quoted variables that were unset or
+null) were not matched correctly, resulting in failure.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2011-01-02 16:12:51.000000000 -0500
+--- subst.c 2011-02-18 22:30:13.000000000 -0500
+***************
+*** 3373,3379 ****
+ if (string == 0 || *string == '\0')
+ return (WORD_LIST *)NULL;
+
+! td.flags = 0;
+ td.word = string;
+ tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
+ return (tresult);
+--- 3373,3379 ----
+ if (string == 0 || *string == '\0')
+ return (WORD_LIST *)NULL;
+
+! td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */
+ td.word = string;
+ tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at);
+ return (tresult);
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-005 b/shell-term-fm/bash/patches/bash42-005
new file mode 100644
index 0000000000..3ca9fc1da6
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-005
@@ -0,0 +1,131 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-005
+
+Bug-Reported-by: Dennis Williamson <dennistwilliamson@gmail.com>
+Bug-Reference-ID: <AANLkTikDbEV5rnbPc0zOfmZfBcg0xGetzLLzK+KjRiNa@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html
+
+Bug-Description:
+
+Systems that use tzset() to set the local timezone require the TZ variable
+to be in the environment. Bash must make sure the environment has been
+modified with any updated value for TZ before calling tzset(). This
+affects prompt string expansions and the `%T' printf conversion specification
+on systems that do not allow bash to supply a replacement for getenv(3).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/variables.h 2010-12-02 20:22:01.000000000 -0500
+--- variables.h 2011-02-19 19:57:12.000000000 -0500
+***************
+*** 314,317 ****
+--- 314,318 ----
+ extern void sort_variables __P((SHELL_VAR **));
+
++ extern int chkexport __P((char *));
+ extern void maybe_make_export_env __P((void));
+ extern void update_export_env_inplace __P((char *, int, char *));
+*** ../bash-4.2-patched/variables.c 2011-01-24 20:07:48.000000000 -0500
+--- variables.c 2011-02-19 20:04:50.000000000 -0500
+***************
+*** 3654,3657 ****
+--- 3654,3673 ----
+ }
+
++ int
++ chkexport (name)
++ char *name;
++ {
++ SHELL_VAR *v;
++
++ v = find_variable (name);
++ if (exported_p (v))
++ {
++ array_needs_making = 1;
++ maybe_make_export_env ();
++ return 1;
++ }
++ return 0;
++ }
++
+ void
+ maybe_make_export_env ()
+***************
+*** 4215,4219 ****
+ { "TEXTDOMAINDIR", sv_locale },
+
+! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
+ { "TZ", sv_tz },
+ #endif
+--- 4231,4235 ----
+ { "TEXTDOMAINDIR", sv_locale },
+
+! #if defined (HAVE_TZSET)
+ { "TZ", sv_tz },
+ #endif
+***************
+*** 4559,4568 ****
+ #endif /* HISTORY */
+
+! #if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE)
+ void
+ sv_tz (name)
+ char *name;
+ {
+! tzset ();
+ }
+ #endif
+--- 4575,4585 ----
+ #endif /* HISTORY */
+
+! #if defined (HAVE_TZSET)
+ void
+ sv_tz (name)
+ char *name;
+ {
+! if (chkexport (name))
+! tzset ();
+ }
+ #endif
+*** ../bash-4.2-patched/parse.y 2011-01-02 15:48:11.000000000 -0500
+--- parse.y 2011-02-19 20:05:00.000000000 -0500
+***************
+*** 5136,5139 ****
+--- 5136,5142 ----
+ /* Make the current time/date into a string. */
+ (void) time (&the_time);
++ #if defined (HAVE_TZSET)
++ sv_tz ("TZ"); /* XXX -- just make sure */
++ #endif
+ tm = localtime (&the_time);
+
+*** ../bash-4.2-patched/builtins/printf.def 2010-11-23 10:02:55.000000000 -0500
+--- builtins/printf.def 2011-02-19 20:05:04.000000000 -0500
+***************
+*** 466,469 ****
+--- 466,472 ----
+ else
+ secs = arg;
++ #if defined (HAVE_TZSET)
++ sv_tz ("TZ"); /* XXX -- just make sure */
++ #endif
+ tm = localtime (&secs);
+ n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 4
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-006 b/shell-term-fm/bash/patches/bash42-006
new file mode 100644
index 0000000000..be6e49c729
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-006
@@ -0,0 +1,46 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-006
+
+Bug-Reported-by: Allan McRae <allan@archlinux.org>
+Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html
+
+Bug-Description:
+
+A problem with bash42-005 caused it to dump core if TZ was unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/variables.c 2011-02-25 12:07:41.000000000 -0500
+--- variables.c 2011-03-01 10:13:04.000000000 -0500
+***************
+*** 3661,3665 ****
+
+ v = find_variable (name);
+! if (exported_p (v))
+ {
+ array_needs_making = 1;
+--- 3661,3665 ----
+
+ v = find_variable (name);
+! if (v && exported_p (v))
+ {
+ array_needs_making = 1;
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-007 b/shell-term-fm/bash/patches/bash42-007
new file mode 100644
index 0000000000..d16156e277
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-007
@@ -0,0 +1,46 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-007
+
+Bug-Reported-by: Matthias Klose <doko@debian.org>
+Bug-Reference-ID: <4D6FD2AC.1010500@debian.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html
+
+Bug-Description:
+
+When used in contexts where word splitting and quote removal were not
+performed, such as case statement word expansion, empty strings
+(either literal or resulting from quoted variables that were unset or
+null) were not expanded correctly, resulting in failure.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2011-02-25 12:03:58.000000000 -0500
+--- subst.c 2011-03-03 14:08:23.000000000 -0500
+***************
+*** 4609,4614 ****
+--- 4611,4617 ----
+ if (ifs_firstc == 0)
+ #endif
+ word->flags |= W_NOSPLIT;
++ word->flags |= W_NOSPLIT2;
+ result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
+ expand_no_split_dollar_star = 0;
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-008 b/shell-term-fm/bash/patches/bash42-008
new file mode 100644
index 0000000000..631abbdf7d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-008
@@ -0,0 +1,74 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-008
+
+Bug-Reported-by: Doug McMahon <mc2man@optonline.net>
+Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html
+
+Bug-Description:
+
+Bash-4.2 does not attempt to save the shell history on receipt of a
+terminating signal that is handled synchronously. Unfortunately, the
+`close' button on most X11 terminal emulators sends SIGHUP, which
+kills the shell.
+
+This is a very small patch to save the history in the case that an
+interactive shell receives a SIGHUP or SIGTERM while in readline and
+reading a command.
+
+The next version of bash will do this differently.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/sig.c Tue Nov 23 08:21:22 2010
+--- sig.c Tue Mar 8 21:28:32 2011
+***************
+*** 47,50 ****
+--- 47,51 ----
+ #if defined (READLINE)
+ # include "bashline.h"
++ # include <readline/readline.h>
+ #endif
+
+***************
+*** 63,66 ****
+--- 64,68 ----
+ extern int history_lines_this_session;
+ #endif
++ extern int no_line_editing;
+
+ extern void initialize_siglist ();
+***************
+*** 506,510 ****
+ #if defined (HISTORY)
+ /* XXX - will inhibit history file being written */
+! history_lines_this_session = 0;
+ #endif
+ terminate_immediately = 0;
+--- 508,515 ----
+ #if defined (HISTORY)
+ /* XXX - will inhibit history file being written */
+! # if defined (READLINE)
+! if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0))
+! # endif
+! history_lines_this_session = 0;
+ #endif
+ terminate_immediately = 0;
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-009 b/shell-term-fm/bash/patches/bash42-009
new file mode 100644
index 0000000000..83a7e2c748
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-009
@@ -0,0 +1,82 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-009
+
+Bug-Reported-by: <piuma@piumalab.org>
+Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html
+
+Bug-Description:
+
+Under certain circumstances, running `fc -l' two times in succession with a
+relative history offset at the end of the history will result in an incorrect
+calculation of the last history entry and a seg fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/fc.def 2010-05-30 18:25:38.000000000 -0400
+--- builtins/fc.def 2011-04-19 15:46:17.000000000 -0400
+***************
+*** 305,309 ****
+
+ /* XXX */
+! if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
+ while (last_hist >= 0 && hlist[last_hist] == 0)
+ last_hist--;
+--- 305,309 ----
+
+ /* XXX */
+! if (i == last_hist && hlist[last_hist] == 0)
+ while (last_hist >= 0 && hlist[last_hist] == 0)
+ last_hist--;
+***************
+*** 476,480 ****
+ {
+ int sign, n, clen, rh;
+! register int i, j;
+ register char *s;
+
+--- 476,480 ----
+ {
+ int sign, n, clen, rh;
+! register int i, j, last_hist;
+ register char *s;
+
+***************
+*** 496,500 ****
+ calculation as if it were on. */
+ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
+! i -= rh + hist_last_line_added;
+
+ /* No specification defaults to most recent command. */
+--- 496,508 ----
+ calculation as if it were on. */
+ rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
+! last_hist = i - rh - hist_last_line_added;
+!
+! if (i == last_hist && hlist[last_hist] == 0)
+! while (last_hist >= 0 && hlist[last_hist] == 0)
+! last_hist--;
+! if (last_hist < 0)
+! return (-1);
+!
+! i = last_hist;
+
+ /* No specification defaults to most recent command. */
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 8
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-010 b/shell-term-fm/bash/patches/bash42-010
new file mode 100644
index 0000000000..e408abd61b
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-010
@@ -0,0 +1,61 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-010
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html
+
+Bug-Description:
+
+Bash did not correctly print/reproduce here documents attached to commands
+inside compound commands such as arithmetic for loops and user-specified
+subshells. This affected the execution of such commands inside a shell
+function when the function definition is saved and later restored using
+`.' or `eval'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/print_cmd.c 2010-05-30 18:34:08.000000000 -0400
+--- print_cmd.c 2011-04-14 10:43:18.000000000 -0400
+***************
+*** 316,319 ****
+--- 317,321 ----
+ skip_this_indent++;
+ make_command_string_internal (command->value.Subshell->command);
++ PRINT_DEFERRED_HEREDOCS ("");
+ cprintf (" )");
+ break;
+***************
+*** 593,596 ****
+--- 606,610 ----
+ indentation += indentation_amount;
+ make_command_string_internal (arith_for_command->action);
++ PRINT_DEFERRED_HEREDOCS ("");
+ semicolon ();
+ indentation -= indentation_amount;
+***************
+*** 654,657 ****
+--- 668,672 ----
+
+ make_command_string_internal (group_command->command);
++ PRINT_DEFERRED_HEREDOCS ("");
+
+ if (inside_function_def)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 9
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-011 b/shell-term-fm/bash/patches/bash42-011
new file mode 100644
index 0000000000..26fdf65f69
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-011
@@ -0,0 +1,46 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-011
+
+Bug-Reported-by: "David Parks" <davidparks21@yahoo.com>
+Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html
+
+Bug-Description:
+
+Overwriting a value in an associative array causes the memory allocated to
+store the key on the second and subsequent assignments to leak.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/assoc.c 2009-08-05 20:19:40.000000000 -0400
+--- assoc.c 2011-10-04 20:23:07.000000000 -0400
+***************
+*** 78,81 ****
+--- 78,86 ----
+ if (b == 0)
+ return -1;
++ /* If we are overwriting an existing element's value, we're not going to
++ use the key. Nothing in the array assignment code path frees the key
++ string, so we can free it here to avoid a memory leak. */
++ if (b->key != key)
++ free (key);
+ FREE (b->data);
+ b->data = value ? savestring (value) : (char *)0;
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 10
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-012 b/shell-term-fm/bash/patches/bash42-012
new file mode 100644
index 0000000000..70f0a56b60
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-012
@@ -0,0 +1,151 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-012
+
+Bug-Reported-by: Rui Santos <rsantos@grupopie.com>
+Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html
+
+Bug-Description:
+
+When calling the parser to recursively parse a command substitution within
+an arithmetic expansion, the shell overwrote the saved shell input line and
+associated state, resulting in a garbled command.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y 2011-02-26 19:19:05.000000000 -0500
+--- parse.y 2011-06-24 20:08:22.000000000 -0400
+***************
+*** 3843,3846 ****
+--- 3849,3853 ----
+ {
+ sh_parser_state_t ps;
++ sh_input_line_state_t ls;
+ int orig_ind, nc, sflags;
+ char *ret, *s, *ep, *ostring;
+***************
+*** 3850,3857 ****
+--- 3857,3866 ----
+ ostring = string;
+
++ /*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/
+ sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE;
+ if (flags & SX_NOLONGJMP)
+ sflags |= SEVAL_NOLONGJMP;
+ save_parser_state (&ps);
++ save_input_line_state (&ls);
+
+ /*(*/
+***************
+*** 3862,3865 ****
+--- 3871,3876 ----
+ restore_parser_state (&ps);
+ reset_parser ();
++ /* reset_parser clears shell_input_line and associated variables */
++ restore_input_line_state (&ls);
+ if (interactive)
+ token_to_read = 0;
+***************
+*** 5909,5912 ****
+--- 5920,5929 ----
+ ps->echo_input_at_read = echo_input_at_read;
+
++ ps->token = token;
++ ps->token_buffer_size = token_buffer_size;
++ /* Force reallocation on next call to read_token_word */
++ token = 0;
++ token_buffer_size = 0;
++
+ return (ps);
+ }
+***************
+*** 5950,5953 ****
+--- 5967,6006 ----
+ expand_aliases = ps->expand_aliases;
+ echo_input_at_read = ps->echo_input_at_read;
++
++ FREE (token);
++ token = ps->token;
++ token_buffer_size = ps->token_buffer_size;
++ }
++
++ sh_input_line_state_t *
++ save_input_line_state (ls)
++ sh_input_line_state_t *ls;
++ {
++ if (ls == 0)
++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t));
++ if (ls == 0)
++ return ((sh_input_line_state_t *)NULL);
++
++ ls->input_line = shell_input_line;
++ ls->input_line_size = shell_input_line_size;
++ ls->input_line_len = shell_input_line_len;
++ ls->input_line_index = shell_input_line_index;
++
++ /* force reallocation */
++ shell_input_line = 0;
++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0;
++ }
++
++ void
++ restore_input_line_state (ls)
++ sh_input_line_state_t *ls;
++ {
++ FREE (shell_input_line);
++ shell_input_line = ls->input_line;
++ shell_input_line_size = ls->input_line_size;
++ shell_input_line_len = ls->input_line_len;
++ shell_input_line_index = ls->input_line_index;
++
++ set_line_mbstate ();
+ }
+
+*** ../bash-4.2-patched/shell.h 2011-01-06 22:16:55.000000000 -0500
+--- shell.h 2011-06-24 19:12:25.000000000 -0400
+***************
+*** 137,140 ****
+--- 139,145 ----
+ int *token_state;
+
++ char *token;
++ int token_buffer_size;
++
+ /* input line state -- line number saved elsewhere */
+ int input_line_terminator;
+***************
+*** 167,171 ****
+--- 172,186 ----
+ } sh_parser_state_t;
+
++ typedef struct _sh_input_line_state_t {
++ char *input_line;
++ int input_line_index;
++ int input_line_size;
++ int input_line_len;
++ } sh_input_line_state_t;
++
+ /* Let's try declaring these here. */
+ extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
+ extern void restore_parser_state __P((sh_parser_state_t *));
++
++ extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *));
++ extern void restore_input_line_state __P((sh_input_line_state_t *));
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 11
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-013 b/shell-term-fm/bash/patches/bash42-013
new file mode 100644
index 0000000000..5bb186b3a8
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-013
@@ -0,0 +1,52 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-013
+
+Bug-Reported-by: Marten Wikstrom <marten.wikstrom@keystream.se>
+Bug-Reference-ID: <BANLkTikKECAh94ZEX68iQvxYuPeEM_xoSQ@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html
+
+Bug-Description:
+
+An off-by-one error caused the shell to skip over CTLNUL characters,
+which are used internally to mark quoted null strings. The effect
+was to have stray 0x7f characters left after expanding words like
+""""""""aa.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2011-03-06 14:11:11.000000000 -0500
+--- subst.c 2011-05-11 11:23:33.000000000 -0400
+***************
+*** 3707,3711 ****
+ }
+ else if (string[i] == CTLNUL)
+! i++;
+
+ prev_i = i;
+--- 3710,3717 ----
+ }
+ else if (string[i] == CTLNUL)
+! {
+! i++;
+! continue;
+! }
+
+ prev_i = i;
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-014 b/shell-term-fm/bash/patches/bash42-014
new file mode 100644
index 0000000000..a43271c348
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-014
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-014
+
+Bug-Reported-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
+Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html
+
+Bug-Description:
+
+The regular expression matching operator did not correctly match
+expressions with an embedded ^A.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/pathexp.c 2010-08-13 23:21:57.000000000 -0400
+--- pathexp.c 2011-05-05 16:40:58.000000000 -0400
+***************
+*** 197,201 ****
+ if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
+ continue;
+! if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+ continue;
+ temp[j++] = '\\';
+--- 197,201 ----
+ if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
+ continue;
+! if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
+ continue;
+ temp[j++] = '\\';
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-015 b/shell-term-fm/bash/patches/bash42-015
new file mode 100644
index 0000000000..8655873855
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-015
@@ -0,0 +1,81 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-015
+
+Bug-Reported-by: <dnade.ext@orange-ftgroup.com>
+Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html
+
+Bug-Description:
+
+When in a context where arithmetic evaluation is not taking place, the
+evaluator should not check for division by 0.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/expr.c 2010-12-21 11:12:13.000000000 -0500
+--- expr.c 2011-08-02 20:58:28.000000000 -0400
+***************
+*** 477,480 ****
+--- 481,492 ----
+ if (special)
+ {
++ if ((op == DIV || op == MOD) && value == 0)
++ {
++ if (noeval == 0)
++ evalerror (_("division by 0"));
++ else
++ value = 1;
++ }
++
+ switch (op)
+ {
+***************
+*** 483,493 ****
+ break;
+ case DIV:
+- if (value == 0)
+- evalerror (_("division by 0"));
+ lvalue /= value;
+ break;
+ case MOD:
+- if (value == 0)
+- evalerror (_("division by 0"));
+ lvalue %= value;
+ break;
+--- 495,501 ----
+***************
+*** 805,809 ****
+
+ if (((op == DIV) || (op == MOD)) && (val2 == 0))
+! evalerror (_("division by 0"));
+
+ if (op == MUL)
+--- 813,822 ----
+
+ if (((op == DIV) || (op == MOD)) && (val2 == 0))
+! {
+! if (noeval == 0)
+! evalerror (_("division by 0"));
+! else
+! val2 = 1;
+! }
+
+ if (op == MUL)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-016 b/shell-term-fm/bash/patches/bash42-016
new file mode 100644
index 0000000000..46025888be
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-016
@@ -0,0 +1,46 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-016
+
+Bug-Reported-by: Martin von Gagern <Martin.vGagern@gmx.net>
+Bug-Reference-ID: <4E43AD9E.8060501@gmx.net>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html
+
+Bug-Description:
+
+Bash should not check for mail while executing the `eval' builtin.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y Fri Feb 25 12:07:41 2011
+--- parse.y Thu Aug 11 19:02:26 2011
+***************
+*** 2500,2504 ****
+ is the mail alarm reset; nothing takes place in check_mail ()
+ except the checking of mail. Please don't change this. */
+! if (prompt_is_ps1 && time_to_check_mail ())
+ {
+ check_mail ();
+--- 2498,2502 ----
+ is the mail alarm reset; nothing takes place in check_mail ()
+ except the checking of mail. Please don't change this. */
+! if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ())
+ {
+ check_mail ();
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-017 b/shell-term-fm/bash/patches/bash42-017
new file mode 100644
index 0000000000..010ed1e502
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-017
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-017
+
+Bug-Reported-by: Curtis Doty <Curtis@GreenKey.net>
+Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html
+
+Bug-Description:
+
+Using `read -a foo' where foo was an already-declared associative array
+caused the shell to die with a segmentation fault.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/read.def 2011-01-04 11:43:36.000000000 -0500
+--- builtins/read.def 2011-06-21 10:31:02.000000000 -0400
+***************
+*** 643,646 ****
+--- 642,651 ----
+ return EXECUTION_FAILURE; /* readonly or noassign */
+ }
++ if (assoc_p (var))
++ {
++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname);
++ xfree (input_string);
++ return EXECUTION_FAILURE; /* existing associative array */
++ }
+ array_flush (array_cell (var));
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-018 b/shell-term-fm/bash/patches/bash42-018
new file mode 100644
index 0000000000..5d11dce164
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-018
@@ -0,0 +1,74 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-018
+
+Bug-Reported-by: Thomas Cort <tcort@minix3.org>
+Bug-Reference-ID: <BANLkTik-ebGGw3k_1YtB=RyfV1bsqdxC_g@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
+
+Bug-Description:
+
+Bash fails to compile unless JOB_CONTROL is defined.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/execute_cmd.c 2011-02-09 17:32:25.000000000 -0500
+--- execute_cmd.c 2011-11-06 15:12:48.000000000 -0500
+***************
+*** 2197,2200 ****
+--- 2315,2319 ----
+ cmd->flags |= CMD_IGNORE_RETURN;
+
++ #if defined (JOB_CONTROL)
+ lastpipe_flag = 0;
+ begin_unwind_frame ("lastpipe-exec");
+***************
+*** 2216,2228 ****
+ add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
+ }
+! cmd->flags |= CMD_LASTPIPE;
+ }
+ if (prev >= 0)
+ add_unwind_protect (close, prev);
+
+ exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
+
+ if (lstdin > 0)
+ restore_stdin (lstdin);
+
+ if (prev >= 0)
+--- 2335,2351 ----
+ add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
+ }
+! if (cmd)
+! cmd->flags |= CMD_LASTPIPE;
+ }
+ if (prev >= 0)
+ add_unwind_protect (close, prev);
++ #endif
+
+ exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
+
++ #if defined (JOB_CONTROL)
+ if (lstdin > 0)
+ restore_stdin (lstdin);
++ #endif
+
+ if (prev >= 0)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-019 b/shell-term-fm/bash/patches/bash42-019
new file mode 100644
index 0000000000..5fce40ae59
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-019
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-019
+
+Bug-Reported-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
+Bug-Reference-ID: <CAGOxLdHcSQu3ck9Qy3pRjj_NBU5tAPSAvNm-95-nLQ9Szwb6aA@mail.gmail.com>
+Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html
+
+Bug-Description:
+
+Using `declare' with attributes and an invalid array variable name or
+assignment reference resulted in a segmentation fault instead of a
+declaration error.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/declare.def 2010-05-30 18:25:21.000000000 -0400
+--- builtins/declare.def 2011-09-15 15:20:20.000000000 -0400
+***************
+*** 514,517 ****
+--- 514,522 ----
+ var = assign_array_element (name, value, 0); /* XXX - not aflags */
+ *subscript_start = '\0';
++ if (var == 0) /* some kind of assignment error */
++ {
++ assign_error++;
++ NEXT_VARIABLE ();
++ }
+ }
+ else if (simple_array_assign)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 18
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-020 b/shell-term-fm/bash/patches/bash42-020
new file mode 100644
index 0000000000..a1dd0443e8
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-020
@@ -0,0 +1,60 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-020
+
+Bug-Reported-by: Vincent Sheffer <vince.sheffer@apisphere.com>
+Bug-Reference-ID: <F13C1C4F-C44C-4071-BFED-4BB6D13CF92F@apisphere.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html
+
+Bug-Description:
+
+The shared object helper script needs to be updated for Mac OS X 10.7
+(Lion, darwin11).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/support/shobj-conf 2009-10-28 09:20:21.000000000 -0400
+--- support/shobj-conf 2011-08-27 13:25:23.000000000 -0400
+***************
+*** 158,162 ****
+
+ # Darwin/MacOS X
+! darwin[89]*|darwin10*)
+ SHOBJ_STATUS=supported
+ SHLIB_STATUS=supported
+--- 172,176 ----
+
+ # Darwin/MacOS X
+! darwin[89]*|darwin1[012]*)
+ SHOBJ_STATUS=supported
+ SHLIB_STATUS=supported
+***************
+*** 187,191 ****
+
+ case "${host_os}" in
+! darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ ;;
+--- 201,205 ----
+
+ case "${host_os}" in
+! darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ ;;
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 19
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-021 b/shell-term-fm/bash/patches/bash42-021
new file mode 100644
index 0000000000..b6153c7847
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-021
@@ -0,0 +1,61 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-021
+
+Bug-Reported-by: Dan Douglas <ormaaj@gmail.com>
+Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html
+
+Bug-Description:
+
+Using `read -N' to assign values to an array can result in NUL values being
+assigned to some array elements. These values cause seg faults when referenced
+later.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/read.def 2011-11-21 18:03:38.000000000 -0500
+--- builtins/read.def 2011-12-19 19:52:12.000000000 -0500
+***************
+*** 738,742 ****
+ }
+ else
+! var = bind_read_variable (varname, t);
+ }
+ else
+--- 775,779 ----
+ }
+ else
+! var = bind_read_variable (varname, t ? t : "");
+ }
+ else
+***************
+*** 799,803 ****
+ }
+ else
+! var = bind_read_variable (list->word->word, input_string);
+
+ if (var)
+--- 836,840 ----
+ }
+ else
+! var = bind_read_variable (list->word->word, input_string ? input_string : "");
+
+ if (var)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 20
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-022 b/shell-term-fm/bash/patches/bash42-022
new file mode 100644
index 0000000000..0067b1335d
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-022
@@ -0,0 +1,61 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-022
+
+Bug-Reported-by: Gregory Margo <gmargo@pacbell.net>
+Bug-Reference-ID: <20110727174529.GA3333@pacbell.net>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html
+
+Bug-Description:
+
+The return value from lseek is `off_t'. This can cause corrupted return
+values when the file offset is greater than 2**31 - 1.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/sh/zread.c Mon Mar 2 08:54:45 2009
+--- lib/sh/zread.c Thu Jul 28 18:16:53 2011
+***************
+*** 161,166 ****
+ int fd;
+ {
+! off_t off;
+! int r;
+
+ off = lused - lind;
+--- 161,165 ----
+ int fd;
+ {
+! off_t off, r;
+
+ off = lused - lind;
+***************
+*** 169,173 ****
+ r = lseek (fd, -off, SEEK_CUR);
+
+! if (r >= 0)
+ lused = lind = 0;
+ }
+--- 168,172 ----
+ r = lseek (fd, -off, SEEK_CUR);
+
+! if (r != -1)
+ lused = lind = 0;
+ }
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 21
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-023 b/shell-term-fm/bash/patches/bash42-023
new file mode 100644
index 0000000000..4f204efb07
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-023
@@ -0,0 +1,62 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-023
+
+Bug-Reported-by: Ewan Mellor <Ewan.Mellor@eu.citrix.com>
+Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net>
+Bug-Reference-URL:
+
+Bug-Description:
+
+Under some circumstances, an exit trap triggered by a bad substitution
+error when errexit is enabled will cause the shell to exit with an
+incorrect exit status (0).
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2011-11-21 12:04:38.000000000 -0500
+--- subst.c 2012-02-08 13:36:28.000000000 -0500
+***************
+*** 7275,7278 ****
+--- 7281,7285 ----
+ case '\0':
+ bad_substitution:
++ last_command_exit_value = EXECUTION_FAILURE;
+ report_error (_("%s: bad substitution"), string ? string : "??");
+ FREE (value);
+*** ../bash-4.2-patched/error.c 2009-08-21 22:31:31.000000000 -0400
+--- error.c 2012-02-25 15:54:40.000000000 -0500
+***************
+*** 201,205 ****
+ va_end (args);
+ if (exit_immediately_on_error)
+! exit_shell (1);
+ }
+
+--- 201,209 ----
+ va_end (args);
+ if (exit_immediately_on_error)
+! {
+! if (last_command_exit_value == 0)
+! last_command_exit_value = 1;
+! exit_shell (last_command_exit_value);
+! }
+ }
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 22
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-024 b/shell-term-fm/bash/patches/bash42-024
new file mode 100644
index 0000000000..b7b1158b89
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-024
@@ -0,0 +1,45 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-024
+
+Bug-Reported-by: Jim Avera <james_avera@yahoo.com>
+Bug-Reference-ID: <4F29E07A.80405@yahoo.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html
+
+Bug-Description:
+
+When `printf -v' is used to set an array element, the format string contains
+`%b', and the corresponding argument is the empty string, the buffer used
+to store the value to be assigned can be NULL, which results in NUL being
+assigned to the array element. This causes a seg fault when it's used later.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/printf.def 2011-02-25 12:07:41.000000000 -0500
+--- builtins/printf.def 2012-02-02 08:37:12.000000000 -0500
+***************
+*** 256,259 ****
+--- 257,262 ----
+ {
+ vflag = 1;
++ if (vbsize == 0)
++ vbuf = xmalloc (vbsize = 16);
+ vblen = 0;
+ if (vbuf)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 23
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-025 b/shell-term-fm/bash/patches/bash42-025
new file mode 100644
index 0000000000..34ac34300e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-025
@@ -0,0 +1,143 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-025
+
+Bug-Reported-by: Bill Gradwohl <bill@ycc.com>
+Bug-Reference-ID: <CAFyvKis-UfuOWr5THBRKh=vYHDoKEEgdW8hN1RviTuYQ00Lu5A@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2012-03/msg00078.html
+
+Bug-Description:
+
+When used in a shell function, `declare -g -a array=(compound assignment)'
+creates a local variable instead of a global one.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/command.h 2010-08-02 19:36:51.000000000 -0400
+--- command.h 2012-04-01 12:38:35.000000000 -0400
+***************
+*** 98,101 ****
+--- 98,102 ----
+ #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */
+ #define W_ARRAYIND 0x800000 /* word is an array index being expanded */
++ #define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */
+
+ /* Possible values for subshell_environment */
+*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 18:03:41.000000000 -0500
+--- execute_cmd.c 2012-04-01 12:42:03.000000000 -0400
+***************
+*** 3581,3585 ****
+ WORD_LIST *w;
+ struct builtin *b;
+! int assoc;
+
+ if (words == 0)
+--- 3581,3585 ----
+ WORD_LIST *w;
+ struct builtin *b;
+! int assoc, global;
+
+ if (words == 0)
+***************
+*** 3587,3591 ****
+
+ b = 0;
+! assoc = 0;
+
+ for (w = words; w; w = w->next)
+--- 3587,3591 ----
+
+ b = 0;
+! assoc = global = 0;
+
+ for (w = words; w; w = w->next)
+***************
+*** 3604,3607 ****
+--- 3604,3609 ----
+ if (assoc)
+ w->word->flags |= W_ASSIGNASSOC;
++ if (global)
++ w->word->flags |= W_ASSNGLOBAL;
+ #endif
+ }
+***************
+*** 3609,3613 ****
+ /* Note that we saw an associative array option to a builtin that takes
+ assignment statements. This is a bit of a kludge. */
+! else if (w->word->word[0] == '-' && strchr (w->word->word, 'A'))
+ {
+ if (b == 0)
+--- 3611,3618 ----
+ /* Note that we saw an associative array option to a builtin that takes
+ assignment statements. This is a bit of a kludge. */
+! else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g')))
+! #else
+! else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
+! #endif
+ {
+ if (b == 0)
+***************
+*** 3619,3626 ****
+ words->word->flags |= W_ASSNBLTIN;
+ }
+! if (words->word->flags & W_ASSNBLTIN)
+ assoc = 1;
+ }
+- #endif
+ }
+
+--- 3624,3632 ----
+ words->word->flags |= W_ASSNBLTIN;
+ }
+! if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A'))
+ assoc = 1;
++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g'))
++ global = 1;
+ }
+ }
+
+*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400
+--- subst.c 2012-04-01 12:38:35.000000000 -0400
+***************
+*** 367,370 ****
+--- 367,375 ----
+ fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : "");
+ }
++ if (f & W_ASSNGLOBAL)
++ {
++ f &= ~W_ASSNGLOBAL;
++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : "");
++ }
+ if (f & W_COMPASSIGN)
+ {
+***************
+*** 2804,2808 ****
+ else if (assign_list)
+ {
+! if (word->flags & W_ASSIGNARG)
+ aflags |= ASS_MKLOCAL;
+ if (word->flags & W_ASSIGNASSOC)
+--- 2809,2813 ----
+ else if (assign_list)
+ {
+! if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0)
+ aflags |= ASS_MKLOCAL;
+ if (word->flags & W_ASSIGNASSOC)
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 24
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-026 b/shell-term-fm/bash/patches/bash42-026
new file mode 100644
index 0000000000..e15d748070
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-026
@@ -0,0 +1,58 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-026
+
+Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org>
+Bug-Reference-ID: <20120425180443.GO22241@eeg.ccf.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00172.html
+
+Bug-Description:
+
+The `lastpipe' option does not behave correctly on machines where the
+open file limit is less than 256.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/execute_cmd.c 2011-11-21 12:04:47.000000000 -0500
+--- execute_cmd.c 2012-04-26 11:09:30.000000000 -0400
+***************
+*** 2206,2210 ****
+ if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
+ {
+! lstdin = move_to_high_fd (0, 0, 255);
+ if (lstdin > 0)
+ {
+--- 2325,2329 ----
+ if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
+ {
+! lstdin = move_to_high_fd (0, 1, -1);
+ if (lstdin > 0)
+ {
+***************
+*** 2252,2256 ****
+--- 2371,2377 ----
+ }
+
++ #if defined (JOB_CONTROL)
+ discard_unwind_frame ("lastpipe-exec");
++ #endif
+
+ return (exec_result);
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 25
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 26
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-027 b/shell-term-fm/bash/patches/bash42-027
new file mode 100644
index 0000000000..c0c5d3f804
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-027
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-027
+
+Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
+Bug-Reference-ID: <201204211243.30163.vapier@gentoo.org>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00134.html
+
+Bug-Description:
+
+When the `extglob' shell option is enabled, pattern substitution does not
+work correctly in the presence of multibyte characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2012-03-11 17:52:57.000000000 -0400
+--- subst.c 2012-04-22 16:19:10.000000000 -0400
+***************
+*** 4167,4171 ****
+ #if defined (EXTENDED_GLOB)
+ if (extended_glob)
+! simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
+ #endif
+
+--- 4167,4171 ----
+ #if defined (EXTENDED_GLOB)
+ if (extended_glob)
+! simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/
+ #endif
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 26
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 27
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-028 b/shell-term-fm/bash/patches/bash42-028
new file mode 100644
index 0000000000..fa3be3b48f
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-028
@@ -0,0 +1,52 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-028
+
+Bug-Reported-by: Mark Edgar <medgar123@gmail.com>
+Bug-Reference-ID: <CABHMh_3d+ZgO_zaEtYXPwK4P7tC0ghZ4g=Ue_TRpsEMf5YDsqw@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00109.html
+
+Bug-Description:
+
+When using a word expansion for which the right hand side is evaluated,
+certain expansions of quoted null strings include spurious ^? characters.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2012-03-11 17:35:13.000000000 -0400
+--- subst.c 2012-03-20 19:30:13.000000000 -0400
+***************
+*** 5810,5813 ****
+--- 5810,5823 ----
+ if (qdollaratp && ((hasdol && quoted) || l->next))
+ *qdollaratp = 1;
++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is
++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the
++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the
++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
++ (which is more paranoia than anything else), we need to return the
++ quoted null string and set the flags to indicate it. */
++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL))
++ {
++ w->flags |= W_HASQUOTEDNULL;
++ }
+ dispose_words (l);
+ }
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 27
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 28
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-029 b/shell-term-fm/bash/patches/bash42-029
new file mode 100644
index 0000000000..c51704ca7e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-029
@@ -0,0 +1,524 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-029
+
+Bug-Reported-by: "Michael Kalisz" <michael@kalisz.homelinux.net>
+Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html
+
+Bug-Description:
+
+Bash-4.2 tries to leave completed directory names as the user typed them,
+without expanding them to a full pathname. One effect of this is that
+shell variables used in pathnames being completed (e.g., $HOME) are left
+unchanged, but the `$' is quoted by readline because it is a special
+character to the shell.
+
+This patch introduces two things:
+
+1. A new shell option, `direxpand', which, if set, attempts to emulate the
+ bash-4.1 behavior of expanding words to full pathnames during
+ completion;
+2. A set of heuristics that reduce the number of times special characters
+ such as `$' are quoted when the directory name is not expanded.
+
+Patch (apply with `patch -p0'):
+
+diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c
+*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500
+--- ./bashline.c 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 122,125 ****
+--- 122,128 ----
+ static int bash_push_line __P((void));
+
++ static rl_icppfunc_t *save_directory_hook __P((void));
++ static void reset_directory_hook __P((rl_icppfunc_t *));
++
+ static void cleanup_expansion_error __P((void));
+ static void maybe_make_readline_line __P((char *));
+***************
+*** 244,251 ****
+--- 247,261 ----
+ int dircomplete_spelling = 0;
+
++ /* Expand directory names during word/filename completion. */
++ int dircomplete_expand = 0;
++ int dircomplete_expand_relpath = 0;
++
+ static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
+ static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
+ /* )) */
+
++ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
++ static char *custom_filename_quote_characters = 0;
++
+ static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
+
+***************
+*** 502,506 ****
+ /* Tell the completer that we might want to follow symbolic links or
+ do other expansion on directory names. */
+! rl_directory_rewrite_hook = bash_directory_completion_hook;
+
+ rl_filename_rewrite_hook = bash_filename_rewrite_hook;
+--- 512,516 ----
+ /* Tell the completer that we might want to follow symbolic links or
+ do other expansion on directory names. */
+! set_directory_hook ();
+
+ rl_filename_rewrite_hook = bash_filename_rewrite_hook;
+***************
+*** 530,534 ****
+
+ /* characters that need to be quoted when appearing in filenames. */
+! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
+
+ rl_filename_quoting_function = bash_quote_filename;
+--- 540,544 ----
+
+ /* characters that need to be quoted when appearing in filenames. */
+! rl_filename_quote_characters = default_filename_quote_characters;
+
+ rl_filename_quoting_function = bash_quote_filename;
+***************
+*** 565,570 ****
+ rl_attempted_completion_function = attempt_shell_completion;
+ rl_completion_entry_function = NULL;
+- rl_directory_rewrite_hook = bash_directory_completion_hook;
+ rl_ignore_some_completions_function = filename_completion_ignore;
+ }
+
+--- 575,582 ----
+ rl_attempted_completion_function = attempt_shell_completion;
+ rl_completion_entry_function = NULL;
+ rl_ignore_some_completions_function = filename_completion_ignore;
++ rl_filename_quote_characters = default_filename_quote_characters;
++
++ set_directory_hook ();
+ }
+
+***************
+*** 1280,1283 ****
+--- 1292,1298 ----
+ rl_ignore_some_completions_function = filename_completion_ignore;
+
++ rl_filename_quote_characters = default_filename_quote_characters;
++ set_directory_hook ();
++
+ /* Determine if this could be a command word. It is if it appears at
+ the start of the line (ignoring preceding whitespace), or if it
+***************
+*** 1592,1595 ****
+--- 1607,1616 ----
+ else
+ {
++ if (dircomplete_expand && dot_or_dotdot (filename_hint))
++ {
++ dircomplete_expand = 0;
++ set_directory_hook ();
++ dircomplete_expand = 1;
++ }
+ mapping_over = 4;
+ goto inner;
+***************
+*** 1792,1795 ****
+--- 1813,1819 ----
+ inner:
+ val = rl_filename_completion_function (filename_hint, istate);
++ if (mapping_over == 4 && dircomplete_expand)
++ set_directory_hook ();
++
+ istate = 1;
+
+***************
+*** 2694,2697 ****
+--- 2718,2767 ----
+ }
+
++ /* Functions to save and restore the appropriate directory hook */
++ /* This is not static so the shopt code can call it */
++ void
++ set_directory_hook ()
++ {
++ if (dircomplete_expand)
++ {
++ rl_directory_completion_hook = bash_directory_completion_hook;
++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0;
++ }
++ else
++ {
++ rl_directory_rewrite_hook = bash_directory_completion_hook;
++ rl_directory_completion_hook = (rl_icppfunc_t *)0;
++ }
++ }
++
++ static rl_icppfunc_t *
++ save_directory_hook ()
++ {
++ rl_icppfunc_t *ret;
++
++ if (dircomplete_expand)
++ {
++ ret = rl_directory_completion_hook;
++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
++ }
++ else
++ {
++ ret = rl_directory_rewrite_hook;
++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
++ }
++
++ return ret;
++ }
++
++ static void
++ restore_directory_hook (hookf)
++ rl_icppfunc_t *hookf;
++ {
++ if (dircomplete_expand)
++ rl_directory_completion_hook = hookf;
++ else
++ rl_directory_rewrite_hook = hookf;
++ }
++
+ /* Handle symbolic link references and other directory name
+ expansions while hacking completion. This should return 1 if it modifies
+***************
+*** 2703,2720 ****
+ {
+ char *local_dirname, *new_dirname, *t;
+! int return_value, should_expand_dirname;
+ WORD_LIST *wl;
+ struct stat sb;
+
+! return_value = should_expand_dirname = 0;
+ local_dirname = *dirname;
+
+! if (mbschr (local_dirname, '$'))
+! should_expand_dirname = 1;
+ else
+ {
+ t = mbschr (local_dirname, '`');
+ if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
+! should_expand_dirname = 1;
+ }
+
+--- 2773,2801 ----
+ {
+ char *local_dirname, *new_dirname, *t;
+! int return_value, should_expand_dirname, nextch, closer;
+ WORD_LIST *wl;
+ struct stat sb;
+
+! return_value = should_expand_dirname = nextch = closer = 0;
+ local_dirname = *dirname;
+
+! if (t = mbschr (local_dirname, '$'))
+! {
+! should_expand_dirname = '$';
+! nextch = t[1];
+! /* Deliberately does not handle the deprecated $[...] arithmetic
+! expansion syntax */
+! if (nextch == '(')
+! closer = ')';
+! else if (nextch == '{')
+! closer = '}';
+! else
+! nextch = 0;
+! }
+ else
+ {
+ t = mbschr (local_dirname, '`');
+ if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
+! should_expand_dirname = '`';
+ }
+
+***************
+*** 2740,2743 ****
+--- 2821,2841 ----
+ dispose_words (wl);
+ local_dirname = *dirname;
++ /* XXX - change rl_filename_quote_characters here based on
++ should_expand_dirname/nextch/closer. This is the only place
++ custom_filename_quote_characters is modified. */
++ if (rl_filename_quote_characters && *rl_filename_quote_characters)
++ {
++ int i, j, c;
++ i = strlen (default_filename_quote_characters);
++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1);
++ for (i = j = 0; c = default_filename_quote_characters[i]; i++)
++ {
++ if (c == should_expand_dirname || c == nextch || c == closer)
++ continue;
++ custom_filename_quote_characters[j++] = c;
++ }
++ custom_filename_quote_characters[j] = '\0';
++ rl_filename_quote_characters = custom_filename_quote_characters;
++ }
+ }
+ else
+***************
+*** 2759,2762 ****
+--- 2857,2871 ----
+ }
+
++ /* no_symbolic_links == 0 -> use (default) logical view of the file system.
++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the
++ current directory (./).
++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames
++ in the current directory (e.g., lib/sh).
++ XXX - should we do spelling correction on these? */
++
++ /* This is test as it was in bash-4.2: skip relative pathnames in current
++ directory. Change test to
++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/'))
++ if we want to skip paths beginning with ./ also. */
+ if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
+ {
+***************
+*** 2764,2767 ****
+--- 2873,2885 ----
+ int len1, len2;
+
++ /* If we have a relative path
++ (local_dirname[0] != '/' && local_dirname[0] != '.')
++ that is canonical after appending it to the current directory, then
++ temp1 = temp2+'/'
++ That is,
++ strcmp (temp1, temp2) == 0
++ after adding a slash to temp2 below. It should be safe to not
++ change those.
++ */
+ t = get_working_directory ("symlink-hook");
+ temp1 = make_absolute (local_dirname, t);
+***************
+*** 2798,2802 ****
+ }
+ }
+! return_value |= STREQ (local_dirname, temp2) == 0;
+ free (local_dirname);
+ *dirname = temp2;
+--- 2916,2928 ----
+ }
+ }
+!
+! /* dircomplete_expand_relpath == 0 means we want to leave relative
+! pathnames that are unchanged by canonicalization alone.
+! *local_dirname != '/' && *local_dirname != '.' == relative pathname
+! (consistent with general.c:absolute_pathname())
+! temp1 == temp2 (after appending a slash to temp2) means the pathname
+! is not changed by canonicalization as described above. */
+! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0))
+! return_value |= STREQ (local_dirname, temp2) == 0;
+ free (local_dirname);
+ *dirname = temp2;
+***************
+*** 3003,3012 ****
+ orig_func = rl_completion_entry_function;
+ orig_attempt_func = rl_attempted_completion_function;
+- orig_dir_func = rl_directory_rewrite_hook;
+ orig_ignore_func = rl_ignore_some_completions_function;
+ orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
+ rl_completion_entry_function = rl_filename_completion_function;
+ rl_attempted_completion_function = (rl_completion_func_t *)NULL;
+- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
+ rl_ignore_some_completions_function = filename_completion_ignore;
+ rl_completer_word_break_characters = " \t\n\"\'";
+--- 3129,3139 ----
+ orig_func = rl_completion_entry_function;
+ orig_attempt_func = rl_attempted_completion_function;
+ orig_ignore_func = rl_ignore_some_completions_function;
+ orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
++
++ orig_dir_func = save_directory_hook ();
++
+ rl_completion_entry_function = rl_filename_completion_function;
+ rl_attempted_completion_function = (rl_completion_func_t *)NULL;
+ rl_ignore_some_completions_function = filename_completion_ignore;
+ rl_completer_word_break_characters = " \t\n\"\'";
+***************
+*** 3016,3023 ****
+ rl_completion_entry_function = orig_func;
+ rl_attempted_completion_function = orig_attempt_func;
+- rl_directory_rewrite_hook = orig_dir_func;
+ rl_ignore_some_completions_function = orig_ignore_func;
+ rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
+
+ return r;
+ }
+--- 3143,3151 ----
+ rl_completion_entry_function = orig_func;
+ rl_attempted_completion_function = orig_attempt_func;
+ rl_ignore_some_completions_function = orig_ignore_func;
+ rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
+
++ restore_directory_hook (orig_dir_func);
++
+ return r;
+ }
+diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h
+*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500
+--- ./bashline.h 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 34,41 ****
+--- 34,46 ----
+ extern int bash_re_edit __P((char *));
+
++ extern void bashline_set_event_hook __P((void));
++ extern void bashline_reset_event_hook __P((void));
++
+ extern int bind_keyseq_to_unix_command __P((char *));
+
+ extern char **bash_default_completion __P((const char *, int, int, int, int));
+
++ void set_directory_hook __P((void));
++
+ /* Used by programmable completion code. */
+ extern char *command_word_completion_function __P((const char *, int));
+diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def
+*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400
+--- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 62,65 ****
+--- 62,69 ----
+ #include "bashgetopt.h"
+
++ #if defined (READLINE)
++ # include "../bashline.h"
++ #endif
++
+ #if defined (HISTORY)
+ # include "../bashhist.h"
+***************
+*** 95,99 ****
+ extern int no_empty_command_completion;
+ extern int force_fignore;
+! extern int dircomplete_spelling;
+
+ extern int enable_hostname_completion __P((int));
+--- 99,103 ----
+ extern int no_empty_command_completion;
+ extern int force_fignore;
+! extern int dircomplete_spelling, dircomplete_expand;
+
+ extern int enable_hostname_completion __P((int));
+***************
+*** 122,125 ****
+--- 126,133 ----
+ #endif
+
++ #if defined (READLINE)
++ static int shopt_set_complete_direxpand __P((char *, int));
++ #endif
++
+ static int shopt_login_shell;
+ static int shopt_compat31;
+***************
+*** 151,154 ****
+--- 159,163 ----
+ { "compat41", &shopt_compat41, set_compatibility_level },
+ #if defined (READLINE)
++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
+ { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
+ #endif
+***************
+*** 536,539 ****
+--- 545,559 ----
+ }
+
++ #if defined (READLINE)
++ static int
++ shopt_set_complete_direxpand (option_name, mode)
++ char *option_name;
++ int mode;
++ {
++ set_directory_hook ();
++ return 0;
++ }
++ #endif
++
+ #if defined (RESTRICTED_SHELL)
+ /* Don't allow the value of restricted_shell to be modified. */
+Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ
+diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1
+*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500
+--- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 8949,8952 ****
+--- 8949,8962 ----
+ The default bash behavior remains as in previous versions.
+ .TP 8
++ .B direxpand
++ If set,
++ .B bash
++ replaces directory names with the results of word expansion when performing
++ filename completion. This changes the contents of the readline editing
++ buffer.
++ If not set,
++ .B bash
++ attempts to preserve what the user typed.
++ .TP 8
+ .B dirspell
+ If set,
+diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi
+*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500
+--- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 4536,4539 ****
+--- 4536,4546 ----
+ The default Bash behavior remains as in previous versions.
+
++ @item direxpand
++ If set, Bash
++ replaces directory names with the results of word expansion when performing
++ filename completion. This changes the contents of the readline editing
++ buffer.
++ If not set, Bash attempts to preserve what the user typed.
++
+ @item dirspell
+ If set, Bash
+diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right
+*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400
+--- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400
+***************
+*** 13,16 ****
+--- 13,17 ----
+ shopt -u compat40
+ shopt -u compat41
++ shopt -u direxpand
+ shopt -u dirspell
+ shopt -u dotglob
+***************
+*** 69,72 ****
+--- 70,74 ----
+ shopt -u compat40
+ shopt -u compat41
++ shopt -u direxpand
+ shopt -u dirspell
+ shopt -u dotglob
+***************
+*** 102,105 ****
+--- 104,108 ----
+ compat40 off
+ compat41 off
++ direxpand off
+ dirspell off
+ dotglob off
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 28
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 29
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-030 b/shell-term-fm/bash/patches/bash42-030
new file mode 100644
index 0000000000..261a619bb5
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-030
@@ -0,0 +1,178 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-030
+
+Bug-Reported-by: Roman Rakus <rrakus@redhat.com>
+Bug-Reference-ID: <4D7DD91E.7040808@redhat.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html
+
+Bug-Description:
+
+When attempting to glob strings in a multibyte locale, and those strings
+contain invalid multibyte characters that cause mbsnrtowcs to return 0,
+the globbing code loops infinitely.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400
+--- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400
+***************
+*** 36,39 ****
+--- 36,41 ----
+ #if HANDLE_MULTIBYTE
+
++ #define WSBUF_INC 32
++
+ #ifndef FREE
+ # define FREE(x) do { if (x) free (x); } while (0)
+***************
+*** 149,153 ****
+ size_t wcnum; /* Number of wide characters in WSBUF */
+ mbstate_t state; /* Conversion State */
+! size_t wcslength; /* Number of wide characters produced by the conversion. */
+ const char *end_or_backslash;
+ size_t nms; /* Number of multibyte characters to convert at one time. */
+--- 151,155 ----
+ size_t wcnum; /* Number of wide characters in WSBUF */
+ mbstate_t state; /* Conversion State */
+! size_t n, wcslength; /* Number of wide characters produced by the conversion. */
+ const char *end_or_backslash;
+ size_t nms; /* Number of multibyte characters to convert at one time. */
+***************
+*** 172,176 ****
+ tmp_p = p;
+ tmp_state = state;
+! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
+
+ /* Conversion failed. */
+--- 174,189 ----
+ tmp_p = p;
+ tmp_state = state;
+!
+! if (nms == 0 && *p == '\\') /* special initial case */
+! nms = wcslength = 1;
+! else
+! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state);
+!
+! if (wcslength == 0)
+! {
+! tmp_p = p; /* will need below */
+! tmp_state = state;
+! wcslength = 1; /* take a single byte */
+! }
+
+ /* Conversion failed. */
+***************
+*** 187,191 ****
+ wchar_t *wstmp;
+
+! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */
+
+ wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
+--- 200,205 ----
+ wchar_t *wstmp;
+
+! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */
+! wsbuf_size += WSBUF_INC;
+
+ wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
+***************
+*** 200,207 ****
+
+ /* Perform the conversion. This is assumed to return 'wcslength'.
+! * It may set 'p' to NULL. */
+! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
+
+! wcnum += wcslength;
+
+ if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
+--- 214,229 ----
+
+ /* Perform the conversion. This is assumed to return 'wcslength'.
+! It may set 'p' to NULL. */
+! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
+
+! /* Compensate for taking single byte on wcs conversion failure above. */
+! if (wcslength == 1 && (n == 0 || n == (size_t)-1))
+! {
+! state = tmp_state;
+! p = tmp_p;
+! wsbuf[wcnum++] = *p++;
+! }
+! else
+! wcnum += wcslength;
+
+ if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
+***************
+*** 231,236 ****
+ of DESTP and INDICESP are NULL. */
+
+- #define WSBUF_INC 32
+-
+ size_t
+ xdupmbstowcs (destp, indicesp, src)
+--- 253,256 ----
+*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500
+--- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400
+***************
+*** 201,206 ****
+ size_t pat_n, dn_n;
+
+ pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
+! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
+
+ ret = 0;
+--- 201,209 ----
+ size_t pat_n, dn_n;
+
++ pat_wc = dn_wc = (wchar_t *)NULL;
++
+ pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
+! if (pat_n != (size_t)-1)
+! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
+
+ ret = 0;
+***************
+*** 222,225 ****
+--- 225,230 ----
+ ret = 1;
+ }
++ else
++ ret = skipname (pat, dname, flags);
+
+ FREE (pat_wc);
+***************
+*** 267,272 ****
+ n = xdupmbstowcs (&wpathname, NULL, pathname);
+ if (n == (size_t) -1)
+! /* Something wrong. */
+! return;
+ orig_wpathname = wpathname;
+
+--- 272,280 ----
+ n = xdupmbstowcs (&wpathname, NULL, pathname);
+ if (n == (size_t) -1)
+! {
+! /* Something wrong. Fall back to single-byte */
+! udequote_pathname (pathname);
+! return;
+! }
+ orig_wpathname = wpathname;
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 29
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 30
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-031 b/shell-term-fm/bash/patches/bash42-031
new file mode 100644
index 0000000000..419d4478ed
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-031
@@ -0,0 +1,80 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-031
+
+Bug-Reported-by: Max Horn <max@quendi.de>
+Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html
+
+Bug-Description:
+
+A change between bash-4.1 and bash-4.2 to prevent the readline input hook
+from being called too frequently had the side effect of causing delays
+when reading pasted input on systems such as Mac OS X. This patch fixes
+those delays while retaining the bash-4.2 behavior.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400
+--- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400
+***************
+*** 410,414 ****
+ rl_read_key ()
+ {
+! int c;
+
+ rl_key_sequence_length++;
+--- 412,416 ----
+ rl_read_key ()
+ {
+! int c, r;
+
+ rl_key_sequence_length++;
+***************
+*** 430,441 ****
+ while (rl_event_hook)
+ {
+! if (rl_gather_tyi () < 0) /* XXX - EIO */
+ {
+ rl_done = 1;
+ return ('\n');
+ }
+ RL_CHECK_SIGNALS ();
+- if (rl_get_char (&c) != 0)
+- break;
+ if (rl_done) /* XXX - experimental */
+ return ('\n');
+--- 432,447 ----
+ while (rl_event_hook)
+ {
+! if (rl_get_char (&c) != 0)
+! break;
+!
+! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
+ {
+ rl_done = 1;
+ return ('\n');
+ }
++ else if (r == 1) /* read something */
++ continue;
++
+ RL_CHECK_SIGNALS ();
+ if (rl_done) /* XXX - experimental */
+ return ('\n');
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 30
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 31
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-032 b/shell-term-fm/bash/patches/bash42-032
new file mode 100644
index 0000000000..d4f25ca031
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-032
@@ -0,0 +1,75 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-032
+
+Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann@orga-systems.com>
+Bug-Reference-ID: <OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html
+
+Bug-Description:
+
+Bash-4.2 has problems with DEL characters in the expanded value of variables
+used in the same quoted string as variables that expand to nothing.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400
+--- subst.c 2012-05-07 16:06:35.000000000 -0400
+***************
+*** 8152,8155 ****
+--- 8152,8163 ----
+ dispose_word_desc (tword);
+
++ /* Kill quoted nulls; we will add them back at the end of
++ expand_word_internal if nothing else in the string */
++ if (had_quoted_null && temp && QUOTED_NULL (temp))
++ {
++ FREE (temp);
++ temp = (char *)NULL;
++ }
++
+ goto add_string;
+ break;
+***************
+*** 8556,8560 ****
+ if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+ tword->flags |= W_QUOTED;
+! if (had_quoted_null)
+ tword->flags |= W_HASQUOTEDNULL;
+ list = make_word_list (tword, (WORD_LIST *)NULL);
+--- 8564,8568 ----
+ if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
+ tword->flags |= W_QUOTED;
+! if (had_quoted_null && QUOTED_NULL (istring))
+ tword->flags |= W_HASQUOTEDNULL;
+ list = make_word_list (tword, (WORD_LIST *)NULL);
+***************
+*** 8587,8591 ****
+ if (word->flags & W_NOEXPAND)
+ tword->flags |= W_NOEXPAND;
+! if (had_quoted_null)
+ tword->flags |= W_HASQUOTEDNULL; /* XXX */
+ list = make_word_list (tword, (WORD_LIST *)NULL);
+--- 8595,8599 ----
+ if (word->flags & W_NOEXPAND)
+ tword->flags |= W_NOEXPAND;
+! if (had_quoted_null && QUOTED_NULL (istring))
+ tword->flags |= W_HASQUOTEDNULL; /* XXX */
+ list = make_word_list (tword, (WORD_LIST *)NULL);
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 31
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 32
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-033 b/shell-term-fm/bash/patches/bash42-033
new file mode 100644
index 0000000000..e58d7286e2
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-033
@@ -0,0 +1,57 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-033
+
+Bug-Reported-by: David Leverton <levertond@googlemail.com>
+Bug-Reference-ID: <4FCCE737.1060603@googlemail.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+Bash uses a static buffer when expanding the /dev/fd prefix for the test
+and conditional commands, among other uses, when it should use a dynamic
+buffer to avoid buffer overflow.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500
+--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400
+***************
+*** 83,86 ****
+--- 83,88 ----
+ struct stat *finfo;
+ {
++ static char *pbuf = 0;
++
+ if (*path == '\0')
+ {
+***************
+*** 107,111 ****
+ On most systems, with the notable exception of linux, this is
+ effectively a no-op. */
+! char pbuf[32];
+ strcpy (pbuf, DEV_FD_PREFIX);
+ strcat (pbuf, path + 8);
+--- 109,113 ----
+ On most systems, with the notable exception of linux, this is
+ effectively a no-op. */
+! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
+ strcpy (pbuf, DEV_FD_PREFIX);
+ strcat (pbuf, path + 8);
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 32
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 33
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-034 b/shell-term-fm/bash/patches/bash42-034
new file mode 100644
index 0000000000..e4f05e1036
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-034
@@ -0,0 +1,46 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-034
+
+Bug-Reported-by: "Davide Brini" <dave_br@gmx.com>
+Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html
+
+Bug-Description:
+
+In bash-4.2, the history code would inappropriately add a semicolon to
+multi-line compound array assignments when adding them to the history.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500
+--- parse.y 2012-06-07 12:48:47.000000000 -0400
+***************
+*** 4900,4905 ****
+--- 4916,4924 ----
+ return (current_command_line_count == 2 ? "\n" : "");
+ }
+
++ if (parser_state & PST_COMPASSIGN)
++ return (" ");
++
+ /* First, handle some special cases. */
+ /*(*/
+ /* If we just read `()', assume it's a function definition, and don't
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 33
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-035 b/shell-term-fm/bash/patches/bash42-035
new file mode 100644
index 0000000000..6f0be6f908
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-035
@@ -0,0 +1,66 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-035
+
+Bug-Reported-by: Dan Douglas <ormaaj@gmail.com>
+Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html
+
+Bug-Description:
+
+When given a number of lines to read, `mapfile -n lines' reads one too many.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400
+--- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400
+***************
+*** 196,206 ****
+ interrupt_immediately++;
+ for (array_index = origin, line_count = 1;
+! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
+! array_index++, line_count++)
+ {
+- /* Have we exceeded # of lines to store? */
+- if (line_count_goal != 0 && line_count > line_count_goal)
+- break;
+-
+ /* Remove trailing newlines? */
+ if (flags & MAPF_CHOP)
+--- 196,202 ----
+ interrupt_immediately++;
+ for (array_index = origin, line_count = 1;
+! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
+! array_index++)
+ {
+ /* Remove trailing newlines? */
+ if (flags & MAPF_CHOP)
+***************
+*** 218,221 ****
+--- 214,222 ----
+
+ bind_array_element (entry, array_index, line, 0);
++
++ /* Have we exceeded # of lines to store? */
++ line_count++;
++ if (line_count_goal != 0 && line_count > line_count_goal)
++ break;
+ }
+
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 35
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-036 b/shell-term-fm/bash/patches/bash42-036
new file mode 100644
index 0000000000..73fac408aa
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-036
@@ -0,0 +1,92 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-036
+
+Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net>
+Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html
+
+Bug-Description:
+
+Bash-4.2 produces incorrect word splitting results when expanding
+double-quoted $@ in the same string as and adjacent to other variable
+expansions. The $@ should be split, the other expansions should not.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400
+--- subst.c 2012-07-08 21:19:32.000000000 -0400
+***************
+*** 7923,7927 ****
+ /* State flags */
+ int had_quoted_null;
+! int has_dollar_at;
+ int tflag;
+ int pflags; /* flags passed to param_expand */
+--- 7923,7927 ----
+ /* State flags */
+ int had_quoted_null;
+! int has_dollar_at, temp_has_dollar_at;
+ int tflag;
+ int pflags; /* flags passed to param_expand */
+***************
+*** 8128,8138 ****
+ *expanded_something = 1;
+
+! has_dollar_at = 0;
+ pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
+ if (word->flags & W_NOSPLIT2)
+ pflags |= PF_NOSPLIT2;
+ tword = param_expand (string, &sindex, quoted, expanded_something,
+! &has_dollar_at, &quoted_dollar_at,
+ &had_quoted_null, pflags);
+
+ if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
+--- 8128,8139 ----
+ *expanded_something = 1;
+
+! temp_has_dollar_at = 0;
+ pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
+ if (word->flags & W_NOSPLIT2)
+ pflags |= PF_NOSPLIT2;
+ tword = param_expand (string, &sindex, quoted, expanded_something,
+! &temp_has_dollar_at, &quoted_dollar_at,
+ &had_quoted_null, pflags);
++ has_dollar_at += temp_has_dollar_at;
+
+ if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
+***************
+*** 8275,8281 ****
+ temp = (char *)NULL;
+
+! has_dollar_at = 0;
+ /* Need to get W_HASQUOTEDNULL flag through this function. */
+! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL);
+
+ if (list == &expand_word_error || list == &expand_word_fatal)
+--- 8276,8283 ----
+ temp = (char *)NULL;
+
+! temp_has_dollar_at = 0; /* XXX */
+ /* Need to get W_HASQUOTEDNULL flag through this function. */
+! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL);
+! has_dollar_at += temp_has_dollar_at;
+
+ if (list == &expand_word_error || list == &expand_word_fatal)
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 35
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 36
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash42-037 b/shell-term-fm/bash/patches/bash42-037
new file mode 100644
index 0000000000..a12b8a7eeb
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash42-037
@@ -0,0 +1,112 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.2
+Patch-ID: bash42-037
+
+Bug-Reported-by: Jakub Filak
+Bug-Reference-ID:
+Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289
+
+Bug-Description:
+
+Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy'
+commands leads to an infinite loop.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500
+--- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400
+***************
+*** 1235,1243 ****
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+! else if (vi_redoing)
+ {
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+ #if defined (READLINE_CALLBACKS)
+ else if (RL_ISSTATE (RL_STATE_CALLBACK))
+--- 1297,1313 ----
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */
+ {
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
++ else if (vi_redoing) /* handle redoing `dd' here */
++ {
++ _rl_vimvcxt->motion = _rl_vi_last_motion;
++ rl_mark = rl_end;
++ rl_beg_of_line (1, key);
++ RL_UNSETSTATE (RL_STATE_VIMOTION);
++ r = vidomove_dispatch (_rl_vimvcxt);
++ }
+ #if defined (READLINE_CALLBACKS)
+ else if (RL_ISSTATE (RL_STATE_CALLBACK))
+***************
+*** 1317,1325 ****
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+! else if (vi_redoing)
+ {
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+ #if defined (READLINE_CALLBACKS)
+ else if (RL_ISSTATE (RL_STATE_CALLBACK))
+--- 1387,1403 ----
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
+! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */
+ {
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
++ else if (vi_redoing) /* handle redoing `cc' here */
++ {
++ _rl_vimvcxt->motion = _rl_vi_last_motion;
++ rl_mark = rl_end;
++ rl_beg_of_line (1, key);
++ RL_UNSETSTATE (RL_STATE_VIMOTION);
++ r = vidomove_dispatch (_rl_vimvcxt);
++ }
+ #if defined (READLINE_CALLBACKS)
+ else if (RL_ISSTATE (RL_STATE_CALLBACK))
+***************
+*** 1378,1381 ****
+--- 1456,1472 ----
+ r = rl_domove_motion_callback (_rl_vimvcxt);
+ }
++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */
++ {
++ _rl_vimvcxt->motion = _rl_vi_last_motion;
++ r = rl_domove_motion_callback (_rl_vimvcxt);
++ }
++ else if (vi_redoing) /* handle redoing `yy' here */
++ {
++ _rl_vimvcxt->motion = _rl_vi_last_motion;
++ rl_mark = rl_end;
++ rl_beg_of_line (1, key);
++ RL_UNSETSTATE (RL_STATE_VIMOTION);
++ r = vidomove_dispatch (_rl_vimvcxt);
++ }
+ #if defined (READLINE_CALLBACKS)
+ else if (RL_ISSTATE (RL_STATE_CALLBACK))
+*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
+--- patchlevel.h Thu Feb 24 21:41:34 2011
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 36
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 37
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/vifm/DEPENDS b/shell-term-fm/vifm/DEPENDS
index fa1074e898..de0ec3bcdc 100755
--- a/shell-term-fm/vifm/DEPENDS
+++ b/shell-term-fm/vifm/DEPENDS
@@ -11,4 +11,7 @@ optional_depends gtk+2 \
"--without-gtk" \
"to determine mimetypes (via GTK+)" &&
-optional_depends libx11 "" "" "to determine terminal emulator title"
+optional_depends libx11 \
+ "--with-X11" \
+ "--without-X11" \
+ "to determine terminal emulator title"
diff --git a/shell-term-fm/vifm/DETAILS b/shell-term-fm/vifm/DETAILS
index 4d16a8accd..12254db95e 100755
--- a/shell-term-fm/vifm/DETAILS
+++ b/shell-term-fm/vifm/DETAILS
@@ -1,8 +1,8 @@
SPELL=vifm
- VERSION=0.7.3a
+ VERSION=0.7.4a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:4e9220b84601151a5fd0ec63b20e216550c2babc7f6b8fdf0d25040c93f1078ac5ab4b68942ce4ab93cb81cb018de18d9b072845b3e72c043405b59c37f54c3a
+ SOURCE_HASH=sha512:7ece768a12ed6837a5713ce41f849ed56120f3d4db17740d83c1e92d26183604dabbf975755353dfe4382d9cb9b01075e3c86b6e6afcf87168960f523cf46dee
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://vifm.sourceforge.net/
LICENSE[0]=GPL
diff --git a/shell-term-fm/vifm/HISTORY b/shell-term-fm/vifm/HISTORY
index c30dca9848..c30e5e359b 100644
--- a/shell-term-fm/vifm/HISTORY
+++ b/shell-term-fm/vifm/HISTORY
@@ -1,3 +1,12 @@
+2012-10-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.7.4a
+ * PRE_BUILD: dropped
+
+2012-10-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.7.4
+ * DEPENDS: added missing flags for libx11
+ * PRE_BUILD: added, to fix configure with newer automake
+
2012-06-24 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.7.3a
diff --git a/utils/accountsservice/DETAILS b/utils/accountsservice/DETAILS
index c4ecf39a27..5f6aea187b 100755
--- a/utils/accountsservice/DETAILS
+++ b/utils/accountsservice/DETAILS
@@ -1,5 +1,5 @@
SPELL=accountsservice
- VERSION=0.6.12
+ VERSION=0.6.25
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://cgit.freedesktop.org/$SPELL/snapshot/$SOURCE
diff --git a/utils/accountsservice/HISTORY b/utils/accountsservice/HISTORY
index 9db410a400..38d34825a8 100644
--- a/utils/accountsservice/HISTORY
+++ b/utils/accountsservice/HISTORY
@@ -1,3 +1,6 @@
+2012-10-09 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.6.25
+
2011-05-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.6.12
diff --git a/utils/accountsservice/accountsservice-0.6.12.tar.bz2.sig b/utils/accountsservice/accountsservice-0.6.12.tar.bz2.sig
deleted file mode 100644
index 2392dccd87..0000000000
--- a/utils/accountsservice/accountsservice-0.6.12.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/utils/accountsservice/accountsservice-0.6.25.tar.bz2.sig b/utils/accountsservice/accountsservice-0.6.25.tar.bz2.sig
new file mode 100644
index 0000000000..07c22e4a9a
--- /dev/null
+++ b/utils/accountsservice/accountsservice-0.6.25.tar.bz2.sig
Binary files differ
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index f2d1c58443..ae5619fe2d 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.10
+ VERSION=2.14
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index 07a9302cd6..6e7c1266d2 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,14 @@
+2012-10-12 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.14
+
+2012-04-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.12
+ * PRE_BUILD, grep-2.11.patch: deleted
+
+2012-03-12 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.11
+ * PRE_BUILD, grep-2.11.patch: official patch added
+
2011-11-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.10, tar.gz -> tar.xz
* DEPENDS, PRE_BUILD: updated to process xz tarball
diff --git a/utils/grep/PRE_BUILD b/utils/grep/PRE_BUILD
deleted file mode 100755
index 6f545045d8..0000000000
--- a/utils/grep/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/utils/metalog/DETAILS b/utils/metalog/DETAILS
index ab50faae95..76e63d6797 100755
--- a/utils/metalog/DETAILS
+++ b/utils/metalog/DETAILS
@@ -1,9 +1,9 @@
SPELL=metalog
- VERSION=2
+ VERSION=3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_HASH=sha512:194d9ca0c5bc8addd1970362cfa7bf1a368f50a9aa7370e2c4d63eb9d9819df08df001a3a85595a74e7b16fdd78c94ffde3cd9a63962ebc9f6ed71b1a574d7cf
+ SOURCE_HASH=sha512:2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
WEB_SITE=http://metalog.sourceforge.net/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/metalog/HISTORY b/utils/metalog/HISTORY
index fc8a0cb2c1..b513fd1932 100644
--- a/utils/metalog/HISTORY
+++ b/utils/metalog/HISTORY
@@ -1,3 +1,6 @@
+2012-10-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3
+
2012-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: dropped p7zip -- no longer needed
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index e0daa0ea01..47da754001 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Apply strigi-0.7.7-ffmpeg-0.11.patch for ffmpeg 1.0+ as well
+
2012-07-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: changed depends clucene to optional_depends, with sub_depends
stable
@@ -13,11 +16,11 @@
added patch to fix building on gcc 4.7
if ffmpeg >= 0.11 is enabled, apply patch to fix build with it
* 0001-fix-build-for-disabled-qt4-option.patch: removed, no longer needed
- * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
+ * strigi-0.7.7-gcc47.patch: added, fixes build with gcc 4.7
* strigi-0.7.7-ffmpeg-0.11.patch: added, fixes build with ffmpeg >= 0.11
2012-02-08 Tommy Boatman <tboatman@sourcemage.org>
- * DEPENDS: ffmpeg optional but currently broken, so option is
+ * DEPENDS: ffmpeg optional but currently broken, so option is
disabled either way
2011-08-31 Bor Kraljič <pyrobor@ver.si>
diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
index ee8c21a234..d90b136b7b 100755
--- a/utils/strigi/PRE_BUILD
+++ b/utils/strigi/PRE_BUILD
@@ -7,6 +7,7 @@ FFMPEG_VER=0
if is_depends_enabled $SPELL ffmpeg; then
FFMPEG_VER=$(installed_version ffmpeg|cut -d. -f2)
fi
-if (( $FFMPEG_VER >= 11 )) || is_depends_enabled $SPELL ffmpeg-svn; then
+if (( $FFMPEG_VER >= 11 || $(installed_version ffmpeg|cut -d. -f1) >= 1)) || is_depends_enabled $SPELL ffmpeg-svn; then
+ message "${MESSAGE_COLOR}Patching for ffmpeg 0.11+ API...${DEFAULT_COLOR}" &&
patch -p1 < $SPELL_DIRECTORY/strigi-0.7.7-ffmpeg-0.11.patch
fi
diff --git a/utils/usbview/DEPENDS b/utils/usbview/DEPENDS
index edffa0e35e..9cacba3a3d 100755
--- a/utils/usbview/DEPENDS
+++ b/utils/usbview/DEPENDS
@@ -1 +1 @@
-depends gtk+2
+depends gtk+3
diff --git a/utils/usbview/DETAILS b/utils/usbview/DETAILS
index db76acf251..d51fb7d565 100755
--- a/utils/usbview/DETAILS
+++ b/utils/usbview/DETAILS
@@ -1,11 +1,11 @@
SPELL=usbview
- VERSION=1.1
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.kroah.com/linux-usb/$SOURCE
WEB_SITE=http://www.kroah.com/linux-usb/
ENTERED=20020909
- SOURCE_HASH=sha512:5d6a3d1d8054a9a5cc9e28d97e52d843aaeda3251da3cf33d00e938695b6296106456192dddc48fb02f1e6490e89ebb2a096f68faa64ac10144a80106d986a39
+ SOURCE_HASH=sha512:87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f
LICENSE=GPL
KEYWORDS="usb utils"
SHORT="USB topology and device viewer"
diff --git a/utils/usbview/HISTORY b/utils/usbview/HISTORY
index b1740a16ba..1453b7cd65 100644
--- a/utils/usbview/HISTORY
+++ b/utils/usbview/HISTORY
@@ -1,3 +1,7 @@
+2012-10-23 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0
+ * DEPENDS: gtk+2 -> gtk+3
+
2009-03-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.1, SHORT changed
* PREPARE, DEPENDS: depends only on gtk+2 now
diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index df6572beda..3b00f63761 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,32 +1,3 @@
-. "$GRIMOIRE/FUNCTIONS" &&
-
-local OLD_SPELL_VERSION="" &&
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-
-# util-linux 2.20 needs ttyX in /etc/inittab without /dev
-# http://www.sourcemage.org/issues/110
-message "${MESSAGE_COLOR}Checking sanity of $INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
-
-if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
- if is_version_less ${OLD_SPELL_VERSION} 2.20 && is_version_less 2.19.1 ${VERSION}; then
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600" &&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast $SPELL." &&
- message "${DEFAULT_COLOR}" &&
-
- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
- fi
- fi
-fi &&
-
if [[ ! -e "$INSTALL_ROOT/etc/sysconfig/hwclock" ]]; then
config_query UTC "Should the hardware clock store time in UTC (may break systems like MS Windows)?" y
fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index a65becf129..d96ea986ab 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2012-10-15 Vlad Glagolev <stealth@sourcemage.org>
+ * PREPARE: removed senseless 2nd version check
+
+2012-10-07 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFIGURE, PREPARE: prevent triggerring from other spells for
+ migrating process
+
2012-05-25 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.21.2
diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index 13921a10e0..f8acac440c 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -1,3 +1,34 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
message "aes version is older usually, but needed for loop-AES patch" &&
-config_query_list UL_VERSION "What version do you want to use?" latest aes
+config_query_list UL_VERSION "What version do you want to use?" \
+ latest \
+ aes &&
+
+local OLD_SPELL_VERSION="" &&
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+message "${MESSAGE_COLOR}Checking sanity of $INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&
+
+if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
+ if is_version_less ${OLD_SPELL_VERSION} 2.20; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600" &&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast $SPELL." &&
+ message "${DEFAULT_COLOR}" &&
+
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ local UL_DEV_AUTOREPLACE="y"
+ fi
+ fi
+fi
diff --git a/utils/virt-manager/DETAILS b/utils/virt-manager/DETAILS
index 170ee57505..57e05853b9 100755
--- a/utils/virt-manager/DETAILS
+++ b/utils/virt-manager/DETAILS
@@ -1,5 +1,5 @@
SPELL=virt-manager
- VERSION=0.9.0
+ VERSION=0.9.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/virt-manager/HISTORY b/utils/virt-manager/HISTORY
index acca80b352..feda80f79a 100644
--- a/utils/virt-manager/HISTORY
+++ b/utils/virt-manager/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.9.4
+
2012-01-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.0
diff --git a/utils/virt-manager/virt-manager-0.9.0.tar.gz.sig b/utils/virt-manager/virt-manager-0.9.0.tar.gz.sig
deleted file mode 100644
index d3c0eb8e0b..0000000000
--- a/utils/virt-manager/virt-manager-0.9.0.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/utils/virt-manager/virt-manager-0.9.4.tar.gz.sig b/utils/virt-manager/virt-manager-0.9.4.tar.gz.sig
new file mode 100644
index 0000000000..84c5e0d47a
--- /dev/null
+++ b/utils/virt-manager/virt-manager-0.9.4.tar.gz.sig
Binary files differ
diff --git a/video-libs/gst-libav-1.0/DETAILS b/video-libs/gst-libav-1.0/DETAILS
index 4231281145..ae1deee18c 100755
--- a/video-libs/gst-libav-1.0/DETAILS
+++ b/video-libs/gst-libav-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gst-libav-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gst-libav-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-libav-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-libav/$SOURCE
diff --git a/video-libs/gst-libav-1.0/HISTORY b/video-libs/gst-libav-1.0/HISTORY
index 284e9a4711..a6e9b7fdf7 100644
--- a/video-libs/gst-libav-1.0/HISTORY
+++ b/video-libs/gst-libav-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-10-05 Ladislav Hagara <hgr@vabo.cz>
* *: spell created, based on gst-ffmpeg, version 1.0.0
diff --git a/video-libs/gst-libav-1.0/gst-libav-1.0.0.tar.xz.sig b/video-libs/gst-libav-1.0/gst-libav-1.0.0.tar.xz.sig
deleted file mode 100644
index f323bae137..0000000000
--- a/video-libs/gst-libav-1.0/gst-libav-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gst-libav-1.0/gst-libav-1.0.2.tar.xz.sig b/video-libs/gst-libav-1.0/gst-libav-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..ba17fb0b97
--- /dev/null
+++ b/video-libs/gst-libav-1.0/gst-libav-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/gst-plugins-bad-1.0/DETAILS b/video-libs/gst-plugins-bad-1.0/DETAILS
index 0620e43923..ee68a7bf5c 100755
--- a/video-libs/gst-plugins-bad-1.0/DETAILS
+++ b/video-libs/gst-plugins-bad-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gst-plugins-bad-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gst-plugins-bad-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-bad-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-bad/$SOURCE
diff --git a/video-libs/gst-plugins-bad-1.0/HISTORY b/video-libs/gst-plugins-bad-1.0/HISTORY
index 8452d69286..d8a0157709 100644
--- a/video-libs/gst-plugins-bad-1.0/HISTORY
+++ b/video-libs/gst-plugins-bad-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-10-05 Ladislav Hagara <hgr@vabo.cz>
* *: spell created, based on gst-plugins-bad, version 1.0.0
diff --git a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.0.tar.xz.sig b/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.0.tar.xz.sig
deleted file mode 100644
index 979de97f65..0000000000
--- a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.2.tar.xz.sig b/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..c8e15fa58f
--- /dev/null
+++ b/video-libs/gst-plugins-bad-1.0/gst-plugins-bad-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/gst-plugins-base-1.0/DETAILS b/video-libs/gst-plugins-base-1.0/DETAILS
index f22d5fd10a..117e44d5b8 100755
--- a/video-libs/gst-plugins-base-1.0/DETAILS
+++ b/video-libs/gst-plugins-base-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gst-plugins-base-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gst-plugins-base-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-base-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-base/$SOURCE
diff --git a/video-libs/gst-plugins-base-1.0/HISTORY b/video-libs/gst-plugins-base-1.0/HISTORY
index caf72106e8..4c709de94e 100644
--- a/video-libs/gst-plugins-base-1.0/HISTORY
+++ b/video-libs/gst-plugins-base-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-10-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: spell created, based on gst-plugin-base, version 1.0.0
diff --git a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.0.tar.xz.sig b/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.0.tar.xz.sig
deleted file mode 100644
index 91ce67b440..0000000000
--- a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.2.tar.xz.sig b/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..b20d8b2449
--- /dev/null
+++ b/video-libs/gst-plugins-base-1.0/gst-plugins-base-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/gst-plugins-good-1.0/DETAILS b/video-libs/gst-plugins-good-1.0/DETAILS
index a1e03b0bf4..03067cf712 100755
--- a/video-libs/gst-plugins-good-1.0/DETAILS
+++ b/video-libs/gst-plugins-good-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gst-plugins-good-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gst-plugins-good-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gst-plugins-good-$VERSION"
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-good/$SOURCE
diff --git a/video-libs/gst-plugins-good-1.0/HISTORY b/video-libs/gst-plugins-good-1.0/HISTORY
index faeec0b116..6ecf53d7bb 100644
--- a/video-libs/gst-plugins-good-1.0/HISTORY
+++ b/video-libs/gst-plugins-good-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-10-05 Ladislav Hagara <hgr@vabo.cz>
* *: spell created, based on gst-plugins-good, version 1.0.0
diff --git a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.0.tar.xz.sig b/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.0.tar.xz.sig
deleted file mode 100644
index 7e832d54ef..0000000000
--- a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.2.tar.xz.sig b/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..d78aa3efe3
--- /dev/null
+++ b/video-libs/gst-plugins-good-1.0/gst-plugins-good-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/gst-plugins-ugly-1.0/DETAILS b/video-libs/gst-plugins-ugly-1.0/DETAILS
index 09d3f8b80f..480bc4cae5 100755
--- a/video-libs/gst-plugins-ugly-1.0/DETAILS
+++ b/video-libs/gst-plugins-ugly-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gst-plugins-ugly-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gst-plugins-ugly-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-ugly-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$SOURCE
diff --git a/video-libs/gst-plugins-ugly-1.0/HISTORY b/video-libs/gst-plugins-ugly-1.0/HISTORY
index 0625c51a97..55beb9e7cb 100644
--- a/video-libs/gst-plugins-ugly-1.0/HISTORY
+++ b/video-libs/gst-plugins-ugly-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-10-05 Ladislav Hagara <hgr@vabo.cz>
* *: spell created, based on gst-plugins-ugly, version 1.0.0
diff --git a/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.0.tar.xz.sig b/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.0.tar.xz.sig
deleted file mode 100644
index 1df1422706..0000000000
--- a/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.2.tar.xz.sig b/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..7b1766ee69
--- /dev/null
+++ b/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/gstreamer-1.0/DETAILS b/video-libs/gstreamer-1.0/DETAILS
index e7e2a0b8a4..31ba230c51 100755
--- a/video-libs/gstreamer-1.0/DETAILS
+++ b/video-libs/gstreamer-1.0/DETAILS
@@ -1,5 +1,5 @@
SPELL=gstreamer-1.0
- VERSION=1.0.0
+ VERSION=1.0.2
SOURCE=gstreamer-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gstreamer-$VERSION"
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gstreamer/$SOURCE
diff --git a/video-libs/gstreamer-1.0/HISTORY b/video-libs/gstreamer-1.0/HISTORY
index 66c54e0a5d..672461bd14 100644
--- a/video-libs/gstreamer-1.0/HISTORY
+++ b/video-libs/gstreamer-1.0/HISTORY
@@ -1,2 +1,5 @@
+2012-10-27 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.0.2
+
2012-09-30 Ladislav Hagara <hgr@vabo.cz>
* *: spell created, based on gstreamer, version 1.0.0
diff --git a/video-libs/gstreamer-1.0/gstreamer-1.0.0.tar.xz.sig b/video-libs/gstreamer-1.0/gstreamer-1.0.0.tar.xz.sig
deleted file mode 100644
index 982cdcd271..0000000000
--- a/video-libs/gstreamer-1.0/gstreamer-1.0.0.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gstreamer-1.0/gstreamer-1.0.2.tar.xz.sig b/video-libs/gstreamer-1.0/gstreamer-1.0.2.tar.xz.sig
new file mode 100644
index 0000000000..7ab861a239
--- /dev/null
+++ b/video-libs/gstreamer-1.0/gstreamer-1.0.2.tar.xz.sig
Binary files differ
diff --git a/video-libs/libdvdnav/DETAILS b/video-libs/libdvdnav/DETAILS
index 031f8f734f..aacd74b901 100755
--- a/video-libs/libdvdnav/DETAILS
+++ b/video-libs/libdvdnav/DETAILS
@@ -1,15 +1,12 @@
SPELL=libdvdnav
- VERSION=4.1.3
+ VERSION=4.2.0
+ SOURCE_HASH=sha512:f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/dvdnav/$SOURCE
- SOURCE_URL[0]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/$SOURCE
- SOURCE_URL[0]=ftp://ftp4.mplayerhq.hu/MPlayer/releases/dvdnav/$SOURCE
+ SOURCE_URL[0]=http://dvdnav.mplayerhq.hu/releases/$SOURCE
WEB_SITE=http://mplayerhq.hu/
ENTERED=20020428
- SOURCE_HASH=sha512:ce3e6ae56d8d73a6c5a2cb30e63f47867569b65a68304ba7da1f6500a4f0136154ce764dfd3e3af91135d068da0dedbc2759dd97de6712011fe37f76e186b45c
LICENSE[0]=GPL
-# DOCS="COPYING NEWS README"
KEYWORDS="video libs"
SHORT="Library for DVD navigation"
cat << EOF
diff --git a/video-libs/libdvdnav/HISTORY b/video-libs/libdvdnav/HISTORY
index 1dd0d177f5..bd4ba41901 100644
--- a/video-libs/libdvdnav/HISTORY
+++ b/video-libs/libdvdnav/HISTORY
@@ -1,3 +1,6 @@
+2012-10-25 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.2.0
+
2008-11-30 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: specify --with-dvdread
fixes bug #14908
diff --git a/video-libs/libdvdread/DETAILS b/video-libs/libdvdread/DETAILS
index 820ecc7c64..708261d1d0 100755
--- a/video-libs/libdvdread/DETAILS
+++ b/video-libs/libdvdread/DETAILS
@@ -1,12 +1,12 @@
SPELL=libdvdread
- VERSION=4.1.3
+ VERSION=4.2.0
+ SOURCE_HASH=sha512:192802a05f4b6561bd3d85ea54a29861d98ec947a5eeaa45a8d53389744c31570ee5dbdf3fbd0645ea8e6b254795e39d0948d54849dad99252155db00501b21f
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/$SOURCE
- SOURCE_URL[1]=http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/$SOURCE
+ SOURCE_URL[0]=http://dvdnav.mplayerhq.hu/releases/$SOURCE
WEB_SITE=http://www.mplayerhq.hu/
ENTERED=20010927
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=GPL
KEYWORDS="dvd video libs"
SHORT="libdvdread provides API for reading DVD video disks."
diff --git a/video-libs/libdvdread/HISTORY b/video-libs/libdvdread/HISTORY
index cef7a175ca..49aaed541a 100644
--- a/video-libs/libdvdread/HISTORY
+++ b/video-libs/libdvdread/HISTORY
@@ -1,3 +1,8 @@
+2012-10-25 Treeve Jelbert <treeve@ourcemage.org>
+ * DETAILS: version 4.2.0
+ new url
+ * UP_TRIGGERS: update version check
+
2008-11-24 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* UP_TRIGGERS: added for the migration from 0.9
diff --git a/video-libs/libdvdread/UP_TRIGGERS b/video-libs/libdvdread/UP_TRIGGERS
index 5d0878d312..f3324c5889 100755
--- a/video-libs/libdvdread/UP_TRIGGERS
+++ b/video-libs/libdvdread/UP_TRIGGERS
@@ -2,12 +2,12 @@
local OLD_SPELL_VERSION=""
if spell_ok $SPELL; then
OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ ${OLD_SPELL_VERSION:0:1} == 0 ]]; then
+ if [[ ${OLD_SPELL_VERSION:0:3} == '4.1' ]]; then
message "This is an incompatible update of libdvdread..."
message "Figuring out what spells need to be recast, this may take a while."
for each in $(show_up_depends $SPELL 1); do
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libdvdread.so.3"; then
+ grep -q "NEEDED.*libdvdread.so.4"; then
up_trigger $each cast_self
fi
done
diff --git a/video-libs/libdvdread/libdvdread-4.1.3.tar.bz2.sig b/video-libs/libdvdread/libdvdread-4.1.3.tar.bz2.sig
deleted file mode 100644
index 331d29f9b1..0000000000
--- a/video-libs/libdvdread/libdvdread-4.1.3.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/libunicap/DEPENDS b/video-libs/libunicap/DEPENDS
index 3eb49afe52..22b46d5502 100755
--- a/video-libs/libunicap/DEPENDS
+++ b/video-libs/libunicap/DEPENDS
@@ -9,7 +9,7 @@ optional_depends libraw1394 \
# "--disable-dcam" \
# "build plugin for IIDC 1394 cameras" &&
-depends libv4l &&
+depends v4l-utils &&
optional_depends gettext \
"--enable-nls" \
diff --git a/video-libs/libunicap/HISTORY b/video-libs/libunicap/HISTORY
index 6595e46e6b..647934d224 100644
--- a/video-libs/libunicap/HISTORY
+++ b/video-libs/libunicap/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-06-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: PATCHLEVEL++
- * PRE_BUILD: fix obsolete syntax in udev rules
2011-08-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: PATCHLEVEL=1
diff --git a/video-libs/libv4l/BUILD b/video-libs/libv4l/BUILD
index 11df526552..27ba77ddaf 100755
--- a/video-libs/libv4l/BUILD
+++ b/video-libs/libv4l/BUILD
@@ -1 +1 @@
-make -C lib all
+true
diff --git a/video-libs/libv4l/CONFLICTS b/video-libs/libv4l/CONFLICTS
new file mode 100755
index 0000000000..4e25c94900
--- /dev/null
+++ b/video-libs/libv4l/CONFLICTS
@@ -0,0 +1 @@
+conflicts libv4l y
diff --git a/video-libs/libv4l/DETAILS b/video-libs/libv4l/DETAILS
index 5fd0b3d23c..4fc19b4a83 100755
--- a/video-libs/libv4l/DETAILS
+++ b/video-libs/libv4l/DETAILS
@@ -1,23 +1,8 @@
SPELL=libv4l
- SPELLX=v4l-utils
- VERSION=0.8.8
- SOURCE_HASH=sha512:4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4
- SOURCE="${SPELLX}-${VERSION}.tar.bz2"
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- SOURCE_URL[0]=http://linuxtv.org/downloads/$SPELLX/$SOURCE
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
- WEB_SITE=http://freshmeat.net/projects/libv4l
- LICENSE[0]=LGPL
- ENTERED=20090108
- SHORT="a collection of libraries that adds a thin abstraction layer on top of video4linux2 (V4L2) devices"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-The purpose of this layer is to make it easy for application writers
-to support a wide variety of devices without having to write separate
-code for different devices in the same class. It consists of 3 different
-libraries. libv4lconvert offers functions to convert from any (known) pixel
-format to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420. libv4l1 offers the
-(deprecated) v4l1 API on top of v4l2 devices, independent of the drivers
-for those devices supporting v4l1 compatibility (which many v4l2 drivers do
-not). libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for
-the application transparent libv4lconvert conversion where necessary.
+deprecated spell [replaced by v4l-utils]
EOF
+
diff --git a/video-libs/libv4l/DOWNLOAD b/video-libs/libv4l/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/video-libs/libv4l/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/video-libs/libv4l/HISTORY b/video-libs/libv4l/HISTORY
index b3e15a7c34..9f167bc6f5 100644
--- a/video-libs/libv4l/HISTORY
+++ b/video-libs/libv4l/HISTORY
@@ -1,50 +1,4 @@
-2012-05-10 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.8.8
-
-2012-02-22 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.8.6
-
-2011-07-27 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.8.5
-
-2011-06-11 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 0.8.4
-
-2011-05-12 Eric Sandall <sandalle@sourcemage.org>
- * DETAILS: Updated to 0.8.3
- Now works with Linux headers 2.6.38+
-
-2011-02-01 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.8.2
-
-2010-09-05 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.8.1, new SOURCE libv4l -> v4l-utils, SOURCE_URL, WEB_SITE
- * BUILD, INSTALL: updated to v4l-utils tarball
-
-2010-01-18 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.6.4
-
-2009-10-26 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.6.3
-
-2009-10-09 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.6.2, new SOURCE_URL[0]
-
-2009-09-01 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.6.1
-
-2009-07-11 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 0.6.0
-
-2009-06-07 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 0.5.99
-
-2009-04-19 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 0.5.97
-
-2009-03-22 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 0.5.9
-
-2009-01-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
- * DETAILS, BUILD, INSTALL: spell created
-
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by v4l-utils]
diff --git a/video-libs/libv4l/INSTALL b/video-libs/libv4l/INSTALL
index 8c2c15c2f2..27ba77ddaf 100755
--- a/video-libs/libv4l/INSTALL
+++ b/video-libs/libv4l/INSTALL
@@ -1 +1 @@
-make -C lib install PREFIX=/usr
+true
diff --git a/video-libs/libv4l/PRE_BUILD b/video-libs/libv4l/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/video-libs/libv4l/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/video-libs/libv4l/UP_TRIGGERS b/video-libs/libv4l/UP_TRIGGERS
new file mode 100755
index 0000000000..20c813a4b2
--- /dev/null
+++ b/video-libs/libv4l/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger v4l-utils cast_self
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 5ce18547d2..80f5bf3db7 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2012.09.13
+ VERSION=2012.10.24
SOURCE=$SPELL.$VERSION.tar.gz
- SOURCE_HASH=sha512:344c29038e9882b3ad8678ceec7755aca5013e3b0821ca6b9d846cc1c926c1dc125b71dce91986b760793123ebff9f291aaf0dbfb3570721968f641a2b530c5d
+ SOURCE_HASH=sha512:4d3cf54dd348d20ddcb5e4be5bc0390bca6cb69e023868def076c494c152dc62ef6ac3d2733b29ba539f6d386c6d019d37bf9267d818f6af99e646546f85016f
#SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index b8e716e28b..637bf1391c 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2012-10-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2012.10.24
+
2012-09-27 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: updated version to 2012.09.27
(At least that one is obtainable.)
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index cf58d15ab8..0308c0b251 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -188,7 +188,7 @@ optional_depends quicktime-codecs \
# input plugins
if list_find "$XINE_LIB_OPTS" "--enable-v4l2"; then
- optional_depends libv4l \
+ optional_depends v4l-utils \
"--enable-libv4l" \
"--disable-libv4l" \
"for libv4l support"
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 3e8c565ad1..ad69eb7483 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-15 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: replaced libdts with libdca
-
2012-06-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.2.2; switched source to .xz
diff --git a/video/bino/DETAILS b/video/bino/DETAILS
index 4fa5aded5a..bd44654ac3 100755
--- a/video/bino/DETAILS
+++ b/video/bino/DETAILS
@@ -1,11 +1,11 @@
SPELL=bino
- VERSION=1.4.0
+ VERSION=1.4.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.savannah.gnu.org/releases/bino/$SOURCE
WEB_SITE=http://bino3d.org/
ENTERED=20110124
- SOURCE_HASH=sha512:374427723dc69ed3a6d24dac05a9cb5b8dfdd4bfc73bcf13bedc1acb4acf7b3f3f8136f78f159c2dbc8db2c8202ef0a6de972646abd60baf66f64970a89b3112
+ SOURCE_HASH=sha512:3901c3504b721e4e393e38b52d90ff2b0afcc485d6757664cebd65fab955fdcb54a3e553a0ad9733e0866010c717d6012e9aff7dc7ea50dfb91fd8d8ba4cab59
LICENSE[0]=GPL
SHORT="3D video player with multi-display support"
cat << EOF
diff --git a/video/bino/HISTORY b/video/bino/HISTORY
index d9e829df0b..12b99c6e47 100644
--- a/video/bino/HISTORY
+++ b/video/bino/HISTORY
@@ -1,3 +1,6 @@
+2012-10-15 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.4.1
+
2012-06-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.4.0, WEB_SITE updated
diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index 304d751c12..e7d1adedd2 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -2,7 +2,7 @@ depends gtk+3 &&
depends sdl &&
depends udev &&
depends libpng &&
-depends libv4l &&
+depends v4l-utils &&
depends portaudio19 &&
depends LIBAVCODEC &&
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 682f31f9a4..034bb2847f 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-08-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.1
-
2012-06-25 Vlad Glagolev <stealth@sourcemage.org>
* PRE_BUILD: apply the patch if uvcvideo.h (comes with kernel sources
> 3.0) isn't found
diff --git a/video/kamerka/DEPENDS b/video/kamerka/DEPENDS
index 195e0b0a65..f1232ac681 100755
--- a/video/kamerka/DEPENDS
+++ b/video/kamerka/DEPENDS
@@ -1,2 +1,2 @@
depends qt4 &&
-depends libv4l
+depends v4l-utils
diff --git a/video/kamerka/HISTORY b/video/kamerka/HISTORY
index 2379482cc7..9aa9925901 100644
--- a/video/kamerka/HISTORY
+++ b/video/kamerka/HISTORY
@@ -1,2 +1,5 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-26 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 0.8.1
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index f7c89d14a8..28d0b103ce 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -8,7 +8,7 @@ optional_depends LIBAVCODEC '--enable-ffmpeg' \
'--disable-ffmpeg' \
'for ffmpeg support' &&
-optional_depends libv4l '--enable-v4l --enable-libv4l2' \
+optional_depends v4l-utils '--enable-v4l --enable-libv4l2' \
'--disable-v4l' \
'for video4linux support' &&
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index da528fffbf..a6bef65185 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-21 Thomas Orgis <sobukus@sourcemage.org>
* DEPENDS: hotfix to make it build (disabling xvid)
-
2012-03-21 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.1.7, SOURCE_URL[0] updated
diff --git a/video/v4l-utils/BUILD b/video/v4l-utils/BUILD
deleted file mode 100755
index 4352d7b0aa..0000000000
--- a/video/v4l-utils/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-make -C utils all
diff --git a/video/v4l-utils/CONFLICTS b/video/v4l-utils/CONFLICTS
new file mode 100755
index 0000000000..4e25c94900
--- /dev/null
+++ b/video/v4l-utils/CONFLICTS
@@ -0,0 +1 @@
+conflicts libv4l y
diff --git a/video/v4l-utils/DEPENDS b/video/v4l-utils/DEPENDS
new file mode 100755
index 0000000000..cb4565a910
--- /dev/null
+++ b/video/v4l-utils/DEPENDS
@@ -0,0 +1,5 @@
+depends pkgconfig &&
+optional_depends JPEG '' '--without-jpeg' 'JPEG support' &&
+optional_depends gettext '' '--disable-nls' 'Native Language support' &&
+# always disable qt4, as usage of RCC is broken
+optional_depends qt4 '--disable-qv4l2' '--disable-qv4l2' 'QT support'
diff --git a/video/v4l-utils/DETAILS b/video/v4l-utils/DETAILS
index 867052ce2c..bda576d33d 100755
--- a/video/v4l-utils/DETAILS
+++ b/video/v4l-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=v4l-utils
- VERSION=0.8.8
- SOURCE_HASH=sha512:4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4
+ VERSION=0.9.1
+ SOURCE_HASH=sha512:5d319512332a62f1ff579629bb99993ccb04172736b3623dd6082198acf18c71c64987661aaa191d9d93aa0a6eccdfe96da4e5ca54200e7ce601108d1745e16b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://linuxtv.org/downloads/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index 919a07265a..89ed6663a2 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,9 @@
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.1
+ * CONFLICTS, DEPENDS: added
+ * BUILD, INSTALL: deleted
+ libv4l is now integrated here
+
2012-05-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.8.8
diff --git a/video/v4l-utils/INSTALL b/video/v4l-utils/INSTALL
deleted file mode 100755
index 70fe5b1b99..0000000000
--- a/video/v4l-utils/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make -C utils install PREFIX=/usr
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 581cf3f951..51ce18cd0d 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -305,7 +305,7 @@ optional_depends "libnotify" \
"--disable-notify" \
"for desktop notifications support" &&
-optional_depends "libv4l" \
+optional_depends "v4l-utils" \
"--enable-libv4l2" \
"--disable-libv4l2" \
"for libv4l2 Video4Linux2 support" &&
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index ed0e9fb8fe..4c6e968b9a 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,7 +1,7 @@
SPELL=vlc
- VERSION=2.0.3
+ VERSION=2.0.4
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_HASH=sha512:015fb4c62f861b67f5e2562cb7e4aea684ea0a6682234c2b89ea48eb58e7bb06c621b96f35d311ec205dd1874e30ca1712beee1f4d75e401d340cee3c68ce4af
+ SOURCE_HASH=sha512:f6a530d96e3a823a5fb036db894f4f224a318edb28ade2297c0fc7a20159d426a39c810cb3d0bf9b3032fe25880232fe0ff1e9bcf6b5aad765774d257cae97ca
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
# SOURCE2=$SOURCE.asc
# SOURCE2_IGNORE=signature
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 86dd00826f..e0ef478f54 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,6 +1,11 @@
+2012-10-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.0.4
+
+2012-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.3
-
2012-07-06 Sukneet Basuta <sukneet@sourcemage.org>
* PRE_BUILD: apply lua 5.2 fixes
* lua.patch, lua-scripts.patch: added, applies fixes for lua 5.2
diff --git a/wm-addons/cairo-dock-plugins/DETAILS b/wm-addons/cairo-dock-plugins/DETAILS
index 6d36f990c0..0069663055 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock-plugins
- VERSION=3.0.2
+ VERSION=3.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock-plugins/HISTORY b/wm-addons/cairo-dock-plugins/HISTORY
index f2e48b25be..970146faf6 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS: version 3.1.0
+
2012-09-02 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: version 3.0.2
diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index b754c299b8..9636367969 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock
- VERSION=3.0.2
+ VERSION=3.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index 219f4a99f6..563b865ec9 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2012-10-10 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS: version 3.1.0
+
2012-09-02 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: version 3.0.2
* DEPENDS: use either gtk+2 or gtk+3
diff --git a/wm-addons/razor-qt/DETAILS b/wm-addons/razor-qt/DETAILS
index f8dd5fd67a..dd7ca43b19 100755
--- a/wm-addons/razor-qt/DETAILS
+++ b/wm-addons/razor-qt/DETAILS
@@ -1,8 +1,8 @@
SPELL=razor-qt
- VERSION=0.4.1
+ VERSION=0.5.1
SOURCE="razorqt-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://${SPELL}.org/downloads/${SOURCE}
- SOURCE_HASH=sha512:c2ac2eaab91957da86c857c3eaaa4ff2757f67af05ea42ccbf02fdd9c2435b42c4be2e27fd11111a2c7802af342d08f798fb1ef64b1580c911bbfc753c0b7814
+ SOURCE_URL[0]=https://github.com/downloads/Razor-qt/razor-qt/$SOURCE
+ SOURCE_HASH=sha512:736e9f38a959cb70465e9d4331c912b26ca9c0ed1e354702a29e1f10b2aec95352b96c6af24022f447bc9526a4f6c77b10aa59cac620837c8355c99884323521
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/razorqt-${VERSION}"
WEB_SITE="http://razor-qt.org"
LICENSE[0]=GPL/LGPL
diff --git a/wm-addons/razor-qt/HISTORY b/wm-addons/razor-qt/HISTORY
index 09cd188797..7851054d19 100644
--- a/wm-addons/razor-qt/HISTORY
+++ b/wm-addons/razor-qt/HISTORY
@@ -1,3 +1,9 @@
+2012-10-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.5.1
+
+2012-10-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.5.0, SOURCE_URL[0] updated
+
2012-02-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.4.1
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 3de42a4c30..9a594b52b7 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -1,15 +1,15 @@
SPELL=cairo
if [[ $CAIRO_DEVEL == y ]]; then
- VERSION=1.12.2
+ VERSION=1.12.6
PATCHLEVEL=0
- SOURCE_HASH=sha512:149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847
+ SOURCE_HASH=sha512:f3dc493103433f71c362ac45b26b69946f24cd8333d5a62a630cea94e0f7fdcf0703e63562ddaa11178485caed4c4f2e29f4773d64415a04d12e0b83a549cbd3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
else
- VERSION=1.12.2
+ VERSION=1.12.6
PATCHLEVEL=0
- SOURCE_HASH=sha512:149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847
+ SOURCE_HASH=sha512:f3dc493103433f71c362ac45b26b69946f24cd8333d5a62a630cea94e0f7fdcf0703e63562ddaa11178485caed4c4f2e29f4773d64415a04d12e0b83a549cbd3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
fi
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f2930304ca..492ce9eedd 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,9 @@
+2012-10-22 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.6
+
+2012-10-11 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.12.4
+
2012-07-24 Vlad Glagolev <stealth@sourcemage.org>
* SUB_DEPENDS: corrected XCB comment, added GOBJ subdep
* {REPAIR^all^,}PRE_SUB_DEPENDS: added GOBJ subdep
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 8993c98aaa..9772983d6c 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.5.14
+ VERSION=1.5.15
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 9a399e96e2..829676f657 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-10-12 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated devel to 1.5.15
+
2012-10-01 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated devel to 1.5.14
diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 285f3ab37c..92534bd5fe 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -3,7 +3,7 @@ QTDIR=/usr &&
local QTSCINT &&
if is_depends_enabled $SPELL qt4 ; then
PATH=$QTDIR/bin/qt4:$PATH
- QTSCINT=Qt4
+ QTSCINT=Qt4Qt5
else
QTSCINT=Qt3
fi &&
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index efe1d5659e..448c7b9ddc 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,10 +1,10 @@
SPELL=qscintilla
- VERSION=2.6
- SOURCE_HASH=sha512:81eda15dfa36eedd874c3523795bf2861f840937f72c8df4d8ac67faf0a8e5f7e431d991f450cd0af2850e5bbffe1dc96afe43674b463e54596b20cc016bb652
+ VERSION=2.6.2
+ SOURCE_HASH=sha512:5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81
SOURCE=QScintilla-gpl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION
WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
- SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/QScintilla2/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/QScintilla2/QScintilla-${VERSION}/${SOURCE}
LICENSE[0]=GPL
ENTERED=20060206
KEYWORDS="qt editors x11 libs"
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index f8efb4caac..fd97e2685f 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2012-10-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.2
+ * BUILD: fixed QTSCINT variable
+
2011-12-11 Bor Kraljič <pyrobor@ver.si>
* DETAILS: updated spell to 2.6
diff --git a/x11/easystroke/DETAILS b/x11/easystroke/DETAILS
index b811544d76..29fa6b5f2b 100755
--- a/x11/easystroke/DETAILS
+++ b/x11/easystroke/DETAILS
@@ -1,5 +1,5 @@
SPELL=easystroke
- VERSION=0.5.5.1
+ VERSION=0.5.6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/x11/easystroke/HISTORY b/x11/easystroke/HISTORY
index df2de8e804..00eea71d84 100644
--- a/x11/easystroke/HISTORY
+++ b/x11/easystroke/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Sukneet Basuta <sukneet@sourcemage.org>
+ * DETAILS: updated spell to 0.5.6
+
2012-07-23 Sukneet Basuta <sukneet@sourcemage.org>
* TRIGGERS: added, to check_self when boost is cast
diff --git a/x11/easystroke/easystroke-0.5.5.1.tar.gz.sig b/x11/easystroke/easystroke-0.5.5.1.tar.gz.sig
deleted file mode 100644
index 818848abb3..0000000000
--- a/x11/easystroke/easystroke-0.5.5.1.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/x11/easystroke/easystroke-0.5.6.tar.gz.sig b/x11/easystroke/easystroke-0.5.6.tar.gz.sig
new file mode 100644
index 0000000000..3c1393ec41
--- /dev/null
+++ b/x11/easystroke/easystroke-0.5.6.tar.gz.sig
Binary files differ
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 0285a90d85..0a05090538 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,6 +1,11 @@
depends gnutls &&
depends -sub VAPIGEN vala &&
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (Recommended)' &&
+
optional_depends python \
'--with-python' \
'--without-python' \
@@ -15,4 +20,14 @@ optional_depends python \
optional_depends LIBSASL \
'--with-sasl' \
'--without-sasl' \
- 'for SASL authentication support'
+ 'for SASL authentication support' &&
+
+optional_depends gobject-introspection \
+ '--enable-introspection' \
+ '--disable-introspection' \
+ 'for GObject introspection' &&
+
+optional_depends pulseaudio \
+ '--with-pulseaudio' \
+ '--without-pulseaudio' \
+ 'for PulseAudio audio playback'
diff --git a/x11/gtk-vnc/DETAILS b/x11/gtk-vnc/DETAILS
index 697d049472..aee9cd0cf8 100755
--- a/x11/gtk-vnc/DETAILS
+++ b/x11/gtk-vnc/DETAILS
@@ -1,6 +1,6 @@
SPELL=gtk-vnc
- VERSION=0.4.4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.5.1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION:0:3}/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 316a5232f3..a57c5543be 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,3 +1,10 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.5.1
+ SOURCE matches upstream SHA256
+ SOURCE uses .xz instead of .bz2
+ * DEPENDS: Optionally depends on gettext, pulseaudio, and
+ gobject-introspection
+
2012-01-19 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS, SUB_DEPENDS: Allow choice between gtk+2 (default) and gtk+3
Some apps require pythong bindings (e.g. virt-manager) which
diff --git a/x11/gtk-vnc/gtk-vnc-0.4.4.tar.bz2.sig b/x11/gtk-vnc/gtk-vnc-0.4.4.tar.bz2.sig
deleted file mode 100644
index c30b9abc3b..0000000000
--- a/x11/gtk-vnc/gtk-vnc-0.4.4.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/x11/gtk-vnc/gtk-vnc-0.5.1.tar.xz.sig b/x11/gtk-vnc/gtk-vnc-0.5.1.tar.xz.sig
new file mode 100644
index 0000000000..1a35b5d93c
--- /dev/null
+++ b/x11/gtk-vnc/gtk-vnc-0.5.1.tar.xz.sig
Binary files differ
diff --git a/x11/virt-viewer/DETAILS b/x11/virt-viewer/DETAILS
index 08710d2cd0..aa1f04746a 100755
--- a/x11/virt-viewer/DETAILS
+++ b/x11/virt-viewer/DETAILS
@@ -1,9 +1,10 @@
SPELL=virt-viewer
- VERSION=0.4.2
+ VERSION=0.5.4
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_HASH=sha512:e583ee1beacff124d5fe85671716cbd68704aa1bc3ab44105ec890fdc764cd50b644728aff04299a90357cb5fcff859820434728662dde033238c8be0c8e229d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://virt-manager.et.redhat.com/download/sources/$SPELL/$SOURCE
- SOURCE_HASH=sha512:e583ee1beacff124d5fe85671716cbd68704aa1bc3ab44105ec890fdc764cd50b644728aff04299a90357cb5fcff859820434728662dde033238c8be0c8e229d
LICENSE[0]=GPL
WEB_SITE=http://virt-manager.et.redhat.com/
KEYWORDS="vnc virtualization"
diff --git a/x11/virt-viewer/HISTORY b/x11/virt-viewer/HISTORY
index a0da484086..e76634fd02 100644
--- a/x11/virt-viewer/HISTORY
+++ b/x11/virt-viewer/HISTORY
@@ -1,3 +1,6 @@
+2012-10-16 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 0.5.4
+
2012-01-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.4.2
diff --git a/x11/virt-viewer/virt-viewer-0.5.4.tar.gz.sig b/x11/virt-viewer/virt-viewer-0.5.4.tar.gz.sig
new file mode 100644
index 0000000000..67c2bdaf11
--- /dev/null
+++ b/x11/virt-viewer/virt-viewer-0.5.4.tar.gz.sig
Binary files differ