summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcpm <cpm@FreeBSD.org>2016-12-27 14:01:27 +0000
committercpm <cpm@FreeBSD.org>2016-12-27 14:01:27 +0000
commitbe7be92573f25fc18b7d2c889377e37b3d65527e (patch)
tree6bc5740833789439cc135444d3a71bb0bcc30f38
parenta7369ce01e8460da145a971ad56f949926094cd5 (diff)
downloadFreeBSD-ports-be7be92573f25fc18b7d2c889377e37b3d65527e.zip
FreeBSD-ports-be7be92573f25fc18b7d2c889377e37b3d65527e.tar.gz
net-im/telegram: Update to 1.4.1.g20161227
- Update telegram 1.3.1 -> 1.4.1.g20161227 PR: 215064 Reported by: Matthias Apitz <guru@unixarea.de> Reviewed by: amdmi3 Approved by: amdmi3, feld (mentors)
-rw-r--r--net-im/telegram/Makefile5
-rw-r--r--net-im/telegram/distinfo13
-rw-r--r--net-im/telegram/files/patch-Makefile.in11
-rw-r--r--net-im/telegram/files/patch-lua-tg.c15
-rw-r--r--net-im/telegram/files/patch-tgl_mtproto-utils.c22
-rw-r--r--net-im/telegram/files/patch-tgl_tl-parser_portable__endian.h18
6 files changed, 75 insertions, 9 deletions
diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile
index f9e33e5..7f29bd4 100644
--- a/net-im/telegram/Makefile
+++ b/net-im/telegram/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= telegram
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.4.1.g20161227
CATEGORIES= net-im
MAINTAINER= cpm@FreeBSD.org
@@ -26,7 +25,7 @@ GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= vysheng
GH_PROJECT= tg tgl:tgl tl-parser:tlparser
-GH_TAGNAME= 2.0.1:tgl 1659d87:tlparser
+GH_TAGNAME= 6547c0b ffb04ca:tgl 36bf190:tlparser
GH_SUBDIR= tgl:tgl tgl/tl-parser:tlparser
PLIST_FILES= bin/telegram-cli \
diff --git a/net-im/telegram/distinfo b/net-im/telegram/distinfo
index 1b94821..9d80703 100644
--- a/net-im/telegram/distinfo
+++ b/net-im/telegram/distinfo
@@ -1,6 +1,7 @@
-SHA256 (vysheng-tg-1.3.1_GH0.tar.gz) = b70b1d8b97b44086b64e467f81c6aceb8263092c26a8cf1a7d717eb1b5360415
-SIZE (vysheng-tg-1.3.1_GH0.tar.gz) = 278051
-SHA256 (vysheng-tgl-2.0.1_GH0.tar.gz) = 549bbfc46715bae31b50a54cc21eefd61109cd28dcdddbe4e53726aec3d924f1
-SIZE (vysheng-tgl-2.0.1_GH0.tar.gz) = 250488
-SHA256 (vysheng-tl-parser-1659d87_GH0.tar.gz) = 6b9538b0c3be3bb25e4f4750ecbea42ce7be58b005a3eeb372b9d15fbaa92e0b
-SIZE (vysheng-tl-parser-1659d87_GH0.tar.gz) = 78615
+TIMESTAMP = 1482845149
+SHA256 (vysheng-tg-1.4.1.g20161227-6547c0b_GH0.tar.gz) = 1e70d800d46e92ab71360db4fee8b63512d682986aa4d8d90adf49219ec17928
+SIZE (vysheng-tg-1.4.1.g20161227-6547c0b_GH0.tar.gz) = 307276
+SHA256 (vysheng-tgl-ffb04ca_GH0.tar.gz) = 2a2aafe6366e3a4c7df2af916c015fa0c0200094e785e69396ca6ff0ef612cd4
+SIZE (vysheng-tgl-ffb04ca_GH0.tar.gz) = 240798
+SHA256 (vysheng-tl-parser-36bf190_GH0.tar.gz) = 9c4222cfc39f1f58061678c2a22dac5d2391e2594d4ec00e5ab9a7c12e606789
+SIZE (vysheng-tl-parser-36bf190_GH0.tar.gz) = 66898
diff --git a/net-im/telegram/files/patch-Makefile.in b/net-im/telegram/files/patch-Makefile.in
new file mode 100644
index 0000000..366dbff
--- /dev/null
+++ b/net-im/telegram/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2016-03-23 11:42:53 UTC
++++ Makefile.in
+@@ -6,7 +6,7 @@ CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
+ DEFS=@DEFS@
+ COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
+ EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
+-LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
++LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -lpthread -lutil
+ LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
+
+ DEP=dep
diff --git a/net-im/telegram/files/patch-lua-tg.c b/net-im/telegram/files/patch-lua-tg.c
new file mode 100644
index 0000000..017dbde
--- /dev/null
+++ b/net-im/telegram/files/patch-lua-tg.c
@@ -0,0 +1,15 @@
+--- lua-tg.c.orig 2016-12-27 02:26:05 UTC
++++ lua-tg.c
+@@ -661,9 +661,9 @@ struct lua_arg {
+ struct lua_arg lua_ptr[MAX_LUA_COMMANDS];
+ static int pos;
+
+-static inline tgl_peer_t *get_peer (const char *s) {
+- return tgl_peer_get_by_name (TLS, s);
+-}
++// static inline tgl_peer_t *get_peer (const char *s) {
++// return tgl_peer_get_by_name (TLS, s);
++// }
+
+ enum lua_query_type {
+ lq_contact_list,
diff --git a/net-im/telegram/files/patch-tgl_mtproto-utils.c b/net-im/telegram/files/patch-tgl_mtproto-utils.c
new file mode 100644
index 0000000..a974a96
--- /dev/null
+++ b/net-im/telegram/files/patch-tgl_mtproto-utils.c
@@ -0,0 +1,22 @@
+--- tgl/mtproto-utils.c.orig 2016-03-23 11:42:06 UTC
++++ tgl/mtproto-utils.c
+@@ -98,9 +98,7 @@ static unsigned long long BN2ull (TGLC_b
+ if (sizeof (unsigned long) == 8) {
+ return TGLC_bn_get_word (b);
+ } else if (sizeof (unsigned long long) == 8) {
+- assert (0); // As long as nobody ever uses this code, assume it is broken.
+ unsigned long long tmp;
+- /* Here be dragons, but it should be okay due to be64toh */
+ TGLC_bn_bn2bin (b, (unsigned char *) &tmp);
+ return be64toh (tmp);
+ } else {
+@@ -112,9 +110,7 @@ static void ull2BN (TGLC_bn *b, unsigned
+ if (sizeof (unsigned long) == 8 || val < (1ll << 32)) {
+ TGLC_bn_set_word (b, val);
+ } else if (sizeof (unsigned long long) == 8) {
+- assert (0); // As long as nobody ever uses this code, assume it is broken.
+ htobe64(val);
+- /* Here be dragons, but it should be okay due to htobe64 */
+ TGLC_bn_bin2bn ((unsigned char *) &val, 8, b);
+ } else {
+ assert (0);
diff --git a/net-im/telegram/files/patch-tgl_tl-parser_portable__endian.h b/net-im/telegram/files/patch-tgl_tl-parser_portable__endian.h
new file mode 100644
index 0000000..abdee15
--- /dev/null
+++ b/net-im/telegram/files/patch-tgl_tl-parser_portable__endian.h
@@ -0,0 +1,18 @@
+--- tgl/tl-parser/portable_endian.h.orig 2015-10-17 13:33:25 UTC
++++ tgl/tl-parser/portable_endian.h
+@@ -53,6 +53,7 @@
+
+ # include <sys/endian.h>
+
++#if !defined(__FreeBSD__)
+ # define be16toh(x) betoh16(x)
+ # define le16toh(x) letoh16(x)
+
+@@ -61,6 +62,7 @@
+
+ # define be64toh(x) betoh64(x)
+ # define le64toh(x) letoh64(x)
++#endif /* !defined(__FreeBSD__) */
+
+ #elif defined(__WINDOWS__)
+
OpenPOWER on IntegriCloud