On Sun, Jul 09, 2017 at 10:30:06AM +0200, Rafael Sadowski wrote:
> On Sat Jul 08, 2017 at 07:34:03AM +0200, Landry Breuil wrote:
> > On Fri, Jul 07, 2017 at 10:54:46PM +0200, Rafael Sadowski wrote:
> > > On Fri Jul 07, 2017 at 10:03:56PM +0200, Landry Breuil wrote:
> > > > On Fri, Jul 07, 2017 at 09:14:01PM +0200, Rafael Sadowski wrote:
> > > > > Hi All,
> > > > >
> > > > > after a long journey with all qca2 consumers, I'm happy to publish
> > > > > this
> > > > > diff. First of all the security/qca2 changelog part:
> > > > >
> > > > > - Update from 2.0.3 to 2.1.3.
> > > > > - Transform security/{qca-ossl,qca-gnupg} in one security/qca2 port
> > > > > with
> > > > > MULTI_PACKAGES -ossl and -gnupg.
> > > > > - rRename PKGNAME from qca2 to qca2-qt4 (qca2-qt5 is in the pipeline)
> > > > > - Disable SSL2 and SSL3 by default!
> > > > > - "qt42 suffix and no more qca2
> > > > > - Improve QcaConfig and remove alle unnecessary patches.
> > > > > - Add @conflict and @pkgpath into the FLAVORS. Ok? (final pkg_add -u
> > > > > test will follow)
> > > >
> > > > That's a lot of churn - does it all come from upstream or that's a local
> > > > customisation ? Ie will the diffs be commited upstream once someone
> > > > tells them they dont build against newer qca2 ?
> > > >
> > >
> > > What do you mean with churn? I think, only one port in place of tree is
> > > a good idea. I renamed share lib and pkgname to avoid conflicts with
> > > security/qca (qca1) and upcoming qca2-qt5. The QcaConfig extension was
> > > necessary to patch and modify less the consumers.
> > >
> > > But after your e-mail I grep for security/qca and there are no consumers.
> > > New idea because we can get rid of qca1:
> > >
> > > - remove the old security/qca.
> > > - update qca from 2.0.3 to 2.1.3. (with MULTI_PACKAGES to remove
> > > security/{qca-ossl,qca-gnupg}
> >
> > You mean update *security/qca2* right ?
>
> right, sorry for the QCA name kung-fu! Our qca situation is terrible in
> the ports tree:
>
> security/qca: extreme outdated, no consumers
> security/qca-tls: extreme outdated, no consumers
> security/qca-ossl: qca-ossl-2.0.0-beta3
> security/qca-:gnupg qca-gnupg-2.0.0-beta3
>
> New and simple solution:
>
> - remove security/{qca,qca-gnupg,qca-ossl,qca-tls}
> - update security/qca2 from 2.0.3 to 2.1.3.
> -- start SHARED_LIB with 3.0 because old security/qca is 2.0
> -- Transform security/{qca-ossl,qca-gnupg} in one security/qca2 port with
> MULTI_PACKAGES -ossl and -gnupg. Background information: The QCA
> project merge all plugins into the main project > 2.0.0.
> - Don't rename sharedlib name from security/qca2. No longer necessary
> forever!
So, i've read through it, comments inline.
> - security/qca-ossl \
> + security/qca2,,-ossl \
Why the double comma ? i think security/qca2,-ossl should be enough
here. There are other occurences here..
> +# Plugins: qca-botan qca-cyrus-sasl qca-gcrypt qca-gnupg qca-logger
> +# qca-nss qca-ossl qca-pkcs11 qca-softstore
> +PSEUDO_FLAVORS = no_ossl no_gnupg
> +FLAVOR ?= no_ossl no_gnupg
I don't think you need those. We're building subpackages, no point in
providing knobs.
> +.if ${BUILD_PACKAGES:M-ossl} || ${BUILD_PACKAGES:M-gnupg}
> +CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
> +RUN_DEPENDS += ${BUILD_PKGPATH},-main
> +.endif
>
> -WANTLIB += c m pthread ${LIBCXX}
> +.if ${BUILD_PACKAGES:M-gnupg}
> +RUN_DEPENDS += security/gnupg
> +.endif
Same thing, this is wrong. This should be enough:
CONFIGURE_ARGS += -DBUILD_PLUGINS="ossl;gnupg"
RUN_DEPENDS-ossl = ${BUILD_PKGPATH},-main
RUN_DEPENDS-gnupg = ${BUILD_PKGPATH},-main \
security/gnupg
The rest seems fine, especially not renaming the library anymore :)
> +@conflict qca-gnupg-*
> +@pkgpath security/qca-gnupg
> +lib/qca/
> +lib/qca/crypto/
> +lib/qca/crypto/libqca-gnupg.so
Can't lib/qca/crypto go into PLIST-main to avoid having it duplicated in
-gnupg and -ossl ?
> +@conflict qca-1*
> +@pkgpath security/qca
I suppose you've tested the upgrade path :)
