pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libstrophe: update to 0.9.1
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Wed Oct 19 15:23:50 2016 +0200
Changeset: 2224036bd2efdab7cc4f570b31dda52576824833
Modified Files:
libstrophe/Makefile
libstrophe/distinfo
Removed Files:
libstrophe/patches/patch-configure.ac
libstrophe/patches/patch-src_auth.c
libstrophe/patches/patch-src_scram.c
libstrophe/patches/patch-src_sha1.c
libstrophe/patches/patch-src_sha1.h
Log Message:
libstrophe: update to 0.9.1
0.9.1
- Fixed bug #95 (DNS lookup failing on Cygwin)
- Removed dependency on the check package
0.9.0
- IPv6 support
- Legacy SSL support
- Initial Android support
- Resolver returns all SRV records instead of one. Lookup is performed
according to RFC2052
- xmpp_connect_raw() provides access to a xmpp_conn object just after
establishing TCP connection. This allows to implement in-band
registration, authentication mechanisms or serverless messaging
- xmpp_conn_t object is reusable now and can be reconnected with saving
all handlers, flags, jid and password
- New API:
- xmpp_uuid_gen()
- xmpp_connect_raw()
- xmpp_conn_open_stream_default()
- xmpp_conn_open_stream()
- xmpp_conn_tls_start()
- xmpp_conn_get_flags()
- xmpp_conn_set_flags()
- xmpp_conn_set_keepalive()
- xmpp_conn_is_secured()
- xmpp_stanza_del_attribute()
- xmpp_stanza_get_to()
- xmpp_stanza_get_from()
- xmpp_stanza_set_to()
- xmpp_stanza_set_from()
- xmpp_stanza_reply()
- xmpp_message_new()
- xmpp_message_get_body()
- xmpp_message_set_body()
- xmpp_iq_new()
- xmpp_presence_new()
- Exposed private API:
- xmpp_jid_new()
- xmpp_jid_bare()
- xmpp_jid_node()
- xmpp_jid_domain()
- xmpp_jid_resource()
- xmpp_stanza_get_attribute_count()
- xmpp_stanza_get_attributes()
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2224036bd2efdab7cc4f570b31dda52576824833
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libstrophe/Makefile | 2 +-
libstrophe/distinfo | 13 ++---
libstrophe/patches/patch-configure.ac | 75 ----------------------------
libstrophe/patches/patch-src_auth.c | 23 ---------
libstrophe/patches/patch-src_scram.c | 46 -----------------
libstrophe/patches/patch-src_sha1.c | 93 -----------------------------------
libstrophe/patches/patch-src_sha1.h | 21 --------
7 files changed, 5 insertions(+), 268 deletions(-)
diffs:
diff --git a/libstrophe/Makefile b/libstrophe/Makefile
index 8e3dc0f..7c7cb0c 100644
--- a/libstrophe/Makefile
+++ b/libstrophe/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= libstrophe-0.8.8
+DISTNAME= libstrophe-0.9.1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_GITHUB:=strophe/}
diff --git a/libstrophe/distinfo b/libstrophe/distinfo
index 68820ea..4e33ce1 100644
--- a/libstrophe/distinfo
+++ b/libstrophe/distinfo
@@ -1,11 +1,6 @@
$NetBSD$
-SHA1 (libstrophe-0.8.8.tar.gz) = c68c2e96eb8c3896b3296d8d126791dfc4cc304b
-RMD160 (libstrophe-0.8.8.tar.gz) = 3250167ebfbcb74c70cc74121c92d51bfb7efdef
-SHA512 (libstrophe-0.8.8.tar.gz) = fe1e9ee0ea93271862ca8bd3cd5cd66d0bd060398f3b11a242158872501ab517f4f436e474dd5603d73433333d4aaf0957d68b7fe69578d7d99541aaa63a38a3
-Size (libstrophe-0.8.8.tar.gz) = 128385 bytes
-SHA1 (patch-configure.ac) = b45ec265650f213f27e9e1bf62d770e6c85ee39a
-SHA1 (patch-src_auth.c) = c58624f78bf962fde3991071ec9a2a44fb79257e
-SHA1 (patch-src_scram.c) = a891d48032af53180d489e68123ae123f07f5448
-SHA1 (patch-src_sha1.c) = 51b1862e4fc9997b16efba3b045d5342df8bf8b0
-SHA1 (patch-src_sha1.h) = 38ecad8589bfbd1d0d86ac15022a45f29f910163
+SHA1 (libstrophe-0.9.1.tar.gz) = 92b85e6b5a7f656a957ab7639076eb94dd66bb1f
+RMD160 (libstrophe-0.9.1.tar.gz) = 11aea3db3928868e7ef0ac284294a7d0fdfb68e9
+SHA512 (libstrophe-0.9.1.tar.gz) = 4ae0ea7ad21fc566dc5372b1b6ed1dd47da87dadeb5771bb85c51b9119d781b7ec8e2b89d056cbfe81968a7f7db6d93fed435f28d28e552b9e61d5ffdddd4916
+Size (libstrophe-0.9.1.tar.gz) = 153142 bytes
diff --git a/libstrophe/patches/patch-configure.ac b/libstrophe/patches/patch-configure.ac
deleted file mode 100644
index 2edbbea..0000000
--- a/libstrophe/patches/patch-configure.ac
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD$
-
-Get rid of several bash-isms.
-
---- configure.ac.orig 2015-08-18 21:07:06.000000000 +0000
-+++ configure.ac
-@@ -12,11 +12,11 @@ AS_CASE([$host_os],
- [freebsd*], [PLATFORM="freebsd"],
- [PLATFORM="nix"])
-
--PKG_CHECK_MODULES([openssl], [openssl], [PC_REQUIRES+=(openssl)],
-+PKG_CHECK_MODULES([openssl], [openssl], [PC_REQUIRES="$PC_REQUIRES openssl"],
- [AC_CHECK_HEADER([openssl/ssl.h],
- [
- openssl_LIBS="-lssl -lcrypto"
-- PC_LIBS+=($openssl_LIBS)
-+ PC_LIBS="$PC_LIBS $openssl_LIBS"
- ],
- [AC_MSG_ERROR([openssl not found; openssl required])]
- )])
-@@ -32,7 +32,7 @@ if test "x$with_libxml2" != xno; then
- PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7],
- [
- with_libxml2=yes
-- PC_REQUIRES+=(libxml-2.0)
-+ PC_REQUIRES="$PC_REQUIRES libxml-2.0"
- ],
- [
- old_CFLAGS=$CFLAGS
-@@ -42,19 +42,19 @@ if test "x$with_libxml2" != xno; then
- with_libxml2=yes
- libxml2_CFLAGS="-I${includedir}/libxml2"
- libxml2_LIBS="-lxml2"
-- PC_LIBS+=($libxml2_LIBS)
-- PC_CFLAGS+=($libxml2_CFLAGS)
-+ PC_LIBS="$PC_LIBS $libxml2_LIBS"
-+ PC_CFLAGS="$PC_CFLAGS $libxml2_CFLAGS"
- ],
- [AC_MSG_ERROR([libxml2 not found.])])
- CFLAGS=$old_CFLAGS
- ])
- else
- PKG_CHECK_MODULES([expat], [expat >= 2.0.0],
-- [PC_REQUIRES+=(expat)],
-+ [PC_REQUIRES="$PC_REQUIRES expat"],
- [AC_CHECK_HEADER([expat.h],
- [
- expat_LIBS="-lexpat"
-- PC_LIBS+=($expat_LIBS)
-+ PC_LIBS="$PC_LIBS $expat_LIBS"
- ],
- [AC_MSG_ERROR([expat not found; expat required.])]
- )
-@@ -80,7 +80,7 @@ if test "x$PLATFORM" != xfreebsd; then
- AC_CHECK_LIB([resolv], [res_query], [],
- [AC_CHECK_LIB([resolv], [__res_query], [],
- [AC_MSG_ERROR([libresolv not found; libresolv required.])])])
-- PC_LIBS+=(-lresolv)
-+ PC_LIBS="$PC_LIBS -lresolv"
- else
- AC_MSG_NOTICE([skipping libresolv checks for freebsd])
- fi
-@@ -97,9 +97,9 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLD
-
- AM_CONDITIONAL([PARSER_EXPAT], [test x$with_parser != xlibxml2])
-
--AC_SUBST([PC_REQUIRES], [${PC_REQUIRES[[@]]}])
--AC_SUBST([PC_CFLAGS], [${PC_CFLAGS[[@]]}])
--AC_SUBST([PC_LIBS], [${PC_LIBS[[@]]}])
-+AC_SUBST(PC_REQUIRES)
-+AC_SUBST(PC_CFLAGS)
-+AC_SUBST(PC_LIBS)
-
- AC_SUBST(PARSER_NAME)
- AC_SUBST(PARSER_CFLAGS)
diff --git a/libstrophe/patches/patch-src_auth.c b/libstrophe/patches/patch-src_auth.c
deleted file mode 100644
index b581900..0000000
--- a/libstrophe/patches/patch-src_auth.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Avoid conflicts with SHA1_* in libssl:
-
- https://github.com/strophe/libstrophe/pull/59/
-
---- src/auth.c.orig 2015-08-18 21:07:06.000000000 +0000
-+++ src/auth.c
-@@ -1187,10 +1187,10 @@ int _handle_component_auth(xmpp_conn_t *
- /* Feed the session id and passphrase to the algorithm.
- * We need to compute SHA1(session_id + passphrase)
- */
-- SHA1_Init(&mdctx);
-- SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id));
-- SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass));
-- SHA1_Final(&mdctx, md_value);
-+ xmpp_SHA1_Init(&mdctx);
-+ xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id));
-+ xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass));
-+ xmpp_SHA1_Final(&mdctx, md_value);
-
- digest = xmpp_alloc(conn->ctx, 2*sizeof(md_value)+1);
- if (digest) {
diff --git a/libstrophe/patches/patch-src_scram.c b/libstrophe/patches/patch-src_scram.c
deleted file mode 100644
index 5fb82d9..0000000
--- a/libstrophe/patches/patch-src_scram.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-Avoid conflicts with SHA1_* in libssl:
-
- https://github.com/strophe/libstrophe/pull/59/
-
---- src/scram.c.orig 2015-08-18 21:07:06.000000000 +0000
-+++ src/scram.c
-@@ -37,9 +37,9 @@ static void SHA1(const uint8_t* data, si
- uint8_t digest[SHA1_DIGEST_SIZE])
- {
- SHA1_CTX ctx;
-- SHA1_Init(&ctx);
-- SHA1_Update(&ctx, data, len);
-- SHA1_Final(&ctx, digest);
-+ xmpp_SHA1_Init(&ctx);
-+ xmpp_SHA1_Update(&ctx, data, len);
-+ xmpp_SHA1_Final(&ctx, digest);
- }
-
- static void HMAC_SHA1(const uint8_t *key, size_t key_len,
-@@ -66,15 +66,15 @@ static void HMAC_SHA1(const uint8_t *key
- key_opad[i] = key_pad[i] ^ opad;
- }
-
-- SHA1_Init(&ctx);
-- SHA1_Update(&ctx, key_ipad, BLOCK_SIZE);
-- SHA1_Update(&ctx, text, len);
-- SHA1_Final(&ctx, sha_digest);
--
-- SHA1_Init(&ctx);
-- SHA1_Update(&ctx, key_opad, BLOCK_SIZE);
-- SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
-- SHA1_Final(&ctx, digest);
-+ xmpp_SHA1_Init(&ctx);
-+ xmpp_SHA1_Update(&ctx, key_ipad, BLOCK_SIZE);
-+ xmpp_SHA1_Update(&ctx, text, len);
-+ xmpp_SHA1_Final(&ctx, sha_digest);
-+
-+ xmpp_SHA1_Init(&ctx);
-+ xmpp_SHA1_Update(&ctx, key_opad, BLOCK_SIZE);
-+ xmpp_SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
-+ xmpp_SHA1_Final(&ctx, digest);
- }
-
- static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
diff --git a/libstrophe/patches/patch-src_sha1.c b/libstrophe/patches/patch-src_sha1.c
deleted file mode 100644
index f9c04c6..0000000
--- a/libstrophe/patches/patch-src_sha1.c
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD$
-
-Avoid conflicts with SHA1_* in libssl:
-
- https://github.com/strophe/libstrophe/pull/59/
-
---- src/sha1.c.orig 2015-08-18 21:07:06.000000000 +0000
-+++ src/sha1.c
-@@ -202,7 +202,7 @@ static void SHA1_Transform(uint32_t stat
-
-
- /* SHA1Init - Initialize new context */
--void SHA1_Init(SHA1_CTX* context)
-+void xmpp_SHA1_Init(SHA1_CTX* context)
- {
- /* SHA1 initialization constants */
- context->state[0] = 0x67452301;
-@@ -215,7 +215,7 @@ void SHA1_Init(SHA1_CTX* context)
-
-
- /* Run your data through this. */
--void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
-+void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
- {
- size_t i, j;
-
-@@ -244,7 +244,7 @@ void SHA1_Update(SHA1_CTX* context, cons
-
-
- /* Add padding and return the message digest. */
--void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
-+void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
- {
- uint32_t i;
- uint8_t finalcount[8];
-@@ -253,11 +253,11 @@ void SHA1_Final(SHA1_CTX* context, uint8
- finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
- }
-- SHA1_Update(context, (uint8_t *)"\200", 1);
-+ xmpp_SHA1_Update(context, (uint8_t *)"\200", 1);
- while ((context->count[0] & 504) != 448) {
-- SHA1_Update(context, (uint8_t *)"\0", 1);
-+ xmpp_SHA1_Update(context, (uint8_t *)"\0", 1);
- }
-- SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
-+ xmpp_SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
- for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
- digest[i] = (uint8_t)
- ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
-@@ -300,12 +300,12 @@ FILE* file;
- return(-1);
- }
- }
-- SHA1_Init(&context);
-+ xmpp_SHA1_Init(&context);
- while (!feof(file)) { /* note: what if ferror(file) */
- i = fread(buffer, 1, 16384, file);
-- SHA1_Update(&context, buffer, i);
-+ xmpp_SHA1_Update(&context, buffer, i);
- }
-- SHA1_Final(&context, digest);
-+ xmpp_SHA1_Final(&context, digest);
- fclose(file);
- for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
- for (j = 0; j < 4; j++) {
-@@ -358,9 +358,9 @@ int main(int argc, char** argv)
- fprintf(stdout, "verifying SHA-1 implementation... ");
-
- for (k = 0; k < 2; k++){
-- SHA1_Init(&context);
-- SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
-- SHA1_Final(&context, digest);
-+ xmpp_SHA1_Init(&context);
-+ xmpp_SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
-+ xmpp_SHA1_Final(&context, digest);
- digest_to_hex(digest, output);
-
- if (strcmp(output, test_results[k])) {
-@@ -372,10 +372,10 @@ int main(int argc, char** argv)
- }
- }
- /* million 'a' vector we feed separately */
-- SHA1_Init(&context);
-+ xmpp_SHA1_Init(&context);
- for (k = 0; k < 1000000; k++)
-- SHA1_Update(&context, (uint8_t*)"a", 1);
-- SHA1_Final(&context, digest);
-+ xmpp_SHA1_Update(&context, (uint8_t*)"a", 1);
-+ xmpp_SHA1_Final(&context, digest);
- digest_to_hex(digest, output);
- if (strcmp(output, test_results[2])) {
- fprintf(stdout, "FAIL\n");
diff --git a/libstrophe/patches/patch-src_sha1.h b/libstrophe/patches/patch-src_sha1.h
deleted file mode 100644
index 6547a29..0000000
--- a/libstrophe/patches/patch-src_sha1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Avoid conflicts with SHA1_* in libssl:
-
- https://github.com/strophe/libstrophe/pull/59/
-
---- src/sha1.h.orig 2015-08-18 21:07:06.000000000 +0000
-+++ src/sha1.h
-@@ -23,9 +23,9 @@ typedef struct {
-
- #define SHA1_DIGEST_SIZE 20
-
--void SHA1_Init(SHA1_CTX* context);
--void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
--void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
-+void xmpp_SHA1_Init(SHA1_CTX* context);
-+void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
-+void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
-
- #ifdef __cplusplus
- }
Home |
Main Index |
Thread Index |
Old Index