From d63d197fa391d9fb51785106e4f47036c33f9674 Mon Sep 17 00:00:00 2001 From: Davide Caratti Date: Thu, 30 Sep 2021 08:59:18 +0200 Subject: [PATCH] Update to release 0.8 Related: #2008796 Signed-off-by:Davide Caratti --- .gitignore | 1 + 0001-issue125.patch | 70 ------------------------------------- 0002-issue144.patch | 85 --------------------------------------------- mptcpd.spec | 12 ++++--- sources | 2 +- 5 files changed, 10 insertions(+), 160 deletions(-) delete mode 100644 0001-issue125.patch delete mode 100644 0002-issue144.patch diff --git a/.gitignore b/.gitignore index 4c944fd..33c1771 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mptcpd-0.5.1.tar.gz /mptcpd-0.6.tar.gz /mptcpd-0.7.tar.gz +/mptcpd-0.8.tar.gz diff --git a/0001-issue125.patch b/0001-issue125.patch deleted file mode 100644 index a6d4a19..0000000 --- a/0001-issue125.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a908793d8c816ba8e08950f7407de2ea9d144800 Mon Sep 17 00:00:00 2001 -Message-Id: -From: dddaniel -Date: Fri, 23 Apr 2021 23:19:23 +0200 -Subject: [PATCH] configure: add --disable-stack-protection option (#125) - -Enabling -DFORTIFY_SOURCE=* and -fstack-protector-* by default may -overwrite global (build) system settings, causing redefinition errors at -compile time. ---- - configure.ac | 37 +++++++++++++++++++++++++------------ - 1 file changed, 25 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3d6a2f0..4be1b81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -255,24 +255,37 @@ AX_APPEND_COMPILE_FLAGS([-Wextra -Werror -pedantic]) - # --------------------------------------------------------------- - # Enable compile-time defense - # --------------------------------------------------------------- --# Fortify source --# Enabling optimization implies _FORTIFY_SOURCE on some platforms. --# Explicitly redefine to _FORTIFY_SOURCE=2 to make sure we have the --# desired fortification level. --AX_APPEND_FLAG([-U_FORTIFY_SOURCE], [CPPFLAGS]) --AX_APPEND_FLAG([-D_FORTIFY_SOURCE=2], [CPPFLAGS]) -+ -+AC_ARG_ENABLE(stack-protection, -+ [AS_HELP_STRING([--disable-stack-protection], -+ [Disable compiler stack protection. -+ FORTIFY_SOURCE=2 and -fstack-protector-strong] -+ )], -+ [], -+ [enable_stack_protection=yes]) -+ -+AS_IF([test "x$enable_stack_protection" = "xyes"], -+ [ -+ # Fortify source -+ # Enabling optimization implies _FORTIFY_SOURCE on some platforms. -+ # Explicitly redefine to _FORTIFY_SOURCE=2 to make sure we have the -+ # desired fortification level. -+ AX_APPEND_FLAG([-U_FORTIFY_SOURCE], [CPPFLAGS]) -+ AX_APPEND_FLAG([-D_FORTIFY_SOURCE=2], [CPPFLAGS]) -+ -+ # Stack-based buffer overrun detection -+ MPTCPD_ADD_COMPILE_FLAG([-fstack-protector-strong], -+ [# GCC < 4.9 -+ MPTCPD_ADD_COMPILE_FLAG([-fstack-protector]) -+ ]) -+ ],[] -+ ) - - # Format string vulnerabilities - # -Wformat=2 implies: - # -Wformat -Wformat-nonliteral -Wformat-security -Wformat-y2k - AX_APPEND_COMPILE_FLAGS([-Wformat=2]) - --# Stack-based buffer overrun detection --MPTCPD_ADD_COMPILE_FLAG([-fstack-protector-strong], -- [# GCC < 4.9 -- MPTCPD_ADD_COMPILE_FLAG([-fstack-protector]) -- ]) -- - # Position Independent Execution (PIE) - AX_APPEND_COMPILE_FLAGS([-fPIE], [EXECUTABLE_CFLAGS]) - AC_SUBST([EXECUTABLE_CFLAGS]) --- -2.31.1 - diff --git a/0002-issue144.patch b/0002-issue144.patch deleted file mode 100644 index 310e6df..0000000 --- a/0002-issue144.patch +++ /dev/null @@ -1,85 +0,0 @@ -From f1207f311ec04aeda07759e04538d65d41d4ea4a Mon Sep 17 00:00:00 2001 -Message-Id: -From: dcaratti -Date: Wed, 23 Jun 2021 18:12:41 +0200 -Subject: [PATCH] Allow empty values of "plugin_dir" in mptcpd.conf. (#145) - -The plugin dirname is $(libdir)/mptcpd/ on standard configurations: -use this value in case the value of plugin_dir is empty in -/etc/mptcpd/mptcpd.conf. ---- - src/Makefile.am | 3 ++- - src/configuration.c | 27 ++++++++++----------------- - 2 files changed, 12 insertions(+), 18 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 09ca74c..4aa5037 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -31,7 +31,8 @@ libpath_manager_la_LIBADD = \ - - libpath_manager_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -- -DMPTCPD_CONFIG_FILE='"$(sysconfdir)/@PACKAGE@/@PACKAGE@.conf"' -+ -DMPTCPD_CONFIG_FILE='"$(sysconfdir)/@PACKAGE@/@PACKAGE@.conf"' \ -+ -DMPTCPD_DEFAULT_PLUGINDIR='"$(libdir)/@PACKAGE@"' - - EXTRA_DIST = mptcp.service.in - -diff --git a/src/configuration.c b/src/configuration.c -index 2a48405..70a8e19 100644 ---- a/src/configuration.c -+++ b/src/configuration.c -@@ -304,8 +304,6 @@ static bool check_file_perms(char const *f) - static bool parse_config_file(struct mptcpd_config *config, - char const *filename) - { -- bool parsed = true; -- - assert(filename != NULL); - - if (!check_file_perms(filename)) -@@ -337,22 +335,17 @@ static bool parse_config_file(struct mptcpd_config *config, - group, - "plugin-dir"); - -- if (plugin_dir == NULL) { -- l_error("No plugin directory set in mptcpd " -- "configuration."); -+ set_plugin_dir(config, -+ plugin_dir ? plugin_dir : -+ l_strdup(MPTCPD_DEFAULT_PLUGINDIR)); - -- parsed = false; -- } else { -- set_plugin_dir(config, plugin_dir); -- -- // Default plugin name. Can be NULL. -- char *const default_plugin = -- l_settings_get_string(settings, -- group, -- "path-manager"); -+ // Default plugin name. Can be NULL. -+ char *const default_plugin = -+ l_settings_get_string(settings, -+ group, -+ "path-manager"); - -- set_default_plugin(config, default_plugin); -- } -+ set_default_plugin(config, default_plugin); - } else { - l_debug("Unable to mptcpd load settings from file '%s'", - filename); -@@ -360,7 +353,7 @@ static bool parse_config_file(struct mptcpd_config *config, - - l_settings_free(settings); - -- return parsed; -+ return true; - } - - /** --- -2.31.1 - diff --git a/mptcpd.spec b/mptcpd.spec index 45f9e05..a2fa959 100644 --- a/mptcpd.spec +++ b/mptcpd.spec @@ -1,7 +1,7 @@ Summary: Multipath TCP daemon Name: mptcpd -Version: 0.7 -Release: 3%{?dist} +Version: 0.8 +Release: 1%{?dist} License: BSD URL: https://multipath-tcp.org Requires(post): systemd @@ -19,8 +19,6 @@ BuildRequires: systemd-rpm-macros Source0: https://github.com/intel/mptcpd/archive/v%{version}/%{name}-%{version}.tar.gz -Patch1: 0001-issue125.patch -Patch2: 0002-issue144.patch Patch3: 0003-fix-multilib-install.patch %description @@ -69,9 +67,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %dir %{_libdir}/%{name} %{_libdir}/libmptcpd.so.* %{_libdir}/%{name}/*.so +%{_libdir}/%{name}/libmptcpwrap.so* %{_libexecdir}/%{name} +%{_bindir}/mptcpize %{_unitdir}/mptcp.service %{_mandir}/man8/%{name}.8.gz +%{_mandir}/man8/mptcpize.8.gz # todo add %doc %license COPYING @@ -83,6 +84,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/pkgconfig/mptcpd.pc %changelog +* Wed Sep 29 2021 Davide Caratti - 0.8-1 +- update to version 0.8 + * Mon Aug 09 2021 Mohan Boddu - 0.7-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index a54c90f..0437c8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mptcpd-0.7.tar.gz) = 931926a2a35ff2de25057132a4f6c151381ec853660e6b3469d3565ae1f19177a6037c2139e651d13ccc43c1951ef5ee8ee472319dbccc8c6222425cb29ff199 +SHA512 (mptcpd-0.8.tar.gz) = acbbc9d42f8d233ea62276f20034a602395945a95b189c123a222d0312840693872b450233e254b3f2a32dae9265c32f5cd5a1de8c2093755f670aba4d267936