From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QM5JKif2BmBkMwAA0tVLHw (envelope-from ) for ; Tue, 19 Jan 2021 15:09:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iLoPJif2BmDREgAAbx9fmQ (envelope-from ) for ; Tue, 19 Jan 2021 15:09:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D8EBE940485 for ; Tue, 19 Jan 2021 15:09:26 +0000 (UTC) Received: from localhost ([::1]:45024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1sdJ-0005jU-PR for larch@yhetil.org; Tue, 19 Jan 2021 10:09:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1scw-0005jA-8U for guix-patches@gnu.org; Tue, 19 Jan 2021 10:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1scw-0000gm-1R for guix-patches@gnu.org; Tue, 19 Jan 2021 10:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1scv-0001PJ-S9 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:09:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45954] Telegram-CLI (v2) References: In-Reply-To: Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45954 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 45954@debbugs.gnu.org Received: via spool by 45954-submit@debbugs.gnu.org id=B45954.16110689325381 (code B ref 45954); Tue, 19 Jan 2021 15:09:01 +0000 Received: (at 45954) by debbugs.gnu.org; 19 Jan 2021 15:08:52 +0000 Received: from localhost ([127.0.0.1]:51249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1scm-0001Oh-77 for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:08:52 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:39183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1sci-0001OC-GZ for 45954@debbugs.gnu.org; Tue, 19 Jan 2021 10:08:50 -0500 X-Originating-IP: 76.68.120.100 Received: from [192.168.5.10] (bras-vprn-toroon474rw-lp130-08-76-68-120-100.dsl.bell.ca [76.68.120.100]) (Authenticated sender: rg@raghavgururajan.name) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 98FE860009 for <45954@debbugs.gnu.org>; Tue, 19 Jan 2021 15:08:41 +0000 (UTC) From: Raghav Gururajan Message-ID: <8faa59bb-369f-a6e5-f2bb-f2025cf41448@raghavgururajan.name> Date: Tue, 19 Jan 2021 10:08:39 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7E0E7BBCD05BB9C0792B4372" Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.35 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: D8EBE940485 X-Spam-Score: -2.35 X-Migadu-Scanner: scn0.migadu.com X-TUID: R3vxLtvz4EsU This is a multi-part message in MIME format. --------------7E0E7BBCD05BB9C0792B4372 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------7E0E7BBCD05BB9C0792B4372 Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-Add-telegram-cli.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0018-gnu-Add-telegram-cli.patch" >From 7ac04da6cf62d16531ac20658a1d6d441a6ef3ca Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 18 Jan 2021 04:04:25 -0500 Subject: [PATCH 18/18] gnu: Add telegram-cli. * gnu/packages/telegram.scm (telegram-cli): New variable. --- gnu/packages/telegram.scm | 117 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index c97289996c..13be4ae4fd 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -42,13 +42,18 @@ #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lxqt) + #:use-module (gnu packages lua) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages qt) + #:use-module (gnu packages readline) + #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) @@ -451,3 +456,115 @@ a part of telegram-cli, but now being maintained separately.") (description "TGL is the telegram library for telegram-cli.") (home-page "https://github.com/vysheng/tgl") (license license:lgpl2.1+))) + +(define-public telegram-cli + (package + (name "telegram-cli") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vysheng/tg.git") + (commit "6547c0b21b977b327b3c5e8142963f4bc246187a"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0c1w7jgska71jjbvg1y09v52549pwa4zkdjly18yxywn7gayd2p6")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + ;; Use gcrypt instead of openssl. + "--disable-openssl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'trigger-bootstrap + (lambda _ + (delete-file "configure") + #t)) + (add-after 'trigger-bootstrap 'patch-tgl-and-tlparser + (lambda* (#:key inputs #:allow-other-keys) + (for-each delete-file + (list + "Makefile.tgl" + "Makefile.tl-parser")) + (substitute* "Makefile.in" + (("include \\$\\{srcdir\\}/Makefile\\.tl-parser") + "") + (("include \\$\\{srcdir\\}/Makefile\\.tgl") + "") + (("-I\\$\\{srcdir\\}/tgl") + (string-append "-I" (assoc-ref inputs "tgl") + "/include/tgl")) + (("AUTO=auto") + (string-append "AUTO=" (assoc-ref inputs "tgl") + "/include/tgl/auto")) + (("LIB=libs") + (string-append "LIB=" (assoc-ref inputs "tgl") + "/lib/tgl"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (source (string-append (getenv "TEMP") "/source"))) + ;; Install client. + (install-file + (string-append source "/bin/telegram-cli") + (string-append out "/bin")) + ;; Install daemon. + (install-file + (string-append source "/start-telegram-daemon") + (string-append out "/bin")) + ;; Install daemon script. + (install-file + (string-append source "/telegram-daemon") + (string-append out "/etc/init.d")) + ;; Install server public-key. + (install-file + (string-append source "/server.pub") + (string-append out "/etc/telegram-cli"))) + #t)) + (add-after 'install 'patch-daemon-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (substitute* "etc/init.d/telegram-daemon" + (("KOT\\'s meta engine") + "Telegram Messaging System") + (("/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin") + "$PATH") + (("\\$ROOT/usr/share/telegram-daemon/bin") + (string-append out "/bin")) + (("/etc/init\\.d") + (string-append out "/etc/init.d"))) + (substitute* "bin/start-telegram-daemon" + (("msg-search-engine") + "telegram-cli") + (("\\$root/usr/share/telegram-daemon/bin") + (string-append out "/bin"))))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("jansson" ,jansson) + ("libconfig" ,libconfig) + ("libevent" ,libevent) + ("libgcrypt" ,libgcrypt) + ("lua" ,lua) + ("openssl" ,openssl) + ("perl" ,perl) + ("python" ,python) + ("readline" ,readline) + ("tgl" ,tgl) + ("tl-parser" ,tl-parser) + ("zlib" ,zlib))) + (synopsis "Telegram Messenger CLI") + (description "TG is the command-line interface for Telegram Messenger.") + (home-page "https://github.com/vysheng/tgl") + (license license:gpl2+))) -- 2.30.0 --------------7E0E7BBCD05BB9C0792B4372 Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-Add-tgl.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0017-gnu-Add-tgl.patch" >From 3f8c1445e5486145d215a1f31962ca06e982e333 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 17 Jan 2021 22:03:11 -0500 Subject: [PATCH 17/18] gnu: Add tgl. * gnu/packages/telegram.scm (tgl): New variable. --- gnu/packages/telegram.scm | 99 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3c3aef4b9a..c97289996c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -21,6 +21,7 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -32,10 +33,12 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) + #:use-module (gnu packages libevent) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lxqt) @@ -53,6 +56,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) #:use-module (guix build-system qt)) (define-public tg_owt @@ -352,3 +356,98 @@ messenger.") a part of telegram-cli, but now being maintained separately.") (home-page "https://github.com/vysheng/tl-parser") (license license:gpl2+)))) + +(define-public tgl + (package + (name "tgl") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vysheng/tgl.git") + (commit "ffb04caca71de0cddf28cd33a4575922900a59ed"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0cf5s7ygslb5klg1qv9qdc3hivhspmvh3zkacyyhd2yyikb5p0f9")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + ;; Use gcrypt instead of openssl. + "--disable-openssl" + ;; Enable extended queries system. + "--enable-extf" + ;; Include libevent-based net and timers. + "--enable-libevent") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'trigger-bootstrap + (lambda _ + (delete-file "configure") + #t)) + (add-after 'trigger-bootstrap 'patch-tl-parser + (lambda _ + (delete-file "Makefile.tl-parser") + (substitute* "Makefile.in" + (("include \\$\\{srcdir\\}/Makefile\\.tl-parser") + "") + (("\\$\\{EXE\\}/tl-parser") + "tl-parser")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin-to (string-append out "/bin")) + (include-to (string-append out "/include")) + (lib-to (string-append out "/lib")) + (source (string-append (getenv "TEMP") "/source")) + (bin-from (string-append source "/bin")) + (lib-from (string-append source "/libs"))) + ;; Install executables. + (with-directory-excursion bin-from + (for-each + (lambda (file) + (install-file file bin-to)) + (list + "generate"))) + ;; Install headers. + (with-directory-excursion source + (for-each + (lambda (file) + (install-file file (string-append include-to "/tgl/crypto")) + (delete-file file)) + (find-files "crypto" "\\.h$")) + (for-each + (lambda (file) + (install-file file (string-append include-to "/tgl/auto")) + (delete-file file)) + (find-files "auto" "\\.h$")) + (for-each + (lambda (file) + (install-file file (string-append include-to "/tgl")) + (delete-file file)) + (find-files "." "\\.h$"))) + ;; Install libraries. + (for-each + (lambda (file) + (install-file file (string-append lib-to "/tgl"))) + (find-files lib-from "\\.(a|so)$"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("libevent" ,libevent) + ("libgcrypt" ,libgcrypt) + ("tl-parser" ,tl-parser) + ("zlib" ,zlib))) + (synopsis "Telegram Library") + (description "TGL is the telegram library for telegram-cli.") + (home-page "https://github.com/vysheng/tgl") + (license license:lgpl2.1+))) -- 2.30.0 --------------7E0E7BBCD05BB9C0792B4372 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-Add-tl-parser.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0016-gnu-Add-tl-parser.patch" >From 656d1067c9c9c15fc69386071dd94c0b29040fd4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 17 Jan 2021 12:16:34 -0500 Subject: [PATCH 16/18] gnu: Add tl-parser. * gnu/packages/telegram.scm (tl-parser): New variable. --- gnu/packages/telegram.scm | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9759a11873..3c3aef4b9a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -303,3 +303,52 @@ messenger.") license:lgpl2.1+ ;; Others license:gpl3+)))) + +(define-public tl-parser + (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") + (revision "1")) + (package + (name "tl-parser") + (version + (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vysheng/tl-parser.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "13cwi247kajzpkbl86hnwmn1sn2h6rqndz6khajbqj0mlw9mv4hq")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No target + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (include (string-append out "/include")) + (source (string-append (getenv "TEMP") "/source")) + (build (string-append (getenv "TEMP") "/build"))) + ;; Install executables. + (with-directory-excursion build + (for-each + (lambda (file) + (install-file file bin)) + (list + "tl-parser"))) + ;; Install headers. + (for-each + (lambda (file) + (install-file file (string-append include "/tl-parser"))) + (find-files source "\\.h$"))) + #t))))) + (synopsis "Parse tl scheme to tlo") + (description "TL-Parser is a tl scheme to tlo file parser. It was formely +a part of telegram-cli, but now being maintained separately.") + (home-page "https://github.com/vysheng/tl-parser") + (license license:gpl2+)))) -- 2.30.0 --------------7E0E7BBCD05BB9C0792B4372--