Date: Sun, 3 Jul 2016 09:16:40 +0200 From: Guido Falsi <madpilot@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org>, Baptiste Daroussin <bapt@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r417895 - in head/net: ndpi ntopng Message-ID: <448ef6e0-5ea1-343a-7660-211ee9831b56@FreeBSD.org> In-Reply-To: <3980A22FBF4119291DE71664@atuin.in.mat.cc> References: <201607011649.u61Gn9fh068891@repo.freebsd.org> <20160701165811.7bcj7applsqmtsvr@ivaldir.etoilebsd.net> <d08ba7cd-14b1-f203-6d5d-81fb4b054dce@FreeBSD.org> <3980A22FBF4119291DE71664@atuin.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WhOIrq1Tg9KWbftUc8mN2qMO1gK5EwvF4 Content-Type: multipart/mixed; boundary="Knq1g2ju7SFqTLuSepRoUsXMwqbmcg2OK" From: Guido Falsi <madpilot@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org>, Baptiste Daroussin <bapt@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <448ef6e0-5ea1-343a-7660-211ee9831b56@FreeBSD.org> Subject: Re: svn commit: r417895 - in head/net: ndpi ntopng References: <201607011649.u61Gn9fh068891@repo.freebsd.org> <20160701165811.7bcj7applsqmtsvr@ivaldir.etoilebsd.net> <d08ba7cd-14b1-f203-6d5d-81fb4b054dce@FreeBSD.org> <3980A22FBF4119291DE71664@atuin.in.mat.cc> In-Reply-To: <3980A22FBF4119291DE71664@atuin.in.mat.cc> --Knq1g2ju7SFqTLuSepRoUsXMwqbmcg2OK Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 07/02/16 22:01, Mathieu Arnold wrote: > +--On 1 juillet 2016 20:04:34 +0200 Guido Falsi <madpilot@FreeBSD.org> > wrote: > | On 07/01/16 18:58, Baptiste Daroussin wrote: > |> On Fri, Jul 01, 2016 at 04:49:09PM +0000, Guido Falsi wrote: > |>> Author: madpilot > |>> Date: Fri Jul 1 16:49:09 2016 > |>> New Revision: 417895 > |>> URL: https://svnweb.freebsd.org/changeset/ports/417895 > |>>=20 > |>> Log: > |>> - Update ndpi port to a newer snapshot from github, required by > |>> ntopng update > |>> - Update ntopng to 2.4 > |>>=20 > |>> Modified: > |>> head/net/ndpi/Makefile > |>> head/net/ndpi/distinfo > |>> head/net/ntopng/Makefile > |>> head/net/ntopng/distinfo > |>> head/net/ntopng/pkg-plist > |>>=20 [...] > |>> +USE_GITHUB=3D yes > |>> +GH_ACCOUNT=3D ntop > |>> +GH_PROJECT=3D nDPI > |>> +GH_TAGNAME=3D 6fb81f1 > |>> + > |> You could use the tags instead of adding GH_TAGNAME, there is a "1.8= " > |> tag, so removing the GH_TAGNAME entirely should just fetch the same > |> sources (distfile name will change) > |=20 > | Unluckily I cannot. This isn't the 1.8 tag, but a commit slightly ahe= ad > | of it in the 1.8-stable branch. There is no tag referencing it. >=20 > If this is not 1.8, it should not be called 1.8 but 1.8.1 or similar. >=20 The upstream did not create a new version, which is something I cannot do. I would just lie by marking the port as 1.8.1 if there is no 1.8.1 release upstream. The commit I am taking is just a few commits ahead of the 1.8 tag and contains fixes which I could have imported as patches i files, like we are doing all the time (I mean importing upstream patches), I did prefer to just move ahead on the upstream repository for coherence with their sources. The upstream is creating packages themselves for other OSes, and they do that by bundling this same version of the nDPI sources in the ntopng source packages. For binary packages they statically link this same nDPI version in ntopng. I could follow suit in the ntopng port and just statically link to the bundled ndpi library, but since we do have a separate ndpi port I thought it was better to dynamically link to it and keep ii up to date. Apart from talking to the upstream and ask them to tag minor releases (which I'm going to do BTW, I just need time ti coordinate about this) I have these options(in random order): - add a date to the ndpi version (like 1.8.2016.07.02) to differentiate from the 1.8 tag (imho this is overkill for just a few small modifications from upstream) - revert my last commit opn ndpi and disengage the ntopng port from it, using a statically linked ndpi in it like upstream is doing (which would anyway come from the same sources ndpi port is using a t present) - maybe create a ndpi-stable port? this would definitely be overkill. - point the port at the tag and cherry pick some fixes from upstream as local patches in files. This would be just formally different from what I'm doing now. I'm open to suggestions, but I don't see the present situation as terribly wrong. --=20 Guido Falsi <madpilot@FreeBSD.org> --Knq1g2ju7SFqTLuSepRoUsXMwqbmcg2OK-- --WhOIrq1Tg9KWbftUc8mN2qMO1gK5EwvF4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEyBAEBCAAcBQJXeLvgFRxtYWRwaWxvdEBmcmVlYnNkLm9yZwAKCRAa5oYOVsvS k+2TCADFF1MRlTBVp2lo6oMUHpDWha4SD92EYkb0vlVmWerIevtyPtZ0Fqv3D/BE 9pWb73B2v6HnTExdlfjjfRrvvwMZjIGEf0vhL8rjzmTwyde7ms1rRp8yFnNLHwGN jPzPIU1u8VfS+iEhw5W6MgD+hVG9ESsimagf2lN76nHagyi3BSNAE+R8TtQMShNu KRT2JajsKCi2F4XjDGDs6qGX7hp6PtIItC6hU6nrIfZxZut+O2nt5CV/lx5p1tGS ZljSPGhPEd2GFdM0pSoc7hzYfilKuRcpoPl1+2xHWZffSKxHHYWAGvZkzf0EXspr j+tiyf1szyWdqwKBuNQdZ02i+Xwo =K4hH -----END PGP SIGNATURE----- --WhOIrq1Tg9KWbftUc8mN2qMO1gK5EwvF4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?448ef6e0-5ea1-343a-7660-211ee9831b56>