From nobody Wed Oct 27 20:17:04 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0DCA01826B97; Wed, 27 Oct 2021 20:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hfg2m6mXjz3sY2; Wed, 27 Oct 2021 20:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDC2B169B3; Wed, 27 Oct 2021 20:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RKH4GO070883; Wed, 27 Oct 2021 20:17:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RKH4Co070882; Wed, 27 Oct 2021 20:17:04 GMT (envelope-from git) Date: Wed, 27 Oct 2021 20:17:04 GMT Message-Id: <202110272017.19RKH4Co070882@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: 278c68d7cac1 - main - net-im/purple-hangouts: Add the upstream's patch for HTTP-errors 429 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 278c68d7cac1ccf982132f2e364a7f129049f0ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=278c68d7cac1ccf982132f2e364a7f129049f0ba commit 278c68d7cac1ccf982132f2e364a7f129049f0ba Author: Mikhail Teterin AuthorDate: 2021-10-27 20:14:28 +0000 Commit: Mikhail Teterin CommitDate: 2021-10-27 20:14:28 +0000 net-im/purple-hangouts: Add the upstream's patch for HTTP-errors 429 PR: 259291 Approved by: J Juanino (maintainer) Sponsored by: United Marsupials --- net-im/purple-hangouts/Makefile | 2 ++ net-im/purple-hangouts/files/patch-429 | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/net-im/purple-hangouts/Makefile b/net-im/purple-hangouts/Makefile index d5aaaed477b7..30668fc1046e 100644 --- a/net-im/purple-hangouts/Makefile +++ b/net-im/purple-hangouts/Makefile @@ -2,6 +2,7 @@ PORTNAME= purple-hangouts PORTVERSION= 20190607 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://bitbucket.org/EionRobb/${PORTNAME}/get/ # Commit tag. Must be changed according with PORTVERSION. @@ -19,6 +20,7 @@ LIB_DEPENDS= libpurple.so:net-im/libpurple \ USES= gmake gnome pkgconfig zip USE_GNOME= glib20 +PATCH_STRIP= -p1 --ignore-whitespace WRKSRC= ${WRKDIR}/EionRobb-${PORTNAME}-${DISTNAME} diff --git a/net-im/purple-hangouts/files/patch-429 b/net-im/purple-hangouts/files/patch-429 new file mode 100644 index 000000000000..fa9a62cfc05b --- /dev/null +++ b/net-im/purple-hangouts/files/patch-429 @@ -0,0 +1,26 @@ +From 55b9f01d040b240b794700f44d9c21a6cb51251e Mon Sep 17 00:00:00 2001 +From: Eion Robb +Date: Wed, 30 Jun 2021 09:53:47 +1200 +Subject: [PATCH] Fix for 429 errors + +Fixes issue #222 +--- + hangouts_auth.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hangouts_auth.c b/hangouts_auth.c +index 025f4f9..d988c3a 100644 +--- a/hangouts_auth.c ++++ b/hangouts_auth.c +@@ -258,6 +258,11 @@ hangouts_auth_get_session_cookies_got_cb(PurpleHttpConnection *http_conn, Purple + return; + } + ++ purple_http_cookie_jar_set(ha->cookie_jar, "__Secure-3PSID", NULL); ++ purple_http_cookie_jar_set(ha->cookie_jar, "__Host-3PLSID", NULL); ++ purple_http_cookie_jar_set(ha->cookie_jar, "__Secure-3PAPISID", NULL); ++ purple_http_cookie_jar_set(ha->cookie_jar, "__Host-GAPS", NULL); ++ + //Restore the last_event_timestamp before it gets overridden by new events + last_event_timestamp = purple_account_get_int(ha->account, "last_event_timestamp_high", 0); + if (last_event_timestamp != 0) {