summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chat/gloox/Makefile5
-rw-r--r--chat/gloox/PLIST17
-rw-r--r--chat/gloox/distinfo12
-rw-r--r--chat/gloox/options.mk4
-rw-r--r--chat/gloox/patches/patch-configure15
-rw-r--r--chat/gloox/patches/patch-src_connectiontcpbase.cpp10
-rw-r--r--chat/gloox/patches/patch-src_sha.cpp19
7 files changed, 47 insertions, 35 deletions
diff --git a/chat/gloox/Makefile b/chat/gloox/Makefile
index df5b69bfef1..c90a7aa0558 100644
--- a/chat/gloox/Makefile
+++ b/chat/gloox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/02/12 23:17:36 tron Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/06 08:41:38 wiz Exp $
-DISTNAME= gloox-1.0
-PKGREVISION= 5
+DISTNAME= gloox-1.0.10
CATEGORIES= chat
MASTER_SITES= http://camaya.net/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/gloox/PLIST b/chat/gloox/PLIST
index cc529cec1fd..281c256d316 100644
--- a/chat/gloox/PLIST
+++ b/chat/gloox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 19:46:48 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/06 08:41:38 wiz Exp $
bin/gloox-config
include/gloox/adhoc.h
include/gloox/adhoccommandprovider.h
@@ -6,6 +6,7 @@ include/gloox/adhochandler.h
include/gloox/amp.h
include/gloox/annotations.h
include/gloox/annotationshandler.h
+include/gloox/atomicrefcount.h
include/gloox/attention.h
include/gloox/base64.h
include/gloox/bookmarkhandler.h
@@ -14,6 +15,7 @@ include/gloox/bytestream.h
include/gloox/bytestreamdatahandler.h
include/gloox/bytestreamhandler.h
include/gloox/capabilities.h
+include/gloox/carbons.h
include/gloox/chatstate.h
include/gloox/chatstatefilter.h
include/gloox/chatstatehandler.h
@@ -51,6 +53,7 @@ include/gloox/eventhandler.h
include/gloox/featureneg.h
include/gloox/flexoff.h
include/gloox/flexoffhandler.h
+include/gloox/forward.h
include/gloox/gloox.h
include/gloox/glooxversion.h
include/gloox/gpgencrypted.h
@@ -60,8 +63,20 @@ include/gloox/instantmucroom.h
include/gloox/iq.h
include/gloox/iqhandler.h
include/gloox/jid.h
+include/gloox/jinglecontent.h
+include/gloox/jinglefiletransfer.h
+include/gloox/jingleiceudp.h
+include/gloox/jingleplugin.h
+include/gloox/jinglepluginfactory.h
+include/gloox/jinglesession.h
+include/gloox/jinglesessionhandler.h
+include/gloox/jinglesessionmanager.h
include/gloox/lastactivity.h
include/gloox/lastactivityhandler.h
+include/gloox/linklocal.h
+include/gloox/linklocalclient.h
+include/gloox/linklocalhandler.h
+include/gloox/linklocalmanager.h
include/gloox/loghandler.h
include/gloox/logsink.h
include/gloox/macros.h
diff --git a/chat/gloox/distinfo b/chat/gloox/distinfo
index 127f22d022c..b68efe38097 100644
--- a/chat/gloox/distinfo
+++ b/chat/gloox/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2013/04/30 22:34:29 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/05/06 08:41:38 wiz Exp $
-SHA1 (gloox-1.0.tar.bz2) = 8c788738f72b05fae7c05c744a67859419ffa09c
-RMD160 (gloox-1.0.tar.bz2) = 92089462ed778fb41bf97d882fc1785b8e82233f
-Size (gloox-1.0.tar.bz2) = 603434 bytes
-SHA1 (patch-src_connectiontcpbase.cpp) = 41cda3692468a86f4b819f66d887667065a6cbe4
+SHA1 (gloox-1.0.10.tar.bz2) = a55b663df28bbac62442ad6cdc5156213933427f
+RMD160 (gloox-1.0.10.tar.bz2) = ec10ee4463593760b86ab09bf6534cb3fdd9e982
+Size (gloox-1.0.10.tar.bz2) = 670288 bytes
+SHA1 (patch-configure) = b14cc132665cbcb722589007c36767c0ddfab25f
+SHA1 (patch-src_connectiontcpbase.cpp) = de9f367b91de7b4efd9ac7a3da463d3d32e5bdf0
SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae
SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c
SHA1 (patch-src_examples_e2ee__client.cpp) = 3a28030733fca789769c9361fe21b586aebe1370
SHA1 (patch-src_examples_e2ee__server.cpp) = eb8c22427def85387b9bf88b665feb1315df878f
SHA1 (patch-src_examples_ft__recv.cpp) = 3a4431f24b9ad933e7829af23ea99bcd4a488abd
-SHA1 (patch-src_sha.cpp) = b9f51307b97c68575aff4a029653584fcc6aeec6
SHA1 (patch-src_util.h) = 225609b219c76fdf1171a326cf40a9c26fde0a80
diff --git a/chat/gloox/options.mk b/chat/gloox/options.mk
index b04c55d43d6..fd43f4bd02d 100644
--- a/chat/gloox/options.mk
+++ b/chat/gloox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/02/06 19:46:48 schnoebe Exp $
+# $NetBSD: options.mk,v 1.2 2014/05/06 08:41:38 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gloox
PKG_OPTIONS_REQUIRED_GROUPS= tls
@@ -16,6 +16,8 @@ PLIST_VARS+= gnutls openssl
PLIST.gnutls= yes
CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls}
. include "../../security/gnutls/buildlink3.mk"
+. include "../../security/libgcrypt/buildlink3.mk"
+USE_TOOLS+= pkg-config
.else
CONFIGURE_ARGS+= --without-gnutls
.endif
diff --git a/chat/gloox/patches/patch-configure b/chat/gloox/patches/patch-configure
new file mode 100644
index 00000000000..510451cae59
--- /dev/null
+++ b/chat/gloox/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2014/05/06 08:41:38 wiz Exp $
+
+Fix unportable test(1) construct.
+
+--- configure.orig 2014-05-06 08:33:05.000000000 +0000
++++ configure
+@@ -15153,7 +15153,7 @@ $as_echo "#define HAVE_GCC_ATOMIC_BUILTI
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- if test $cross_compiling == "yes"; then
++ if test $cross_compiling = "yes"; then
+ # Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
+ # unless -lgcc and -lgcc_s are explicitly included.
+ # (Errors like
diff --git a/chat/gloox/patches/patch-src_connectiontcpbase.cpp b/chat/gloox/patches/patch-src_connectiontcpbase.cpp
index 7d30fe359cb..73988f2b7c3 100644
--- a/chat/gloox/patches/patch-src_connectiontcpbase.cpp
+++ b/chat/gloox/patches/patch-src_connectiontcpbase.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_connectiontcpbase.cpp,v 1.1 2012/02/16 13:57:16 hans Exp $
+$NetBSD: patch-src_connectiontcpbase.cpp,v 1.2 2014/05/06 08:41:38 wiz Exp $
---- src/connectiontcpbase.cpp.orig 2009-10-26 00:05:39.000000000 +0100
-+++ src/connectiontcpbase.cpp 2012-01-20 11:51:07.167505326 +0100
-@@ -20,6 +20,8 @@
- #include "prep.h"
+--- src/connectiontcpbase.cpp.orig 2013-08-30 07:17:35.000000000 +0000
++++ src/connectiontcpbase.cpp
+@@ -21,6 +21,8 @@
#include "mutexguard.h"
+ #include "util.h"
+#include <string.h>
+
diff --git a/chat/gloox/patches/patch-src_sha.cpp b/chat/gloox/patches/patch-src_sha.cpp
deleted file mode 100644
index 80de28182d1..00000000000
--- a/chat/gloox/patches/patch-src_sha.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_sha.cpp,v 1.1.1.1 2011/02/06 19:46:48 schnoebe Exp $
-
-# correct an SHA1 implementation error, only evident when the message
-# block is exactly 56 bytes long.
-#
-# This has been fixed upstream in the dev branch.
-#
-
---- src/sha.cpp.orig 2009-10-12 09:38:59.000000000 -0500
-+++ src/sha.cpp
-@@ -214,7 +214,7 @@ namespace gloox
- {
- Message_Block[Message_Block_Index++] = 0x80;
-
-- if( Message_Block_Index > 55 )
-+ if( Message_Block_Index > 56 )
- {
- while( Message_Block_Index < 64 )
- {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 22:09:31 +0000