Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (c1d022825679ba47398c49471916d20506505d6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (c1d022825679ba47398c49471916d20506505d6f)
  • Date: Sat, 4 Jan 2014 18:47:41 -0600

GIT changes to devel-xorg-modular grimoire by Robin Cook <rcook AT wyrms.net>:

ChangeLog | 3
audio-creation/mhwaveedit/DETAILS | 4
audio-creation/mhwaveedit/HISTORY | 3
audio-players/cantata/DETAILS | 4
audio-players/cantata/HISTORY | 3
chat-im/mcabber/DEPENDS | 1
chat-im/mcabber/HISTORY | 4
chat-im/mcabber/PRE_BUILD | 6
chat-im/mcabber/mcabber_use_libotr4.patch | 596
+++++++++++++
chat-libs/loudmouth/BUILD | 1
chat-libs/loudmouth/HISTORY | 3
collab/subversion/DETAILS | 4
collab/subversion/HISTORY | 4
dev/null |binary
gnome2-libs/atk/DETAILS | 6
gnome2-libs/atk/HISTORY | 3
gnustep-libs/gnustep-base/DETAILS | 2
gnustep-libs/gnustep-base/HISTORY | 3
gnustep-libs/gnustep-gui/DETAILS | 2
gnustep-libs/gnustep-gui/HISTORY | 3
gnustep-libs/gnustep-make/DETAILS | 2
gnustep-libs/gnustep-make/HISTORY | 4
gnustep-libs/gnustep-make/INSTALL | 2
gnustep-libs/gnustep-make/gs_make | 3
haskell/haskell-async/DETAILS | 16
haskell/haskell-async/HISTORY | 6
haskell/haskell-git-annex/0001-add-dependency-on-stm.patch | 25
haskell/haskell-git-annex/DETAILS | 4
haskell/haskell-git-annex/HISTORY | 5
haskell/haskell-git-annex/PRE_BUILD | 3
haskell/haskell-stm/DETAILS | 4
haskell/haskell-stm/HISTORY | 3
libs/apr-util/DETAILS | 2
libs/apr-util/HISTORY | 3
libs/apr/DETAILS | 2
libs/apr/HISTORY | 3
libs/neon/DETAILS | 3
libs/neon/HISTORY | 4
libs/neon/PRE_BUILD | 4
libs/neon/spaces.patch | 22
python-pypi/isort/DEPENDS | 1
python-pypi/isort/DETAILS | 16
python-pypi/isort/HISTORY | 4
python-pypi/mercurial/DETAILS | 4
python-pypi/mercurial/HISTORY | 3
python-pypi/python-stdnum/DETAILS | 4
python-pypi/python-stdnum/HISTORY | 3
python-pypi/setuptools/DETAILS | 4
python-pypi/setuptools/HISTORY | 3
python-pypi/sqlacodegen/DETAILS | 4
python-pypi/sqlacodegen/HISTORY | 3
python-pypi/sqlalchemy/DEPENDS | 3
python-pypi/sqlalchemy/DETAILS | 4
python-pypi/sqlalchemy/HISTORY | 5
security-libs/cracklib/DETAILS | 4
security-libs/cracklib/HISTORY | 4
security-libs/cracklib/PRE_BUILD | 12
video/gecko-mediaplayer/DETAILS | 4
video/gecko-mediaplayer/HISTORY | 3
59 files changed, 789 insertions(+), 74 deletions(-)

New commits:
commit 9ed565d9c279ed11ca64eb0574a0563de2b817c1
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gecko-mediaplayer: updated to 1.0.8

commit 6c0e7f82c866a8360da45180de4f295c04d06195
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mhwaveedit: => 1.4.23

commit 4f9e11a6c95cfab56e1781b7d55dc140f12f0d33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/mcabber: give credit to Debian for patch

commit 955793f2148ca6f6dcb33432f06806ecacb48b38
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/mcabber: fix build with libotr >= 4.0.0

commit 3a6967a118338b9c253f3537913a0c0b4f35d944
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-libs/loudmouth: prevent build error due to use of deprecated symbols

commit 96aaee6c1cc38922348c4462a7ef0ef90c5a3501
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-make: add script for invoking gnustep-make

commit 5402ed379446824431c914970a296690a69eb387
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-gui: version 0.24.0

commit a5175705a10e6bf60a6ce46da1579a4367c5d3ac
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-make: version 2.6.6

commit 08310f1155b6ed3ddd52477b9029949b98c37f60
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

gnustep-libs/gnustep-base: version 1.24.6

commit 39af61df2c4b7cc39c3bd8b83258107e5b75837e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sqlacodegen: => 1.1.4

commit c2d02e7aa9ebcc1e6646b53d5435e0249d8cfb0b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

setuptools: => 2.0.2

commit c66ca71bdf875f4a69785cd9e7d8a9714791c6b7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mercurial: => 2.8.2

commit 2e0d2512fd6f78307a4cee7892a5a1e253b9e550
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

subversion-1.8.5 SECURITY FIX

commit fdc657fa11823fe84be12f445352590dbdfddefe
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

apr-util: => 1.5.3

commit 1839768aa14d93a0420b899dacb374afd62fe8b9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

apr: => 1.5.0

commit d462a2045c233000c4dd1a29cee4ffea549376c2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

isort-3.0.0

commit d58b28491c564ea4bd43303c75dd4b653b0daa4a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

neon: => 0.30.0

commit a1c13e5448aebb70fb45deff6f4478e08b690c30
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/cantata: version 1.2.1

commit ed212bdb72441ec6d228f74573209a4b7571d3e7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python-stdnum: => 0.9

commit c539dfe91262506a2a39cfcd0d3ffb6edd68b9da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cracklib: => 2.9.1

commit 38fcb1c1c86c1a686a7e0af93108f56bd16be864
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sqlalchemy: => 0.9.0

commit f1c8a3864e1b0f338eafacaee0800e51f8f0b6bd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

atk: => 2.11.4

commit 4b19e63797baceb6f43c5d48f708b43180dc79a1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-git-annex: version 5.20131230

commit fbb9822545e8bcc7a28e09faf99e23dfa619a475
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-async: version 2.0.1.5

commit 56f13ee1fbfac840fc80e368c7be5dec4f1d2c90
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-stm: version 2.4.2

diff --git a/ChangeLog b/ChangeLog
index c1c991e..bbf02a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * python-pypi/isort: new spell, sort python imports
+
2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
* ruby-raa/ruby-2.1: new spell

diff --git a/audio-creation/mhwaveedit/DETAILS
b/audio-creation/mhwaveedit/DETAILS
index 8abd9ff..32ae1e0 100755
--- a/audio-creation/mhwaveedit/DETAILS
+++ b/audio-creation/mhwaveedit/DETAILS
@@ -1,8 +1,8 @@
SPELL=mhwaveedit
- VERSION=1.4.22
+ VERSION=1.4.23
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.gna.org/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c44428dd4f848fda08aaff351380163697504d0ac133ab78d34817d974111719d724e985539d85c5bda23eda2fdb4fce3c1c680b5a8fa673f8d37a9d4fbcf590
+
SOURCE_HASH=sha512:c8b3f1ca2c573e03bbe8e2c61c80d8bae0f9b9ec99fff0110119698f95328d1ab86eb4641d582865cd091f2955388343cbd912fd5f0b15f2a937b88cc01b974f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://gna.org/projects/mhwaveedit/
LICENSE[0]=GPL
diff --git a/audio-creation/mhwaveedit/HISTORY
b/audio-creation/mhwaveedit/HISTORY
index 17f3e75..bed3561 100644
--- a/audio-creation/mhwaveedit/HISTORY
+++ b/audio-creation/mhwaveedit/HISTORY
@@ -1,3 +1,6 @@
+2014-01-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.23
+
2012-08-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.22
* PRE_BUILD, alsa.patch: dropped, fixed by upstream
diff --git a/audio-players/cantata/DETAILS b/audio-players/cantata/DETAILS
index 29a85ff..401ff40 100755
--- a/audio-players/cantata/DETAILS
+++ b/audio-players/cantata/DETAILS
@@ -1,8 +1,8 @@
SPELL=cantata
- VERSION=1.0.3
+ VERSION=1.2.1
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=https://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:23fc6cc1c1e27ef04b299d7dacf1b3bf31a4731b9e7ad52e24a062a5367a9f2ec713ce90a9af4ee4029c06207771847b57eea4bb1326f789295241be2b96546b
+
SOURCE_HASH=sha512:c0b51f4615e23694ebc2ce355bb79fe1b5afb772ac65d4a15def3ca5af6d44efeccb4e3ff73907c400d378b5ab714eb9c0045892e1ecf6cfc97f1fdeb257e905
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://code.google.com/p/cantata/";
LICENSE[0]=GPL
diff --git a/audio-players/cantata/HISTORY b/audio-players/cantata/HISTORY
index 04688cc..a1e995b 100644
--- a/audio-players/cantata/HISTORY
+++ b/audio-players/cantata/HISTORY
@@ -1,3 +1,6 @@
+2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.2.1
+
2013-05-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created

diff --git a/chat-im/mcabber/DEPENDS b/chat-im/mcabber/DEPENDS
index 62e3c83..29884d7 100755
--- a/chat-im/mcabber/DEPENDS
+++ b/chat-im/mcabber/DEPENDS
@@ -1,6 +1,7 @@
depends glib2 &&
depends ncurses &&
depends loudmouth &&
+depends autoconf &&

optional_depends aspell \
"--enable-aspell" \
diff --git a/chat-im/mcabber/HISTORY b/chat-im/mcabber/HISTORY
index ef68f5e..5d84099 100644
--- a/chat-im/mcabber/HISTORY
+++ b/chat-im/mcabber/HISTORY
@@ -1,3 +1,7 @@
+2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PRE_BUILD, mcabber_use_libotr4.patch: fix build with
libotr >= 4.0.0,
+ patch is from Debian
+
2013-01-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.10.2; updated source urls; disabled
doc-duplicating; added example config installation; cleaned up
diff --git a/chat-im/mcabber/PRE_BUILD b/chat-im/mcabber/PRE_BUILD
new file mode 100755
index 0000000..82029af
--- /dev/null
+++ b/chat-im/mcabber/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/mcabber_use_libotr4.patch &&
+aclocal &&
+automake --add-missing &&
+autoreconf
diff --git a/chat-im/mcabber/mcabber_use_libotr4.patch
b/chat-im/mcabber/mcabber_use_libotr4.patch
new file mode 100644
index 0000000..ac044b3
--- /dev/null
+++ b/chat-im/mcabber/mcabber_use_libotr4.patch
@@ -0,0 +1,596 @@
+# HG changeset patch
+# Parent 1b31bdb72d83850b146a0e1e135eba35bad73d29
+Switch to libotr v4 API
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,16 +184,26 @@
+
+ # Check for otr
+ AC_ARG_ENABLE(otr,
+- AC_HELP_STRING([--enable-otr],
+- [enable OTR (Off-the-Record) messaging
support]),
+- enable_otr=$enableval, otr="")
++ AC_HELP_STRING([--enable-otr],
++ [enable OTR (Off-the-Record) messaging support]),
++ enable_otr=$enableval,
++ otr="")
+ if test "x$enable_otr" = "xyes"; then
+- # Look for libgcrypt and libotr
+- AM_PATH_LIBGCRYPT(1.2.2, [
+- AM_PATH_LIBOTR(3.1.0, ,
+- AC_MSG_ERROR(libotr 3.1.0 or newer is required.))
+- ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
+- )
++ # Look for libgcrypt and libotr
++ AM_PATH_LIBGCRYPT(1.2.2, [
++ AM_PATH_LIBOTR(4.0.0, [
++ AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
++ ], [
++ AM_PATH_LIBOTR(3.1.0, [
++ AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
++ AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3])
++ ], [
++ AC_MSG_ERROR(libotr 3.1.0 or newer is required.)
++ ])
++ ])
++ ], [
++ AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
++ ])
+ fi
+
+ # Check for Enchant stuff
+@@ -290,3 +300,4 @@
+ mcabber.pc
+ Makefile])
+ AC_OUTPUT
++dnl vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim
users...
+--- a/mcabber/otr.c
++++ b/mcabber/otr.c
+@@ -56,6 +56,20 @@
+ const char *protocol,
+ const char *recipient,
+ const char *message);
++static void cb_update_context_list(void *opdata);
++static void cb_new_fingerprint (void *opdata, OtrlUserState us,
++ const char *accountname,
++ const char *protocol,
++ const char *username,
++ unsigned char fingerprint[20]);
++static void cb_write_fingerprints (void *opdata);
++static void cb_gone_secure (void *opdata, ConnContext
*context);
++static void cb_gone_insecure (void *opdata, ConnContext
*context);
++static void cb_still_secure (void *opdata, ConnContext *context,
++ int is_reply);
++static int cb_max_message_size (void *opdata, ConnContext
*context);
++
++#ifdef HAVE_LIBOTR3
+ static void cb_notify (void *opdata,
+ OtrlNotifyLevel level,
+ const char *accountname,
+@@ -69,22 +83,26 @@
+ const char *protocol,
+ const char *username,
+ const char *msg);
+-static void cb_update_context_list(void *opdata);
+ static const char *cb_protocol_name (void *opdata, const char
*protocol);
+ static void cb_protocol_name_free (void *opdata,
+ const char *protocol_name);
+-static void cb_new_fingerprint (void *opdata, OtrlUserState us,
+- const char *accountname,
+- const char *protocol,
+- const char *username,
+- unsigned char fingerprint[20]);
+-static void cb_write_fingerprints (void *opdata);
+-static void cb_gone_secure (void *opdata, ConnContext
*context);
+-static void cb_gone_insecure (void *opdata, ConnContext
*context);
+-static void cb_still_secure (void *opdata, ConnContext *context,
+- int is_reply);
+ static void cb_log_message (void *opdata, const char *message);
+-static int cb_max_message_size (void *opdata, ConnContext
*context);
++
++static void otr_handle_smp_tlvs (OtrlTLV *tlvs, ConnContext *ctx);
++#else /* HAVE_LIBOTR3 */
++static char *tagfile = NULL;
++static guint otr_timer_source = 0;
++
++static void cb_handle_smp_event (void *opdata, OtrlSMPEvent event,
++ ConnContext *context, unsigned
short percent,
++ char *question);
++static void cb_handle_msg_event (void *opdata, OtrlMessageEvent
event,
++ ConnContext *context, const char
*message,
++ gcry_error_t err);
++static void cb_create_instag (void *opdata, const char
*accountname,
++ const char *protocol);
++static void cb_timer_control (void *opdata, unsigned int
interval);
++#endif /* HAVE_LIBOTR3 */
+
+ static OtrlMessageAppOps ops =
+ {
+@@ -92,26 +110,44 @@
+ cb_create_privkey,
+ cb_is_logged_in,
+ cb_inject_message,
++#ifdef HAVE_LIBOTR3
+ cb_notify,
+ cb_display_otr_message,
++#endif
+ cb_update_context_list,
++#ifdef HAVE_LIBOTR3
+ cb_protocol_name,
+ cb_protocol_name_free,
++#endif
+ cb_new_fingerprint,
+ cb_write_fingerprints,
+ cb_gone_secure,
+ cb_gone_insecure,
+ cb_still_secure,
++#ifdef HAVE_LIBOTR3
+ cb_log_message,
++#endif
+ cb_max_message_size,
+- NULL, /*account_name*/
+- NULL /*account_name_free*/
++ NULL, /* account_name */
++ NULL, /* account_name_free */
++#ifndef HAVE_LIBOTR3
++ NULL, /* received_symkey */
++ NULL, /* otr_error_message */
++ NULL, /* otr_error_message_free */
++ NULL, /* resent_msg_prefix */
++ NULL, /* resent_msg_prefix_free */
++ cb_handle_smp_event,
++ cb_handle_msg_event,
++ cb_create_instag,
++ NULL, /* convert_msg */
++ NULL, /* convert_free */
++ cb_timer_control,
++#endif
+ };
+
+ static void otr_message_disconnect(ConnContext *ctx);
+ static ConnContext *otr_get_context(const char *buddy);
+ static void otr_startstop(const char *buddy, int start);
+-static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx);
+
+ static char *otr_get_dir(void);
+
+@@ -135,7 +171,6 @@
+ account = jidtodisp(fjid);
+ keyfile = g_strdup_printf("%s%s.key", root, account);
+ fprfile = g_strdup_printf("%s%s.fpr", root, account);
+- g_free(root);
+
+ if (otrl_privkey_read(userstate, keyfile)){
+ scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR key from %s", keyfile);
+@@ -145,6 +180,14 @@
+ scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR fingerprints from %s",
+ fprfile);
+ }
++#ifndef HAVE_LIBOTR3
++ tagfile = g_strdup_printf("%s%s.tag", root, account);
++ if (otrl_instag_read(userstate, tagfile)) {
++ scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR instance tag from %s",
tagfile);
++ cb_create_instag(NULL, account, OTR_PROTOCOL_NAME);
++ }
++#endif
++ g_free(root);
+ }
+
+ void otr_terminate(void)
+@@ -154,6 +197,13 @@
+ if (!otr_is_enabled)
+ return;
+
++#ifndef HAVE_LIBOTR3
++ if (otr_timer_source > 0) {
++ g_source_remove (otr_timer_source);
++ otr_timer_source = 0;
++ }
++#endif
++
+ for (ctx = userstate->context_root; ctx; ctx = ctx->next)
+ if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
+ otr_message_disconnect(ctx);
+@@ -175,6 +225,12 @@
+ userstate = NULL;
+ g_free(keyfile);
+ keyfile = NULL;
++ g_free(fprfile);
++ fprfile = NULL;
++#ifndef HAVE_LIBOTR3
++ g_free(tagfile);
++ tagfile = NULL;
++#endif
+ }
+
+ static char *otr_get_dir(void)
+@@ -206,7 +262,12 @@
+
+ mc_strtolower(lowcasebuddy);
+ ctx = otrl_context_find(userstate, lowcasebuddy, account,
OTR_PROTOCOL_NAME,
++#ifdef HAVE_LIBOTR3
+ 1, &null, NULL, NULL);
++#else
++ // INSTAG XXX
++ OTRL_INSTAG_BEST, 1, &null, NULL, NULL);
++#endif
+ g_free(lowcasebuddy);
+ return ctx;
+ }
+@@ -216,7 +277,12 @@
+ if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
+ cb_gone_insecure(NULL, ctx);
+ otrl_message_disconnect(userstate, &ops, NULL, ctx->accountname,
++#ifdef HAVE_LIBOTR3
+ ctx->protocol, ctx->username);
++#else
++ // INSTAG XXX
++ ctx->protocol, ctx->username, OTRL_INSTAG_BEST);
++#endif
+ }
+
+ static void otr_startstop(const char *buddy, int start)
+@@ -283,6 +349,8 @@
+ cb_write_fingerprints(NULL);
+ }
+
++#ifdef HAVE_LIBOTR3
++
+ static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx)
+ {
+ OtrlTLV *tlv = NULL;
+@@ -354,6 +422,130 @@
+ }
+ }
+
++#else /* HAVE_LIBOTR3 */
++
++static void cb_handle_smp_event(void *opdata, OtrlSMPEvent event,
++ ConnContext *context, unsigned short
percent,
++ char *question)
++{
++ const char *msg = NULL;
++ char *freeme = NULL;
++ switch (event) {
++ case OTRL_SMPEVENT_ASK_FOR_SECRET:
++ msg = freeme = g_strdup_printf("OTR: Socialist Millionaires'
Protocol: "
++ "Received SMP Initiation.\n"
++ "Answer with /otr smpr %s $secret",
++ context->username);
++ break;
++ case OTRL_SMPEVENT_ASK_FOR_ANSWER:
++ msg = freeme = g_strdup_printf("OTR: Socialist Millionaires'
Protocol: "
++ "Received SMP Initiation.\n"
++ "Answer with /otr smpr %s $secret\n"
++ "Question: %s", context->username,
++ question);
++ break;
++ case OTRL_SMPEVENT_CHEATED:
++ msg = "OTR: Socialist Millionaires' Protocol: Correspondent cancelled
negotiation!";
++ otrl_message_abort_smp(userstate, &ops, opdata, context);
++ break;
++ case OTRL_SMPEVENT_IN_PROGRESS:
++ scr_log_print(LPRINT_DEBUG, "OTR: Socialist Millionaires' Protocol: "
++ "Negotiation is in pogress...");
++ break;
++ case OTRL_SMPEVENT_SUCCESS:
++ msg = "OTR: Socialist Millionaires' Protocol: Success!";
++ break;
++ case OTRL_SMPEVENT_FAILURE:
++ msg = "OTR: Socialist Millionaires' Protocol: Failure.";
++ break;
++ case OTRL_SMPEVENT_ABORT:
++ msg = "OTR: Socialist Millionaires' Protocol: Aborted.";
++ break;
++ case OTRL_SMPEVENT_ERROR:
++ msg = "OTR: Socialist Millionaires' Protocol: Error occured, aborting
negotiations!";
++ otrl_message_abort_smp(userstate, &ops, opdata, context);
++ break;
++ default:
++ break;
++ }
++
++ if (msg) {
++ scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
++ g_free(freeme);
++ }
++}
++
++static void cb_handle_msg_event(void *opdata, OtrlMessageEvent event,
++ ConnContext *context, const char *message,
++ gcry_error_t err)
++{
++ const char *msg = NULL;
++ char *freeme = NULL;
++ switch (event) {
++ case OTRL_MSGEVENT_ENCRYPTION_REQUIRED:
++ msg = "OTR: Policy requires encryption on message!";
++ break;
++ case OTRL_MSGEVENT_ENCRYPTION_ERROR:
++ msg = "OTR: Encryption error! Message not sent.";
++ break;
++ case OTRL_MSGEVENT_CONNECTION_ENDED:
++ msg = "OTR: Connection closed by remote end, message lost. "
++ "Close or refresh connection.";
++ break;
++ case OTRL_MSGEVENT_SETUP_ERROR:
++ // FIXME
++ msg = freeme = g_strdup_printf("OTR: Error setting up private
conversation: %u",
++ err);
++ break;
++ case OTRL_MSGEVENT_MSG_REFLECTED:
++ msg = "OTR: Received own OTR message!";
++ break;
++ case OTRL_MSGEVENT_MSG_RESENT:
++ msg = "OTR: Previous message was resent.";
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_NOT_IN_PRIVATE:
++ msg = "OTR: Received encrypted message, but connection is not
established " \
++ "yet! Message lost.";
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_UNREADABLE:
++ msg = "OTR: Unable to read incoming message!";
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
++ msg = "OTR: Malformed incoming message!";
++ break;
++ case OTRL_MSGEVENT_LOG_HEARTBEAT_RCVD:
++ scr_log_print(LPRINT_DEBUG, "OTR: Received heartbeat.");
++ break;
++ case OTRL_MSGEVENT_LOG_HEARTBEAT_SENT:
++ scr_log_print(LPRINT_DEBUG, "OTR: Sent heartbeat.");
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
++ msg = freeme = g_strdup_printf("OTR: Received general otr error: %s",
++ message);
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
++ msg = freeme = g_strdup_printf("OTR: Received unencrypted message:
%s",
++ message);
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
++ msg = "OTR: Unable to determine type of received OTR message!";
++ break;
++ case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
++ // XXX
++ scr_log_print(LPRINT_DEBUG, "OTR: Received message for other
instance.");
++ break;
++ default:
++ break;
++ }
++
++ if (msg) {
++ scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
++ g_free(freeme);
++ }
++}
++
++#endif /* HAVE_LIBOTR3 */
++
+ /*
+ * returns whether a otr_message was received
+ * sets *otr_data to NULL, when it was an internal otr message
+@@ -362,8 +554,10 @@
+ {
+ int ignore_message;
+ char *newmessage = NULL;
++#ifdef HAVE_LIBOTR3
+ OtrlTLV *tlvs = NULL;
+ OtrlTLV *tlv = NULL;
++#endif
+ ConnContext *ctx;
+
+ ctx = otr_get_context(buddy);
+@@ -371,8 +565,8 @@
+ ignore_message = otrl_message_receiving(userstate, &ops, NULL,
+ ctx->accountname, ctx->protocol,
+ ctx->username, *otr_data,
+- &newmessage, &tlvs,NULL, NULL);
+-
++#ifdef HAVE_LIBOTR3
++ &newmessage, &tlvs, NULL, NULL);
+
+ tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
+ if (tlv) {
+@@ -387,6 +581,9 @@
+
+ if (tlvs != NULL)
+ otrl_tlv_free(tlvs);
++#else
++ &newmessage, NULL, NULL, NULL,
NULL);
++#endif
+
+ if (ignore_message)
+ *otr_data = NULL;
+@@ -410,13 +607,27 @@
+
+ if (ctx->msgstate == OTRL_MSGSTATE_PLAINTEXT)
+ err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
++#ifdef HAVE_LIBOTR3
+ ctx->protocol, ctx->username, *msg, NULL,
+ &newmessage, NULL, NULL);
++#else
++ // INSTAG XXX
++ ctx->protocol, ctx->username,
OTRL_INSTAG_BEST,
++ *msg, NULL, &newmessage,
OTRL_FRAGMENT_SEND_SKIP,
++ NULL, NULL, NULL);
++#endif
+ else {
+ htmlmsg = html_escape(*msg);
+ err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
++#ifdef HAVE_LIBOTR3
+ ctx->protocol, ctx->username, htmlmsg, NULL,
+ &newmessage, NULL, NULL);
++#else
++ // INSTAG XXX
++ ctx->protocol, ctx->username,
OTRL_INSTAG_BEST,
++ htmlmsg, NULL, &newmessage,
OTRL_FRAGMENT_SEND_SKIP,
++ NULL, NULL, NULL);
++#endif
+ g_free(htmlmsg);
+ }
+
+@@ -648,6 +859,59 @@
+ LM_MESSAGE_SUB_TYPE_NOT_SET, NULL);
+ }
+
++/* When the list of ConnContexts changes (including a change in
++ * state), this is called so the UI can be updated. */
++static void cb_update_context_list(void *opdata)
++{
++ /*maybe introduce new status characters for mcabber,
++ * then use this function (?!)*/
++}
++
++/* A new fingerprint for the given user has been received. */
++static void cb_new_fingerprint(void *opdata, OtrlUserState us,
++ const char *accountname, const char
*protocol,
++ const char *username,
++ unsigned char fingerprint[20])
++{
++ char *sbuf = NULL;
++ char readable[45];
++
++ otrl_privkey_hash_to_human(readable, fingerprint);
++ sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
++ scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
++ g_free(sbuf);
++}
++
++/* The list of known fingerprints has changed. Write them to disk. */
++static void cb_write_fingerprints(void *opdata)
++{
++ otrl_privkey_write_fingerprints(userstate, fprfile);
++}
++
++/* A ConnContext has entered a secure state. */
++static void cb_gone_secure(void *opdata, ConnContext *context)
++{
++ scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
++ HBB_PREFIX_INFO, 0);
++}
++
++/* A ConnContext has left a secure state. */
++static void cb_gone_insecure(void *opdata, ConnContext *context)
++{
++ scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
++ HBB_PREFIX_INFO, 0);
++}
++
++/* We have completed an authentication, using the D-H keys we
++ * already knew. is_reply indicates whether we initiated the AKE. */
++static void cb_still_secure(void *opdata, ConnContext *context, int
is_reply)
++{
++ scr_WriteIncomingMessage(context->username, "OTR: channel reestablished",
0,
++ HBB_PREFIX_INFO, 0);
++}
++
++#ifdef HAVE_LIBOTR3
++
+ /* Display a notification message for a particular
+ * accountname / protocol / username conversation. */
+ static void cb_notify(void *opdata, OtrlNotifyLevel level,
+@@ -684,14 +948,6 @@
+ return 0;
+ }
+
+-/* When the list of ConnContexts changes (including a change in
+- * state), this is called so the UI can be updated. */
+-static void cb_update_context_list(void *opdata)
+-{
+- /*maybe introduce new status characters for mcabber,
+- * then use this function (?!)*/
+-}
+-
+ /* Return a newly allocated string containing a human-friendly name
+ * for the given protocol id */
+ static const char *cb_protocol_name(void *opdata, const char *protocol)
+@@ -705,54 +961,40 @@
+ /* We didn't allocated memory, so we don't have to free anything :p */
+ }
+
+-/* A new fingerprint for the given user has been received. */
+-static void cb_new_fingerprint(void *opdata, OtrlUserState us,
+- const char *accountname, const char
*protocol,
+- const char *username,
+- unsigned char fingerprint[20])
++/* Log a message. The passed message will end in "\n". */
++static void cb_log_message(void *opdata, const char *message)
+ {
+- char *sbuf = NULL;
+- char readable[45];
+-
+- otrl_privkey_hash_to_human(readable, fingerprint);
+- sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
+- scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
+- g_free(sbuf);
++ scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
+ }
+
+-/* The list of known fingerprints has changed. Write them to disk. */
+-static void cb_write_fingerprints(void *opdata)
+-{
+- otrl_privkey_write_fingerprints(userstate, fprfile);
+-}
++#else /* HAVE_LIBOTR3 */
+
+-/* A ConnContext has entered a secure state. */
+-static void cb_gone_secure(void *opdata, ConnContext *context)
++/* Generate unique instance tag for account. */
++static void cb_create_instag(void *opdata, const char *accountname,
++ const char *protocol)
+ {
+- scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
+- HBB_PREFIX_INFO, 0);
++ if (otrl_instag_generate(userstate, tagfile, accountname, protocol)) {
++ scr_LogPrint(LPRINT_LOGNORM, "OTR instance tag generation failed!");
++ }
+ }
+
+-/* A ConnContext has left a secure state. */
+-static void cb_gone_insecure(void *opdata, ConnContext *context)
++static gboolean otr_timer_cb(gpointer userdata)
+ {
+- scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
+- HBB_PREFIX_INFO, 0);
++ otrl_message_poll(userstate, &ops, userdata);
++ return TRUE;
+ }
+
+-/* We have completed an authentication, using the D-H keys we
+- * already knew. is_reply indicates whether we initiated the AKE. */
+-static void cb_still_secure(void *opdata, ConnContext *context, int
is_reply)
++static void cb_timer_control(void *opdata, unsigned int interval)
+ {
+- scr_WriteIncomingMessage(context->username, "OTR: channel reestablished",
0,
+- HBB_PREFIX_INFO, 0);
++ if (otr_timer_source > 0) {
++ g_source_remove(otr_timer_source);
++ otr_timer_source = 0;
++ }
++ if (interval > 0)
++ otr_timer_source = g_timeout_add_seconds(interval, otr_timer_cb,
opdata);
+ }
+
+-/* Log a message. The passed message will end in "\n". */
+-static void cb_log_message(void *opdata, const char *message)
+-{
+- scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
+-}
++#endif /* HAVE_LIBOTR3 */
+
+ /* Find the maximum message size supported by this protocol. */
+ static int cb_max_message_size(void *opdata, ConnContext *context)
+--- a/mcabber/otr.h
++++ b/mcabber/otr.h
+@@ -5,6 +5,9 @@
+
+ #ifdef HAVE_LIBOTR
+
++#ifndef HAVE_LIBOTR3
++# include <libotr/instag.h>
++#endif
+ #include <libotr/proto.h>
+ #include <libotr/message.h>
+ #include <libotr/privkey.h>
diff --git a/chat-libs/loudmouth/BUILD b/chat-libs/loudmouth/BUILD
new file mode 100755
index 0000000..22184bd
--- /dev/null
+++ b/chat-libs/loudmouth/BUILD
@@ -0,0 +1 @@
+CFLAGS+="-Wno-error=deprecated-declarations" default_build
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index e914abf..5b1c506 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disable compiler error
+
2013-02-03 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: added, run autoconf so it links to gobject correctly

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index f144a6c..b08c074 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=subversion
- VERSION=1.8.4
- SECURITY_PATCH=4
+ VERSION=1.8.5
+ SECURITY_PATCH=5
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 1f46b4d..e97f4a7 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,7 @@
+2014-02-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.5
+ SECURITY_PATCH++ fix CVE-2013-4505 CVE-2013-4558
+
2013-11-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.4
SECURITY_PATCH++ fix CVE-2013-4246 CVE-2013-4262 CVE-2013-4246
diff --git a/gnome2-libs/atk/DETAILS b/gnome2-libs/atk/DETAILS
index c2fa1f4..fcf697e 100755
--- a/gnome2-libs/atk/DETAILS
+++ b/gnome2-libs/atk/DETAILS
@@ -1,15 +1,15 @@
SPELL=atk
if [[ $ATK_DEVEL == y ]]; then
- VERSION=2.8.0
+ VERSION=2.11.4
else
- VERSION=2.8.0
+ VERSION=2.11.4
fi
+
SOURCE_HASH=sha512:36ce1af3989672af143e27c0da1fbebca5b2178855852ed914f2e3f80606c6ecb1b10ea6694abf4aa1a64a0b5594a6e4e56bf4b640d32410a1509e9438166e75
PATCHLEVEL=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:4f8b654a73ec3be8c2e453836dee2a9d02c1e0aac792f140dc63edf55d294c16b831b127152cdbba7b6e94340a8b843a565fe9ba47cecc0f79ed8262ef3d4397
LICENSE[0]=LGPL
WEB_SITE=http://library.gnome.org/devel/atk/
ENTERED=20020314
diff --git a/gnome2-libs/atk/HISTORY b/gnome2-libs/atk/HISTORY
index 0160aca..2171703 100644
--- a/gnome2-libs/atk/HISTORY
+++ b/gnome2-libs/atk/HISTORY
@@ -1,3 +1,6 @@
+2013-12-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.11.4
+
2013-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.8.0

diff --git a/gnustep-libs/gnustep-base/DETAILS
b/gnustep-libs/gnustep-base/DETAILS
index 187def8..adbe8b6 100755
--- a/gnustep-libs/gnustep-base/DETAILS
+++ b/gnustep-libs/gnustep-base/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-base
- VERSION=1.24.0
+ VERSION=1.24.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/gnustep-libs/gnustep-base/HISTORY
b/gnustep-libs/gnustep-base/HISTORY
index a5b7c9c..6859721 100644
--- a/gnustep-libs/gnustep-base/HISTORY
+++ b/gnustep-libs/gnustep-base/HISTORY
@@ -1,3 +1,6 @@
+2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.24.6
+
2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.24.0
* DEPENDS: added optional dependency on icu
diff --git a/gnustep-libs/gnustep-gui/DETAILS
b/gnustep-libs/gnustep-gui/DETAILS
index a5743c3..3e3a81f 100755
--- a/gnustep-libs/gnustep-gui/DETAILS
+++ b/gnustep-libs/gnustep-gui/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-gui
- VERSION=0.22.0
+ VERSION=0.24.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnustep-libs/gnustep-gui/HISTORY
b/gnustep-libs/gnustep-gui/HISTORY
index c31cb29..d894d39 100644
--- a/gnustep-libs/gnustep-gui/HISTORY
+++ b/gnustep-libs/gnustep-gui/HISTORY
@@ -1,3 +1,6 @@
+2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.24.0
+
2012-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.22.0
* DEPENDS: added optional dependency on icu
diff --git a/gnustep-libs/gnustep-make/DETAILS
b/gnustep-libs/gnustep-make/DETAILS
index 58ecaf8..16ea670 100755
--- a/gnustep-libs/gnustep-make/DETAILS
+++ b/gnustep-libs/gnustep-make/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnustep-make
- VERSION=2.6.4
+ VERSION=2.6.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE2_IGNORE=signature
diff --git a/gnustep-libs/gnustep-make/HISTORY
b/gnustep-libs/gnustep-make/HISTORY
index 2b85c68..7942b6e 100644
--- a/gnustep-libs/gnustep-make/HISTORY
+++ b/gnustep-libs/gnustep-make/HISTORY
@@ -1,3 +1,7 @@
+2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.6
+ * INSTALL, gs_make: add script for invoking gnustep make
+
2013-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.4

diff --git a/gnustep-libs/gnustep-make/INSTALL
b/gnustep-libs/gnustep-make/INSTALL
new file mode 100755
index 0000000..2409a9d
--- /dev/null
+++ b/gnustep-libs/gnustep-make/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install -m 755 $SPELL_DIRECTORY/gs_make ${INSTALL_ROOT}/usr/bin/
diff --git a/gnustep-libs/gnustep-make/gs_make
b/gnustep-libs/gnustep-make/gs_make
new file mode 100644
index 0000000..59b2edc
--- /dev/null
+++ b/gnustep-libs/gnustep-make/gs_make
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles make "$@"
diff --git a/haskell/haskell-async/DETAILS b/haskell/haskell-async/DETAILS
new file mode 100755
index 0000000..4e826a0
--- /dev/null
+++ b/haskell/haskell-async/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=haskell-async
+ VERSION=2.0.1.5
+ SOURCE="async-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/package/async-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:58004930b12bd6aafc09db56dcbdd1071b94bdfea1c55f1ba0854c17b61054e272aa8c3edac05bcf34ee39c63318ffca26680215748994e8ae604b600b0563fc
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/async-${VERSION}"
+ WEB_SITE="http://hackage.haskell.org/package/async";
+ LICENSE[0]=BSD
+ ENTERED=20131025
+ SHORT="a higher-level interface over threads"
+cat << EOF
+This package provides a higher-level interface over threads, in which an
Async
+a is a concurrent thread that will eventually deliver a value of type a. The
+package provides ways to create Async computations, wait for their results,
+and cancel them.
+EOF
diff --git a/haskell/haskell-async/HISTORY b/haskell/haskell-async/HISTORY
new file mode 100644
index 0000000..2d28697
--- /dev/null
+++ b/haskell/haskell-async/HISTORY
@@ -0,0 +1,6 @@
+2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.1.5
+
+2013-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
b/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
new file mode 100644
index 0000000..34f7aef
--- /dev/null
+++ b/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
@@ -0,0 +1,25 @@
+From 5bfd934170589f547a2ab2b19a22c479df8deec5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 1 Jan 2014 15:11:45 +0100
+Subject: [PATCH] add dependency on stm
+
+---
+ git-annex.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 8dccfed..6cfcb03 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -90,7 +90,7 @@ Executable git-annex
+ extensible-exceptions, dataenc, SHA, process, json,
+ base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
+ IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
+- SafeSemaphore, uuid, random, dlist, unix-compat, async
++ SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3)
+ CC-Options: -Wall
+ GHC-Options: -Wall
+ Extensions: PackageImports
+--
+1.8.5.2
+
diff --git a/haskell/haskell-git-annex/DETAILS
b/haskell/haskell-git-annex/DETAILS
index 6c3489f..8db9877 100755
--- a/haskell/haskell-git-annex/DETAILS
+++ b/haskell/haskell-git-annex/DETAILS
@@ -1,9 +1,9 @@
SPELL=haskell-git-annex
XSPELL=git-annex
- VERSION=5.20131221
+ VERSION=5.20131230
SOURCE="${XSPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:271b3aa94c29cf77957770b33c3ab51b2b0f7008f233c06574f565a3569e1b7d2fd963c9db0934b4cef186825cfff1129833445a2e91f27dd1587335d42e1154
+
SOURCE_HASH=sha512:bd22341d6e28de1e15c0b60bf6b5dca2365673d44fbb58baa7d2a20d5c0b23dba5d0e728564c4b8cceabe57ce0fed03a76571085e26b033c646c1874f44fdc6d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${XSPELL}-${VERSION}"
WEB_SITE="Homepage: http://git-annex.branchable.com/";
LICENSE[0]=License: GPL-3
diff --git a/haskell/haskell-git-annex/HISTORY
b/haskell/haskell-git-annex/HISTORY
index 2981279..7b14dc6 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,8 @@
+2013-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.20131230
+ * PRE_BUILD, 0001-add-dependency-on-stm.patch: fix dependency
+ on stm
+
2013-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20131221

diff --git a/haskell/haskell-git-annex/PRE_BUILD
b/haskell/haskell-git-annex/PRE_BUILD
new file mode 100755
index 0000000..9ab0b08
--- /dev/null
+++ b/haskell/haskell-git-annex/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-dependency-on-stm.patch
diff --git a/haskell/haskell-stm/DETAILS b/haskell/haskell-stm/DETAILS
index 47098a6..10a38f3 100755
--- a/haskell/haskell-stm/DETAILS
+++ b/haskell/haskell-stm/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-stm
- VERSION=2.2.0.1
+ VERSION=2.4.2
SOURCE="stm-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/stm/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0ac83afadd2e1b13e56fc971dd933e96af8e46ff26ffdec29c9ce5a14b3eb1fcbcc41fcdc0f904c933ab1ffa952ef76afa2d1e6c679ddbc856f42e1e063ae204
+
SOURCE_HASH=sha512:ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/stm-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stm";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-stm/HISTORY b/haskell/haskell-stm/HISTORY
index 3697e2b..aeb09be 100644
--- a/haskell/haskell-stm/HISTORY
+++ b/haskell/haskell-stm/HISTORY
@@ -1,3 +1,6 @@
+2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.2
+
2011-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.0.1

diff --git a/libs/apr-util/DETAILS b/libs/apr-util/DETAILS
index d1c3a70..29efcae 100755
--- a/libs/apr-util/DETAILS
+++ b/libs/apr-util/DETAILS
@@ -3,7 +3,7 @@ if [ -f $DEPENDS_CONFIG/apr.p ]; then
fi

SPELL=apr-util
- VERSION=1.5.2
+ VERSION=1.5.3
SECURITY_PATCH=2
# SOURCE_HASH=sha512:
REPOS_URI="branches/${VERSION%.*}.x"
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 6412a7a..855d5fa 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.3
+
2013-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.2

diff --git a/libs/apr/DETAILS b/libs/apr/DETAILS
index 51854f3..53673b5 100755
--- a/libs/apr/DETAILS
+++ b/libs/apr/DETAILS
@@ -1,5 +1,5 @@
SPELL=apr
- VERSION=1.4.8
+ VERSION=1.5.0
SECURITY_PATCH=2
REPOS_URI="branches/${VERSION%.*}.x"
# APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY
index ddddf89..6af4cd7 100644
--- a/libs/apr/HISTORY
+++ b/libs/apr/HISTORY
@@ -1,3 +1,6 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.0
+
2013-06-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.8

diff --git a/libs/neon/DETAILS b/libs/neon/DETAILS
index 62ff43e..63938c0 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,7 +1,6 @@
SPELL=neon
- VERSION=0.29.6
+ VERSION=0.30.0
SECURITY_PATCH=2
- PATCHLEVEL=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index f97f29b..d1a44ac 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,7 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.30.0
+ * PRE_BUILD, spaces.patch: deleted
+
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: Allow requiring SSL support

diff --git a/libs/neon/PRE_BUILD b/libs/neon/PRE_BUILD
deleted file mode 100755
index 4077f33..0000000
--- a/libs/neon/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/spaces.patch"
diff --git a/libs/neon/spaces.patch b/libs/neon/spaces.patch
deleted file mode 100644
index 9df8abd..0000000
--- a/libs/neon/spaces.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ne_uri.c b/src/ne_uri.c
-index 8d86c31..a930b9c 100644
---- a/src/ne_uri.c
-+++ b/src/ne_uri.c
-@@ -96,7 +96,7 @@ static const unsigned int uri_chars[256] = {
- /* 0xXX x0 x2 x4 x6 x8 xA xC xE */
- /* 0x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
- /* 1x */ OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT, OT,
--/* 2x */ OT, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
-+/* 2x */ AL, SD, OT, GD, SD, PC, SD, SD, SD, SD, SD, PS, SD, DS, DT, FS,
- /* 3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
- /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL,
- /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US,
-@@ -475,7 +475,7 @@ char *ne_path_unescape(const char *uri)
-
- /* CH must be an unsigned char; evaluates to 1 if CH should be
- * percent-encoded. */
--#define path_escape_ch(ch) (uri_lookup(ch) & URI_ESCAPE)
-+#define path_escape_ch(ch) ((ch == ' ') | (uri_lookup(ch) & URI_ESCAPE))
-
- char *ne_path_escape(const char *path)
- {
diff --git a/python-pypi/isort/DEPENDS b/python-pypi/isort/DEPENDS
new file mode 100755
index 0000000..48d8ddc
--- /dev/null
+++ b/python-pypi/isort/DEPENDS
@@ -0,0 +1 @@
+. $SECTION_DIRECTORY/PY_DEPENDS
diff --git a/python-pypi/isort/DETAILS b/python-pypi/isort/DETAILS
new file mode 100755
index 0000000..5d19bb8
--- /dev/null
+++ b/python-pypi/isort/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=isort
+ VERSION=3.0.0
+
SOURCE_HASH=sha512:aed0661663d2bc0bf596ad205ab3e56076afcbcc6a607c45878cbbf3d88c529fc5a7095be2a61a9a684c62f413f077c39bcded3968a339a8ce5abcbe939273b6
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://pypi.python.org/pypi/$SPELL
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/i/$SPELL/$SOURCE
+ LICENSE[0]=MIT
+ ENTERED=2014-01-02
+ KEYWORDS="python"
+ SHORT="sort Python imports"
+cat << EOF
+isort is a Python utility / library to sort imports alphabetically, and
automatically separated
+into sections. It provides a command line utility, Python library, Vim
plugin, Sublime plugin, and
+Kate plugin to quickly sort all your imports
+EOF
diff --git a/python-pypi/isort/HISTORY b/python-pypi/isort/HISTORY
new file mode 100644
index 0000000..587a8d1
--- /dev/null
+++ b/python-pypi/isort/HISTORY
@@ -0,0 +1,4 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0
+ spell created
+
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 24eaa00..e86ba42 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.8.1
-
SOURCE_HASH=sha512:fda2927026a0f0df96b73cbec50add8424eecae0b1dcb43bcb1b0281005474f6e01a8832a4079be80deafef2b1b1c03fa3e9a44411435bf3db9013ab261fea84
+ VERSION=2.8.2
+
SOURCE_HASH=sha512:9db5a8ed7b38c95db8bafac3efffb1735619ceb80564342bf1eb25be124f10075b8238d38a62b5cf34786a0463237e30619750c06220e2ab025f8da933b28844
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index 18f5c5f..a3fcbc9 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.8.2
+
2013-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.8.1

diff --git a/python-pypi/python-stdnum/DETAILS
b/python-pypi/python-stdnum/DETAILS
index b258d2a..b6ccf4a 100755
--- a/python-pypi/python-stdnum/DETAILS
+++ b/python-pypi/python-stdnum/DETAILS
@@ -1,6 +1,6 @@
SPELL=python-stdnum
- VERSION=0.8.1
-
SOURCE_HASH=sha512:c3aa3179b6c27ca88ad8a39c086f8305d3406f79e29ea06656c1a5caf2c78a0fac4fa04bb663bb83f2c8e105cf156e9e421854b9b4c16b2cc18825c4f0ae1028
+ VERSION=0.9
+
SOURCE_HASH=sha512:c9870ad116c2c08b123b7b01cc229a1f9d3f3e15da3ba75bdf5da8bee2a854474f6ddd7464c2d662559fedf272ea13a3549ed79a4636ddc1d733a47ea11ae058
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/python-pypi/python-stdnum/HISTORY
b/python-pypi/python-stdnum/HISTORY
index 6526b76..ea75216 100644
--- a/python-pypi/python-stdnum/HISTORY
+++ b/python-pypi/python-stdnum/HISTORY
@@ -1,3 +1,6 @@
+2014-01-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9
+
2013-06-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.81.
spell created
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index bba6f75..6f9f10c 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
SPELL=setuptools
- VERSION=2.0.1
-
SOURCE_HASH=sha512:9caa190889870f7c7c46a3fddd86ce306423051cd08a7a2eb6c0b317645fa0ddfde1f2e10025f13209e785aa817c0bd46c81aba63a3874f09e5c68d59315b91f
+ VERSION=2.0.2
+
SOURCE_HASH=sha512:6ed9e589b456ecfb261b0d13a11c84b5361b0b96138aa8663d761c659139aa7cb04e44e7e89db298f40139a53dd69934e808815deaaa18104bee58fc6eb478f4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index fcc3582..8ac7343 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2014-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.2
+
2013-12-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.1

diff --git a/python-pypi/sqlacodegen/DETAILS b/python-pypi/sqlacodegen/DETAILS
index fd6551f..96c3dcd 100755
--- a/python-pypi/sqlacodegen/DETAILS
+++ b/python-pypi/sqlacodegen/DETAILS
@@ -1,6 +1,6 @@
SPELL=sqlacodegen
- VERSION=1.1.1
-
SOURCE_HASH=sha512:529ce7f4ad143b101fc2b0cf848c00dad31f46aa195fd0eacb2ae4da8e105df14ad8873eb722b2d2e5aca2c3281f068cccef3beb27b3654161a7b0f818831218
+ VERSION=1.1.4
+
SOURCE_HASH=sha512:273a15b3fe2f4d7ef4cec450e467d682bac50fb61b4f4223235c1dd2892768054036152e7367747ef634431990faa880ad0274ec2871eb2543a2fd0d80317dff
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=https://pypi.python.org/packages/source/s/sqlacodegen/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/sqlacodegen/HISTORY b/python-pypi/sqlacodegen/HISTORY
index 6401308..678328b 100644
--- a/python-pypi/sqlacodegen/HISTORY
+++ b/python-pypi/sqlacodegen/HISTORY
@@ -1,3 +1,6 @@
+2014-01-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.4
+
2013-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1

diff --git a/python-pypi/sqlalchemy/DEPENDS b/python-pypi/sqlalchemy/DEPENDS
index 72a4f9d..0cad495 100755
--- a/python-pypi/sqlalchemy/DEPENDS
+++ b/python-pypi/sqlalchemy/DEPENDS
@@ -3,5 +3,4 @@
suggest_depends fdb "" "" "for Firebird support" &&
suggest_depends mysql-python "" "" "for MySQL support via MySQL-Python" &&
suggest_depends psycopg2 "" "" "for PostgreSQL support via psycopg2" &&
-suggest_depends pysqlite "" "" "for SQLite support via pysqlite" &&
-suggest_depends -sub SQLITE python "" "" "for SQLite support via native
Python module"
+suggest_depends pysqlite "" "" "for SQLite support via pysqlite"
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index 0a7b657..ccdc04b 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.8.4
-
SOURCE_HASH=sha512:0ed3d6c60ff8a5aaf72ee5e1c86b9ad4a0cbc9f605e1d58ea0cdcdbd82ef9329e2683f14f33ba1f4fc778e9139454abc00540f92973f0746161db0d41c32c14b
+ VERSION=0.9.0
+
SOURCE_HASH=sha512:5e29e0561c009060e8c101872b5d0c07f18e98debe2832f2c7cbf325bb5c318d05a429543d42aa3d6bf52b93688be74bbef987079cd4784cf94fe42651b65cf0
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 0fc89b4..0d5e227 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,8 @@
+2013-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+ * DEPENDS: remove 'suggest -sub SQLITE python'
+ it causes problems when building against python3
+
2013-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.4

diff --git a/security-libs/cracklib/DETAILS b/security-libs/cracklib/DETAILS
index 19df9f9..4b7b523 100755
--- a/security-libs/cracklib/DETAILS
+++ b/security-libs/cracklib/DETAILS
@@ -1,5 +1,6 @@
SPELL=cracklib
- VERSION=2.9.0
+ VERSION=2.9.1
+
SOURCE_HASH=sha512:19b1d38dfcfce98893e6a63e4387a8da9da1eae109d9d84e0f84adabc0ee25fac930576011fb60de007f59f7dea2ee0bb01fd6d8607d4854b7de006ec07a4b2a
VERSIONWORDS=20080507
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-words-$VERSIONWORDS.gz
@@ -7,7 +8,6 @@
SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
SOURCE_HASH=sha512:10e58618fbe42a2ee6a5106dac5ae9cb66d6ae01162caee03954f2f39bd009e0a194513152f5cf593631d5d164c6c26ec35c82470bfc23d70ceb1a440f863d30

SOURCE2_HASH='sha512:d21055d6439a2b92b23ab6fd31222d9330315a0b44f53fae308ce5749a9fcb33b7df982f85ca8e2d6d2f9cc4c7264dfc3ed454edbccecd76289713df09fd633e'
WEB_SITE=http://sf.net/projects/$SPELL
ENTERED=20050310
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index 28fca85..0d0dbc0 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,7 @@
+2013-12-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.9.1
+ * PRE_BUILD: remove obsolete fixes
+
2013-06-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.9.0

diff --git a/security-libs/cracklib/PRE_BUILD
b/security-libs/cracklib/PRE_BUILD
index 6b51408..3aa2d0d 100755
--- a/security-libs/cracklib/PRE_BUILD
+++ b/security-libs/cracklib/PRE_BUILD
@@ -1,15 +1,3 @@
default_pre_build &&
# the next instruction checks the file but doesn't decompress it
unpack_file 2
-
-# Doesn't really need C++...
-cd $SOURCE_DIRECTORY &&
-# update the config scripts
-sed -i "s/AM_GNU_GETTEXT_VERSION/&(0.18.1)/" configure.in &&
-sedit 's/AM_CONFIG_HEADER(config.h)/AC_CONFIG_HEADERS(config.h)/'
configure.in &&
-# fix detection of python3
-if is_depends_enabled $SPELL python3;then
- sed -i "s/}/}m/" configure.in &&
- sed -i "s|@/|@m/|" python/Makefile.am
-fi &&
-autoreconf -f -i --symlink
diff --git a/video/gecko-mediaplayer/DETAILS b/video/gecko-mediaplayer/DETAILS
index 3f30c5b..5663f8b 100755
--- a/video/gecko-mediaplayer/DETAILS
+++ b/video/gecko-mediaplayer/DETAILS
@@ -1,8 +1,8 @@
SPELL=gecko-mediaplayer
- VERSION=1.0.7
+ VERSION=1.0.8
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://gecko-mediaplayer.googlecode.com/files/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:a66d286e668dbe1bbbbf42bbf68bd35bda68db73e7a30674f2cd87850e17a8c27ecf9ae3f32c3024fcca31174e3c5ef88da668b11a5cc3641824fae8c9367962
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://kdekorte.googlepages.com/gecko-mediaplayer
LICENSE[0]=GPL
diff --git a/video/gecko-mediaplayer/HISTORY b/video/gecko-mediaplayer/HISTORY
index 0c24443..8f97708 100644
--- a/video/gecko-mediaplayer/HISTORY
+++ b/video/gecko-mediaplayer/HISTORY
@@ -1,3 +1,6 @@
+2014-01-04 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 1.0.8
+
2012-11-29 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 1.0.7

diff --git a/video/gecko-mediaplayer/gecko-mediaplayer-1.0.7.tar.gz.sig
b/video/gecko-mediaplayer/gecko-mediaplayer-1.0.7.tar.gz.sig
deleted file mode 100644
index 6c6ed29..0000000
Binary files a/video/gecko-mediaplayer/gecko-mediaplayer-1.0.7.tar.gz.sig and
/dev/null differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Robin Cook (c1d022825679ba47398c49471916d20506505d6f), Robin Cook, 01/04/2014

Archive powered by MHonArc 2.6.24.

Top of Page