On 13/07/17 14:34, Илья Шипицин wrote: > 2017-07-13 11:16 GMT+05:00 Samuli Seppänen <sam...@openvpn.net>: > >> On 13/07/2017 09:05, Antonio Quartulli wrote: >>> On 13/07/17 14:02, Илья Шипицин wrote: >>>> Should we add --disable-multi to some travis-ci build ? >>> >>> Might be a good idea. It was actually broken since 2013, therefore it >>> seems like not many people are using it....either we drop it or yes, we >>> should have some automated test. >> >> There were no bugs reports about --disable-multi in Trac. I say scrap >> that option altogether and make the code slightly cleaner and less >> entangled. >> > > > was it broken in 2.3 as well ? > I'm afraid, not many people are using 2.4 since 2013
As reported in my patch, this is the commit that introduced the first
problem:
commit 598e03f0e7bce434e501a9895819f2af0714d5f6
Author: James Yonan <ja...@openvpn.net>
Date: Mon May 20 12:13:21 2013 +0200
Always push basic set of peer info values to server.
Checking what tag contains this id, we get:
$ git tag --contains 598e03f0e7bce434e501a9895819f2af0714d5f6
892e64b6b9
v2.4.0
v2.4.1
v2.4.2
v2.4.3
v2.4_alpha1
v2.4_alpha2
v2.4_beta1
v2.4_beta2
v2.4_rc1
v2.4_rc2
However, if you check the release/2.3 branch, you will see that this
commit was cherry-picked manually and therefore it has a new id in the
2.3 history: eed9b8eec911a26a952f07ad18d4397c334ac089
Checking this commit ID shows that:
$ git tag --contains eed9b8eec911a26a952f07ad18d4397c334ac089
v2.3.10
v2.3.11
v2.3.12
v2.3.13
v2.3.14
v2.3.15
v2.3.16
v2.3.17
v2.3.2
v2.3.3
v2.3.4
v2.3.5
v2.3.6
v2.3.7
v2.3.8
v2.3.9
Hence, 2.3 is broken starting at v2.3.9. This is confirmed by the fact
that release/2.3 does not compile with --disable-multi.
Cheers,
p.s. this is an example of how cherry-picking instead of forward merging
can be troublesome for the git history.
Cheers²,
--
Antonio Quartulli
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
