.gitignore

@@ -85,3 +85,5 @@ osx/.HexChat.app
 po/.intltool-merge-cache
 *.zip
 *.dmg
+*.VC.db
+*.VC.opendb

.mailmap

@@ -0,0 +1,10 @@
+Berke Viktor <github.bviktor@outlook.com> <berkeviktor@aol.com>
+Berke Viktor <github.bviktor@outlook.com> <bviktor@hexchat.org>
+Berke Viktor <github.bviktor@outlook.com> <bviktor@outlook.com>
+Berke Viktor <github.bviktor@outlook.com> berkeviktor@aol.com
+Patrick Griffis <tingping@tingping.se> TingPing <tingping@fedoraproject.org>
+Patrick Griffis <tingping@tingping.se> TingPing <tingping@tingping.se>
+Patrick Griffis <tingping@tingping.se> TingPing <tngpng@gmail.com>
+Patrick Griffis <tingping@tingping.se> TingPing <TingPing@users.noreply.github.com>
+Arnav Singh <arnavion@gmail.com> Arnavion
+Eustachy Kapusta <Eustachy.kapusta@gmail.com> tomek

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([HexChat],[2.12.1])
+AC_INIT([HexChat],[2.12.2])
 
 AC_PREREQ([2.64])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
@@ -174,6 +174,9 @@ AC_ARG_WITH(theme-manager,
 	[AS_HELP_STRING([--with-theme-manager],[compile theme manager (needs monodevelop, default: off)])],
 		theme_manager=$withval, theme_manager=no)
 
+AC_ARG_ENABLE(stack-protector,
+	[AS_HELP_STRING([--disable-stack-protector],[disable building with stack-protector])],
+        stack_protector=$enableval, stack_protector=yes)
 
 
 dnl *********************************************************************
@@ -370,7 +373,7 @@ dnl *********************************************************************
 
 
 AS_IF([test "$openssl" != no], [
-	PKG_CHECK_MODULES(OPENSSL, [openssl], [
+	PKG_CHECK_MODULES(OPENSSL, [openssl >= 0.9.8], [
 		AC_DEFINE(USE_OPENSSL)
 		openssl=yes
 		COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
@@ -623,7 +626,6 @@ dnl *********************************************************************
 AX_APPEND_COMPILE_FLAGS([\
 	-pipe \
 	-funsigned-char \
-	-fstack-protector-strong \
 	-fPIE \
 	-fPIC \
 	-Wall \
@@ -643,6 +645,12 @@ AX_APPEND_COMPILE_FLAGS([\
 	-Werror=pointer-arith \
 ])
 
+AS_IF([test "$stack_protector" = "yes"], [
+	AX_APPEND_COMPILE_FLAGS([ \
+		-fstack-protector-strong \
+	])
+])
+
 AX_APPEND_LINK_FLAGS([ \
 	-pie \
 	-Wl,-z,relro \

data/Makefile.am

@@ -1,7 +1,15 @@
-SUBDIRS = pkgconfig man
+SUBDIRS =
+
+if DO_PLUGIN
+SUBDIRS += pkgconfig
+endif
 
 if DO_GTK
-SUBDIRS += icons misc
+SUBDIRS += icons misc man
+else
+if WITH_TM
+SUBDIRS += misc
+endif
 endif
 
 EXTRA_DIST = \

data/misc/Makefile.am

@@ -1,6 +1,12 @@
-appdata_in_files = hexchat.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 appdatadir = $(datadir)/appdata
+appdata_in_files =
+
+if DO_GTK
+appdata_in_files += hexchat.appdata.xml.in
+endif
+
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 if USE_DBUS
@@ -13,7 +19,11 @@ hexchat.desktop.in: hexchat.desktop.in.in
 	$(AM_V_GEN)sed -e s!\@exec_command\@!$(exec_command)! < $< > $@
 
 data_desktopdir = $(datadir)/applications
-data_desktop_in_files = hexchat.desktop.in
+data_desktop_in_files =
+
+if DO_GTK
+data_desktop_in_files += hexchat.desktop.in
+endif
 
 if WITH_TM
 data_desktop_in_files += htm.desktop.in

data/misc/hexchat.appdata.xml.in

@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application>
-	<id type="desktop">hexchat.desktop</id>
-	<licence>CC0</licence>
-	<description>
-		<_p>HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.</_p>
-		<_p>HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.</_p>
-	</description>
-	<url type="homepage">http://hexchat.github.io</url>
-	<screenshots>
-		<screenshot type="default">http://i.imgur.com/XBbQKXf.png</screenshot>
-	</screenshots>
-	<updatecontact>tingping_at_fedoraproject.org</updatecontact>
-</application>
-
+<component type="desktop">
+  <id>hexchat.desktop</id>
+  <name>HexChat</name>
+  <developer_name>HexChat</developer_name>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <translation type="gettext">hexchat</translation>
+  <summary>IRC Client</summary>
+  <description>
+    <_p>HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.</_p>
+    <_p>HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.</_p>
+  </description>
+  <url type="homepage">http://hexchat.github.io</url>
+  <url type="bugtracker">https://github.com/hexchat/hexchat</url>
+  <url type="translate">https://www.transifex.com/hexchat/hexchat</url>
+  <url type="donation">https://goo.gl/jESZvU</url>
+  <url type="help">https://hexchat.readthedocs.io/en/latest/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://i.imgur.com/tLMguQz.png</image>
+      <_caption>Main Chat Window</_caption>
+    </screenshot>
+  </screenshots>
+  <update_contact>tingping_at_fedoraproject.org</update_contact>
+</component>

plugins/checksum/Makefile.am

@@ -4,4 +4,5 @@ lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c
 checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
 checksum_la_LIBADD = $(GLIB_LIBS)
-checksum_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+checksum_la_CPPFLAGS = -I$(top_srcdir)/src/common
+checksum_la_CFLAGS = $(GLIB_CFLAGS)

plugins/doat/Makefile.am

@@ -4,5 +4,6 @@ lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c
 doat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
 doat_la_LIBADD = $(GLIB_LIBS)
-doat_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+doat_la_CPPFLAGS = -I$(top_srcdir)/src/common
+doat_la_CFLAGS = $(GLIB_CFLAGS)
 

plugins/fishlim/Makefile.am

@@ -1,9 +1,10 @@
-EXTRA_DIST = INSTALL LICENSE fish.h irc.h keystore.h plugin_hexchat.h
+EXTRA_DIST = LICENSE fish.h irc.h keystore.h plugin_hexchat.h dh1080.h
 
 libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = fishlim.la
-fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c
+fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c dh1080.c
 fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
 fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
-fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/common
+fishlim_la_CPPFLAGS = -I$(top_srcdir)/src/common
+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)