Attachment #178309 for bug #215064

Lines 2-9 Link Here

(-)net-im/telegram/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= telegram	4	PORTNAME= telegram
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.4.1
6	PORTREVISION= 1
7	CATEGORIES= net-im	6	CATEGORIES= net-im
8		7
9	MAINTAINER= cpm@FreeBSD.org	8	MAINTAINER= cpm@FreeBSD.org
Lines 26-32 Link Here
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= vysheng	26	GH_ACCOUNT= vysheng
28	GH_PROJECT= tg tgl:tgl tl-parser:tlparser	27	GH_PROJECT= tg tgl:tgl tl-parser:tlparser
29	GH_TAGNAME= 2.0.1:tgl 1659d87:tlparser	28	GH_TAGNAME= 6547c0b ffb04ca:tgl 36bf190:tlparser
30	GH_SUBDIR= tgl:tgl tgl/tl-parser:tlparser	29	GH_SUBDIR= tgl:tgl tgl/tl-parser:tlparser
31		30
32	PLIST_FILES= bin/telegram-cli \	31	PLIST_FILES= bin/telegram-cli \

Lines 1-6 Link Here

(-)net-im/telegram/distinfo (-6 / +7 lines)
1	SHA256 (vysheng-tg-1.3.1_GH0.tar.gz) = b70b1d8b97b44086b64e467f81c6aceb8263092c26a8cf1a7d717eb1b5360415	1	TIMESTAMP = 1482804239
2	SIZE (vysheng-tg-1.3.1_GH0.tar.gz) = 278051	2	SHA256 (vysheng-tg-1.4.1-6547c0b_GH0.tar.gz) = 1e70d800d46e92ab71360db4fee8b63512d682986aa4d8d90adf49219ec17928
3	SHA256 (vysheng-tgl-2.0.1_GH0.tar.gz) = 549bbfc46715bae31b50a54cc21eefd61109cd28dcdddbe4e53726aec3d924f1	3	SIZE (vysheng-tg-1.4.1-6547c0b_GH0.tar.gz) = 307276
4	SIZE (vysheng-tgl-2.0.1_GH0.tar.gz) = 250488	4	SHA256 (vysheng-tgl-ffb04ca_GH0.tar.gz) = 2a2aafe6366e3a4c7df2af916c015fa0c0200094e785e69396ca6ff0ef612cd4
5	SHA256 (vysheng-tl-parser-1659d87_GH0.tar.gz) = 6b9538b0c3be3bb25e4f4750ecbea42ce7be58b005a3eeb372b9d15fbaa92e0b	5	SIZE (vysheng-tgl-ffb04ca_GH0.tar.gz) = 240798
6	SIZE (vysheng-tl-parser-1659d87_GH0.tar.gz) = 78615	6	SHA256 (vysheng-tl-parser-36bf190_GH0.tar.gz) = 9c4222cfc39f1f58061678c2a22dac5d2391e2594d4ec00e5ab9a7c12e606789
		7	SIZE (vysheng-tl-parser-36bf190_GH0.tar.gz) = 66898

Line 0 Link Here

(-)net-im/telegram/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig 2016-03-23 11:42:53 UTC
	2	+++ Makefile.in
	3	@@ -6,7 +6,7 @@ CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
	4	DEFS=@DEFS@
	5	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
	6	EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
	7	-LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
	8	+LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -lpthread -lutil
	9	LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
	10
	11	DEP=dep




--- 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,




--- 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);




--- 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__)
 

Return to bug 215064

Line 0 Link Here

(-)net-im/telegram/files/patch-lua-tg.c (+15 lines)
	1	--- lua-tg.c.orig 2016-12-27 02:26:05 UTC
	2	+++ lua-tg.c
	3	@@ -661,9 +661,9 @@ struct lua_arg {
	4	struct lua_arg lua_ptr[MAX_LUA_COMMANDS];
	5	static int pos;
	6
	7	-static inline tgl_peer_t get_peer (const char s) {
	8	- return tgl_peer_get_by_name (TLS, s);
	9	-}
	10	+// static inline tgl_peer_t get_peer (const char s) {
	11	+// return tgl_peer_get_by_name (TLS, s);
	12	+// }
	13
	14	enum lua_query_type {
	15	lq_contact_list,

Line 0 Link Here

(-)net-im/telegram/files/patch-tgl_mtproto-utils.c (+22 lines)
	1	--- tgl/mtproto-utils.c.orig 2016-03-23 11:42:06 UTC
	2	+++ tgl/mtproto-utils.c
	3	@@ -98,9 +98,7 @@ static unsigned long long BN2ull (TGLC_b
	4	if (sizeof (unsigned long) == 8) {
	5	return TGLC_bn_get_word (b);
	6	} else if (sizeof (unsigned long long) == 8) {
	7	- assert (0); // As long as nobody ever uses this code, assume it is broken.
	8	unsigned long long tmp;
	9	- /* Here be dragons, but it should be okay due to be64toh */
	10	TGLC_bn_bn2bin (b, (unsigned char *) &tmp);
	11	return be64toh (tmp);
	12	} else {
	13	@@ -112,9 +110,7 @@ static void ull2BN (TGLC_bn *b, unsigned
	14	if (sizeof (unsigned long) == 8 \|\| val < (1ll << 32)) {
	15	TGLC_bn_set_word (b, val);
	16	} else if (sizeof (unsigned long long) == 8) {
	17	- assert (0); // As long as nobody ever uses this code, assume it is broken.
	18	htobe64(val);
	19	- /* Here be dragons, but it should be okay due to htobe64 */
	20	TGLC_bn_bin2bn ((unsigned char *) &val, 8, b);
	21	} else {
	22	assert (0);

Line 0 Link Here

(-)net-im/telegram/files/patch-tgl_tl-parser_portable__endian.h (+18 lines)
	1	--- tgl/tl-parser/portable_endian.h.orig 2015-10-17 13:33:25 UTC
	2	+++ tgl/tl-parser/portable_endian.h
	3	@@ -53,6 +53,7 @@
	4
	5	# include <sys/endian.h>
	6
	7	+#if !defined(__FreeBSD__)
	8	# define be16toh(x) betoh16(x)
	9	# define le16toh(x) letoh16(x)
	10
	11	@@ -61,6 +62,7 @@
	12
	13	# define be64toh(x) betoh64(x)
	14	# define le64toh(x) letoh64(x)
	15	+#endif /* !defined(__FreeBSD__) */
	16
	17	#elif defined(__WINDOWS__)
	18