It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.
(cherry picked from commit 075e265fe04fb3acfe50a2d682b38edfb1f6fc97)
commit bda4410c225d62924a742e7660122f102bb1cd45
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
It is not strictly necessary to for it to be recast since the conflicting
files are overwritten by pygobject3, but some files are left over which I
*assume* may lead to unintentional consequences. It is recommended that
pygobject2 be built without gobject-introspection if pygobect3 is installed
in either case.
(cherry picked from commit 518f5051a4a5c7083060e0c12666c83f97fb289c)
commit 8653da279cab96dbadcc2b3e7b29a393667053a8
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pygobject: fix build with gobject-introspection
BUILD: only build with introspection if pygobject3 does not have
introspection enabled.
see https://bugzilla.gnome.org/show_bug.cgi?id=657054
DEPENDS: only depend on gobject-introspection if pygobject3 does not have
introspection enabled.
PRE_BUILD: added, apply patch to fix introspection
introspection.patch: added, remove depreciated references
(cherry picked from commit 3f7e58fad3de8397e4a3e26b565a677ae14f556c)
commit dca9b923ac6e4208471044d83971c672c3005b5c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnuplot: apply fix for automake-1.12
patch from upstream
(cherry picked from commit f31d056cf13f4edae864beb3a967370c0b3860ac)
commit fc7b4afe1c9969dfd9cc6ba2fcdaa9463797cb4e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
seamonkey: => 2.10 (+security)
(cherry picked from commit 5fe2fa6091e9af9b40a7fee55a69a3ac73a29dda)
commit c07b5aa3592f28b6c326dfaee4e0490b6bd6dc99
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mariadb: => 5.2.12 (security)
(cherry picked from commit 891e79b3150af0492552b226aee1f7da74e8df59)
commit c1fa7f346aea63bbbc58845db76e42d736c21d4a
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ibpp: use the right char for (r)
(cherry picked from commit 7ffb2c104239e17b39a7950032e3cd227d20db61)
commit cea97eeb95d497f7a00249ea99159c5bbb064dff
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl: fixed UP_TRIGGERS
(cherry picked from commit 4c0aa23778f5308a77f9dd60abc3b03453f09c4f)
commit 1892ed57d844f2b42db685af8622e320b9c21c2f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libevent: corrected UP_TRIGGERS
(cherry picked from commit 050389e4f6d83d8cf3f776e2c4b3496819a4c567)
commit 28441294cda4f3c5b2a62d6cb0994e68e934b572
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libevent 2.0.19
(cherry picked from commit 3eb72d9ff6771411b9ed557cf1f873076d0a92cd)
commit f410aa91c1defa65988f8db3c177d7fb797d2e5c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxfce4util: UP_TRIGGERS fixed
if libxfce4util is installed for the first time:
libxfce4util checking for reverse triggers...
Removing dependees of libxfce4util
No spells to cast!
Cannot cast these spells:
---------------------------
libxfce4util (up_triggers)
(cherry picked from commit 387eb588640f3592c68c37b32cd635f14fd0dfb3)
commit f75b5eb3aa2de6a9be399a348860d858cde18dff
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
init.d: make udev check for linux 3.x more robust
(cherry picked from commit 6ce0e03ddb5a844fb50fbf7dd1b07c90016ce325)
commit 0113d11707e389634465ca5f8e25169d6b4b01ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
smgl/castfs: add -lpthread to LDFLAGS to prevent linker error
(cherry picked from commit c8b5f6d9b8d4596d9b0231513daafb167ee5d105)
commit b5e7d3d9aa83bd0c913cdf677c61b1e6b61ba49f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
init.d: fixed udev check for linux 3.x
(cherry picked from commit 303e7741088e3d5eefb2d3880e6a49a9bf474e37)
commit e3a7b23861044a8705be5fae007a386b26827dab
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
firefox 13.0, SECURITY_PATCH=49
(cherry picked from commit 84c0b2655c5d024b1b508255e7d2c65a8a7c2f31)
commit 2de4500bde6ad8e1ea8536d33c76abc11e1fcf70
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
surf: ensure EDITOR has a value by sourcing /etc/profile.d/editor.sh or
defaulting to nano
(cherry picked from commit 7a6c79f7f83203a14d9d882f484664faa7ee2abd)
commit a9e07fbfcc3418ab80f4524037bd55deb18347d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
postgresql: => 9.1.4 (security)
(cherry picked from commit e13f00b3a4c77eb57190f6abd1abfbdc8d755684)
commit c757afc17ffea0038766657f9c83e73633d07db0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlalchemy: => 0.7.7, fixed dep flags
(cherry picked from commit 8dbe5ec2f16d9c821399be44636167e30b9f83d0)
commit 435446a9b8398d20e268cf4ca769162e6a4f913f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
udisks: added depends udev with GUDEV subdepends
(cherry picked from commit 450f0531df44b6673da03a082d2b60a4ba566b7d)
commit 0978cc8b5fde0618c7606fc1ce11acb804aac07a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg-svn: remove optional_depends dirac replaced by schroedinger
(cherry picked from commit 6f837eed7405e8947aece21dd419e16321930248)
commit 8e51adb4047405b8ffb9d57224e211c6078f07eb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg-svn: Add optional dependency on libvpx
(cherry picked from commit 9c0cb9e68d746407cd4738dcc37c9c80a27a7519)
commit a8483ad4ba08005ed6f5bfccdffb1f687012bba2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpcap: fixed libnl support
(cherry picked from commit ee167d992ede32000fa62424a4cc9d0290f0f954)
commit 3d89e243a670162f6e4cbcb17812fa7582dd6317
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnome-python-desktop: Fix compilation with metacity 2.34.2+
(cherry picked from commit c002288c917f8b2830b5a59df5d9cc25717b638c)
commit eaaf4a27ab56986582000deb18df87b40c40d9e9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: security update for legacy branch (with backported patches) to
20120526
(cherry picked from commit 9e398219ed19fe907c0b18826ef9ad89bfe564e3)
commit aafb1ddc48c42076ab967dfd568977047650fcb3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
iasl: => 20120518
(cherry picked from commit 95c38784805f515c117c34d6db7773c99c16892a)
commit 6702e6eee8e703197565d66ab00839a69351bb62
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mdnsresponder: updated version to 333.10, no longer fails to build with
multiple make jobs
(cherry picked from commit 6c1e50a06b088909196be81c77befbc0ae7d283f)
commit ef2728c0492a4deb2ec79dd3df06d07d14a9d3da
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
goffice: pcre_info is replaced by pcre_fullinfo, I added a fix from
opensuse so we can build spells that depend on goffice again.
see http://lists.opensuse.org/archive/opensuse-commit/2012-02/msg01190.html
for more info
(cherry picked from commit 154e6048583740150a8c385760196e67aed119ca)
commit c721e0587e9d4614096dc1f8d500e4f671ad91a2
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
video/mplayer2: changed git url, disabled esound and arts dependencies
for scm branch
(cherry picked from commit f8abd674aef9393aaf09e1ddd5108a1062194dc2)
commit b94ce60f9c21fc8e31dcf222b90bacc270c54b6e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cyrus-sasl: added sqlite optional_depends
sqlite.patch: added, removes invalid gcc flags to allow compilation with
sqlite support
(cherry picked from commit e610b3dcd6b2e460b7d159b51585e1a6fb50e599)
commit 376345c818230241dcb414e2e85d4c794c594c56
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pycrypto: => 2.6 (security)
(cherry picked from commit 72334958f468fe31eb439707329850c4dc95b86d)
commit 30985c29763e6ba06c2fdcd959d146829450582b
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
apache22: fix compilation for pcre8.30
(cherry picked from commit 9d44198c10a1d6765e58874e94d8661f5a4f1bad)
commit c88245ff7f5d9788e8b2fdec2cce671a0f71797c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
btrfs-progs: Fix compilation
The convert target isn't valid anymore.
(cherry picked from commit e2de053ae5a4aae2a8b68ccaebddc1901f2efd77)
commit 1a2899ff99c2179b627f1080e83aafd8411ba2f5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
btrfs-progs: Add dependency on e2fsprogs
(cherry picked from commit 366bbce91d037c3bc6c38e66f54428fe72cae8d0)
commit 691f51bf8306e205af74658f3e981b99a5907437
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
btrfs-progs: Add scm branch
Also add dependency on acl.
(cherry picked from commit f3330322fcc9ae594493ac2d3a1dad9c059ce629)
commit 685569aae2c73ea067a6fbc076cd6f1215bc11bf
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libglade2: added depends atk
(cherry picked from commit d36365b999d0f726567bdf9bfcde627d830faf7b)
commit 1f326f025143e333405461d718730aabc431ebca
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
printproto: re-sign source tarball, source seems to have changed
removed PRE_BUILD, no longer needed
(cherry picked from commit fa5ee8017f2ff3f688bab8e8acd926e1ecd80ca2)
commit 8540c671518b142dc329cad62d484af9fb137503
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce4-dict: PATCHLEVEL=1
(cherry picked from commit 441273b30da9ba37d3b67b191c6d36eba903f0d9)
commit b87219e78c223e30095abe19ec4339d228836e5e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce4-mixer: PATCHLEVEL=1
(cherry picked from commit fb2e4f9574993a05d560b8bc0d9e989bdaffcce6)
commit ba497553ffeb11edc7dc4e67e9cb5c9e0cfc5436
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
orage: PATCHLEVEL=1
(cherry picked from commit bd7ac5ac234ceb56800a96a49ccca1549ed61d08)
commit b11a74a030b58762d0095787c6be536003908c9c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce4-dict: added missing dep
(cherry picked from commit 620bd06533f973dedf5080486e56637aac2de0b4)
commit 9c0d52fd20de4a6708da428c8fa0652fc258d8e1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce4-mixer: added missing dep
(cherry picked from commit 75559f52264322547cea937e9a634195f320ddd9)
commit 96ca4dad0a43b0b967d4bd66110913b350b30911
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
orage: added missing dep
(cherry picked from commit 74a78652c44f982ca42e0c5f1b4cd4cb9da32d1c)
commit 25090f42627ceffc7f06ecab4ee1b3b57cba17a2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfce4-panel: fixed the trigger
(cherry picked from commit ee0ff3e43b89423c68c6b66c0894369d297451cd)
commit b5ddfdd893cf0dea3246c9c698cbcbbaa872ec01
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxfce4util: properly handle upgrade process
(cherry picked from commit bce6914191fb433462decb3c49ec13463cf64785)
commit 40aea33732551abae3d4eeb5037bb550fe6bbed8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
volatiles: esc dots
(cherry picked from commit f0b4971026a1ca30c8a5c69747cbd6e97c75811e)
commit 646156fe0cfcbada2fcc755502457183437011ab
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bins: corrected required dependencies
(cherry picked from commit e0a6770b336d1d668e5e8031203a4bf4076c8822)
commit 96ebd119893820cfb226878f961af663317cace6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xml-parser-expat: conflicts with duplicate spell
(cherry picked from commit 5dd295acadfe2c32bf634236d15e03641798aff7)
commit 2a79c7d249f410a816214d1db2680e42354a76b0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xml-parser: deprecated duplicate spell
(cherry picked from commit 87ebf1e2b37361321400036c31a131e19892315e)
commit 925ac4bf95b5351ef050a2cabca62ef18875f55b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "gnome2-libs/intltool: added dependency on xml-parser"
This reverts commit c7f1ba74291797a884381dec8e5b876fe67b868d.
xml-parser is a wrong duplicate spell
Conflicts:
gnome2-libs/intltool/HISTORY
(cherry picked from commit 9f94609737edf694ff48c9b91d4b3b927f4e5218)
commit e7e32564b31a4301b907abdacac0911ba5435d10
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xml-parser-expat: => 2.41
(cherry picked from commit c138d67dc37dc2cca872755d3bcdb1677f4831f2)
commit cefc5da0af7abb56a283a51c5661c3a78bc68362
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
curl: set SECURITY_PATCH back to 8
it was set to 0 by commit 86e65842ec5edee6059daa1584a8eaf11355403c
nobody has catched it
(cherry picked from commit 93108fb01334625c775db742ef714cccb5a5c428)
commit 58016556cba9e27e5700565dee5ba2c4d2c36c24
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
curl 7.26.0
no idea why SOURCE_GPG has been replaced by SOURCE_HASH by previous
commit
(cherry picked from commit dde5033f62104f3557442a20f3ee37b0837ff7d1)
commit 3d0e52d1a57735fc61ed13e52521158a8bf3679a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ruby-1.8: => 1.8.7-p358 (security)
(cherry picked from commit b385c09c4778ef0ad823539fddee376bebfc5191)
commit c9c9636a57cfa37e255b4d158640d7d62a882aeb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libproxy: added missing opt deps
(cherry picked from commit d75dc430c3173851b12b3520601074abdeec6648)
commit d450505f3855e16c6fc755f96e7ccf8ef68053a7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnuplot: bump to 4.6 and fixup
(cherry picked from commit 21f562a4a2be16207694ff57a4dd4e33cedf1481)
commit 548a890053953bea43eae2873bdfa3993b992216
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ChangLog: forgot to add additions to gnu.gpg and kernel.gpg
relevant commits are:
ff89247d36d1f89017f0164788bf434fec2b5c6f -
gnu.gpg: added 5B147849: public key "Aspell Dictionary Upload
<dict-upload AT aspell.net>"
& 7084d80b203bae09e8ba22abcd9aca746cb0eb91 -
kernel.gpg: 6092693E Greg Kroah-Hartman (Linux kernel stable release
signing key)
(cherry picked from commit 58221816fcbfad9ccb04bbca920fd96b3a71ae7f)
commit dd8d6891dd052f0bb41f91e6bee8441db0ff22e0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tor: => 0.2.2.36 (security)
(cherry picked from commit 2ed99055bd41d71ed98dd490b8f55d23b775a960)
commit 56ed1d71c23f21c95e6ca1bfe8965c8b06f211ea
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
net/tor.gpg: added 19F78451 public key (Roger Dingledine <arma AT mit.edu>)
(cherry picked from commit f01d8932fde3711f6b0af3d32203e0059ea697bf)
Conflicts:
ChangeLog
commit 935b2b0fe2d8f52c1a2b6efb99b08bb2f11c9eeb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xchat: fixed compilation with static spelling support
(cherry picked from commit 0f204730c4a21937099bde1f3cb97b874144a69c)
commit 8ec443e0f6da97edbcd1887df2b6186645143059
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxml2: => 2.8.0
(cherry picked from commit fe54b76870449f3f8f4b5823ca1a913f582f3a41)
commit dfb906ab027f4aa5ef9cfaffef5e9581bfe66a8d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sudo: => 1.8.5p1 (security)
(cherry picked from commit 903c87e358647880f263077720c4d047b5bed51a)
commit 8daea21cb9da1fa2268efe899dde2835bcfaa2f7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gvfs: corrected dependency for HTTP/FTP support
(cherry picked from commit 9e7f54dc70c3738c539cdb758f925afaa574ee42)
commit 86669874a0fb0c112b48cd88235ebcde31f97fb8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gvfs 1.12.3
(cherry picked from commit d433b87e6097cc7cd9686b810671b824358447b7)
commit 6d6eef1008f5ea06752631ed42a78b0e1f30e1a9
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.6.8, SECURITY_PATCH=36
(cherry picked from commit e4910a63019a869e4413f714a26168f609f0b7d1)
commit 4962d618043b32d3805289971ad2d95c72d7de6e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libsoup: requires glib-networking built with TLS support
(cherry picked from commit cdbe2447b9fda2ab5febec4bd181ee0bb9200312)
commit 5ee190b49eeecb6f7d106614d2a0f3d117aae0cf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
glib-networking: added TLS subdependency
(cherry picked from commit 6477def14ee16e7855ba89595b6295ff636db8bd)
commit 69fa9dcf8fdb946e947148ec68c909759f1eafae
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
glib-networking 2.32.3
(cherry picked from commit c7ee4411973cfa85ac1c5d5f91a45c813768098f)
commit 89ed14ae972cddf43260244617ce0ff3de194645
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
abiword: fixed glib includes, only glib.h can be included.
(cherry picked from commit a3bb220a8acef44223da00a63cbba14e2dbe30f4)
commit 915fea9443ffdb9d321ed2911b97914d354f0748
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
loudmouth: fixed glib2 includes
(cherry picked from commit 58cc88ed67d9371dd82285cc03c649e42859fa6e)
commit 8e679caf7835bd4b9a9a74c8cc974b068ade7326
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libvdpau: PATCHLEVEL=1
recast to ensure new TRIGGERS are active
(cherry picked from commit f662f3ab673d9eb06590dd264eeec9014a6709cb)
commit 631bda54af786ef02bb1a1e8c97bac1041e0da67
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
lxde/lxdm/HISTORY: corrected formatting
(cherry picked from commit f1f211ed25cac176735e738fd79177f8efae408b)
commit b09bf87f5739cbf6be2faad67a9172cda393620e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
lxde/lxdm: added high CPU load fix
(cherry picked from commit e9865e0ad7de2fd508ae8581382bc07e0ce2bb1d)
commit 07f3cf19ac2ebd143e6cc06b69743712dc32d30f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pygobjec: added missing optional dep on libffi
(cherry picked from commit ee515ba466710e914fee4bb0bdcb1e868831f51e)
commit eb366ec1c10de496b537cf0f54ec585b9b6d8561
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nfs-utils: actually incremented PATCHLEVEL
(cherry picked from commit db809f7b5989f79df0ab2d6823b264e19d7ac06b)
commit 2f77336c7998c0d237319068da4f85f9c3111136
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
man: fixed cleanse check
(cherry picked from commit 796fab5cf4e6b81d1329cb567c6d161236a00a2b)
commit 63e597dcb0516bcbc592232204e91bf887d6d769
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
hplip: added volatiles
(cherry picked from commit a583b5fb07453178a320dd704b77a842dfcffceb)
commit f87576ae9614c7e4cc272701ce2c554894b5302c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nfs-utils: added /var/lib/nfs/xtab to volatiles
(cherry picked from commit d8a2ecbe6f50bd3b8750ca3289e7164305ce2ffd)
commit 2a12e29ae1f2bf2669a6b146981dcc2a6cfe7b43
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
excluded, volatiles: renewed files
(cherry picked from commit 4d7e8615a4f0b0ef176ec3ec34165b9927b32b01)
Conflicts:
ChangeLog
commit 19d0fc4f330c6eb43d028bdc05528c0dc36428bc
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
glibc: fix SOURCE URLS for sigs of kernel versions >=3.0
PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1 and
patches >3.0.4
(cherry picked from commit 9c5b31e1e6ab9f376a0ddc72280ab313fd01fad2)
commit 62b7fee286ed702447b98b5f598eb7c6152b816a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
optional_depends MYSQL \
"--enable-sql --with-mysql=$INSTALL_ROOT/usr" \
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index 303d2bc..2a66b60 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,8 @@
+2012-05-28 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added sqlite optional_depends
+ * PRE_BUILD: patch to fix compilation with sqlite
+ * sqlite.patch: added, removes invalid gcc flags
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* 6581B5F1.gpg: deleted, use the same key from section
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ba9528d..fc26314 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p0 < $SPELL_DIRECTORY/sqlite.patch
patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/sqlite.patch b/crypto/cyrus-sasl/sqlite.patch
new file mode 100644
index 0000000..dd2715e
--- /dev/null
+++ b/crypto/cyrus-sasl/sqlite.patch
@@ -0,0 +1,26 @@
+--- configure.b 2011-09-07 09:29:25.000000000 -0400
++++ configure 2012-05-29 04:58:43.374173367 -0400
+@@ -14470,9 +14470,9 @@
+ $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++ LIB_SQLITE="-L${with_sqlite}/lib"
+ else
+- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++ LIB_SQLITE="-L${with_sqlite}"
+ fi
+
+ LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -14600,9 +14600,9 @@
+ $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++ LIB_SQLITE3="-L${with_sqlite3}/lib"
+ else
+- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++ LIB_SQLITE3="-L${with_sqlite3}"
+ fi
+
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 85a9b0d..7fcc22c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't go below spell_ok if it fails check
+
2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19 http://www.openssl.org/news/secadv_20120510.txt
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index d9b53dc..3edee70 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -1,7 +1,7 @@
# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
+
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
diff --git a/database/ibpp/DETAILS b/database/ibpp/DETAILS
index e146917..0a27ced 100755
--- a/database/ibpp/DETAILS
+++ b/database/ibpp/DETAILS
@@ -13,7 +13,7 @@ SHORT="C++ classes to access and administer a Firebird
database"
cat << EOF
IBPP, where 'PP' stands for '++', is a C++ client interface for
Firebird Server versions 1.0, 1.5 and further. It also works with
-InterBase� 6.0, though it is expected it might only support Firebird
+InterBase® 6.0, though it is expected it might only support Firebird
in the future. It is a class library, free of any specific
development tool dependancies. It is not tied to any 'visual' or
'RAD' tool. It was indeed developed to add Firebird access in any
diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index d6d2aad..ca53f7c 100644
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: use properly encoded char for (r)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 073b1ad..ed9f6ec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -7,9 +7,10 @@ optional_depends zlib \
"--with-zlib-dir=bundled" \
"to use system zlib instead of bundled" &&
-optional_depends readline \
- "--without-readline" "" \
- "to use system readline instead of bundled" &&
+# temporarily broken cause of mismatching API
+#optional_depends readline \
+# "--without-readline" "" \
+# "to use system readline instead of bundled" &&
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 2a20157..9227111 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: only glib.h can be included or build will fail
+
2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index 410429d..ae86946 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch &&
+# only glib.h can be included
+sedit 34d src/af/util/xp/ut_go_file.h
diff --git a/gnome2-libs/glib-networking/DEPENDS
b/gnome2-libs/glib-networking/DEPENDS
index 8ac8121..1d643d5 100755
--- a/gnome2-libs/glib-networking/DEPENDS
+++ b/gnome2-libs/glib-networking/DEPENDS
@@ -1,4 +1,11 @@
-depends glib2 &&
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends glib2 &&
+
+if spell_ok glib2 && is_version_less $(installed_version glib2) 2.32; then
+ force_depends glib2
+fi &&
+
depends libgcrypt &&
-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection"
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+#if ! spell_ok pygobject3; then
+
+ optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection"
+
+#fi &&
+
+optional_depends libffi \
+ "--with-ffi" \
+ "--without-ffi" \
+ "to enable libffi support"
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 45aed17..70b14e7 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,15 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: only build with introspection if pygobject3
+ does not have introspection enabled.
+ see https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ * DEPENDS: only depend on gobject-introspection if pygobject3
+ does not have introspection enabled.
+ * PRE_BUILD: added, apply patch to fix introspection
+ * introspection.patch: added, remove depreciated references
+
+2012-05-18 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing optional dep on libffi
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing pycairo dep (fixes #361)
diff --git a/gnome2-libs/pygobject/PRE_BUILD b/gnome2-libs/pygobject/PRE_BUILD
new file mode 100755
index 0000000..9dafa11
--- /dev/null
+++ b/gnome2-libs/pygobject/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/introspection.patch
diff --git a/gnome2-libs/pygobject/introspection.patch
b/gnome2-libs/pygobject/introspection.patch
new file mode 100644
index 0000000..0b63759
--- /dev/null
+++ b/gnome2-libs/pygobject/introspection.patch
@@ -0,0 +1,28 @@
+--- gi/pygi-info.c.orig 2011-06-13 16:30:25.000000000 +0000
++++ gi/pygi-info.c
+@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
+ case GI_INFO_TYPE_CONSTANT:
+ type = &PyGIConstantInfo_Type;
+ break;
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+- type = &PyGIErrorDomainInfo_Type;
+- break;
+ case GI_INFO_TYPE_UNION:
+ type = &PyGIUnionInfo_Type;
+ break;
+@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index 1bc8e00..1fbfadc 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,3 +1,14 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * UP_TRIGGERS: added, cast pygobject if pygobject
+ has gobject-introspection enabled, so it is built
+ without it. See https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ It is not strictly necessary to for it to be recast since
+ the conflicting files are overwritten by pygobject3, but
+ some files are left over which I *assume* may lead to
+ unintentional consequences. It is recommended that pygobject2
+ be built without gobject-introspection if pygobect3 is
+ installed in either case.
+
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome3-libs/pygobject3/UP_TRIGGERS
b/gnome3-libs/pygobject3/UP_TRIGGERS
new file mode 100755
index 0000000..04704dc
--- /dev/null
+++ b/gnome3-libs/pygobject3/UP_TRIGGERS
@@ -0,0 +1,5 @@
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+if is_depends_enabled pygobject gobject-introspection; then
+ up_trigger pygobject cast_self
+fi
diff --git a/graphics/bins/DEPENDS b/graphics/bins/DEPENDS
index a714a5d..2c65f82 100755
--- a/graphics/bins/DEPENDS
+++ b/graphics/bins/DEPENDS
@@ -12,4 +12,4 @@ depends text-iconv &&
depends text-unaccent &&
depends uri &&
depends xml-grove &&
-depends xml-parser
+depends xml-parser-expat
diff --git a/graphics/bins/HISTORY b/graphics/bins/HISTORY
index a71882a..7e90fab 100644
--- a/graphics/bins/HISTORY
+++ b/graphics/bins/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: xml-parser -> xml-parser-expat
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 95D463F3.gpg: added gpg keyring
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index b8a47ff..337c2bf 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -22,7 +22,7 @@ optional_depends gd "" "" "for GD conversion support" &&
optional_depends libtool "--with-ltdl" "--without-ltdl" \
"an alternative way of opening shared libraries" &&
-optional_depends LIBUSB "" "" "enable use of cameras connected though the
USB port" &&
+optional_depends libusb-compat "" "" "enable use of cameras connected though
the USB port" &&
sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#'
mozilla/configure &&
-# This patch fixes various files to ensure that Seamonkey compiles with GCC
4.7
-patch -p1 < "$SPELL_DIRECTORY/seamonkey-2.9_gcc-4.7-1.patch" &&
+# ignore packaging errors for the libs we have in a system
+sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&
diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index b8aa116..4ef15ef 100755
--- a/libs/libevent/UP_TRIGGERS
+++ b/libs/libevent/UP_TRIGGERS
@@ -1,8 +1,8 @@
# up_trigger everything on major version updates
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
-if spell_ok $SPELL && [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]];
then
+if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&
+optional_depends xz-utils \
+ "--with-lzma=${INSTALL_ROOT}/usr/lib" \
+ "--without-lzma" \
+ "to build with LZMA support" &&
+
optional_depends python \
"--with-python" \
"--without-python" \
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index c3837e7..b094dd4 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,8 +1,7 @@
SPELL=libxml2
- VERSION=2.7.8
- PATCHLEVEL=1
+ VERSION=2.8.0
SECURITY_PATCH=7
-
SOURCE_HASH=sha512:cb5d88f95feffde6a805a7583306864ad9cc909e958a1044afc6d5864ec480da545343f25c10bba99be59c2344e98d4cd2dcc8a152407a0ce581a51ce214d6bc
+
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 c6f9c6f..d1aaa7f 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,11 @@
+2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.0
+ * DEPENDS: added xz-utils opt dep for LZMA support
+ * PRE_BUILD, CVE-2011-0216.patch, CVE-2011-1944.patch,
+ CVE-2011-2834.patch, CVE-2011-3102.patch, CVE-2011-3905.patch,
+ CVE-2011-3919.patch, libxml2-2.7.8-xpath-freeing{,2}.patch,
+ libxml2-2.7.8-xpath-hardening.patch, libxml2-2.7.8.patch: dropped
+
2012-05-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, CVE-2011-0216.patch, CVE-2011-1944.patch,
CVE-2011-2834.patch,
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index bc044af..0000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing2.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-1944.patch &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-hardening.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-0216.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-2834.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3905.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3919.patch &&
-patch -p1 < $SPELL_DIRECTORY/CVE-2011-3102.patch
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
deleted file mode 100644
index 2844f4a..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit df83c17e5a2646bd923f75e5e507bc80d73c9722
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Wed Nov 17 14:12:14 2010 +0100
-
- Fix a potential freeing error in XPath
-
-diff --git a/xpath.c b/xpath.c
-index 81e33f6..1447be5 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11763,11 +11763,15 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
-
- if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
- xmlXPathObjectPtr tmp;
-- /* pop the result */
-+ /* pop the result if any */
- tmp = valuePop(ctxt);
-- xmlXPathReleaseObject(xpctxt, tmp);
-- /* then pop off contextObj, which will be freed later */
-- valuePop(ctxt);
-+ if (tmp != contextObj)
-+ /*
-+ * Free up the result
-+ * then pop off contextObj, which will be freed later
-+ */
-+ xmlXPathReleaseObject(xpctxt, tmp);
-+ valuePop(ctxt);
- goto evaluation_error;
- }
-
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
deleted file mode 100644
index 714954d..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit fec31bcd452e77c10579467ca87a785b41115de6
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Thu Nov 18 11:07:24 2010 +0100
-
- Small fix for previous commit
-
-diff --git a/xpath.c b/xpath.c
-index 1447be5..8b56189 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11765,13 +11765,14 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathObjectPtr tmp;
- /* pop the result if any */
- tmp = valuePop(ctxt);
-- if (tmp != contextObj)
-+ if (tmp != contextObj) {
- /*
- * Free up the result
- * then pop off contextObj, which will be freed later
- */
- xmlXPathReleaseObject(xpctxt, tmp);
- valuePop(ctxt);
-+ }
- goto evaluation_error;
- }
-
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
b/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
deleted file mode 100644
index 7a4ad86..0000000
--- a/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-commit 0f136dcd18c287073a4d67b03fdb9696d7010940
-Author: Daniel Veillard <veillard AT redhat.com>
-Date: Thu Aug 18 17:10:13 2011 +0800
-
- Hardening of XPath evaluation
-
- Add a mechanism of frame for XPath evaluation when entering a function
- or a scoped evaluation, also fix a potential problem in predicate
- evaluation.
-
-diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
-index 1a9e30e..ddd9dd8 100644
---- a/include/libxml/xpath.h
-+++ b/include/libxml/xpath.h
-@@ -68,7 +68,8 @@ typedef enum {
- XPATH_UNDEF_PREFIX_ERROR,
- XPATH_ENCODING_ERROR,
- XPATH_INVALID_CHAR_ERROR,
-- XPATH_INVALID_CTXT
-+ XPATH_INVALID_CTXT,
-+ XPATH_STACK_ERROR
- } xmlXPathError;
-
- /*
-@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
- xmlXPathCompExprPtr comp; /* the precompiled expression */
- int xptr; /* it this an XPointer expression */
- xmlNodePtr ancestor; /* used for walking preceding axis */
-+
-+ int valueFrame; /* used to limit Pop on the stack */
- };
-
- /************************************************************************
-diff --git a/xpath.c b/xpath.c
-index b59ac5a..bcee2ea 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
- "Encoding error\n",
- "Char out of XML range\n",
- "Invalid or incomplete context\n",
-+ "Stack usage errror\n",
- "?? Unknown error ??\n" /* Must be last in the list! */
- };
- #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \
-@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt,
xmlXPathObjectPtr val) {
- ************************************************************************/
-
- /**
-+ * xmlXPathSetFrame:
-+ * @ctxt: an XPath parser context
-+ *
-+ * Set the callee evaluation frame
-+ *
-+ * Returns the previous frame value to be restored once done
-+ */
-+static int
-+xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
-+ int ret;
-+
-+ if (ctxt == NULL)
-+ return(0);
-+ ret = ctxt->valueFrame;
-+ ctxt->valueFrame = ctxt->valueNr;
-+ return(ret);
-+}
-+
-+/**
-+ * xmlXPathPopFrame:
-+ * @ctxt: an XPath parser context
-+ * @frame: the previous frame value
-+ *
-+ * Remove the callee evaluation frame
-+ */
-+static void
-+xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
-+ if (ctxt == NULL)
-+ return;
-+ if (ctxt->valueNr < ctxt->valueFrame) {
-+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+ }
-+ ctxt->valueFrame = frame;
-+}
-+
-+/**
- * valuePop:
- * @ctxt: an XPath evaluation context
- *
-@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
-
- if ((ctxt == NULL) || (ctxt->valueNr <= 0))
- return (NULL);
-+
-+ if (ctxt->valueNr <= ctxt->valueFrame) {
-+ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+ return (NULL);
-+ }
-+
- ctxt->valueNr--;
- if (ctxt->valueNr > 0)
- ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
-@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp,
xmlXPathContextPtr ctxt) {
- ret->valueNr = 0;
- ret->valueMax = 10;
- ret->value = NULL;
-+ ret->valueFrame = 0;
-
- ret->context = ctxt;
- ret->comp = comp;
-@@ -11711,6 +11755,7 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
- xmlNodePtr oldContextNode, contextNode = NULL;
- xmlXPathContextPtr xpctxt = ctxt->context;
-+ int frame;
-
- #ifdef LIBXML_XPTR_ENABLED
- /*
-@@ -11730,6 +11775,8 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- */
- exprOp = &ctxt->comp->steps[op->ch2];
- for (i = 0; i < set->nodeNr; i++) {
-+ xmlXPathObjectPtr tmp;
-+
- if (set->nodeTab[i] == NULL)
- continue;
-
-@@ -11757,23 +11804,25 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- xmlXPathNodeSetAddUnique(contextObj->nodesetval,
- contextNode);
-
-+ frame = xmlXPathSetFrame(ctxt);
- valuePush(ctxt, contextObj);
- res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
-+ tmp = valuePop(ctxt);
-+ xmlXPathPopFrame(ctxt, frame);
-
- if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
-- xmlXPathObjectPtr tmp;
-- /* pop the result if any */
-- tmp = valuePop(ctxt);
-- if (tmp != contextObj) {
-+ while (tmp != contextObj) {
- /*
- * Free up the result
- * then pop off contextObj, which will be freed later
- */
- xmlXPathReleaseObject(xpctxt, tmp);
-- valuePop(ctxt);
-+ tmp = valuePop(ctxt);
- }
- goto evaluation_error;
- }
-+ /* push the result back onto the stack */
-+ valuePush(ctxt, tmp);
-
- if (res)
- pos++;
-@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlXPathFunction func;
- const xmlChar *oldFunc, *oldFuncURI;
- int i;
-+ int frame;
-
-+ frame = xmlXPathSetFrame(ctxt);
- if (op->ch1 != -1)
- total +=
- xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
-@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: parameter error\n");
- ctxt->error = XPATH_INVALID_OPERAND;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
-- for (i = 0; i < op->value; i++)
-+ for (i = 0; i < op->value; i++) {
- if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: parameter error\n");
- ctxt->error = XPATH_INVALID_OPERAND;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
-+ }
- if (op->cache != NULL)
- XML_CAST_FPTR(func) = op->cache;
- else {
-@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- xmlGenericError(xmlGenericErrorContext,
- "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
- (char *)op->value4, (char *)op->value5);
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
- func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
- func(ctxt, op->value);
- ctxt->context->function = oldFunc;
- ctxt->context->functionURI = oldFuncURI;
-+ xmlXPathPopFrame(ctxt, frame);
- return (total);
- }
- case XPATH_OP_ARG:
-@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int
toBool)
- ctxt->valueNr = 0;
- ctxt->valueMax = 10;
- ctxt->value = NULL;
-+ ctxt->valueFrame = 0;
- }
- #ifdef XPATH_STREAMING
- if (ctxt->comp->stream) {
-diff --git a/xpointer.c b/xpointer.c
-index 7a42d02..37afa3a 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
- ctxt->valueNr = 0;
- ctxt->valueMax = 10;
- ctxt->value = NULL;
-+ ctxt->valueFrame = 0;
- }
- SKIP_BLANKS;
- if (CUR == '/') {
diff --git a/libs/libxml2/libxml2-2.7.8.patch
b/libs/libxml2/libxml2-2.7.8.patch
deleted file mode 100644
index a0b62bc..0000000
--- a/libs/libxml2/libxml2-2.7.8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard AT redhat.com>
-Date: Thu, 04 Nov 2010 20:53:14 +0000
-Subject: Reactivate the shared library versionning script
-
----
-diff --git a/configure.in b/configure.in
-index 59d0629..a1d2c89 100644
---- a/configure.in
-+++ b/configure.in
-@@ -84,7 +84,7 @@ else
- esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
-
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify
---
-cgit v0.8.3.1
diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index 90882be..c65b56c 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, lxdm-0.4.1-high-cpu-load.patch: added high CPU load fix
+ from upstream SCM
+
2011-11-11 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: give a choice between gtk 2 and 3, added optional
dep on libxcb
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
index 5b7f691..0982fae 100755
--- a/lxde/lxdm/PRE_BUILD
+++ b/lxde/lxdm/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
+rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
&&
+patch -p1 < ${SPELL_DIRECTORY}/lxdm-0.4.1-high-cpu-load.patch
diff --git a/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
new file mode 100644
index 0000000..3de9730
--- /dev/null
+++ b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
@@ -0,0 +1,27 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa AT gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint
*timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc
callback,gpointer user_data)
+--
+1.7.4.1
+
+
+
diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
new file mode 100755
index 0000000..6f9ce09
--- /dev/null
+++ b/net/libpcap/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="-I$INSTALL_ROOT/usr/include/libnl3 $CFLAGS" &&
+
+default_build
diff --git a/net/libpcap/DEPENDS b/net/libpcap/DEPENDS
index 46f3a98..1d85d08 100755
--- a/net/libpcap/DEPENDS
+++ b/net/libpcap/DEPENDS
@@ -1,3 +1,12 @@
depends flex &&
depends bison &&
-optional_depends libnl '' '--without-libnl' 'nettlink support'
+
+optional_depends BLUEZ \
+ "--enable-bluetooth" \
+ "--disable-bluetooth" \
+ "for Bluetooth support" &&
+
+optional_depends libnl \
+ "--with-libnl" \
+ "--without-libnl" \
+ "for netlink support"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 7b5d9cb..2b3a32b 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,9 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: added, for missing flags
+ * DEPENDS: added optional depends on BLUEZ; corrected flags
+ * PRE_BUILD: added, to apply the patch
+ * libnl-3.patch: added, to make libnl dependency actually work
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.1
diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
new file mode 100755
index 0000000..8a3b86d
--- /dev/null
+++ b/net/libpcap/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/libnl-3.patch" &&
+
+autoconf
diff --git a/net/libpcap/libnl-3.patch b/net/libpcap/libnl-3.patch
new file mode 100644
index 0000000..2ce5936
--- /dev/null
+++ b/net/libpcap/libnl-3.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig 2012-01-02 04:47:37.000000000 +0400
++++ configure.in 2012-06-04 23:41:10.871001151 +0400
+@@ -431,14 +431,14 @@
+
+ if test x$with_libnl != xno ; then
+ #
+- # Try libnl 2.x first.
++ # Try libnl 3.x first.
+ #
+- AC_CHECK_LIB(nl, nl_socket_alloc,
++ AC_CHECK_LIB(nl-3, nl_socket_alloc,
+ [
+ #
+- # Yes, we have libnl 2.x.
++ # Yes, we have libnl 3.x.
+ #
+- LIBS="-lnl-genl -lnl $LIBS"
++ LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is
version 2.x])
+ ],
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index d403840..388756e 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -12,5 +12,6 @@ fi &&
optional_depends kdelibs4 '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
optional_depends glib2 '-DWITH_GNOME3=1' '-DWITH_GNOME3=0' 'Gnome
support' &&
optional_depends xulrunner '' '' 'Mozilla support' &&
-optional_depends python '' '' "for Python bindings"
-
+optional_depends vala '-DWITH_VALA=1' '-DWITH_VALA=0' "for Vala
bindings" &&
+optional_depends perl '-DWITH_PERL=1' '-DWITH_PERL=0' "for Perl
bindings" &&
+optional_depends python '-DWITH_PYTHON=1' '-DWITH_PYTHON=0' "for Python
bindings"
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 2016cfd..4d8cbab 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing opt deps and flags
+
2012-03-10 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added option for which webkitgtk to use
* DEPENDS: changed to use configure option
diff --git a/net/mdnsresponder/BUILD b/net/mdnsresponder/BUILD
index 9848e46..337b05e 100755
--- a/net/mdnsresponder/BUILD
+++ b/net/mdnsresponder/BUILD
@@ -1,3 +1,2 @@
cd $SOURCE_DIRECTORY/mDNSPosix/ &&
-make_single &&
make os=linux
diff --git a/net/mdnsresponder/DETAILS b/net/mdnsresponder/DETAILS
index 3b642c4..03dc403 100755
--- a/net/mdnsresponder/DETAILS
+++ b/net/mdnsresponder/DETAILS
@@ -1,7 +1,7 @@
SPELL=mdnsresponder
- VERSION=107.6
+ VERSION=333.10
SOURCE=mDNSResponder-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:c9485128fee5c5dfe90737eeef834d797afe53545c62010db8f56405c62a39b39c41c0616b08fc35d150be8fc595d71507662c51a5f0fb798d58b269b136f713
+
SOURCE_HASH=sha512:976502db2fcdf8d24cf81002179fd9ff38d2b8afb6a8183f424ebeee4e968bafb2dbcd9770424a71b3bda12bd2267093471ec31da30c6e4fc5d71eeba7b3e6c2
SOURCE_URL[0]=http://www.opensource.apple.com/darwinsource/tarballs/other/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mDNSResponder-$VERSION
WEB_SITE=http://developer.apple.com/networking/bonjour/index.html
diff --git a/net/mdnsresponder/HISTORY b/net/mdnsresponder/HISTORY
index 62b2064..af306df 100644
--- a/net/mdnsresponder/HISTORY
+++ b/net/mdnsresponder/HISTORY
@@ -1,3 +1,7 @@
+2012-05-30 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 333.10
+ * BUILD: no longer fails to build with multiple make jobs
+
2008-03-16 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails to build with multiple make jobs
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index bc25096..a73e24a 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=1.1.6
- PATCHLEVEL=1
+ PATCHLEVEL=2
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 798c6ab..8cce150 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,7 @@
+2012-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1
+ * volatiles: moved "/var/lib/nfs/xtab" here from global volatiles
+
2011-06-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/net/nfs-utils/volatiles b/net/nfs-utils/volatiles
old mode 100755
new mode 100644
index 3126cf7..3e63a49
--- a/net/nfs-utils/volatiles
+++ b/net/nfs-utils/volatiles
@@ -1,3 +1,4 @@
^/var/lib/nfs/etab$
^/var/lib/nfs/rmtab$
^/var/lib/nfs/state$
+^/var/lib/nfs/xtab$
diff --git a/net/tor.gpg b/net/tor.gpg
index b64da97..8fc8f2d 100644
Binary files a/net/tor.gpg and b/net/tor.gpg differ
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 31961e9..beca5c9 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,8 +4,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.35
- SECURITY_PATCH=6
+ VERSION=0.2.2.36
+ SECURITY_PATCH=7
fi
diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
new file mode 100755
index 0000000..ff7732c
--- /dev/null
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -0,0 +1,17 @@
+# recast everything on minor version update
+
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+ message "This is a possibly incompatible update of $SPELL..." &&
+ 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.*libxfce4util\.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/xfce/orage/DEPENDS b/xfce/orage/DEPENDS
index 5608dad..c342e50 100755
--- a/xfce/orage/DEPENDS
+++ b/xfce/orage/DEPENDS
@@ -1,3 +1,4 @@
+depends libxfce4util &&
depends gtk+2 &&
optional_depends xfce4-panel \
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index 3bd6f3e..cdd8f7c 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,6 +1,7 @@
SPELL=orage
if [[ $ORAGE_STABLE == y ]]; then
VERSION=4.8.3
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index a5d0436..29b5d5e 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dep; PATCHLEVEL=1
+
2012-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.8.3
if spell_ok $SPELL; then
local OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ ${VERSION%.*} > ${OLD_SPELL_VERSION%.*} ]]; then
- message "This is a possibly incompatible update of xfce4-panel..."
+ if [[ ${VERSION%.*} != ${OLD_SPELL_VERSION%.*} ]]; then
+ message "This is a possibly incompatible update of $SPELL..."
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL 1); do
# Check if the binaries link against libpython.so
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libxfce4panel.so"; then
+ grep -q "NEEDED.*libxfce4panel\.so"; then
up_trigger $each cast_self
fi
done
diff --git a/xorg-proto/printproto/HISTORY b/xorg-proto/printproto/HISTORY
index 48938dd..b36c5de 100644
--- a/xorg-proto/printproto/HISTORY
+++ b/xorg-proto/printproto/HISTORY
@@ -1,3 +1,8 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * printproto-1.0.5.tar.bz2.sig: re-sign source tarball,
+ source seems to have changed
+ * PRE_BUILD: removed, no longer needed
+
2011-10-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.5
* PRE_BUILD: added to do autogen.sh
diff --git a/xorg-proto/printproto/PRE_BUILD b/xorg-proto/printproto/PRE_BUILD
deleted file mode 100755
index c5b8fb6..0000000
--- a/xorg-proto/printproto/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-./autogen.sh
diff --git a/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig
index 2f21750..6e9965f 100644
Binary files a/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig and
b/xorg-proto/printproto/printproto-1.0.5.tar.bz2.sig differ
[SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (a6cdb3bd69125855e0fa951a60df861fb7db7f2a),
Vlad Glagolev, 06/14/2012