Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2017-06-07 09:56:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irssi" Wed Jun 7 09:56:23 2017 rev:44 rq:501554 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2017-03-16 09:51:02.625966217 +0100 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2017-06-07 09:57:19.786519435 +0200 @@ -1,0 +2,21 @@ +Tue Jun 6 19:48:30 UTC 2017 - [email protected] + +- update to 1.0.3 + - Fix out of bounds read when scanning expandos (GL!11). + - Fix invalid memory access with quoted filenames in DCC + (GL#8, GL!12). + - Fix null-pointer dereference on DCC without address (GL#9, GL!13). + - Improve integer overflow handling. Originally reported by + oss-fuzz#525 (#706). + - Improve nicklist performance from O(N^2) to O(N) (#705). + - Fix initial screen redraw delay. By Stephen Oberholtzer + (#680, bdo#856201). + - Fix incorrect reset of true colours when resetting background. (#711). + - Fix missing -notls option in /SERVER. By Jari Matilainen (#117, #702). + - Fix minor history glitch on overcounter (#462, #685). + - Improved OpenSSL detection at compile time. By Rodrigo Rebello (#677). + - Improved NetBSD Terminfo detection. By Maya Rashish (#694, #698). + - Add missing syntax info for COMPLETION (#687, #688). + - Minor typo correction in help. By Michael Hansen (#707). + +------------------------------------------------------------------- Old: ---- irssi-1.0.2.tar.xz irssi-1.0.2.tar.xz.asc New: ---- irssi-1.0.3.tar.xz irssi-1.0.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.DtabJP/_old 2017-06-07 09:57:21.394292239 +0200 +++ /var/tmp/diff_new_pack.DtabJP/_new 2017-06-07 09:57:21.398291673 +0200 @@ -18,7 +18,7 @@ %bcond_with socks Name: irssi -Version: 1.0.2 +Version: 1.0.3 Release: 0 # Summary: Modular, Secure, and Well Designed IRC Client ++++++ irssi-1.0.2.tar.xz -> irssi-1.0.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/ChangeLog new/irssi-1.0.3/ChangeLog --- old/irssi-1.0.2/ChangeLog 2017-03-10 17:43:14.000000000 +0100 +++ new/irssi-1.0.3/ChangeLog 2017-06-06 20:12:07.000000000 +0200 @@ -1,3 +1,118 @@ +commit 68bb0c6e488916d1880e249c61f1e638f23b1d62 +Author: Ailin Nemui <[email protected]> +Date: Mon Jun 5 16:25:53 2017 +0200 + + tag as 1.0.3 + +commit 712e02960a85208c7800a593e2b4f21dc06dfad9 +Author: ailin-nemui <[email protected]> +Date: Tue May 30 13:14:10 2017 +0200 + + Merge pull request #711 from ailin-nemui/24bit-reset + + do not reset true colour bit on colour reset + (cherry picked from commit 2d0a9b4ca30ab09ccf5a84d267a824e2a2059d70) + +commit 18df0934b5c7e71ef6fe942ab201179b09314b16 +Author: ailin-nemui <[email protected]> +Date: Thu May 18 15:39:02 2017 +0200 + + Merge pull request #707 from mh-source/patch-1 + + dcc.in: fixed typo 'resolved' -> 'resolves' + (cherry picked from commit aac20b15132e0facee14bd9b721d6bfa9251a172) + +commit d5bdf00ba6f3125e8348d3aed02667c71c8d2ccf +Author: ailin-nemui <[email protected]> +Date: Fri Jun 2 14:47:38 2017 +0200 + + Merge pull request #706 from dequis/parse-uint + + Add parse_uint function to improve integer overflow handling + (cherry picked from commit 31b9d115b065570020ce9be1a1d8cd49212f70a9) + +commit d8167908d00f0c8ba39bcac14cf0f49046cdca0e +Author: ailin-nemui <[email protected]> +Date: Sun May 14 09:40:55 2017 +0200 + + Merge pull request #705 from ailin-nemui/nicklist-performance + + improve nicklist performance + (cherry picked from commit 476f19f1235d7d28ede002be3c7a249952124058) + +commit 54215ce9588f594a87bad0080e1694e269e301ba +Author: ailin-nemui <[email protected]> +Date: Sun May 14 09:44:26 2017 +0200 + + Merge pull request #702 from vague666/server_modify_notls + + Added support for -notls and -notls_verify + (cherry picked from commit 10cea6169694808ab2bf2caf9451cfac2db0d9da) + +commit 81c42d4da97a4b8f7f9436147497e193dc974406 +Author: ailin-nemui <[email protected]> +Date: Thu May 4 12:31:32 2017 +0200 + + Merge pull request #698 from ailin-nemui/master + + detect Netbsd terminfo + (cherry picked from commit f24ad9a36605f54ac8583ec3e223ccdfe30bb666) + +commit 2520ea338192837f9e9f3748d69505e6ef842d4a +Author: ailin-nemui <[email protected]> +Date: Fri Apr 7 21:22:48 2017 +0200 + + Merge pull request #688 from josephbisch/fix-687 + + Add syntax info for completion + (cherry picked from commit 411ace0a15483d44b4bd0016f586108630cd5142) + +commit 35e56cdb75296a6aa377701600eca9393ea67b67 +Author: ailin-nemui <[email protected]> +Date: Thu Apr 6 17:37:23 2017 +0200 + + Merge pull request #685 from josephbisch/fix-462 + + Fix strange history behavior when history is empty + (cherry picked from commit 3f69e718044ac87eeb5144be6113c2be33261cd0) + +commit 7fc08ba0e50a9dc1fb986e087aa6e3115f01badc +Author: ailin-nemui <[email protected]> +Date: Tue Mar 21 15:47:16 2017 +0100 + + Merge pull request #680 from Stevie-O/slow-startup-with-glib-2.49.3 + + Fix slow startup with glib 2.49.3 + (cherry picked from commit 3d4ba86a91b4f246665259c1e2100f5768e89237) + +commit 7b4106fe0c9b0c2b1fc8c87a02d2f92646cb1d50 +Author: ailin-nemui <[email protected]> +Date: Tue Apr 4 12:27:50 2017 +0200 + + Merge pull request #677 from rrebello/openssl-misc + + OpenSSL support detection and documentation fixes + (cherry picked from commit 590056d3c33a0efc126f35c7c0a7389282158855) + +commit 1f1868c532c4493e16f20925fc77f7d6f83b6d47 +Author: Ailin Nemui <[email protected]> +Date: Mon Jun 5 15:12:16 2017 +0200 + + Merge remote-tracking branch 'gitlab/security' + + (cherry picked from commit fb08fc7f1aa6b2e616413d003bf021612301ad55) + +commit 8724b4a7a74486a62b801c11a4fcd394db04ecc9 +Author: Joseph Bisch <[email protected]> +Date: Fri Mar 31 20:06:14 2017 +0000 + + Merge branch 'off-by-one-fix' into 'master' + + Fix off by one error with char_expandos + + See merge request !11 + (cherry picked from commit d5e23f97a7f98177bedc1842430a1199785bee20) + commit 2a53853f369b47e42e32e183c8109e3d63808899 Author: Ailin Nemui <[email protected]> Date: Fri Mar 10 17:41:04 2017 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/INSTALL new/irssi-1.0.3/INSTALL --- old/irssi-1.0.2/INSTALL 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/INSTALL 2017-06-05 15:57:58.000000000 +0200 @@ -30,10 +30,6 @@ Build the irssi proxy (see startup-HOWTO). - --disable-ssl - - Disable SSL support. - --with-perl=[yes|no|module] Enable Perl support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/Makefile.in new/irssi-1.0.3/Makefile.in --- old/irssi-1.0.2/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -307,6 +307,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/NEWS new/irssi-1.0.3/NEWS --- old/irssi-1.0.2/NEWS 2017-03-10 17:31:03.000000000 +0100 +++ new/irssi-1.0.3/NEWS 2017-06-05 19:28:27.000000000 +0200 @@ -1,3 +1,21 @@ +v1.0.3 2017-06-06 The Irssi team <[email protected]> + - Fix out of bounds read when scanning expandos (GL!11). + - Fix invalid memory access with quoted filenames in DCC + (GL#8, GL!12). + - Fix null-pointer dereference on DCC without address (GL#9, GL!13). + - Improve integer overflow handling. Originally reported by + oss-fuzz#525 (#706). + - Improve nicklist performance from O(N^2) to O(N) (#705). + - Fix initial screen redraw delay. By Stephen Oberholtzer + (#680, bdo#856201). + - Fix incorrect reset of true colours when resetting background. (#711). + - Fix missing -notls option in /SERVER. By Jari Matilainen (#117, #702). + - Fix minor history glitch on overcounter (#462, #685). + - Improved OpenSSL detection at compile time. By Rodrigo Rebello (#677). + - Improved NetBSD Terminfo detection. By Maya Rashish (#694, #698). + - Add missing syntax info for COMPLETION (#687, #688). + - Minor typo correction in help. By Michael Hansen (#707). + v1.0.2 2017-03-10 The Irssi team <[email protected]> - Prevent some null-pointer crashes (GL!9). - Fix compilation with OpenSSL 1.1.0 (#628, #597). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/aclocal.m4 new/irssi-1.0.3/aclocal.m4 --- old/irssi-1.0.2/aclocal.m4 2017-03-10 17:43:19.000000000 +0100 +++ new/irssi-1.0.3/aclocal.m4 2017-06-06 20:12:12.000000000 +0200 @@ -20,9 +20,9 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/build-aux/config.guess new/irssi-1.0.3/build-aux/config.guess --- old/irssi-1.0.2/build-aux/config.guess 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/build-aux/config.guess 2017-06-06 20:12:14.000000000 +0200 @@ -1013,7 +1013,7 @@ echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/build-aux/config.sub new/irssi-1.0.3/build-aux/config.sub --- old/irssi-1.0.2/build-aux/config.sub 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/build-aux/config.sub 2017-06-06 20:12:14.000000000 +0200 @@ -1058,12 +1058,18 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) + s390) basic_machine=s390-ibm ;; - s390x | s390x-*) + s390-*) + basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + s390x) basic_machine=s390x-ibm ;; + s390x-*) + basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sa29200) basic_machine=a29k-amd os=-udi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/configure new/irssi-1.0.3/configure --- old/irssi-1.0.2/configure 2017-03-10 17:43:20.000000000 +0100 +++ new/irssi-1.0.3/configure 2017-06-06 20:12:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for irssi 1.0.2. +# Generated by GNU Autoconf 2.69 for irssi 1.0.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='irssi' PACKAGE_TARNAME='irssi' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='irssi 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='irssi 1.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -661,6 +661,8 @@ perl_module_lib PERL_EXTRA_OPTS TEXTUI_LIBS +OPENSSL_LIBS +OPENSSL_CFLAGS GLIB_MKENUMS GOBJECT_QUERY GLIB_GENMARSHAL @@ -826,7 +828,9 @@ LT_SYS_LIBRARY_PATH PKG_CONFIG PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR' +PKG_CONFIG_LIBDIR +OPENSSL_CFLAGS +OPENSSL_LIBS' # Initialize some variables set by options. @@ -1367,7 +1371,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures irssi 1.0.2 to adapt to many kinds of systems. +\`configure' configures irssi 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1437,7 +1441,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of irssi 1.0.2:";; + short | recursive ) echo "Configuration of irssi 1.0.3:";; esac cat <<\_ACEOF @@ -1504,6 +1508,10 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + OPENSSL_CFLAGS + C compiler flags for OPENSSL, overriding pkg-config + OPENSSL_LIBS + linker flags for OPENSSL, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1571,7 +1579,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -irssi configure 1.0.2 +irssi configure 1.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2173,7 +2181,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by irssi $as_me 1.0.2, which was +It was created by irssi $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3042,7 +3050,7 @@ # Define the identity of the package. PACKAGE='irssi' - VERSION='1.0.2' + VERSION='1.0.3' # Some tools Automake needs. @@ -13150,52 +13158,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 -$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } -if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_library_init (); -int -main () -{ -return SSL_library_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSL_library_init=yes -else - ac_cv_lib_ssl_SSL_library_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 -$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } -if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSSL 1 -_ACEOF - - LIBS="-lssl $LIBS" - -fi - - for try in 1 2; do if test $try = 1; then @@ -13584,7 +13546,176 @@ as_fn_error $? "GLIB is required to build irssi." "$LINENO" 5 fi -LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto" +LIBS="$LIBS $GLIB_LIBS" + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +$as_echo_n "checking for openssl... " >&6; } + +if test -n "$OPENSSL_CFLAGS"; then + pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$OPENSSL_LIBS"; then + pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1` + else + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPENSSL_PKG_ERRORS" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_library_init (); +int +main () +{ +return SSL_library_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_library_init=yes +else + ac_cv_lib_ssl_SSL_library_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : + + LIBS="$LIBS -lssl -lcrypto" + +else + + as_fn_error $? "The OpenSSL library was not found" "$LINENO" 5 + +fi + + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_library_init (); +int +main () +{ +return SSL_library_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_library_init=yes +else + ac_cv_lib_ssl_SSL_library_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : + + LIBS="$LIBS -lssl -lcrypto" + +else + + as_fn_error $? "The OpenSSL library was not found" "$LINENO" 5 + +fi + + +else + OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS + OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CFLAGS $OPENSSL_CFLAGS" + LIBS="$LIBS $OPENSSL_LIBS" + +fi if test "x$want_textui" != "xno"; then @@ -13615,7 +13746,7 @@ return 0; } _ACEOF -for ac_lib in '' tinfo ncursesw ncurses; do +for ac_lib in '' tinfo ncursesw ncurses terminfo; do if test -z "$ac_lib"; then ac_res="none required" else @@ -14483,7 +14614,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by irssi $as_me 1.0.2, which was +This file was extended by irssi $as_me 1.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14549,7 +14680,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -irssi config.status 1.0.2 +irssi config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/configure.ac new/irssi-1.0.3/configure.ac --- old/irssi-1.0.2/configure.ac 2017-03-10 17:31:03.000000000 +0100 +++ new/irssi-1.0.3/configure.ac 2017-06-05 16:02:11.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(irssi, 1.0.2) +AC_INIT(irssi, 1.0.3) AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) @@ -231,11 +231,6 @@ fi dnl ** -dnl ** OpenSSL checks -dnl ** -AC_CHECK_LIB([ssl], [SSL_library_init]) - -dnl ** dnl ** fe-text checks dnl ** @@ -276,7 +271,21 @@ AC_ERROR([GLIB is required to build irssi.]) fi -LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto" +LIBS="$LIBS $GLIB_LIBS" + +dnl ** +dnl ** OpenSSL checks +dnl ** +PKG_CHECK_MODULES([OPENSSL], [openssl], [ + CFLAGS="$CFLAGS $OPENSSL_CFLAGS" + LIBS="$LIBS $OPENSSL_LIBS" +], [ + AC_CHECK_LIB([ssl], [SSL_library_init], [ + LIBS="$LIBS -lssl -lcrypto" + ], [ + AC_MSG_ERROR([The OpenSSL library was not found]) + ]) +]) dnl ** dnl ** curses checks @@ -286,7 +295,7 @@ TEXTUI_NO_LIBS="$LIBS" LIBS= - AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses], [want_textui=yes], [ + AC_SEARCH_LIBS([setupterm], [tinfo ncursesw ncurses terminfo], [want_textui=yes], [ AC_ERROR(Terminfo not found - install libncurses-dev or ncurses-devel package) want_textui="no, Terminfo not found" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/Makefile.in new/irssi-1.0.3/docs/Makefile.in --- old/irssi-1.0.2/docs/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/docs/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -271,6 +271,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/help/Makefile.in new/irssi-1.0.3/docs/help/Makefile.in --- old/irssi-1.0.2/docs/help/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/docs/help/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -270,6 +270,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/help/completion new/irssi-1.0.3/docs/help/completion --- old/irssi-1.0.2/docs/help/completion 2017-03-10 17:43:14.000000000 +0100 +++ new/irssi-1.0.3/docs/help/completion 2017-06-06 20:12:07.000000000 +0200 @@ -1,6 +1,7 @@ %9Syntax:%9 +COMPLETION %|[-auto] [-delete] <key> <value> %9Parameters:%9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/help/dcc new/irssi-1.0.3/docs/help/dcc --- old/irssi-1.0.2/docs/help/dcc 2017-03-10 17:43:14.000000000 +0100 +++ new/irssi-1.0.3/docs/help/dcc 2017-06-06 20:12:07.000000000 +0200 @@ -31,7 +31,7 @@ and file transfers. If you are behind NAT, or if the firewall is too restrictive, you might - want to try if using the passive parameter resolved your connection + want to try if using the passive parameter resolves your connection problem. You can send files which contain special character or spaces by enclosing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/help/in/Makefile.in new/irssi-1.0.3/docs/help/in/Makefile.in --- old/irssi-1.0.2/docs/help/in/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/docs/help/in/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -180,6 +180,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/docs/help/in/dcc.in new/irssi-1.0.3/docs/help/in/dcc.in --- old/irssi-1.0.2/docs/help/in/dcc.in 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/docs/help/in/dcc.in 2017-06-05 16:00:21.000000000 +0200 @@ -27,7 +27,7 @@ and file transfers. If you are behind NAT, or if the firewall is too restrictive, you might - want to try if using the passive parameter resolved your connection + want to try if using the passive parameter resolves your connection problem. You can send files which contain special character or spaces by enclosing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/irssi-config.h new/irssi-1.0.3/irssi-config.h --- old/irssi-1.0.2/irssi-config.h 2017-03-10 17:43:26.000000000 +0100 +++ new/irssi-1.0.3/irssi-config.h 2017-06-06 20:12:18.000000000 +0200 @@ -13,9 +13,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 -/* Define to 1 if you have the `ssl' library (-lssl). */ -#define HAVE_LIBSSL 1 - /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 @@ -26,7 +23,7 @@ /* #undef HAVE_SOCKS_H */ /* */ -/* #undef HAVE_STATIC_PERL */ +#define HAVE_STATIC_PERL 1 /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -74,7 +71,7 @@ #define PACKAGE_NAME "irssi" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "irssi 1.0.2" +#define PACKAGE_STRING "irssi 1.0.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "irssi" @@ -83,7 +80,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.2" +#define PACKAGE_VERSION "1.0.3" /* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */ #define PRIuUOFF_T "lu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/irssi-config.h.in new/irssi-1.0.3/irssi-config.h.in --- old/irssi-1.0.2/irssi-config.h.in 2017-03-10 17:43:20.000000000 +0100 +++ new/irssi-1.0.3/irssi-config.h.in 2017-06-06 20:12:13.000000000 +0200 @@ -12,9 +12,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `ssl' library (-lssl). */ -#undef HAVE_LIBSSL - /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/irssi-version.h new/irssi-1.0.3/irssi-version.h --- old/irssi-1.0.2/irssi-version.h 2017-03-10 17:43:32.000000000 +0100 +++ new/irssi-1.0.3/irssi-version.h 2017-06-06 20:12:19.000000000 +0200 @@ -1,2 +1,2 @@ -#define IRSSI_VERSION_DATE 20170310 -#define IRSSI_VERSION_TIME 1741 +#define IRSSI_VERSION_DATE 20170605 +#define IRSSI_VERSION_TIME 1625 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/scripts/Makefile.in new/irssi-1.0.3/scripts/Makefile.in --- old/irssi-1.0.2/scripts/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/scripts/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -268,6 +268,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/scripts/examples/Makefile.in new/irssi-1.0.3/scripts/examples/Makefile.in --- old/irssi-1.0.2/scripts/examples/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/scripts/examples/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -208,6 +208,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/Makefile.in new/irssi-1.0.3/src/Makefile.in --- old/irssi-1.0.2/src/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -269,6 +269,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/Makefile.in new/irssi-1.0.3/src/core/Makefile.in --- old/irssi-1.0.2/src/core/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/core/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -280,6 +280,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/expandos.c new/irssi-1.0.3/src/core/expandos.c --- old/irssi-1.0.2/src/core/expandos.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/core/expandos.c 2017-06-05 15:55:06.000000000 +0200 @@ -51,7 +51,7 @@ static int timer_tag; -static EXPANDO_REC *char_expandos[255]; +static EXPANDO_REC *char_expandos[256]; static GHashTable *expandos; static char *last_sent_msg, *last_sent_msg_body; static char *last_privmsg_from, *last_public_from; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/misc.c new/irssi-1.0.3/src/core/misc.c --- old/irssi-1.0.2/src/core/misc.c 2017-03-10 17:21:45.000000000 +0100 +++ new/irssi-1.0.3/src/core/misc.c 2017-06-05 16:00:05.000000000 +0200 @@ -750,10 +750,42 @@ return n; } -int parse_time_interval(const char *time, int *msecs) +/* Parses unsigned integers from strings with decent error checking. + * Returns true on success, false otherwise (overflow, no valid number, etc) + * There's a 31 bit limit so the output can be assigned to signed positive ints */ +int parse_uint(const char *nptr, char **endptr, int base, guint *number) +{ + char *endptr_; + gulong parsed; + + /* strtoul accepts whitespace and plus/minus signs, for some reason */ + if (!i_isdigit(*nptr)) { + return FALSE; + } + + errno = 0; + parsed = strtoul(nptr, &endptr_, base); + + if (errno || endptr_ == nptr || parsed >= (1U << 31)) { + return FALSE; + } + + if (endptr) { + *endptr = endptr_; + } + + if (number) { + *number = (guint) parsed; + } + + return TRUE; +} + +static int parse_time_interval_uint(const char *time, guint *msecs) { const char *desc; - int number, sign, len, ret, digits; + guint number; + int sign, len, ret, digits; *msecs = 0; @@ -769,8 +801,11 @@ } for (;;) { if (i_isdigit(*time)) { - number = number*10 + (*time - '0'); - time++; + char *endptr; + if (!parse_uint(time, &endptr, 10, &number)) { + return FALSE; + } + time = endptr; digits = TRUE; continue; } @@ -835,10 +870,11 @@ return ret; } -int parse_size(const char *size, int *bytes) +static int parse_size_uint(const char *size, guint *bytes) { const char *desc; - int number, len; + guint number, multiplier, limit; + int len; *bytes = 0; @@ -846,8 +882,11 @@ number = 0; while (*size != '\0') { if (i_isdigit(*size)) { - number = number*10 + (*size - '0'); - size++; + char *endptr; + if (!parse_uint(size, &endptr, 10, &number)) { + return FALSE; + } + size = endptr; continue; } @@ -869,14 +908,31 @@ return FALSE; } - if (g_ascii_strncasecmp(desc, "gbytes", len) == 0) - *bytes += number * 1024*1024*1024; - if (g_ascii_strncasecmp(desc, "mbytes", len) == 0) - *bytes += number * 1024*1024; - if (g_ascii_strncasecmp(desc, "kbytes", len) == 0) - *bytes += number * 1024; - if (g_ascii_strncasecmp(desc, "bytes", len) == 0) - *bytes += number; + multiplier = 0; + limit = 0; + + if (g_ascii_strncasecmp(desc, "gbytes", len) == 0) { + multiplier = 1U << 30; + limit = 2U << 0; + } + if (g_ascii_strncasecmp(desc, "mbytes", len) == 0) { + multiplier = 1U << 20; + limit = 2U << 10; + } + if (g_ascii_strncasecmp(desc, "kbytes", len) == 0) { + multiplier = 1U << 10; + limit = 2U << 20; + } + if (g_ascii_strncasecmp(desc, "bytes", len) == 0) { + multiplier = 1; + limit = 2U << 30; + } + + if (limit && number > limit) { + return FALSE; + } + + *bytes += number * multiplier; /* skip punctuation */ while (*size != '\0' && i_ispunct(*size)) @@ -886,6 +942,37 @@ return TRUE; } +int parse_size(const char *size, int *bytes) +{ + guint bytes_; + int ret; + + ret = parse_size_uint(size, &bytes_); + + if (bytes_ > (1U << 31)) { + return FALSE; + } + + *bytes = bytes_; + return ret; +} + +int parse_time_interval(const char *time, int *msecs) +{ + guint msecs_; + int ret; + + ret = parse_time_interval_uint(time, &msecs_); + + if (msecs_ > (1U << 31)) { + return FALSE; + } + + *msecs = msecs_; + return ret; +} + + char *ascii_strup(char *str) { char *s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/misc.h new/irssi-1.0.3/src/core/misc.h --- old/irssi-1.0.2/src/core/misc.h 2017-03-07 22:41:44.000000000 +0100 +++ new/irssi-1.0.3/src/core/misc.h 2017-06-05 16:00:05.000000000 +0200 @@ -71,6 +71,7 @@ int nearest_power(int num); /* Returns TRUE / FALSE */ +int parse_uint(const char *nptr, char **endptr, int base, guint *number); int parse_time_interval(const char *time, int *msecs); int parse_size(const char *size, int *bytes); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/nicklist.c new/irssi-1.0.3/src/core/nicklist.c --- old/irssi-1.0.2/src/core/nicklist.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/core/nicklist.c 2017-06-05 15:59:46.000000000 +0200 @@ -169,37 +169,39 @@ static NICK_REC *nicklist_find_wildcards(CHANNEL_REC *channel, const char *mask) { - GSList *nicks, *tmp; NICK_REC *nick; + GHashTableIter iter; - nicks = nicklist_getnicks(channel); - nick = NULL; - for (tmp = nicks; tmp != NULL; tmp = tmp->next) { - nick = tmp->data; - - if (mask_match_address(channel->server, mask, - nick->nick, nick->host)) - break; + g_hash_table_iter_init(&iter, channel->nicks); + while (g_hash_table_iter_next(&iter, NULL, (void*)&nick)) { + for (; nick != NULL; nick = nick->next) { + if (mask_match_address(channel->server, mask, + nick->nick, nick->host)) + return nick; + } } - g_slist_free(nicks); - return tmp == NULL ? NULL : nick; + + return NULL; } GSList *nicklist_find_multiple(CHANNEL_REC *channel, const char *mask) { - GSList *nicks, *tmp, *next; + GSList *nicks; + NICK_REC *nick; + GHashTableIter iter; g_return_val_if_fail(IS_CHANNEL(channel), NULL); g_return_val_if_fail(mask != NULL, NULL); - nicks = nicklist_getnicks(channel); - for (tmp = nicks; tmp != NULL; tmp = next) { - NICK_REC *nick = tmp->data; - - next = tmp->next; - if (!mask_match_address(channel->server, mask, - nick->nick, nick->host)) - nicks = g_slist_remove(nicks, tmp->data); + nicks = NULL; + + g_hash_table_iter_init(&iter, channel->nicks); + while (g_hash_table_iter_next(&iter, NULL, (void*)&nick)) { + for (; nick != NULL; nick = nick->next) { + if (mask_match_address(channel->server, mask, + nick->nick, nick->host)) + nicks = g_slist_prepend(nicks, nick); + } } return nicks; @@ -264,8 +266,8 @@ static void get_nicks_hash(gpointer key, NICK_REC *rec, GSList **list) { while (rec != NULL) { - *list = g_slist_append(*list, rec); - rec = rec->next; + *list = g_slist_prepend(*list, rec); + rec = rec->next; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/core/special-vars.c new/irssi-1.0.3/src/core/special-vars.c --- old/irssi-1.0.2/src/core/special-vars.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/core/special-vars.c 2017-06-05 16:00:05.000000000 +0200 @@ -275,6 +275,8 @@ static int get_alignment_args(char **data, int *align, int *flags, char *pad) { char *str; + char *endptr; + guint align_; *align = 0; *flags = ALIGN_CUT|ALIGN_PAD; @@ -295,10 +297,11 @@ return FALSE; /* expecting number */ /* get the alignment size */ - while (i_isdigit(*str)) { - *align = (*align) * 10 + (*str-'0'); - str++; + if (!parse_uint(str, &endptr, 10, &align_)) { + return FALSE; } + str = endptr; + *align = align_; /* get the pad character */ while (*str != '\0' && *str != ']') { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/Makefile.in new/irssi-1.0.3/src/fe-common/Makefile.in --- old/irssi-1.0.2/src/fe-common/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -238,6 +238,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/core/Makefile.in new/irssi-1.0.3/src/fe-common/core/Makefile.in --- old/irssi-1.0.2/src/fe-common/core/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/core/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -278,6 +278,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/core/command-history.c new/irssi-1.0.3/src/fe-common/core/command-history.c --- old/irssi-1.0.2/src/fe-common/core/command-history.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/core/command-history.c 2017-06-05 15:58:44.000000000 +0200 @@ -116,6 +116,8 @@ history->pos = history->pos->prev; if (history->pos == NULL) history->over_counter++; + } else if (history->lines == 0) { + history->over_counter++; } else { history->pos = g_list_last(history->list); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/core/completion.c new/irssi-1.0.3/src/fe-common/core/completion.c --- old/irssi-1.0.2/src/fe-common/core/completion.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/core/completion.c 2017-06-05 15:58:58.000000000 +0200 @@ -784,6 +784,7 @@ if (*list != NULL) signal_stop(); } +/* SYNTAX: COMPLETION [-auto] [-delete] <key> <value> */ static void cmd_completion(const char *data) { GHashTable *optlist; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/core/fe-server.c new/irssi-1.0.3/src/fe-common/core/fe-server.c --- old/irssi-1.0.2/src/fe-common/core/fe-server.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/core/fe-server.c 2017-06-05 15:59:31.000000000 +0200 @@ -154,8 +154,14 @@ else if (g_hash_table_lookup(optlist, "4")) rec->family = AF_INET; - if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl")) + if (g_hash_table_lookup(optlist, "tls") || g_hash_table_lookup(optlist, "ssl")) { rec->use_tls = TRUE; + } + else if (g_hash_table_lookup(optlist, "notls") || g_hash_table_lookup(optlist, "nossl")) { + rec->use_tls = FALSE; + /* tls_verify implies use_tls, disable it explicitly */ + rec->tls_verify = FALSE; + } value = g_hash_table_lookup(optlist, "tls_cert"); if (value == NULL) @@ -177,6 +183,8 @@ if (g_hash_table_lookup(optlist, "tls_verify") || g_hash_table_lookup(optlist, "ssl_verify")) rec->tls_verify = TRUE; + else if (g_hash_table_lookup(optlist, "notls_verify") || g_hash_table_lookup(optlist, "nossl_verify")) + rec->tls_verify = FALSE; value = g_hash_table_lookup(optlist, "tls_cafile"); if (value == NULL) @@ -434,8 +442,8 @@ command_bind_first("server", NULL, (SIGNAL_FUNC) server_command); command_bind_first("disconnect", NULL, (SIGNAL_FUNC) server_command); - command_set_options("server add", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd"); - command_set_options("server modify", "4 6 !! ssl +ssl_cert +ssl_pkey +ssl_pass ssl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls +tls_cert +tls_pkey +tls_pass tls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd"); + command_set_options("server add", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd"); + command_set_options("server modify", "4 6 !! ssl nossl +ssl_cert +ssl_pkey +ssl_pass ssl_verify nossl_verify +ssl_cafile +ssl_capath +ssl_ciphers +ssl_fingerprint tls notls +tls_cert +tls_pkey +tls_pass tls_verify notls_verify +tls_cafile +tls_capath +tls_ciphers +tls_pinned_cert +tls_pinned_pubkey auto noauto proxy noproxy -host -port noautosendcmd"); signal_add("server looking", (SIGNAL_FUNC) sig_server_looking); signal_add("server connecting", (SIGNAL_FUNC) sig_server_connecting); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/core/formats.c new/irssi-1.0.3/src/fe-common/core/formats.c --- old/irssi-1.0.2/src/fe-common/core/formats.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/core/formats.c 2017-06-05 16:00:05.000000000 +0200 @@ -33,6 +33,7 @@ #include "themes.h" #include "recode.h" #include "utf8.h" +#include "misc.h" static const char *format_backs = "04261537"; static const char *format_fores = "kbgcrmyw"; @@ -870,8 +871,9 @@ { static char ansitab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 }; const char *start; - int fg, bg, flags, num, i; - unsigned int num2; + char *endptr; + int fg, bg, flags, i; + guint num, num2; if (*str != '[') return str; @@ -886,8 +888,10 @@ if (*str == '\0') return start; if (i_isdigit(*str)) { - num = num*10 + (*str-'0'); - continue; + if (!parse_uint(str, &endptr, 10, &num)) { + return start; + } + str = endptr; } if (*str != ';' && *str != 'm') @@ -958,8 +962,12 @@ /* ANSI indexed color or RGB color */ if (*str != ';') break; str++; - for (num2 = 0; i_isdigit(*str); str++) - num2 = num2*10 + (*str-'0'); + + if (!parse_uint(str, &endptr, 10, &num2)) { + return start; + } + str = endptr; + if (*str == '\0') return start; switch (num2) { @@ -1006,8 +1014,12 @@ /* indexed */ if (*str != ';') break; str++; - for (num2 = 0; i_isdigit(*str); str++) - num2 = num2*10 + (*str-'0'); + + if (!parse_uint(str, &endptr, 10, &num2)) { + return start; + } + str = endptr; + if (*str == '\0') return start; if (num == 38) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/irc/Makefile.in new/irssi-1.0.3/src/fe-common/irc/Makefile.in --- old/irssi-1.0.2/src/fe-common/irc/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/irc/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -313,6 +313,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/irc/dcc/Makefile.in new/irssi-1.0.3/src/fe-common/irc/dcc/Makefile.in --- old/irssi-1.0.2/src/fe-common/irc/dcc/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/irc/dcc/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -268,6 +268,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-common/irc/notifylist/Makefile.in new/irssi-1.0.3/src/fe-common/irc/notifylist/Makefile.in --- old/irssi-1.0.2/src/fe-common/irc/notifylist/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-common/irc/notifylist/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -266,6 +266,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-none/Makefile.in new/irssi-1.0.3/src/fe-none/Makefile.in --- old/irssi-1.0.2/src/fe-none/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-none/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -232,6 +232,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-text/Makefile.in new/irssi-1.0.3/src/fe-text/Makefile.in --- old/irssi-1.0.2/src/fe-text/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/fe-text/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -273,6 +273,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-text/irssi.c new/irssi-1.0.3/src/fe-text/irssi.c --- old/irssi-1.0.2/src/fe-text/irssi.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/fe-text/irssi.c 2017-06-05 15:58:30.000000000 +0200 @@ -317,22 +317,22 @@ /* Does the same as g_main_run(main_loop), except we can call our dirty-checker after each iteration */ while (!quitting) { - term_refresh_freeze(); - g_main_iteration(TRUE); - term_refresh_thaw(); - if (reload_config) { - /* SIGHUP received, do /RELOAD */ + /* SIGHUP received, do /RELOAD */ reload_config = FALSE; - signal_emit("command reload", 1, ""); + signal_emit("command reload", 1, ""); } dirty_check(); + + term_refresh_freeze(); + g_main_iteration(TRUE); + term_refresh_thaw(); } g_main_destroy(main_loop); textui_deinit(); - session_upgrade(); /* if we /UPGRADEd, start the new process */ + session_upgrade(); /* if we /UPGRADEd, start the new process */ return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/fe-text/textbuffer-view.c new/irssi-1.0.3/src/fe-text/textbuffer-view.c --- old/irssi-1.0.2/src/fe-text/textbuffer-view.c 2017-03-10 17:31:03.000000000 +0100 +++ new/irssi-1.0.3/src/fe-text/textbuffer-view.c 2017-06-05 16:00:34.000000000 +0200 @@ -114,7 +114,6 @@ if (cmd & LINE_COLOR_BG) { /* set background color */ *color &= FGATTR; - *color &= ~ATTR_FGCOLOR24; if ((cmd & LINE_COLOR_DEFAULT) == 0) *color |= (cmd & 0x0f) << BG_SHIFT; else { @@ -123,7 +122,6 @@ } else { /* set foreground color */ *color &= BGATTR; - *color &= ~ATTR_BGCOLOR24; if ((cmd & LINE_COLOR_DEFAULT) == 0) *color |= cmd & 0x0f; else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/Makefile.in new/irssi-1.0.3/src/irc/Makefile.in --- old/irssi-1.0.2/src/irc/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -275,6 +275,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/core/Makefile.in new/irssi-1.0.3/src/irc/core/Makefile.in --- old/irssi-1.0.2/src/irc/core/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/core/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -277,6 +277,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/dcc/Makefile.in new/irssi-1.0.3/src/irc/dcc/Makefile.in --- old/irssi-1.0.2/src/irc/dcc/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/dcc/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -267,6 +267,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/dcc/dcc-get.c new/irssi-1.0.3/src/irc/dcc/dcc-get.c --- old/irssi-1.0.2/src/irc/dcc/dcc-get.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/irc/dcc/dcc-get.c 2017-06-05 15:55:23.000000000 +0200 @@ -382,6 +382,8 @@ if (*params[0] == '"') { /* quoted file name? */ for (pos = 0; pos < paramcount-3; pos++) { + if (strlen(params[pos]) == 0) + continue; if (params[pos][strlen(params[pos])-1] == '"' && get_params_match(params, pos+1)) return pos+1; @@ -428,6 +430,10 @@ int p_id = -1; int passive = FALSE; + if (addr == NULL) { + addr = ""; + } + /* SEND <file name> <address> <port> <size> [...] */ /* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */ params = g_strsplit(data, " ", -1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/dcc/dcc-resume.c new/irssi-1.0.3/src/irc/dcc/dcc-resume.c --- old/irssi-1.0.2/src/irc/dcc/dcc-resume.c 2017-03-04 21:30:38.000000000 +0100 +++ new/irssi-1.0.3/src/irc/dcc/dcc-resume.c 2017-06-05 15:55:23.000000000 +0200 @@ -62,6 +62,8 @@ if (*params[0] == '"') { /* quoted file name? */ for (pos = 0; pos < paramcount-2; pos++) { + if (strlen(params[pos]) == 0) + continue; if (params[pos][strlen(params[pos])-1] == '"' && get_params_match_resume(params, pos+1)) return pos+1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/flood/Makefile.in new/irssi-1.0.3/src/irc/flood/Makefile.in --- old/irssi-1.0.2/src/irc/flood/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/flood/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -265,6 +265,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/notifylist/Makefile.in new/irssi-1.0.3/src/irc/notifylist/Makefile.in --- old/irssi-1.0.2/src/irc/notifylist/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/notifylist/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -267,6 +267,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/irc/proxy/Makefile.in new/irssi-1.0.3/src/irc/proxy/Makefile.in --- old/irssi-1.0.2/src/irc/proxy/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/irc/proxy/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -263,6 +263,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/lib-config/Makefile.in new/irssi-1.0.3/src/lib-config/Makefile.in --- old/irssi-1.0.2/src/lib-config/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/lib-config/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -266,6 +266,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/irssi-1.0.2/src/perl/Makefile.in new/irssi-1.0.3/src/perl/Makefile.in --- old/irssi-1.0.2/src/perl/Makefile.in 2017-03-10 17:43:21.000000000 +0100 +++ new/irssi-1.0.3/src/perl/Makefile.in 2017-06-06 20:12:14.000000000 +0200 @@ -282,6 +282,8 @@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@
