Hi, On Tue, Nov 24, 2015 at 12:49 PM, ValdikSS <i...@valdikss.org.ru> wrote:
> I can't figure out why Thunderbird corrupts my patches. > Its not a thunderbird-specific malady, almost every mail client messes up with line breaks, adds extra spaces etc. As Gert suggested please use git send-email. That makes it easy for everyone.. > Please use the attached version. > I still need help with 2.3 build system. If somebody willing to help me, > please use the attached version. > The patch for 2.3 doesn't apply. Hope its not just me.. In fact both patches apply to the master (after some coaxing and with different offsets, of course). That shows something is wrong, as some contexts have to be different in 2.3 and master. For example: Checking patch src/openvpn/init.c... error: while searching for: "up", c->c2.es); /* possibly add routes */ if ((route_order() == ROUTE_AFTER_TUN) && (!c->options.route_delay_defined)) do_route (&c->options, c->c1.route_list, c->c1.route_ipv6_list, error: patch failed: src/openvpn/init.c:1468 The problem is route_order() == ROUTE_AFTER_TUN is not in 2.3, its in master. Similarly in options.c error: while searching for: VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS); } #endif #if PASSTOS_CAPABILITY else if (streq (p[0], "passtos") && !p[1]) <--- this line doesn't match the one in 2.3 { Could you please check whether the patch is really against 2.3? Also please see why the code has to be different for 2.3 and master -- why not just use ifdef _WINNT_WIN32 ? Selva P.S. There are tons of whitespace errors as well, but that could be worked around..