From d1997d6a738f0bc1fb47840b1d1e15b00fb5fa07 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 15 Jun 2019 02:12:29 +0100 Subject: [PATCH 1/4] ZNC 1.7.4-rc1 --- CMakeLists.txt | 8 ++++---- configure.ac | 4 ++-- include/znc/version.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9ab6293..ec55d258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,10 @@ # cmake_minimum_required(VERSION 3.1) -project(ZNC VERSION 1.7.3) -set(ZNC_VERSION 1.7.x) -set(append_git_version true) -set(alpha_version "") # e.g. "-rc1" +project(ZNC VERSION 1.7.4) +set(ZNC_VERSION 1.7.4) +set(append_git_version false) +set(alpha_version "-rc1") # e.g. "-rc1" set(VERSION_EXTRA "" CACHE STRING "Additional string appended to version, e.g. to mark distribution") diff --git a/configure.ac b/configure.ac index b755cfe8..a65fe100 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.7.x]) -LIBZNC_VERSION=1.7.x +AC_INIT([znc], [1.7.4-rc1]) +LIBZNC_VERSION=1.7.4 AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index 3f3fbab8..1a136303 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -20,9 +20,9 @@ limitations under the License. // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 7 -#define VERSION_PATCH -1 +#define VERSION_PATCH 4 // This one is for display purpose and to check ABI compatibility of modules -#define VERSION_STR "1.7.x" +#define VERSION_STR "1.7.4" #endif // Don't use this one From e661cdf9a394e2afd1b97517efa21fa2fa757e22 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 21 Jun 2019 21:31:06 +0100 Subject: [PATCH 2/4] ZNC 1.7.4 --- CMakeLists.txt | 2 +- ChangeLog.md | 11 +++++++++++ configure.ac | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec55d258..528d7e46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.1) project(ZNC VERSION 1.7.4) set(ZNC_VERSION 1.7.4) set(append_git_version false) -set(alpha_version "-rc1") # e.g. "-rc1" +set(alpha_version "") # e.g. "-rc1" set(VERSION_EXTRA "" CACHE STRING "Additional string appended to version, e.g. to mark distribution") diff --git a/ChangeLog.md b/ChangeLog.md index de4156b8..0ab7ffa8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,14 @@ +# ZNC 1.7.4 (2019-06-19) + +## Fixes +* This is a security release to fix CVE-2019-12816 (remote code execution by existing non-admin users). Thanks to Jeriko One for the bugreport. +* Send "Connected!" messages to client to the correct nick. + +# Internal +* Increase znc-buildmod timeout in the test. + + + # ZNC 1.7.3 (2019-03-30) ## Fixes diff --git a/configure.ac b/configure.ac index a65fe100..4277d188 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.7.4-rc1]) +AC_INIT([znc], [1.7.4]) LIBZNC_VERSION=1.7.4 AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) From e75b9c3b50cfe59be6c6fbb93405996ee4f62876 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 21 Jun 2019 21:35:15 +0100 Subject: [PATCH 3/4] Return version number to 1.7.x --- CMakeLists.txt | 4 ++-- configure.ac | 4 ++-- include/znc/version.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 528d7e46..64ebbd0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.1) project(ZNC VERSION 1.7.4) -set(ZNC_VERSION 1.7.4) -set(append_git_version false) +set(ZNC_VERSION 1.7.x) +set(append_git_version true) set(alpha_version "") # e.g. "-rc1" set(VERSION_EXTRA "" CACHE STRING "Additional string appended to version, e.g. to mark distribution") diff --git a/configure.ac b/configure.ac index 4277d188..b755cfe8 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with version.h! -AC_INIT([znc], [1.7.4]) -LIBZNC_VERSION=1.7.4 +AC_INIT([znc], [1.7.x]) +LIBZNC_VERSION=1.7.x AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index 1a136303..3f3fbab8 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -20,9 +20,9 @@ limitations under the License. // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 7 -#define VERSION_PATCH 4 +#define VERSION_PATCH -1 // This one is for display purpose and to check ABI compatibility of modules -#define VERSION_STR "1.7.4" +#define VERSION_STR "1.7.x" #endif // Don't use this one From b0a00e96cd0398877cac991d5a0997790b3bc498 Mon Sep 17 00:00:00 2001 From: Indjov Date: Mon, 17 Jun 2019 14:08:25 +0300 Subject: [PATCH 4/4] Create bg-BG Bulgarian Languages Close #1668 --- translations/bg-BG | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/bg-BG diff --git a/translations/bg-BG b/translations/bg-BG new file mode 100644 index 00000000..103e75e8 --- /dev/null +++ b/translations/bg-BG @@ -0,0 +1 @@ +SelfName Български