[Pkg-privacy-commits] [hexchat-otr] 04/05: Removed network-key.patch and accept-var-formats.patch already fixed upstream.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository hexchat-otr.

commit ad54e2e40a0a221adf7cc61f65d8faad16eaf5f7
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Aug 7 18:07:42 2016 +0200

    Removed network-key.patch and accept-var-formats.patch already fixed upstream.
---
 debian/patches/accept-var-formats.patch |  18 ------
 debian/patches/network-key.patch        | 107 --------------------------------
 debian/patches/series                   |   2 -
 3 files changed, 127 deletions(-)

diff --git a/debian/patches/accept-var-formats.patch b/debian/patches/accept-var-formats.patch
deleted file mode 100644
index 895d835..0000000
--- a/debian/patches/accept-var-formats.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Disable error for nonliteral format strings.
- This fixes a build failure with GCC 6.
-Author: Petter Reinholdtsen <pere at hungry.com>
-Bug-Debian: https://bugs.debian.org/831154
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2016-07-18
-
---- hexchat-otr-0.2.0.orig/configure.ac
-+++ hexchat-otr-0.2.0/configure.ac
-@@ -61,6 +61,7 @@ AX_APPEND_COMPILE_FLAGS([ \
- 	-Werror=format=2 \
- 	-Werror=missing-include-dirs \
- 	-Werror=date-time \
-+	-Wnoerror=format-nonliteral \
- ])
- 
- AC_CONFIG_FILES([
diff --git a/debian/patches/network-key.patch b/debian/patches/network-key.patch
deleted file mode 100644
index e1c95dc..0000000
--- a/debian/patches/network-key.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Use network rather than server for account name
-    
-    Note that this will require regenerating keys as they
-    are not migrated.
-
-Author: Petter Reinholdtsen <pere at debian.org>
-Bug: https://github.com/TingPing/hexchat-otr/issues/7
-Origin: https://github.com/TingPing/hexchat-otr/commit/243efd269eb45d54349fa104f472bc6a0f415926
-Forwarded: yes
-Reviewed-By: Petter Reinholdtsen <pere at debian.org>
-Last-Update: 2016-05-16
-
-diff --git a/src/hexchat_otr.c b/src/hexchat_otr.c
-index 7bef9ed..7e521c6 100644
---- a/src/hexchat_otr.c
-+++ b/src/hexchat_otr.c
-@@ -64,10 +64,10 @@ static int cmd_otr (char *word[], char *word_eol[], void *userdata)
- {
- 	const char *own_nick = hexchat_get_info (ph, "nick");
- 	char *target = (char *)hexchat_get_info (ph, "channel");
--	const char *server = hexchat_get_info (ph, "server");
-+	const char *network = hexchat_get_info (ph, "network");
- 	IRC_CTX ircctxs = {
- 				.nick = (char *)own_nick,
--				.address = (char *)server
-+				.address = (char *)network
- 			},
- 			*ircctx = &ircctxs;
- 
-@@ -189,12 +189,12 @@ static int hook_outgoing (char *word[], char *word_eol[], void *userdata)
- {
- 	const char *own_nick = hexchat_get_info (ph, "nick");
- 	const char *channel = hexchat_get_info (ph, "channel");
--	const char *server = hexchat_get_info (ph, "server");
-+	const char *network = hexchat_get_info (ph, "network");
- 	char newmsg[512];
- 	char *otrmsg;
- 	IRC_CTX ircctx = {
- 		.nick = (char *)own_nick,
--		.address = (char *)server
-+		.address = (char *)network
- 	};
- 
- 	if (get_current_context_type () != 3) /* Not PM */
-@@ -224,12 +224,12 @@ static int hook_privmsg (char *word[], char *word_eol[], void *userdata)
- {
- 	char nick[256];
- 	char *newmsg;
--	const char *server = hexchat_get_info (ph, "server");
-+	const char *network = hexchat_get_info (ph, "network");
- 	const char *own_nick = hexchat_get_info (ph, "nick");
- 	const char *chantypes = hexchat_list_str (ph, NULL, "chantypes");
- 	IRC_CTX ircctx = {
- 		.nick = (char *)own_nick,
--		.address = (char *)server
-+		.address = (char *)network
- 	};
- 	hexchat_context *query_ctx;
- 
-@@ -254,11 +254,11 @@ static int hook_privmsg (char *word[], char *word_eol[], void *userdata)
- 		return HEXCHAT_EAT_NONE;
- 	}
- 
--	query_ctx = hexchat_find_context (ph, server, nick);
-+	query_ctx = hexchat_find_context (ph, network, nick);
- 	if (query_ctx == NULL)
- 	{
- 		hexchat_commandf (ph, "query %s", nick);
--		query_ctx = hexchat_find_context (ph, server, nick);
-+		query_ctx = hexchat_find_context (ph, network, nick);
- 	}
- 
- 	GRegex *regex_quot = g_regex_new (""", 0, 0, NULL);
-@@ -348,19 +348,19 @@ void printformat (IRC_CTX *ircctx, const char *nick, int lvl, int fnum, ...)
- 	va_start (params, fnum);
- 	char msg[LOGMAX], *s = msg;
- 	hexchat_context *find_query_ctx;
--	char *server = NULL;
-+	char *network = NULL;
- 
- 	if (ircctx)
--		server = ircctx->address;
-+		network = ircctx->address;
- 
--	if (server && nick)
-+	if (network && nick)
- 	{
--		find_query_ctx = hexchat_find_context (ph, server, nick);
-+		find_query_ctx = hexchat_find_context (ph, network, nick);
- 		if (find_query_ctx == NULL)
- 		{
- 			/* no query window yet, let's open one */
- 			hexchat_commandf (ph, "query %s", nick);
--			find_query_ctx = hexchat_find_context (ph, server, nick);
-+			find_query_ctx = hexchat_find_context (ph, network, nick);
- 		}
- 	}
- 	else
-@@ -369,7 +369,7 @@ void printformat (IRC_CTX *ircctx, const char *nick, int lvl, int fnum, ...)
- 											   NULL,
- 											   hexchat_get_info (ph,
- 																 "network")
--												   ?: hexchat_get_info (ph, "server"));
-+												   ?: hexchat_get_info (ph, "network"));
- 	}
- 
- 	hexchat_set_context (ph, find_query_ctx);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 020b8b6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-network-key.patch
-accept-var-formats.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/hexchat-otr.git