diff options
author | wiz <wiz@pkgsrc.org> | 2018-04-19 07:28:41 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2018-04-19 07:28:41 +0000 |
commit | e3df5f69d9e9af66a70d4cbe6963fa76ac6be989 (patch) | |
tree | 78665943544404febe1c0f002cc2acc4fc4adfb9 /chat | |
parent | 340944c90bd210f9e5031bd87a662491b67d3c6f (diff) | |
download | pkgsrc-e3df5f69d9e9af66a70d4cbe6963fa76ac6be989.tar.gz |
libpurple: remove files that are not needed after 2.13.0 update
Diffstat (limited to 'chat')
-rw-r--r-- | chat/libpurple/patches/patch-configure | 101 | ||||
-rw-r--r-- | chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c | 39 |
2 files changed, 0 insertions, 140 deletions
diff --git a/chat/libpurple/patches/patch-configure b/chat/libpurple/patches/patch-configure deleted file mode 100644 index abfdb66f96c..00000000000 --- a/chat/libpurple/patches/patch-configure +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2016/01/13 22:25:38 wiz Exp $ - -Fix unportable test(1) construct. - ---- configure.orig 2015-12-31 23:19:55.000000000 +0000 -+++ configure -@@ -17931,7 +17931,7 @@ else - fi - - if test "x$enable_gst" != "xno"; then -- if test "x$with_gstreamer" == "xauto"; then -+ if test "x$with_gstreamer" = "xauto"; then - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5 -@@ -18208,7 +18208,7 @@ $as_echo "#define USE_GSTREAMER 1" >>con - - - fi -- elif test "x$with_gstreamer" == "x1.0"; then -+ elif test "x$with_gstreamer" = "x1.0"; then - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5 -@@ -18306,7 +18306,7 @@ $as_echo "#define USE_GSTREAMER 1" >>con - - - fi -- elif test "x$with_gstreamer" == "x0.10"; then -+ elif test "x$with_gstreamer" = "x0.10"; then - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5 -@@ -18409,14 +18409,14 @@ fi - fi - fi - --if test "x$with_gtk" == "x3" -a "x$with_gstreamer" == "x0.10"; then -+if test "x$with_gtk" = "x3" -a "x$with_gstreamer" = "x0.10"; then - as_fn_error $? "WebKitGTK+ 3.0 cannot be mixed with GStreamer 0.10. - Please switch to WebKitGTK+ 2.0 or GStreamer 1.0." "$LINENO" 5 --elif test "x$with_gtk" == "x2" -a "x$with_gstreamer" == "x1.0"; then -+elif test "x$with_gtk" = "x2" -a "x$with_gstreamer" = "x1.0"; then - as_fn_error $? "WebKitGTK+ 2.0 cannot be mixed with GStreamer 1.0. - Please switch to WebKitGTK+ 3.0 or GStreamer 0.10." "$LINENO" 5 - fi --if test "x$with_gstreamer" == "x0.10" -o "x$with_gstreamer" == "x1.0"; then -+if test "x$with_gstreamer" = "x0.10" -o "x$with_gstreamer" = "x1.0"; then - GSTREAMER_VER=$with_gstreamer - - else -@@ -18424,7 +18424,7 @@ else - - fi - --if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0"; then -+if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x1.0"; then - # Check whether --enable-gstreamer-video was given. - if test "${enable_gstreamer_video+set}" = set; then : - enableval=$enable_gstreamer_video; enable_gstvideo="$enableval" -@@ -18519,7 +18519,7 @@ else - enable_gstvideo="no" - fi - --if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10"; then -+if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x0.10"; then - # Check whether --enable-gstreamer-interfaces was given. - if test "${enable_gstreamer_interfaces+set}" = set; then : - enableval=$enable_gstreamer_interfaces; enable_gstinterfaces="$enableval" -@@ -18622,7 +18622,7 @@ else - fi - - if test "x$enable_farstream" != "xno"; then -- if test "x$with_gstreamer" == "x1.0"; then -+ if test "x$with_gstreamer" = "x1.0"; then - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FARSTREAM" >&5 -@@ -18953,11 +18953,11 @@ else - fi - - if test "x$enable_vv" != "xno"; then -- if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then -+ if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x1.0" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then - - $as_echo "#define USE_VV 1" >>confdefs.h - -- elif test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then -+ elif test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x0.10" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then - - $as_echo "#define USE_VV 1" >>confdefs.h - -@@ -18981,7 +18981,7 @@ else - fi - - --if test "x$enable_vv" != "xno" -a "x$with_gstreamer" == "x1.0"; then -+if test "x$enable_vv" != "xno" -a "x$with_gstreamer" = "x1.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for raw data support in Farstream" >&5 - $as_echo_n "checking for raw data support in Farstream... " >&6; } - diff --git a/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c b/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c deleted file mode 100644 index 922c96bf615..00000000000 --- a/chat/libpurple/patches/patch-libpurple_protocols_jabber_auth__scram.c +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-libpurple_protocols_jabber_auth__scram.c,v 1.2 2016/07/06 09:55:39 wiz Exp $ - -Fix conflict with NetBSD's hmac(3) function. -https://developer.pidgin.im/ticket/17061 - ---- libpurple/protocols/jabber/auth_scram.c.orig 2015-12-31 23:19:40.000000000 +0000 -+++ libpurple/protocols/jabber/auth_scram.c -@@ -134,7 +134,7 @@ guchar *jabber_scram_hi(const JabberScra - * Needless to say, these are fragile. - */ - static void --hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str) -+purple_hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str) - { - PurpleCipherContext *context; - -@@ -187,18 +187,18 @@ jabber_scram_calc_proofs(JabberScramData - return FALSE; - - /* client_key = HMAC(salted_password, "Client Key") */ -- hmac(data->hash, client_key, salted_password, "Client Key"); -+ purple_hmac(data->hash, client_key, salted_password, "Client Key"); - /* server_key = HMAC(salted_password, "Server Key") */ -- hmac(data->hash, server_key, salted_password, "Server Key"); -+ purple_hmac(data->hash, server_key, salted_password, "Server Key"); - g_free(salted_password); - - /* stored_key = HASH(client_key) */ - hash(data->hash, stored_key, client_key); - - /* client_signature = HMAC(stored_key, auth_message) */ -- hmac(data->hash, client_signature, stored_key, data->auth_message->str); -+ purple_hmac(data->hash, client_signature, stored_key, data->auth_message->str); - /* server_signature = HMAC(server_key, auth_message) */ -- hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str); -+ purple_hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str); - - /* client_proof = client_key XOR client_signature */ - for (i = 0; i < hash_len; ++i) |