New commits:
commit 7aa107dcb222f3c7bdb9ff8c1d07dfae3b3d1f9f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
totem: added optional_depends on libgdata
commit 38240b3d29205cfb1480e3da4e8144a4da07e3cd
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
libgdata: new spell
commit ae389a36062dcf86639ab8950b797b86e0e15355
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdewebdev4: => 4.4.2
commit f9a0fb4ddebaf06d2166ca080672b7754626dbc3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeutils4: => 4.4.2
commit 517abba07b5da07e86161f56f024da11bcf20463
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdetoys4: => 4.4.2
commit ca781b7ce3aa9d8f2bc4ab0a09a08e868eac567e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdesdk4: => 4.4.2
commit dc02da962feae9be6969d52296cb5b85a6efeeff
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeplasmoids4: => 4.4.2
commit e1681a40708ff26de92c7dfcab1ae91bdb9da664
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdepimlibs4: => 4.4.2
commit 6fe8ae0a6903fd42d7c4e6aaad9084e4f72764f4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdepim4: => 4.4.2
commit 6ba0f78eb2c441edbec8e05b50d5ae311245d054
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdepim4-runtime: => 4.4.2
commit 1729ef4707ba85d99629f79caf7e0786da75391b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdenetwork4: => 4.4.2
commit b8057be367ea63bc0f106166e5821a69e933265e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdemultimedia4: => 4.4.2
commit 1d7e5bb907928105545cde4e998c0bbcbe991e70
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdelibs4: => 4.4.2
commit ce245787d54cdcac2b9744ab747961c0224ffd91
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdegraphics4: => 4.4.2
commit ec31d3c24481f0f33e1e5098c6bf6f985405bb9e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdegames4: => 4.4.2
commit 4631719c6c5c80f0d8f1a812197eab8dbe533398
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeedu4: => 4.4.2
commit 07873f211c6a91c6073c282226c8280a3c1ffc77
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdebindings4: => 4.4.2
commit 15690fd8978639e00b7dc113aae0388c54a9584e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdebase4: => 4.4.2
commit c8e517c7dd13588d6fdef56cfc27f0ab979e46c4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdebase4-runtime: => 4.4.2
commit 677bda1df3dc38794a7d0922ca783d01f1bdd994
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdebase-workspace4: => 4.4.2
commit 9a09741a3f930e670802e0dea35d12c55cc1d731
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeartwork4: => 4.4.2
commit 8c6431162e20e1d8dcab19cf7658c27427b32c2c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeadmin4: => 4.4.2
commit 0b051c101632f6e0c4e26b1793f5195e0578f6e9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdeaccessibility4: => 4.4.2
commit 82a9eb4c7dede3e35ab861d07d9e91aa4377e3bc
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kde4-l10n: => 4.4.2
commit ec82ff4a35913fe1b168ae75691132cc89de732f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fileinfo: new spell, Fileinfo extension
commit d4979ff09d6a25bd8823e6e84aac3eb7167db05b
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
totem: fixed tracker header includes
commit ed3fd25968a1052bfbfc76d649927aeca0e089cb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
grep: => 2.6.3
commit b349f88ef868f231e141d0bd6ce475012c3b3cce
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gajim: => 0.13.4
commit e2c9f72d71f94d6fb46e47b26bcdacf6216675a0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gramps - make it actually work by using bsddb3 instead of broken python
db support
commit 1ed2edfb469d050b9a7b1fbb687c6c680daffe64
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gss: => 1.0.0
commit 8b7e90b1c0ca4face75ffceedfcba465ca6d01b2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gramps: => 3.2.0
commit d9a3380f95664ab5d1a7d26e6767f0e9318f430a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mercurial: => 1.5.1
commit 21084426016b41e5f60404d6886cb4cbc0831e3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gftp: added openssl as optional dep
commit 51098d6443286a16da4bb1f65ce35c2210ca92d1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tcpdump: => 4.1.0
commit 40b15e8a430444535d2da23b316b2080a62a56a3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpcap: => 1.1.0
commit 9a776c56672fb40e693460e3bbfe37fd246a5f36
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
net/tcpdump.gpg: added key E99DD5FD (Michael Richardson <mcr AT credil.org>)
commit 3a8058f6a64121230fddc7a16bf162dff676b06e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
totem: removed unneeded UP_TRIGGERS
commit f133ccb67e2ccf8cd47a22129c37aebe375c7622
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
epiphany: added optional_depends on ca-certificates
commit 7ef6ad8fe27823f5e2e29d1a0ec3e331ec9d2227
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
epiphany: sub_depend on WEBKIT_DEVEL for webkitgtk
commit c703bf7fe48cc0f4c7c1e620725ad76654bb51a9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
webkitgtk: added WEBKIT_DEVEL sub dependency
commit d58b71e93d70cf4ae67a0f4b78f32416377ff068
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>
database/mariadb New spell Added, mysql clone
commit 49a296b20a2447362515c7dec8e40aaea3169133
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/codeblocks: added missing dependencies on automake and autoconf,
fixed build with gcc 4.4, fixed build with recent versions of automake
commit 8c8b6f686921864670ba5ed6715c938071cb4a46
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
udisks 1.0.0
new gnome-disk-utility needs this version
commit e3c305ae858de4dfbf6c1fbfcddac2a10f06c870
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
epiphany: fixed SOURCE_GPG location in DETAILS
commit b92a8f684d3e43ecd8ca62ecf69aa2fa1716d2d0
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
libgnome-keyring: needs eggdbus
commit 90f1117ffac189216f25256bdf5847e41f590281
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
mpg123: update to 1.12.1 .
commit d515a66528950c869577714239b4cc5fe4b8a1ba
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
xmms2: Only use the hacked mpg123 wscript for mpg123 1.11.0 .
commit 3ef80fa31c242923c84bbb6803a657ac5db72fee
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
wine: Only apply the patch for mpg123 1.11.0, newer versions don't need
it.
commit e23b4384c58a9285ceec3ae17f9e388ced36b689
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
VERSION: 0.44-test
commit 97f7c56973e7f811b9e41dd3d465ded1dc646b84
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
arping: => 2.09
commit 68a26e7cf6a878e2e92c01b3dcde533cb6804ab7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sylpheed: => 3.0.2
commit 11b6e186a43d25c173b01af28304a3595954f288
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
xf86-input-vmmouse: update to 12.6.7
commit 80b610c665b4025d9ab4e7f3dfbeb2454587b70e
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
xf86-input-penmount: update to 1.4.1
commit 9c289c715eab674958d827d0917024623314c13d
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
xf86-video-vmware: update to 11.0.1
commit ccf3e7ecc67e4d56f66c6ed50a898ae434e15b7f
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
xf86-video-geode: update to 2.11.7
commit 8be0b4b630d16ae56be0bca2e4b6f9ef18086edb
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-jis-misc: update to 1.0.1
commit 8c26c013ac3a3c3555aeadc87a47f672f46a15f2
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-misc-cyrillic: update to 1.0.1
commit e30d8f52a30dac605945029b82ede9668c9e48b3
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-dec-misc: update to 1.0.1
commit 3476c411b336645cd711dfa9e04872ef9c3c982a
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-arabic-misc: update to 1.0.1
commit fa7a4d926a4646254619422c0b2da06fb028cd14
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-misc-meltho: update to 1.0.1
commit 0f3d0c92e4c03f7125ecba297bdb72b571036755
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-screen-cyrillic: update to 1.0.2
commit e468e3f0d6b301dcafbb8e314da160e3a61a537a
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-micro-misc: update to 1.0.1
commit d683241ee226af606e2f49bfb6a2be4048ea5c4c
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-isas-misc: update to 1.0.1
commit a0354b9d608167cd14fb95b801bea80a11ccfd5a
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
encodings: update to 1.0.3
commit b562a8368f45a23e3720f700ca9a321bb83c937b
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-sun-misc: update to 1.0.1
commit 472bae41c2111c2e7b48794a7ff6296196026261
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-winitzki-cyrillic: update to 1.0.1
commit b6cb0932bd2f3f9b5dbfeb9483bdb1ed241754ee
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-cronyx-cyrillic: update to 1.0.1
commit 4e390d62ba15a3acb2740fdb781a1c966c43c465
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-daewoo-misc: update to 1.0.1
commit 1721d72bc7ff1f539474d69aa958745f69b2ea06
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-schumacher-misc: update to 1.1.0
commit 4b3620ea7f7e909f0848c876cff28c3e760e4e92
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-bitstream-speedo: update to 1.0.1
commit c5dff392f54e899049a214e781679d4163accfd6
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-mutt-misc: update to 1.0.1
commit 536312c77ec780ea535d3984f59ec94d9b8ddc29
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-sony-misc: update to 1.0.1
commit 8bf6801522f0928be88cd8941791b176b533c6d2
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
font-misc-ethiopic: update to 1.0.1
commit 07f825283242617b9802fde3fe387072c361cc1f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
linux: Updated latest 2.6.27 to 2.6.27.46
commit 90f73d63496124b1b60952c4954df103953ec50a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
linux: Updated latest 2.6.31 to 2.6.31.13
commit 2e076fc411e0151ef0d0cf0d106492fc0649701b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
linux: Updated latest 2.6.32 to 2.6.32.11
commit a358cd76e61cfa75188f87cd4fd2855a0cad1572
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
linux: Updated latest 2.6 patch to 2.6.33.2
commit 59a04a113c47516da84b304d3dd6c35618380ce9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gvfs: gnome keyring support is _OPTIONAL_; please check triple times
every configure flag for not adding EXTRA NON-REQUIRED dependencies to the
spell
commit 8264a02faa90791b7d2f24c25b5409e4d86f4deb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
This reverts commit 179b73ca988e9b6ca3e9ef9c3a14f66fd8d2d00c.
commit b7159a5af076c6106b3d365079e3ac7533e96bdb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
evolution: added missing dep on gtkimageview
commit 19fd4f6c3a4395069c76cfd401e21b28a29f09fc
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
libpst: attempt to let evolution use libpst to import PST files. maybe
someone else can take a look.
commit 55b8a49d9186626913828a4d68a8fecd4e3a9508
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
libgnomecanvas: => 2.30.1
commit 2751887a81784f47044d09a5c09b6f88e06a3785
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
libart_lgpl: => 2.3.21
commit fec24f506a4c06f11bbca0943a45ca0c86d205f0
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
epiphany-extensions: => 2.30.0
commit 342a8c453f35846d72672194945fb2bf3e3a1f1c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
readpst: version 0.5.3
commit c1cf5c53ce982345aa5d92a0aaa34e10b5e0e561
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
vala: => 0.8.0
diff --git a/ChangeLog b/ChangeLog
index 1f9972a..e48822b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * gnome2-libs/libgdata: new spell, glib based GData protocol
+ implementation
+
+2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/tcpdump.gpg: added key E99DD5FD (Michael Richardson
<mcr AT credil.org>)
+ * php-pear/fileinfo: new spell, Fileinfo extension
+
+2010-04-02 Philippe 'Puppet_Master' Caseiro <puppetmaster AT sourcemage.org>
+ * database/mariadb: new spell, mysql fork
+
2010-04-01 Arjan Bouter <abouter AT sourcemage.org>
* spelling/mythes: new spell, thesaurus library
diff --git a/VERSION b/VERSION
index 2bcbbb1..8af6beb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.43-test
+0.44-test
diff --git a/accounts b/accounts
index 41cbd6f..29ac051 100755
--- a/accounts
+++ b/accounts
@@ -84,5 +84,6 @@ avahi:168:162
tss:175:175
memcached:176:177
camera:177:178
+mariadb:178:180
avahi-autoipd:180:180
nobody:65534:65534
diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index 52568b9..0dc6fef 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -5,12 +5,4 @@ if [[ "$MPG123_SEEKTABLE" != "" ]]; then
OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS"
fi &&
OPTS="$MPG123_MODULES $OPTS" &&
-if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]]; then
- # Installing both libmpg123 and libmpg123_64, as recommended by upstream
(yes, that's me;-).
- message "${MESSAGE_COLOR}Preparing dual build for providing libmpg123 for
small and large files.$DEFAULT_COLOR"
- OPTS="$OPTS --disable-modules --disable-largefile" default_build &&
- make DESTDIR="$SOURCE_DIRECTORY/mpg123-smallfile" install # Will grab the
library build later from there.
-fi &&
-# Sane systems, in this case 64 bit Linux, just need default build.
-# On 32 bit systems, default build will enable largefile support for
libmpg123_64
default_build
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index e809c94..327f992 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.11.0
+ VERSION=1.12.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 71f420c..128f681 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, BUILD: Update to 1.12.1
+ * INSTALL: gone (special install hack not needed anymore)
+
2010-03-24 Thomas Orgis <sobukus AT sourcemage.org>
* INSTALL: Use cp -P --preserve=links instead of cp -a to work around
castfs bug.
diff --git a/audio-players/mpg123/INSTALL b/audio-players/mpg123/INSTALL
deleted file mode 100755
index b051928..0000000
--- a/audio-players/mpg123/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-cd "$SOURCE_DIRECTORY" &&
-if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]]; then
- cp -v -P --preserve=links
mpg123-smallfile/$INSTALL_ROOT/usr/lib/libmpg123* "$INSTALL_ROOT/usr/lib" &&
- cp -v mpg123-smallfile/$INSTALL_ROOT/usr/lib/pkgconfig/libmpg123.pc
"$INSTALL_ROOT/usr/lib/pkgconfig"
-fi &&
-default_install
diff --git a/audio-players/mpg123/UP_TRIGGERS
b/audio-players/mpg123/UP_TRIGGERS
index a292e97..9fbcecd 100755
--- a/audio-players/mpg123/UP_TRIGGERS
+++ b/audio-players/mpg123/UP_TRIGGERS
@@ -1,6 +1,8 @@
-# On x86, if there is mpg123 >= 1.5 but < 1.11 installed, it will have
libmpg123.so with 64bit off_t.
-# Since 1.11, libmpg123.so offers 32 bit off_t, consistent with pre-1.5
versions,
-# plus additional libmpg123_64.so for 64 bit offsets.
+# For a very brief period, there was mpg123 1.11.0 with the split of
libmpg123
+# for 32 bit file offsets and and libmpg123_64 for 64 bit offsets.
+# 1.12.0 introduces a dualmode library instead, replacing the split ones and
+# being binary compatible with all earlier libmpg123 versions (be it for 32
or 64 bit offsets).
+# So only when updating from 1.11.0, we might need to recast users of
libmpg123_64 .
local OLD_SPELL_VERSION=""
local MAJOR=""
local MINOR=""
@@ -8,12 +10,13 @@ if [[ ${SMGL_COMPAT_ARCHS[0]} == 32 ]] && spell_ok
$SPELL; then
OLD_SPELL_VERSION="$(installed_version $SPELL)"
MAJOR=$(echo $OLD_SPELL_VERSION | cut -d . -f 1)
MINOR=$(echo $OLD_SPELL_VERSION | cut -d . -f 2)
- if [[ $MAJOR -eq 1 ]] && [[ $MINOR -ge 5 ]] && [[ $MINOR -lt 11 ]]; then
+ if [[ $MAJOR -eq 1 ]] && [[ $MINOR -eq 11 ]]; then
message "This is a possibly incompatible update of libmpg123..."
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL); do
+message "Checking $each."
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libmpg123.so.0"; then
+ grep -q "NEEDED.*libmpg123_64.so.0"; then
up_trigger $each cast_self
fi
done
diff --git a/audio-players/xmms2/HISTORY b/audio-players/xmms2/HISTORY
index 04aa417..9f4e461 100644
--- a/audio-players/xmms2/HISTORY
+++ b/audio-players/xmms2/HISTORY
@@ -1,3 +1,8 @@
+2010-04-02 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: Only apply the wscript for mpg123 1.11.0 .
+ This is subject to removal once we are sure that this version
+ of mpg123 is history...
+
2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, xmms2-0.6_and_0.7_mpg123-wscript:
prepared for mpg123 1.11.0
diff --git a/audio-players/xmms2/PRE_BUILD b/audio-players/xmms2/PRE_BUILD
index a63f571..b7586d2 100755
--- a/audio-players/xmms2/PRE_BUILD
+++ b/audio-players/xmms2/PRE_BUILD
@@ -5,6 +5,7 @@ cd xmms* &&
echo -e "#!/bin/sh\ncd xmms*\n./waf configure --help" > ../configure &&
chmod +x ../configure &&
patch -p0 < $SPELL_DIRECTORY/fix_flags.diff &&
-# Be prepared for mpg123 >= 1.11.0, needed at least until xmms2 0.7
-cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript"
src/plugins/mpg123/wscript
-
+# Be prepared for mpg123 == 1.11.0, newer mpg123 does not need this.
+if spell_ok mpg123 && [[ $(installed_version mpg123) == 1.11.0 ]]; then
+ cp -v "$SCRIPT_DIRECTORY/xmms2-0.6_and_0.7_mpg123-wscript"
src/plugins/mpg123/wscript
+fi
diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index a603467..8f82b85 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,5 @@
SPELL=gajim
- VERSION=0.13.3
+ VERSION=0.13.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[1]=http://www.gajim.org/downloads/$BRANCH/$SOURCE
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 2518342..8e40d47 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.13.4
+
2010-02-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.13.3
diff --git a/chat-im/gajim/gajim-0.13.3.tar.bz2.sig
b/chat-im/gajim/gajim-0.13.3.tar.bz2.sig
deleted file mode 100644
index 5bb4699..0000000
Binary files a/chat-im/gajim/gajim-0.13.3.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/gajim/gajim-0.13.4.tar.bz2.sig
b/chat-im/gajim/gajim-0.13.4.tar.bz2.sig
new file mode 100644
index 0000000..1054b98
Binary files /dev/null and b/chat-im/gajim/gajim-0.13.4.tar.bz2.sig differ
diff --git a/crypto/gss/DETAILS b/crypto/gss/DETAILS
index a453695..641cd35 100755
--- a/crypto/gss/DETAILS
+++ b/crypto/gss/DETAILS
@@ -1,9 +1,9 @@
SPELL=gss
- VERSION=0.1.5
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://alpha.gnu.org/gnu/gss/$SOURCE
+ SOURCE_URL[0]=$GNU_URL/gss/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=B565716F.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/crypto/gss/HISTORY b/crypto/gss/HISTORY
index 211a7c8..22839fd 100644
--- a/crypto/gss/HISTORY
+++ b/crypto/gss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.0
+ use GNU_URL
+
2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.1.5
diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
new file mode 100755
index 0000000..a1c3986
--- /dev/null
+++ b/database/mariadb/BUILD
@@ -0,0 +1,80 @@
+OPTS="--with-charset=$MADB_CHARSET $OPTS" &&
+
+
+if list_find "$MADB_ENGINES" "none" ; then
+ OPTS="--without-archive-storage-engine \
+ --without-berkeley-db \
+ --without-blackhole-storage-engine \
+ --without-example-storage-engine \
+ --without-federated-storage-engine \
+ --without-innodb \
+ --without-ndbcluster \
+ $OPTS"
+else
+ if list_find "$MADB_ENGINES" "ARCHIVE" ; then
+ OPTS="--with-archive-storage-engine $OPTS"
+ else
+ OPTS="--without-archive-storage-engine $OPTS"
+ fi &&
+ if ! list_find "$MADB_ENGINES" "BerkeleyDB" ; then
+ OPTS="--without-berkeley-db $OPTS"
+ fi &&
+ if list_find "$MADB_ENGINES" "BLACKHOLE" ; then
+ OPTS="--with-blackhole-storage-engine $OPTS"
+ else
+ OPTS="--without-blackhole-storage-engine $OPTS"
+ fi &&
+ if list_find "$MADB_ENGINES" "EXAMPLE" ; then
+ OPTS="--with-example-storage-engine $OPTS"
+ else
+ OPTS="--without-example-storage-engine $OPTS"
+ fi &&
+ if list_find "$MADB_ENGINES" "FEDERATED" ; then
+ OPTS="--with-federated-storage-engine $OPTS"
+ else
+ OPTS="--without-federated-storage-engine $OPTS"
+ fi &&
+ if list_find "$MADB_ENGINES" "InnoDB" ; then
+ OPTS="--with-innodb $OPTS"
+ else
+ OPTS="--without-innodb $OPTS"
+ fi &&
+ if list_find "$MADB_ENGINES" "ndbcluster" ; then
+ OPTS="--with-ndbcluster $OPTS"
+ else
+ OPTS="--without-ndbcluster $OPTS"
+ fi
+fi &&
+
+OPTS="$MADB_SERVER $MADB_EMBED $OPTS" &&
+CFLAGS="${CFLAGS//-ffast-math}" &&
+
+create_account mariadb &&
+
+local LD_PRELOAD_OLD="$LD_PRELOAD" &&
+unset LD_PRELOAD &&
+export CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+
+if glibc_is_nptl; then
+ OPTS="$OPTS --with-named-thread-libs=-lpthread" &&
+ export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+fi &&
+OPTS="$OPTS --with-mysqld-user=mariadb --without-bench \
+ --localstatedir=${INSTALL_ROOT}/var/lib/mysql \
+ --enable-assembler --enable-thread-safe-client" &&
+default_build &&
+
+#./configure --build=$BUILD \
+# --prefix=$INSTALL_ROOT/usr \
+# --sysconfdir=$INSTALL_ROOT/etc \
+# --mandir=$INSTALL_ROOT/usr/share/man \
+# --infodir=$INSTALL_ROOT/usr/share/info \
+# --localstatedir=/var/lib/mysql \
+# --with-mysqld-user=mysql \
+# --without-bench \
+# --enable-assembler \
+# --enable-thread-safe-client \
+# $OPTS &&
+
+export LD_PRELOAD="$LD_PRELOAD_OLD" &&
+make pkglibdir=${TRACK_ROOT}/usr/lib
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
new file mode 100755
index 0000000..a9ecc45
--- /dev/null
+++ b/database/mariadb/CONFIGURE
@@ -0,0 +1,68 @@
+source $GRIMOIRE/config_query_multi.function &&
+
+config_query_option MADB_SERVER \
+ "Install client only?" \
+ n \
+ "--without-server" \
+ "--with-server" &&
+
+config_query_list MADB_CHARSET "Select default character set" \
+ latin1 \
+ utf8 \
+ binary \
+ armscii8 \
+ ascii \
+ big5 \
+ cp1250 \
+ cp1251 \
+ cp1256 \
+ cp1257 \
+ cp850 \
+ cp852 \
+ cp866 \
+ cp932 \
+ dec8 \
+ eucjpms \
+ euckr \
+ gb2312 \
+ gbk \
+ geostd8 \
+ greek \
+ hebrew \
+ hp8 \
+ keybcs2 \
+ koi8r \
+ koi8u \
+ latin2 \
+ latin5 \
+ latin7 \
+ macce \
+ macroman \
+ sjis \
+ swe7 \
+ tis620 \
+ ucs2 \
+ ujis &&
+
+config_query_multi MADB_ENGINES \
+ "What additional storage engines to build?" \
+ none \
+ all \
+ ARCHIVE \
+ BerkeleyDB \
+ BLACKHOLE \
+ EXAMPLE \
+ FEDERATED \
+ InnoDB \
+ ndbcluster &&
+
+if list_find "$MADB_ENGINES" "all"
+then
+ MADB_ENGINES="ARCHIVE BerkeleyDB BLACKHOLE EXAMPLE FEDERATED InnoDB
ndbcluster"
+fi &&
+
+config_query_option MADB_EMBED \
+ "Build the embedded server (libmysqld)?" \
+ n \
+ "--with-embedded-server" \
+ "--without-embedded-server"
diff --git a/database/mariadb/CONFLICTS b/database/mariadb/CONFLICTS
new file mode 100755
index 0000000..59a63e1
--- /dev/null
+++ b/database/mariadb/CONFLICTS
@@ -0,0 +1 @@
+conflicts mysql
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
new file mode 100755
index 0000000..3387320
--- /dev/null
+++ b/database/mariadb/DEPENDS
@@ -0,0 +1,20 @@
+depends zlib &&
+depends perl &&
+depends procps &&
+depends g++ &&
+
+if [[ $OLD == y ]]; then
+ optional_depends openssl \
+ "--with-openssl" \
+ "--without-openssl" \
+ "for OpenSSL support"
+else
+ optional_depends openssl \
+ "--with-ssl" \
+ "--without-ssl" \
+ "for OpenSSL support"
+fi &&
+
+if ! list_find "$MSQL_ENGINES" "none" && list_find "$MSQL_ENGINES"
"BerkeleyDB"; then
+ depends db "--with-berkeley-db"
+fi
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
new file mode 100755
index 0000000..34aef07
--- /dev/null
+++ b/database/mariadb/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=mariadb
+ VERSION=5.1.44
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE_HASH=sha512:b8c0e9fd0c8447962c94f4d82948b3c3154c25cf2587ee1e7c50b39dc4e81c6548ace118461a46f673d296414188fc59dc280419a9831dce7286896699db19d9
+
SOURCE_URL[0]=http://ftp.rediris.es/mirror/MariaDB/${SPELL}-${VERSION}/distro/kvm-tarbake-jaunty-x86/${SOURCE}
+ LICENSE[0]=GPL
+ WEB_SITE=http://askmonty.org/wiki/MariaDB
+ KEYWORDS="sql database"
+ ENTERED=20011114
+ SHORT="MariaDB is a backward compatible, drop-in replacement
branch of the MySQL® Database Sever"
+cat << EOF
+MariaDB is a backward compatible, drop-in replacement branch of the
+MySQL® Database Server.
+
+It includes all major open source storage engines,
+including the Maria storage engine.
+EOF
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
new file mode 100644
index 0000000..cc06a6c
--- /dev/null
+++ b/database/mariadb/HISTORY
@@ -0,0 +1,3 @@
+2010-04-02 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * spell created
+
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
new file mode 100755
index 0000000..cdf532b
--- /dev/null
+++ b/database/mariadb/INSTALL
@@ -0,0 +1,4 @@
+make pkglibdir=${TRACK_ROOT}/usr/lib install &&
+rm -rf ${INSTALL_ROOT}/usr/mysql-test &&
+install -m 0644 $SCRIPT_DIRECTORY/profile.d/mariadb
$INSTALL_ROOT/etc/sysconfig &&
+install-info ${INSTALL_ROOT}/usr/share/info/mysql.info --info-dir
${INSTALL_ROOT}/usr/share/info
diff --git a/database/mariadb/POST_INSTALL b/database/mariadb/POST_INSTALL
new file mode 100755
index 0000000..16144c3
--- /dev/null
+++ b/database/mariadb/POST_INSTALL
@@ -0,0 +1,3 @@
+default_post_install &&
+chown mariadb.mariadb /var/lib/mariadb
+${INSTALL_ROOT}/usr/bin/mysql_install_db --user=mariadb
--datadir=/var/lib/mariadb
diff --git a/database/mariadb/PRE_BUILD b/database/mariadb/PRE_BUILD
new file mode 100755
index 0000000..db6414a
--- /dev/null
+++ b/database/mariadb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
diff --git a/database/mariadb/PRE_REMOVE b/database/mariadb/PRE_REMOVE
new file mode 100755
index 0000000..65c9a4e
--- /dev/null
+++ b/database/mariadb/PRE_REMOVE
@@ -0,0 +1 @@
+install-info --delete ${INSTALL_ROOT}/usr/share/info/mysql.info --info-dir
${INSTALL_ROOT}/usr/share/info
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..b79f83d
--- /dev/null
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
+ innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" ==
"all" ]]; then return 0; fi;;
+esac
+return 1
diff --git a/database/mariadb/PROVIDES b/database/mariadb/PROVIDES
new file mode 100755
index 0000000..b433cc9
--- /dev/null
+++ b/database/mariadb/PROVIDES
@@ -0,0 +1 @@
+SQL
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
new file mode 100755
index 0000000..b31384a
--- /dev/null
+++ b/database/mariadb/SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
+ MSQL_EMBED="--with-embedded-server" ;;
+ innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
+ if [ "$MSQL_ENGINES" == "none" ]; then
+ MSQL_ENGINES="InnoDB"
+ else
+ MSQL_ENGINES="$MSQL_ENGINES InnoDB"
+ fi ;;
+ *) echo "unknown sub-depends!"; return 1 ;;
+esac
diff --git a/database/mariadb/UP_TRIGGERS b/database/mariadb/UP_TRIGGERS
new file mode 100755
index 0000000..000b21c
--- /dev/null
+++ b/database/mariadb/UP_TRIGGERS
@@ -0,0 +1,16 @@
+# up_trigger everything on update to 5.1.32 as most stuff links to
libmysqlclient.so.15 from version 5.0.77
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of libmysql..."
+ 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.*libmysqlclient.so.15"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/database/mariadb/init.d/mariadb b/database/mariadb/init.d/mariadb
new file mode 100644
index 0000000..2b5d8ee
--- /dev/null
+++ b/database/mariadb/init.d/mariadb
@@ -0,0 +1,186 @@
+#!/bin/bash
+# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
+# This file is public domain and comes with NO WARRANTY of any kind
+#
+# If you install MySQL on some other places than /usr, then you
+# have to do one of the following things for this script to work:
+#
+# - Run this script from within the MySQL installation directory
+# - Create a /etc/my.cnf file with the following information:
+# [mariadbd]
+# basedir=<path-to-mariadb-installation-directory>
+# - Add the above to any other configuration file (for example ~/.my.ini)
+# and copy my_print_defaults to /usr/bin
+# - Add the path to the mariadb-installation-directory to the basedir
variable
+# below.
+#
+# If you want to affect other MySQL variables, you should make your changes
+# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
+#
+# SMGL-script-version=20030723
+# SMGL-START:3 4 5:S90
+# SMGL-STOP:0 1 2 6:K10
+
+PROGRAM=
+RUNLEVEL=3
+NEEDS="+remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/mariadb
+
+[[ ! -d ${DATA_DIR} ]] && mkdir -p ${DATA_DIR}
+
+basedir=
+
+# The following variables are only set for letting mariadb.server find
things.
+
+# Set some defaults
+datadir=${DATA_DIR}
+pid_file=
+if test -z "$basedir"
+then
+ basedir=/usr
+ bindir=/usr/bin
+else
+ bindir="$basedir/bin"
+fi
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin
+export PATH
+
+if test -z "$pid_file"
+then
+ pid_file=$datadir/`/bin/hostname`.pid
+else
+ case "$pid_file" in
+ /* ) ;;
+ * ) pid_file="$datadir/$pid_file" ;;
+ esac
+fi
+
+mode=$1 # start or stop
+
+parse_arguments() {
+ for arg do
+ case "$arg" in
+ --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ --pid-file=*) pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ esac
+ done
+}
+
+# Get arguments from the my.cnf file,
+# groups [mariadbd] [mariadb_server] and [mariadb.server]
+if test -x ./bin/my_print_defaults
+then
+ print_defaults="./bin/my_print_defaults"
+elif test -x $bindir/my_print_defaults
+then
+ print_defaults="$bindir/my_print_defaults"
+elif test -x $bindir/mariadb_print_defaults
+then
+ print_defaults="$bindir/mariadb_print_defaults"
+else
+ # Try to find basedir in /etc/my.cnf
+ conf=/etc/my.cnf
+ print_defaults=
+ if test -r $conf
+ then
+ subpat='^[^=]*basedir[^=]*=\(.*\)$'
+ dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf`
+ for d in $dirs
+ do
+ d=`echo $d | sed -e 's/[ ]//g'`
+ if test -x "$d/bin/my_print_defaults"
+ then
+ print_defaults="$d/bin/my_print_defaults"
+ break
+ fi
+ if test -x "$d/bin/mariadb_print_defaults"
+ then
+ print_defaults="$d/bin/mariadb_print_defaults"
+ break
+ fi
+ done
+ fi
+
+ # Hope it's in the PATH ... but I doubt it
+ test -z "$print_defaults" && print_defaults="my_print_defaults"
+fi
+
+parse_arguments `$print_defaults mariadbd mariadb_server mariadb.server`
+
+# Safeguard (relative paths, core dumps..)
+cd $basedir
+
+case "$mode" in
+ 'start')
+ # Start daemon
+
+ if test -x $bindir/mysqld_safe
+ then
+ # Give extra arguments to mariadbd with the my.cnf file. This script
may
+ # be overwritten at next upgrade.
+ echo "Starting mariadbd_safe..."
+ iter=0
+ ( unset -f echo
+ $bindir/mysqld_safe --datadir=$datadir --pid-file=$pid_file 2>&1 >
/dev/null ) &
+ while [ ! -e $pid_file ] && [ $((iter++)) -lt 10 ] ; do sleep 1; echo
-n . ; done
+ [ $((iter++)) -lt 11 ]
+ evaluate_retval
+ # Make lock for RedHat / SuSE
+ if test -w /var/lock/subsys
+ then
+ touch /var/lock/subsys/mariadb
+ fi
+ else
+ echo "Can't execute $bindir/mariadbd_safe from dir $basedir"
+ fi
+ evaluate_retval
+ ;;
+
+ 'stop')
+ # Stop daemon. We use a signal here to avoid having to know the
+ # root password.
+ if test -s "$pid_file"
+ then
+ mariadbd_pid=`cat $pid_file`
+ echo "Killing mariadbd with pid $mariadbd_pid"
+ kill $mariadbd_pid
+ # mariadbd should remove the pid_file when it exits, so wait for it.
+
+ sleep 1
+ while [ -s $pid_file -a "$flags" != aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
]
+ do
+ [ -z "$flags" ] && echo -n "Wait for mariadbd to exit" || echo -n "."
+ flags=a$flags
+ sleep 1
+ done
+ if [ -s $pid_file ]
+ then echo " gave up waiting!"
+ elif [ -n "$flags" ]
+ then echo " done"
+ fi
+ # delete lock for RedHat / SuSE
+ if test -f /var/lock/subsys/mariadb
+ then
+ rm /var/lock/subsys/mariadb
+ fi
+ else
+ echo "No mariadbd pid file found. Looked for $pid_file."
+ fi
+ evaluate_retval
+ ;;
+ 'restart')
+ echo "Restarting mariadb server"
+ $0 stop
+ $0 start
+ evaluate_retval
+ ;;
+ *)
+ # usage
+ echo "usage: $0 start|stop|restart"
+ exit 1
+ ;;
+esac
diff --git a/database/mariadb/profile.d/mariadb
b/database/mariadb/profile.d/mariadb
new file mode 100644
index 0000000..b591f15
--- /dev/null
+++ b/database/mariadb/profile.d/mariadb
@@ -0,0 +1,4 @@
+# Mariadb Global Configuration
+# Set the Data directory here
+
+DATA_DIR=/var/lib/mariadb
diff --git a/devel/codeblocks/02_ftbfs_gcc44.dpatch
b/devel/codeblocks/02_ftbfs_gcc44.dpatch
new file mode 100644
index 0000000..4a48d51
--- /dev/null
+++ b/devel/codeblocks/02_ftbfs_gcc44.dpatch
@@ -0,0 +1,161 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_ftbfs_gcc44.dpatch by Felix Geyer <debfx-pkg AT fobos.de>
+##
+## DP: Fix FTBFS with gcc 4.4
+## DP: Taken from upstream svn commit 5613
+
+@DPATCH@
+
+--- trunk/src/src/prefix.cpp 2009/05/30 07:19:02 5612
++++ trunk/src/src/prefix.cpp 2009/05/30 16:45:25 5613
+@@ -12,7 +12,7 @@
+ * Written by: Mike Hearn <mike AT theoretic.com>
+ * Hongli Lai <h.lai AT chello.nl>
+ * http://autopackage.org/
+- *
++ *
+ * This source code is public domain. You can relicense this code
+ * under whatever license you want.
+ *
+@@ -202,21 +202,20 @@
+ char *
+ br_prepend_prefix (void *symbol, char *path)
+ {
+- char *tmp, *newpath;
+-
+- br_return_val_if_fail (symbol != NULL, (char*)NULL);
+- br_return_val_if_fail (path != NULL, (char*)NULL);
++ br_return_val_if_fail (symbol != 0, (char*)0);
++ br_return_val_if_fail (path != 0, (char*)0);
+
+- tmp = br_locate_prefix (symbol);
+- if (!tmp) return (char*)NULL;
++ char* tmp = br_locate_prefix (symbol);
++ if (!tmp) return (char*)0;
+
++ char *newpath;
+ if (strcmp (tmp, "/") == 0)
+ newpath = strdup (path);
+ else
+ newpath = br_strcat (tmp, path);
+
+ /* Get rid of compiler warning ("br_prepend_prefix never used") */
+- if (0) br_prepend_prefix (NULL, (char*)NULL);
++ if (0) br_prepend_prefix (0, (char*)0);
+
+ free (tmp);
+ return newpath;
+@@ -240,9 +239,7 @@
+ static void
+ br_thread_local_store_fini ()
+ {
+- char *specific;
+-
+- specific = (char *) pthread_getspecific (br_thread_key);
++ char* specific = (char *) pthread_getspecific (br_thread_key);
+ if (specific)
+ {
+ free (specific);
+@@ -301,11 +298,9 @@
+ br_thread_local_store (char *str)
+ {
+ #if BR_PTHREADS
+- char *specific;
+-
+ pthread_once (&br_thread_key_once,
br_thread_local_store_init);
+
+- specific = (char *) pthread_getspecific (br_thread_key);
++ char* specific = (char *) pthread_getspecific (br_thread_key);
+ br_str_free (specific);
+ pthread_setspecific (br_thread_key, str);
+
+@@ -338,16 +333,13 @@
+ char *
+ br_strcat (const char *str1, const char *str2)
+ {
+- char *result;
+- size_t len1, len2;
+-
+ if (!str1) str1 = "";
+ if (!str2) str2 = "";
+
+- len1 = strlen (str1);
+- len2 = strlen (str2);
++ size_t len1 = strlen (str1);
++ size_t len2 = strlen (str2);
+
+- result = (char *) malloc (len1 + len2 + 1);
++ char* result = (char *) malloc (len1 + len2 + 1);
+ memcpy (result, str1, len1);
+ memcpy (result + len1, str2, len2);
+ result[len1 + len2] = '\0';
+@@ -360,16 +352,13 @@
+ static char *
+ br_strndup (char *str, size_t size)
+ {
+- char *result = (char *) NULL;
+- size_t len;
++ br_return_val_if_fail (str != (char *) 0, (char *) 0);
+
+- br_return_val_if_fail (str != (char *) NULL, (char *) NULL);
+-
+- len = strlen (str);
++ size_t len = strlen (str);
+ if (!len) return strdup ("");
+ if (size > len) size = len;
+
+- result = (char *) calloc (sizeof (char), len + 1);
++ char* result = (char *) calloc (sizeof (char), len + 1);
+ memcpy (result, str, size);
+ return result;
+ }
+@@ -389,16 +378,16 @@
+ char *
+ br_extract_dir (const char *path)
+ {
+- char *end, *result;
+-
+- br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
++ br_return_val_if_fail (path != (char *) 0, (char *) 0);
+
+- end = strrchr (path, '/');
++ const char* end = strrchr (path, '/');
+ if (!end) return strdup (".");
+
+ while (end > path && *end == '/')
++ {
+ end--;
+- result = br_strndup ((char *) path, end - path + 1);
++ }
++ char* result = br_strndup ((char *) path, end - path + 1);
+ if (!*result)
+ {
+ free (result);
+@@ -424,15 +413,13 @@
+ char *
+ br_extract_prefix (const char *path)
+ {
+- char *end, *tmp, *result;
+-
+- br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
++ br_return_val_if_fail (path != (char *) 0, (char *) 0);
+
+ if (!*path) return strdup ("/");
+- end = strrchr (path, '/');
++ const char* end = strrchr (path, '/');
+ if (!end) return strdup (path);
+
+- tmp = br_strndup ((char *) path, end - path);
++ char* tmp = br_strndup ((char *) path, end - path);
+ if (!*tmp)
+ {
+ free (tmp);
+@@ -441,7 +428,7 @@
+ end = strrchr (tmp, '/');
+ if (!end) return tmp;
+
+- result = br_strndup (tmp, end - tmp);
++ char* result = br_strndup (tmp, end - tmp);
+ free (tmp);
+
+ if (!*result)
diff --git a/devel/codeblocks/DEPENDS b/devel/codeblocks/DEPENDS
index c677a6a..c7b9457 100755
--- a/devel/codeblocks/DEPENDS
+++ b/devel/codeblocks/DEPENDS
@@ -1 +1,3 @@
-depends wxgtk
+depends wxgtk &&
+depends automake &&
+depends autoconf
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index 9bf9a5b..809f5cb 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,10 @@
+2010-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added missing dependencies on autoconf and automake
+ * 02_ftbfs_gcc44.dpatch, PRE_BUILD: added patch from ubuntu
+ to make the spell compile with gcc 4.4
+ * automake.patch, PRE_BUILD: added patch to make the spell
+ build with recent versions of automake
+
2008-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE: added option to build the stable version
* PRE_BUILD, gtk-update-icon-cache.patch: added patch so install
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
index 3a4688b..5195e02 100755
--- a/devel/codeblocks/PRE_BUILD
+++ b/devel/codeblocks/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/automake.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/02_ftbfs_gcc44.dpatch
diff --git a/devel/codeblocks/automake.patch b/devel/codeblocks/automake.patch
new file mode 100644
index 0000000..3829227
--- /dev/null
+++ b/devel/codeblocks/automake.patch
@@ -0,0 +1,18 @@
+--- bootstrap.orig 2010-04-02 13:02:21.394443953 +0200
++++ bootstrap 2010-04-02 13:03:15.957443368 +0200
+@@ -42,15 +42,6 @@
+ exit 1;
+ fi
+
+-if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep
'1\.[0-6](\.[0-9]+)?$'`"; then
+- echo "Automake 1.7 or above is required. Aborting build...";
+- exit 1;
+-fi
+-
+-if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep
'1\.7(\.[0-9]+)?$|1\.8(\.[0-9]+)?$'`"; then
+- echo "make dist only supported with automake 1.9 or above" >&2;
+-fi
+-
+ if test -n "`$LIBTOOL --version 2>&1|head -n 1|cut -f 4 -d ' '|egrep
'1\.[0-3](\.[0-9]+)?$'`"; then
+ echo "Libtool 1.4 or above is required. Aborting build...";
+ exit 1;
diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 726ea95..b128ba9 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,6 +1,6 @@
SPELL=vala
- VERSION=0.7.10
-
SOURCE_HASH=sha512:1c9bd4657adc80999d82a26786f194c40d1265ae78ab8e99c9f12a6e8ac2d517ca17b075437b30f38a4c5895c06349e5ef5ccf7df23b4381a5436c6335efce43
+ VERSION=0.8.0
+
SOURCE_HASH=sha512:5b67b6fa7ff42f04fb4c1705b769e1f823bb02f892d4146ac071f1843c2303085e5b29bf69ee71d1252958b269239f25d57c4c4da4992b95535773ea7c8ba5ea
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 5e881c4..461cf94 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2010-04-01 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.0
+
2010-02-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.10
diff --git a/disk/udisks/DETAILS b/disk/udisks/DETAILS
index e658677..eb3270a 100755
--- a/disk/udisks/DETAILS
+++ b/disk/udisks/DETAILS
@@ -1,8 +1,8 @@
SPELL=udisks
- VERSION=1.0.0.git20091202
+ VERSION=1.0.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://hal.freedesktop.org/releases/${SOURCE}
-
SOURCE_HASH=sha512:3950a0a3d7ca05647b059644eb8bd84a0650ed7d0716126177b2db933bd6c6c0cd639208c2e1ec97864663f8f1b9e0163b42e0d1a077fcb699e2ef63f556c518
+
SOURCE_HASH=sha512:b3e34fd8531cffad597044550ca0a1926df3245e4191ec2b03ada359c343683086911e6465cbfe2700153963a1826cf80a8353dccae02eafb4fb4a82c66fae93
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.0"
WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks"
LICENSE[0]=GPL
diff --git a/disk/udisks/HISTORY b/disk/udisks/HISTORY
index 2bf2b5a..ef134c1 100644
--- a/disk/udisks/HISTORY
+++ b/disk/udisks/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.0
+
2010-03-10 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: depends on policykit with gobject-introspection